From 5edf41da60d7447766f382b28a24294aaaa838b4 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 8 Mar 2023 03:34:41 +0000 Subject: Remove empty rules.mk from keymaps (#20056) --- keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk | 0 keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk | 0 keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk | 0 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk delete mode 100644 keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk delete mode 100644 keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk (limited to 'keyboards/maple_computing') diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.3.1 From caa8c81086a806ea048c91ba142d424dc6a49f50 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:39:56 +1100 Subject: Move matrix config to info.json, part 7 (#20020) --- keyboards/m10a/config.h | 8 ---- keyboards/m10a/info.json | 5 +++ keyboards/machine_industries/m4_a/config.h | 17 -------- keyboards/machine_industries/m4_a/info.json | 5 +++ keyboards/machkeyboards/mach3/config.h | 25 ----------- keyboards/machkeyboards/mach3/info.json | 5 +++ keyboards/macro1/config.h | 8 ---- keyboards/macro1/info.json | 5 +++ keyboards/majistic/config.h | 9 ---- keyboards/majistic/info.json | 13 +++++- keyboards/makrosu/config.h | 7 --- keyboards/makrosu/info.json | 5 +++ keyboards/malevolti/lyra/rev1/config.h | 6 --- keyboards/malevolti/lyra/rev1/info.json | 5 +++ keyboards/malevolti/superlyra/rev1/config.h | 6 --- keyboards/malevolti/superlyra/rev1/info.json | 5 +++ keyboards/manta60/config.h | 17 -------- keyboards/manta60/info.json | 5 +++ keyboards/manyboard/macro/config.h | 7 --- keyboards/manyboard/macro/info.json | 5 +++ keyboards/maple_computing/6ball/config.h | 8 ---- keyboards/maple_computing/6ball/info.json | 5 +++ keyboards/maple_computing/c39/config.h | 41 ----------------- keyboards/maple_computing/c39/info.json | 5 +++ keyboards/maple_computing/christmas_tree/config.h | 8 ---- keyboards/maple_computing/christmas_tree/info.json | 5 +++ keyboards/maple_computing/ivy/rev1/config.h | 24 ---------- keyboards/maple_computing/ivy/rev1/info.json | 5 +++ keyboards/maple_computing/jnao/config.h | 7 --- keyboards/maple_computing/jnao/info.json | 5 +++ keyboards/maple_computing/launchpad/rev1/config.h | 8 ---- keyboards/maple_computing/launchpad/rev1/info.json | 5 +++ .../maple_computing/lets_split_eh/eh/config.h | 7 --- .../maple_computing/lets_split_eh/eh/info.json | 5 +++ keyboards/maple_computing/minidox/config.h | 4 -- keyboards/maple_computing/minidox/rev1/config.h | 24 ---------- keyboards/maple_computing/minidox/rev1/info.json | 5 +++ keyboards/maple_computing/the_ruler/config.h | 17 -------- keyboards/maple_computing/the_ruler/info.json | 5 +++ keyboards/marksard/leftover30/config.h | 16 ------- keyboards/marksard/leftover30/info.json | 5 +++ keyboards/marksard/rhymestone/rev1/config.h | 17 -------- keyboards/marksard/rhymestone/rev1/info.json | 5 +++ keyboards/marksard/treadstone32/lite/config.h | 16 ------- keyboards/marksard/treadstone32/lite/info.json | 5 +++ keyboards/marksard/treadstone32/rev1/config.h | 17 -------- keyboards/marksard/treadstone32/rev1/info.json | 5 +++ keyboards/marksard/treadstone48/rev1/config.h | 17 -------- keyboards/marksard/treadstone48/rev1/info.json | 5 +++ keyboards/marksard/treadstone48/rev2/config.h | 17 -------- keyboards/marksard/treadstone48/rev2/info.json | 5 +++ keyboards/massdrop/alt/config.h | 6 --- keyboards/massdrop/alt/info.json | 5 +++ keyboards/massdrop/ctrl/config.h | 6 --- keyboards/massdrop/ctrl/info.json | 5 +++ keyboards/massdrop/thekey/config.h | 9 ---- keyboards/massdrop/thekey/info.json | 5 +++ keyboards/massdrop/thekey_v2/config.h | 9 ---- keyboards/massdrop/thekey_v2/info.json | 5 +++ keyboards/masterworks/classy_tkl/rev_a/config.h | 19 -------- keyboards/masterworks/classy_tkl/rev_a/info.json | 5 +++ keyboards/matchstickworks/southpad/config.h | 51 ---------------------- keyboards/matchstickworks/southpad/info.json | 5 +++ keyboards/matrix/cain_re/config.h | 8 ---- keyboards/matrix/cain_re/info.json | 5 +++ keyboards/matrix/falcon/config.h | 6 --- keyboards/matrix/falcon/info.json | 5 +++ keyboards/matrix/m12og/rev2/config.h | 8 ---- keyboards/matrix/m12og/rev2/info.json | 5 +++ keyboards/matrix/me/config.h | 5 --- keyboards/matrix/me/info.json | 5 +++ keyboards/matrix/noah/config.h | 5 --- keyboards/matthewdias/m3n3van/config.h | 42 ------------------ keyboards/matthewdias/m3n3van/info.json | 5 +++ keyboards/matthewdias/minim/config.h | 42 ------------------ keyboards/matthewdias/minim/info.json | 5 +++ keyboards/matthewdias/model_v/config.h | 42 ------------------ keyboards/matthewdias/model_v/info.json | 5 +++ keyboards/matthewdias/txuu/config.h | 42 ------------------ keyboards/matthewdias/txuu/info.json | 5 +++ keyboards/maxipad/promicro/config.h | 33 -------------- keyboards/maxipad/promicro/info.json | 5 +++ keyboards/maxipad/teensy2/config.h | 33 -------------- keyboards/maxipad/teensy2/info.json | 5 +++ keyboards/maxr1998/pulse4k/config.h | 8 ---- keyboards/maxr1998/pulse4k/info.json | 5 +++ keyboards/mb44/config.h | 35 --------------- keyboards/mb44/info.json | 5 +++ keyboards/mc_76k/config.h | 17 -------- keyboards/mc_76k/info.json | 5 +++ keyboards/mechanickeys/miniashen40/config.h | 34 --------------- keyboards/mechanickeys/miniashen40/info.json | 5 +++ keyboards/mechanickeys/undead60m/config.h | 17 -------- keyboards/mechanickeys/undead60m/info.json | 5 +++ keyboards/mechbrewery/mb65h/config.h | 25 ----------- keyboards/mechbrewery/mb65h/info.json | 5 +++ keyboards/mechbrewery/mb65s/config.h | 7 --- keyboards/mechbrewery/mb65s/info.json | 5 +++ keyboards/mechkeys/acr60/config.h | 8 ---- keyboards/mechkeys/acr60/info.json | 5 +++ keyboards/mechkeys/alu84/config.h | 17 -------- keyboards/mechkeys/alu84/info.json | 5 +++ keyboards/mechkeys/espectro/config.h | 8 ---- keyboards/mechkeys/espectro/info.json | 5 +++ keyboards/mechkeys/mechmini/v1/config.h | 5 --- keyboards/mechkeys/mechmini/v1/info.json | 5 +++ keyboards/mechkeys/mechmini/v2/config.h | 8 ---- keyboards/mechkeys/mechmini/v2/info.json | 5 +++ keyboards/mechkeys/mk60/config.h | 17 -------- keyboards/mechkeys/mk60/info.json | 5 +++ keyboards/mechllama/g35/config.h | 3 -- keyboards/mechllama/g35/v1/config.h | 3 -- keyboards/mechllama/g35/v1/info.json | 7 ++- keyboards/mechllama/g35/v2/config.h | 3 -- keyboards/mechllama/g35/v2/info.json | 7 ++- keyboards/mechlovin/adelais/rgb_led/config.h | 21 --------- keyboards/mechlovin/adelais/rgb_led/rev1/config.h | 3 -- keyboards/mechlovin/adelais/rgb_led/rev1/info.json | 5 +++ keyboards/mechlovin/adelais/rgb_led/rev2/config.h | 3 -- keyboards/mechlovin/adelais/rgb_led/rev2/info.json | 5 +++ keyboards/mechlovin/adelais/rgb_led/rev3/config.h | 3 -- keyboards/mechlovin/adelais/rgb_led/rev3/info.json | 5 +++ .../mechlovin/adelais/standard_led/arm/config.h | 6 --- .../mechlovin/adelais/standard_led/arm/info.json | 5 +++ keyboards/mechlovin/delphine/config.h | 34 --------------- keyboards/mechlovin/delphine/info.json | 5 +++ keyboards/mechlovin/foundation/config.h | 18 -------- keyboards/mechlovin/foundation/info.json | 5 +++ keyboards/mechlovin/hannah60rgb/config.h | 34 --------------- keyboards/mechlovin/hannah60rgb/rev1/info.json | 5 +++ keyboards/mechlovin/hannah60rgb/rev2/info.json | 5 +++ keyboards/mechlovin/hannah65/config.h | 16 ------- keyboards/mechlovin/hannah65/info.json | 5 +++ keyboards/mechlovin/hannah910/config.h | 17 -------- keyboards/mechlovin/hannah910/rev1/info.json | 5 +++ keyboards/mechlovin/hannah910/rev2/info.json | 5 +++ keyboards/mechlovin/hannah910/rev3/info.json | 5 +++ keyboards/mechlovin/hex4b/config.h | 33 -------------- keyboards/mechlovin/hex4b/rev1/config.h | 33 -------------- keyboards/mechlovin/hex4b/rev1/info.json | 5 +++ keyboards/mechlovin/hex4b/rev2/config.h | 15 ------- keyboards/mechlovin/hex4b/rev2/info.json | 5 +++ keyboards/mechlovin/hex6c/config.h | 17 -------- keyboards/mechlovin/hex6c/info.json | 5 +++ keyboards/mechlovin/infinity87/rev1/config.h | 5 --- keyboards/mechlovin/infinity87/rev1/info.json | 5 +++ keyboards/mechlovin/infinity87/rgb_rev1/config.h | 6 --- keyboards/mechlovin/infinity87/rgb_rev1/info.json | 5 +++ keyboards/mechlovin/infinity88/config.h | 16 ------- keyboards/mechlovin/infinity88/info.json | 5 +++ keyboards/mechlovin/infinityce/config.h | 7 --- keyboards/mechlovin/infinityce/info.json | 5 +++ keyboards/mechlovin/jay60/config.h | 17 -------- keyboards/mechlovin/jay60/info.json | 5 +++ keyboards/mechlovin/kanu/config.h | 17 -------- keyboards/mechlovin/kanu/info.json | 5 +++ keyboards/mechlovin/kay60/config.h | 17 -------- keyboards/mechlovin/kay60/info.json | 5 +++ keyboards/mechlovin/kay65/config.h | 17 -------- keyboards/mechlovin/kay65/info.json | 5 +++ keyboards/mechlovin/mechlovin9/config.h | 21 --------- keyboards/mechlovin/mechlovin9/rev1/config.h | 13 ------ keyboards/mechlovin/mechlovin9/rev1/info.json | 5 +++ keyboards/mechlovin/mechlovin9/rev2/config.h | 31 ------------- keyboards/mechlovin/mechlovin9/rev2/info.json | 5 +++ keyboards/mechlovin/olly/octagon/config.h | 8 ---- keyboards/mechlovin/olly/octagon/info.json | 5 +++ keyboards/mechlovin/olly/orion/config.h | 17 -------- keyboards/mechlovin/olly/orion/info.json | 5 +++ keyboards/mechlovin/pisces/config.h | 16 ------- keyboards/mechlovin/pisces/info.json | 5 +++ keyboards/mechlovin/th1800/config.h | 35 --------------- keyboards/mechlovin/th1800/info.json | 5 +++ keyboards/mechlovin/tmkl/config.h | 16 ------- keyboards/mechlovin/tmkl/info.json | 5 +++ keyboards/mechlovin/zed60/config.h | 17 -------- keyboards/mechlovin/zed60/info.json | 5 +++ keyboards/mechlovin/zed65/config.h | 48 -------------------- keyboards/mechlovin/zed65/mono_led/config.h | 5 --- keyboards/mechlovin/zed65/mono_led/info.json | 5 +++ .../mechlovin/zed65/no_backlight/cor65/config.h | 22 ---------- .../mechlovin/zed65/no_backlight/cor65/info.json | 5 +++ .../mechlovin/zed65/no_backlight/retro66/config.h | 4 -- .../mechlovin/zed65/no_backlight/retro66/info.json | 5 +++ .../zed65/no_backlight/wearhaus66/config.h | 5 --- .../zed65/no_backlight/wearhaus66/info.json | 5 +++ keyboards/mechstudio/dawn/config.h | 26 ----------- keyboards/mechstudio/dawn/info.json | 5 +++ keyboards/mechstudio/ud_40_ortho/config.h | 9 ---- keyboards/mechstudio/ud_40_ortho/info.json | 5 +++ keyboards/mechwild/bbs/config.h | 16 ------- keyboards/mechwild/bbs/info.json | 5 +++ keyboards/mechwild/mercutio/config.h | 8 ---- keyboards/mechwild/mercutio/info.json | 5 +++ keyboards/mechwild/mokulua/mirrored/config.h | 8 ---- keyboards/mechwild/mokulua/mirrored/info.json | 5 +++ keyboards/mechwild/mokulua/standard/config.h | 8 ---- keyboards/mechwild/mokulua/standard/info.json | 5 +++ keyboards/mechwild/murphpad/config.h | 8 ---- keyboards/mechwild/murphpad/info.json | 5 +++ keyboards/mechwild/obe/config.h | 17 -------- keyboards/mechwild/obe/info.json | 5 +++ keyboards/mechwild/puckbuddy/config.h | 16 ------- keyboards/mechwild/puckbuddy/info.json | 5 +++ keyboards/mechwild/waka60/config.h | 17 -------- keyboards/mechwild/waka60/info.json | 5 +++ keyboards/mehkee96/config.h | 5 --- keyboards/mehkee96/info.json | 5 +++ keyboards/meletrix/zoom65/config.h | 6 --- keyboards/meletrix/zoom65/info.json | 5 +++ keyboards/meletrix/zoom65_lite/config.h | 6 --- keyboards/meletrix/zoom65_lite/info.json | 5 +++ keyboards/meletrix/zoom87/config.h | 6 --- keyboards/meletrix/zoom87/info.json | 5 +++ keyboards/melgeek/mach80/rev1/config.h | 17 -------- keyboards/melgeek/mach80/rev1/info.json | 7 +++ keyboards/melgeek/mach80/rev2/config.h | 17 -------- keyboards/melgeek/mach80/rev2/info.json | 7 +++ keyboards/melgeek/mj61/rev1/config.h | 17 -------- keyboards/melgeek/mj61/rev1/info.json | 7 +++ keyboards/melgeek/mj61/rev2/config.h | 17 -------- keyboards/melgeek/mj61/rev2/info.json | 7 +++ keyboards/melgeek/mj63/rev1/config.h | 17 -------- keyboards/melgeek/mj63/rev1/info.json | 7 +++ keyboards/melgeek/mj63/rev2/config.h | 17 -------- keyboards/melgeek/mj63/rev2/info.json | 7 +++ keyboards/melgeek/mj64/rev1/config.h | 17 -------- keyboards/melgeek/mj64/rev1/info.json | 7 +++ keyboards/melgeek/mj64/rev2/config.h | 17 -------- keyboards/melgeek/mj64/rev2/info.json | 7 +++ keyboards/melgeek/mj64/rev3/config.h | 17 -------- keyboards/melgeek/mj64/rev3/info.json | 7 +++ keyboards/melgeek/mj65/info.json | 5 +++ keyboards/melgeek/mj65/rev3/config.h | 17 -------- keyboards/melgeek/mj6xy/rev3/config.h | 6 --- keyboards/melgeek/mj6xy/rev3/info.json | 5 +++ keyboards/melgeek/mojo68/info.json | 5 +++ keyboards/melgeek/mojo68/rev1/config.h | 17 -------- keyboards/melgeek/mojo75/info.json | 5 +++ keyboards/melgeek/mojo75/rev1/config.h | 17 -------- keyboards/melgeek/tegic/info.json | 5 +++ keyboards/melgeek/tegic/rev1/config.h | 17 -------- keyboards/melgeek/z70ultra/config.h | 4 -- keyboards/melgeek/z70ultra/info.json | 5 +++ keyboards/melgeek/z70ultra/rev1/config.h | 32 -------------- keyboards/meme/config.h | 17 -------- keyboards/meme/info.json | 5 +++ keyboards/meow48/config.h | 17 -------- keyboards/meow48/info.json | 7 ++- keyboards/meow65/config.h | 17 -------- keyboards/meow65/info.json | 5 +++ keyboards/merge/iso_macro/config.h | 24 ---------- keyboards/merge/iso_macro/info.json | 5 +++ keyboards/merge/uc1/config.h | 6 --- keyboards/merge/uc1/info.json | 5 +++ keyboards/merge/um70/config.h | 6 --- keyboards/merge/um70/info.json | 5 +++ keyboards/merge/um80/config.h | 6 --- keyboards/merge/um80/info.json | 5 +++ keyboards/merge/uma/config.h | 6 --- keyboards/merge/uma/info.json | 5 +++ keyboards/mesa/mesa_tkl/config.h | 17 -------- keyboards/mesa/mesa_tkl/info.json | 5 +++ keyboards/meson/config.h | 7 --- keyboards/meson/info.json | 5 +++ keyboards/metamechs/timberwolf/config.h | 51 ---------------------- keyboards/metamechs/timberwolf/info.json | 5 +++ keyboards/mikeneko65/config.h | 17 -------- keyboards/mikeneko65/info.json | 5 +++ keyboards/miller/gm862/config.h | 16 ------- keyboards/miller/gm862/info.json | 5 +++ keyboards/millipad/config.h | 17 -------- keyboards/millipad/info.json | 5 +++ keyboards/mini_elixivy/config.h | 17 -------- keyboards/mini_elixivy/info.json | 5 +++ keyboards/mini_ten_key_plus/config.h | 17 -------- keyboards/mini_ten_key_plus/info.json | 5 +++ keyboards/minimon/index_tab/config.h | 9 ---- keyboards/minimon/index_tab/info.json | 5 +++ keyboards/mino/hotswap/config.h | 17 -------- keyboards/mino/hotswap/info.json | 5 +++ keyboards/mint60/config.h | 17 -------- keyboards/mint60/info.json | 5 +++ keyboards/misonoworks/chocolatebar/config.h | 8 ---- keyboards/misonoworks/chocolatebar/info.json | 5 +++ keyboards/misonoworks/karina/config.h | 8 ---- keyboards/misonoworks/karina/info.json | 5 +++ keyboards/misterknife/knife66/config.h | 5 --- keyboards/misterknife/knife66/info.json | 5 +++ keyboards/misterknife/knife66_iso/config.h | 5 --- keyboards/misterknife/knife66_iso/info.json | 5 +++ keyboards/miuni32/config.h | 17 -------- keyboards/miuni32/info.json | 5 +++ keyboards/ml/gas75/config.h | 8 ---- keyboards/ml/gas75/info.json | 5 +++ keyboards/mlego/m48/config.h | 3 -- keyboards/mlego/m48/rev1/config.h | 6 --- keyboards/mlego/m48/rev1/info.json | 5 +++ keyboards/mlego/m60/config.h | 4 -- keyboards/mlego/m60/rev1/config.h | 5 --- keyboards/mlego/m60/rev1/info.json | 5 +++ keyboards/mlego/m60_split/config.h | 3 -- keyboards/mlego/m60_split/rev1/config.h | 12 ----- keyboards/mlego/m60_split/rev1/info.json | 11 +++++ keyboards/mlego/m60_split/rev2/config.h | 12 ----- keyboards/mlego/m60_split/rev2/info.json | 11 +++++ keyboards/mlego/m65/config.h | 3 -- keyboards/mlego/m65/rev1/config.h | 7 --- keyboards/mlego/m65/rev1/info.json | 5 +++ keyboards/mlego/m65/rev2/config.h | 7 --- keyboards/mlego/m65/rev2/info.json | 5 +++ keyboards/mlego/m65/rev3/config.h | 7 --- keyboards/mlego/m65/rev3/info.json | 5 +++ keyboards/mlego/m65/rev4/config.h | 7 --- keyboards/mlego/m65/rev4/info.json | 5 +++ keyboards/mmkzoo65/config.h | 8 ---- keyboards/mmkzoo65/info.json | 5 +++ keyboards/mnk1800s/config.h | 7 --- keyboards/mnk1800s/info.json | 5 +++ keyboards/mnk50/config.h | 7 --- keyboards/mnk50/info.json | 5 +++ keyboards/mnk75/config.h | 7 --- keyboards/mnk75/info.json | 5 +++ keyboards/mntre/config.h | 17 -------- keyboards/mntre/info.json | 5 +++ keyboards/mode/m65ha_alpha/config.h | 4 -- keyboards/mode/m65ha_alpha/info.json | 5 +++ keyboards/mode/m65hi_alpha/config.h | 4 -- keyboards/mode/m65hi_alpha/info.json | 5 +++ keyboards/mode/m65s/config.h | 4 -- keyboards/mode/m65s/info.json | 5 +++ keyboards/mode/m75h/config.h | 6 --- keyboards/mode/m75h/info.json | 5 +++ keyboards/mode/m75s/config.h | 6 --- keyboards/mode/m75s/info.json | 5 +++ keyboards/mode/m80v1/config.h | 17 -------- keyboards/mode/m80v1/m80h/info.json | 5 +++ keyboards/mode/m80v1/m80s/info.json | 5 +++ keyboards/mode/m80v2/config.h | 5 --- keyboards/mode/m80v2/m80v2h/info.json | 5 +++ keyboards/mode/m80v2/m80v2s/info.json | 5 +++ keyboards/mokey/ginkgo65hot/config.h | 19 -------- keyboards/mokey/ginkgo65hot/info.json | 5 +++ keyboards/mokey/ibis80/config.h | 22 ---------- keyboards/mokey/ibis80/info.json | 5 +++ keyboards/mokey/mokey63/config.h | 22 ---------- keyboards/mokey/mokey63/info.json | 5 +++ keyboards/mokey/mokey64/config.h | 22 ---------- keyboards/mokey/mokey64/info.json | 5 +++ keyboards/mokey/xox70/config.h | 20 --------- keyboards/mokey/xox70/info.json | 5 +++ keyboards/mokey/xox70hot/config.h | 20 --------- keyboards/mokey/xox70hot/info.json | 5 +++ keyboards/molecule/config.h | 17 -------- keyboards/molecule/info.json | 5 +++ keyboards/momoka_ergo/config.h | 6 --- keyboards/momoka_ergo/info.json | 5 +++ keyboards/momokai/tap_duo/config.h | 7 --- keyboards/momokai/tap_duo/info.json | 5 +++ keyboards/momokai/tap_trio/config.h | 7 --- keyboards/momokai/tap_trio/info.json | 5 +++ keyboards/monarch/config.h | 4 -- keyboards/monarch/info.json | 5 +++ keyboards/monoflex60/config.h | 26 ----------- keyboards/monoflex60/info.json | 5 +++ keyboards/monstargear/xo87/rgb/config.h | 3 -- keyboards/monstargear/xo87/rgb/info.json | 5 +++ keyboards/monstargear/xo87/solderable/config.h | 4 -- keyboards/monstargear/xo87/solderable/info.json | 5 +++ keyboards/montsinger/rebound/rev1/config.h | 19 -------- keyboards/montsinger/rebound/rev1/info.json | 5 +++ keyboards/montsinger/rebound/rev2/config.h | 19 -------- keyboards/montsinger/rebound/rev2/info.json | 5 +++ keyboards/montsinger/rebound/rev3/config.h | 19 -------- keyboards/montsinger/rebound/rev3/info.json | 5 +++ keyboards/montsinger/rebound/rev4/config.h | 19 -------- keyboards/montsinger/rebound/rev4/info.json | 5 +++ keyboards/montsinger/rewind/config.h | 19 -------- keyboards/montsinger/rewind/info.json | 5 +++ keyboards/morizon/config.h | 6 --- keyboards/morizon/info.json | 5 +++ keyboards/mountainblocks/mb17/config.h | 17 -------- keyboards/mountainblocks/mb17/info.json | 5 +++ keyboards/mss_studio/m63_rgb/config.h | 8 ---- keyboards/mss_studio/m63_rgb/info.json | 5 +++ keyboards/mss_studio/m64_rgb/config.h | 8 ---- keyboards/mss_studio/m64_rgb/info.json | 5 +++ keyboards/mt/blocked65/config.h | 9 ---- keyboards/mt/blocked65/info.json | 5 +++ keyboards/mt/mt40/config.h | 21 --------- keyboards/mt/mt40/info.json | 5 +++ keyboards/mt/mt64rgb/config.h | 17 -------- keyboards/mt/mt64rgb/info.json | 5 +++ keyboards/mt/mt84/config.h | 17 -------- keyboards/mt/mt84/info.json | 5 +++ keyboards/mt/mt980/config.h | 8 ---- keyboards/mt/mt980/info.json | 5 +++ keyboards/mt/ncr80/hotswap/config.h | 15 ------- keyboards/mt/ncr80/hotswap/info.json | 5 +++ keyboards/mt/ncr80/solder/config.h | 33 -------------- keyboards/mt/ncr80/solder/info.json | 5 +++ keyboards/mtbkeys/mtb60/hotswap/config.h | 8 ---- keyboards/mtbkeys/mtb60/hotswap/info.json | 5 +++ keyboards/mtbkeys/mtb60/solder/config.h | 8 ---- keyboards/mtbkeys/mtb60/solder/info.json | 5 +++ keyboards/murcielago/info.json | 11 +++++ keyboards/murcielago/rev1/config.h | 18 -------- keyboards/mwstudio/alicekk/config.h | 8 ---- keyboards/mwstudio/alicekk/info.json | 5 +++ keyboards/mwstudio/mw65_black/config.h | 8 ---- keyboards/mwstudio/mw65_black/info.json | 5 +++ keyboards/mwstudio/mw65_rgb/config.h | 8 ---- keyboards/mwstudio/mw65_rgb/info.json | 5 +++ keyboards/mwstudio/mw75/config.h | 8 ---- keyboards/mwstudio/mw75/info.json | 5 +++ keyboards/mwstudio/mw75r2/config.h | 8 ---- keyboards/mwstudio/mw75r2/info.json | 5 +++ keyboards/mxss/config.h | 8 ---- keyboards/mxss/info.json | 5 +++ keyboards/mysticworks/wyvern/config.h | 8 ---- keyboards/mysticworks/wyvern/info.json | 5 +++ 421 files changed, 1081 insertions(+), 3038 deletions(-) delete mode 100644 keyboards/machkeyboards/mach3/config.h delete mode 100755 keyboards/maple_computing/c39/config.h delete mode 100644 keyboards/maple_computing/ivy/rev1/config.h delete mode 100644 keyboards/maple_computing/minidox/rev1/config.h delete mode 100644 keyboards/matchstickworks/southpad/config.h delete mode 100644 keyboards/matthewdias/m3n3van/config.h delete mode 100644 keyboards/matthewdias/minim/config.h delete mode 100644 keyboards/matthewdias/model_v/config.h delete mode 100644 keyboards/matthewdias/txuu/config.h delete mode 100644 keyboards/maxipad/promicro/config.h delete mode 100644 keyboards/maxipad/teensy2/config.h delete mode 100644 keyboards/mb44/config.h delete mode 100644 keyboards/mechanickeys/miniashen40/config.h delete mode 100644 keyboards/mechbrewery/mb65h/config.h delete mode 100644 keyboards/mechlovin/adelais/rgb_led/config.h delete mode 100644 keyboards/mechlovin/delphine/config.h delete mode 100644 keyboards/mechlovin/hannah60rgb/config.h delete mode 100644 keyboards/mechlovin/hex4b/config.h delete mode 100644 keyboards/mechlovin/hex4b/rev1/config.h delete mode 100644 keyboards/mechlovin/mechlovin9/config.h delete mode 100644 keyboards/mechlovin/mechlovin9/rev2/config.h delete mode 100644 keyboards/mechlovin/th1800/config.h delete mode 100644 keyboards/mechlovin/zed65/config.h delete mode 100644 keyboards/mechlovin/zed65/no_backlight/cor65/config.h delete mode 100644 keyboards/mechstudio/dawn/config.h create mode 100644 keyboards/melgeek/mach80/rev1/info.json create mode 100644 keyboards/melgeek/mach80/rev2/info.json create mode 100644 keyboards/melgeek/mj61/rev1/info.json create mode 100644 keyboards/melgeek/mj61/rev2/info.json create mode 100644 keyboards/melgeek/mj63/rev1/info.json create mode 100644 keyboards/melgeek/mj63/rev2/info.json create mode 100644 keyboards/melgeek/mj64/rev1/info.json create mode 100644 keyboards/melgeek/mj64/rev2/info.json create mode 100644 keyboards/melgeek/mj64/rev3/info.json delete mode 100644 keyboards/melgeek/z70ultra/rev1/config.h delete mode 100644 keyboards/merge/iso_macro/config.h delete mode 100644 keyboards/metamechs/timberwolf/config.h delete mode 100644 keyboards/mokey/ginkgo65hot/config.h delete mode 100644 keyboards/mokey/ibis80/config.h delete mode 100644 keyboards/mokey/mokey63/config.h delete mode 100644 keyboards/mokey/mokey64/config.h delete mode 100644 keyboards/mokey/xox70/config.h delete mode 100644 keyboards/mokey/xox70hot/config.h delete mode 100644 keyboards/monoflex60/config.h delete mode 100644 keyboards/mt/ncr80/solder/config.h (limited to 'keyboards/maple_computing') diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h index dac3f44a3e..6c9b63c5ee 100644 --- a/keyboards/m10a/config.h +++ b/keyboards/m10a/config.h @@ -18,14 +18,6 @@ #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { B6, F7, F6, D6 } -#define MATRIX_COL_PINS { F5, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json index f517d49087..de50593b9d 100644 --- a/keyboards/m10a/info.json +++ b/keyboards/m10a/info.json @@ -8,6 +8,11 @@ "pid": "0x00AA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F1", "F0"], + "rows": ["B6", "F7", "F6", "D6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 6 diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h index 0e71c0e8c1..da001ee1da 100644 --- a/keyboards/machine_industries/m4_a/config.h +++ b/keyboards/machine_industries/m4_a/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C7, C6 } -#define MATRIX_COL_PINS { F6, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json index 05c2a57234..f6532a6409 100644 --- a/keyboards/machine_industries/m4_a/info.json +++ b/keyboards/machine_industries/m4_a/info.json @@ -8,6 +8,11 @@ "pid": "0x004A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7"], + "rows": ["C7", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/machkeyboards/mach3/config.h b/keyboards/machkeyboards/mach3/config.h deleted file mode 100644 index ba1628e954..0000000000 --- a/keyboards/machkeyboards/mach3/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Mach Keyboards - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* key pins */ -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json index 767beb2026..3af4e154c1 100644 --- a/keyboards/machkeyboards/mach3/info.json +++ b/keyboards/machkeyboards/mach3/info.json @@ -8,6 +8,11 @@ "pid": "0x4D33", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5, diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h index a03f212f37..30b3906f0d 100644 --- a/keyboards/macro1/config.h +++ b/keyboards/macro1/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 } -#define MATRIX_COL_PINS { D3, D4, D6, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json index ae4de40310..5fb86fecb7 100644 --- a/keyboards/macro1/info.json +++ b/keyboards/macro1/info.json @@ -8,6 +8,11 @@ "pid": "0x9999", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D4", "D6", "D7"], + "rows": ["E6", "B7", "D0", "D1", "D2", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"} diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h index 2ff78e2bed..c896b12478 100644 --- a/keyboards/majistic/config.h +++ b/keyboards/majistic/config.h @@ -18,15 +18,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } // F4, F5 is dummy -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json index be3a1cafdd..7c475660c7 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/info.json @@ -8,8 +8,19 @@ "pid": "0x6E55", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], + "rows": ["F6", "F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + } + }, }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h index c00353db89..98108cce78 100644 --- a/keyboards/makrosu/config.h +++ b/keyboards/makrosu/config.h @@ -16,14 +16,7 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5} - #define TAP_CODE_DELAY 10 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json index 77974305e5..9abafac946 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/info.json @@ -8,6 +8,11 @@ "pid": "0x8585", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "D1"} diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h index 113174ff1e..38a1a09cd3 100644 --- a/keyboards/malevolti/lyra/rev1/config.h +++ b/keyboards/malevolti/lyra/rev1/config.h @@ -15,10 +15,4 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json index 572e5c118d..2cc916c7cf 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x4C43", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h index 4a56b96808..cffc2e9ff2 100644 --- a/keyboards/malevolti/superlyra/rev1/config.h +++ b/keyboards/malevolti/superlyra/rev1/config.h @@ -15,10 +15,4 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json index c45b496c54..1c0e9c72bc 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x4C53", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h index 8c8e3f4ccb..9051dd7f4e 100644 --- a/keyboards/manta60/config.h +++ b/keyboards/manta60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 ,B4} -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 #define RGB_DI_PIN D3 diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json index e81c4e4580..15594fe13c 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/info.json @@ -8,6 +8,11 @@ "pid": "0x991D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index 1839a1091d..dab95cea0e 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Pins */ #define RGB_DI_PIN B6 #define RGBLED_NUM 2 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index cdf40f6801..6d82466ac8 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "matrix_pins": { + "cols": ["D4", "D5", "D6", "D7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "C7"} diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h index 4eaec15ad2..6f4decad61 100644 --- a/keyboards/maple_computing/6ball/config.h +++ b/keyboards/maple_computing/6ball/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -/* pin-out */ -#define MATRIX_ROW_PINS { F5 } -#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 } - /* ws2812 RGB LED */ #define RGB_DI_PIN F7 @@ -37,7 +32,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 6 // Number of LEDs -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 200 diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json index 21df7d9dda..38f127cffc 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D4", "B5", "B6", "B2", "F6"], + "rows": ["F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h deleted file mode 100755 index 1b11bc5ce9..0000000000 --- a/keyboards/maple_computing/c39/config.h +++ /dev/null @@ -1,41 +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 - - -#define MATRIX_ROW_PINS { D1, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, C6, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json index 370f21ad09..7cb73383a7 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/info.json @@ -8,6 +8,11 @@ "pid": "0xCA39", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"], + "rows": ["D1", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 40c2ce1f48..5070f05156 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D3, F4, D0, F6, F5, D4 } -#define MATRIX_COL_PINS { D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index d60dabe1df..3ef81f9fd3 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -7,6 +7,11 @@ "vid": "0xFEED", "pid": "0x3070" }, + "matrix_pins": { + "cols": ["D1"], + "rows": ["D3", "F4", "D0", "F6", "F5", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h deleted file mode 100644 index 902f807051..0000000000 --- a/keyboards/maple_computing/ivy/rev1/config.h +++ /dev/null @@ -1,24 +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 - -/* Let's Macro V2 pin-out */ -#define MATRIX_ROW_PINS { F1, B2, D3 } -#define MATRIX_COL_PINS { F5, B3, D5 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index 19109ca73f..e9cf604e19 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "B3", "D5"], + "rows": ["F1", "B2", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h index 24942e7a51..c2949ab3a7 100644 --- a/keyboards/maple_computing/jnao/config.h +++ b/keyboards/maple_computing/jnao/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { E6, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { F1, F4, B1, B2, B3, B7, D1, D2, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index afa5a8674e..cfc198c02e 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -8,6 +8,11 @@ "pid": "0x6017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "B1", "B2", "B3", "B7", "D1", "D2", "D4", "D6", "D7", "B4"], + "rows": ["E6", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D0" }, diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index cd0ea962c2..aecb3f02bd 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once -#include "../config.h" - -/* Let's Macro V2 pin-out */ -#define MATRIX_ROW_PINS { C6, B1, B3, D7 } -#define MATRIX_COL_PINS { D2, F7 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 10 #define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 8ae1835b69..49f4c16bc9 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F7"], + "rows": ["C6", "B1", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h index 55d2428db0..0a12b77265 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/eh/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once - -/* Let's Split EH? pin-out */ -#define MATRIX_ROW_PINS { B1, B3, D7, B4 } -#define MATRIX_COL_PINS { F4, F5, C6, B6, B5, D5 } - -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ #define RGB_DI_PIN B2 #define RGBLED_NUM 12 // Number of LEDs (each hand) diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 4574b10b64..4d2ee20c0b 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -8,6 +8,11 @@ "pid": "0xE401", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "C6", "B6", "B5", "D5"], + "rows": ["B1", "B3", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h index cc2f0c8379..c59b7d33b1 100644 --- a/keyboards/maple_computing/minidox/config.h +++ b/keyboards/maple_computing/minidox/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h deleted file mode 100644 index 26979e4edc..0000000000 --- a/keyboards/maple_computing/minidox/rev1/config.h +++ /dev/null @@ -1,24 +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 - -// wiring of each half -#define MATRIX_ROW_PINS { B2, B6, B4, B5 } -#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 } - -//#define EE_HANDS diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 83794bb116..9d1e2b806f 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "D3", "D2", "D1", "D4"], + "rows": ["B2", "B6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h index 53e7bfe55f..d6c805d7c5 100644 --- a/keyboards/maple_computing/the_ruler/config.h +++ b/keyboards/maple_computing/the_ruler/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C7 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json index 69347412ce..fd4de0bcbf 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/info.json @@ -8,6 +8,11 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], + "rows": ["C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h index bf7aa7f198..9a15aa3826 100644 --- a/keyboards/marksard/leftover30/config.h +++ b/keyboards/marksard/leftover30/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, D4, D0 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index 39de1d6bda..7aca7e75df 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json @@ -8,6 +8,11 @@ "pid": "0xDFA8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index 9cc003be13..b832cd5ce3 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json index 6d68519512..376101c642 100644 --- a/keyboards/marksard/rhymestone/rev1/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xDFA1", "device_version": "0.2.0" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index a460abd0ef..1da59006d4 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, F4, F5 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 040083b968..a66783b8c9 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.5" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index db39ee477c..573427ff75 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F1, F0, E6, B2, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 6 diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 51b46b22d2..f7b19c63fa 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7"], + "rows": ["F1", "F0", "E6", "B2", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index 505548a75d..a9fd1ad829 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #ifndef RS_EXTRA_LED diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json index 2c589cac51..7d36463643 100644 --- a/keyboards/marksard/treadstone48/rev1/info.json +++ b/keyboards/marksard/treadstone48/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xDFA3", "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h index 02b08d3bf1..87136e222f 100644 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ b/keyboards/marksard/treadstone48/rev2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index 34f44f1aba..403cd17ebe 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0xDFA3", "device_version": "0.2.0" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h index fe2db0a478..33991d4c8f 100644 --- a/keyboards/massdrop/alt/config.h +++ b/keyboards/massdrop/alt/config.h @@ -21,12 +21,6 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define SERIAL_NUM "Unavailable" -#define MATRIX_ROW_PINS { A00, A01, A02, A03, A04 } -#define MATRIX_COL_PINS { B04, B05, B06, B07, B08, B09, B10, B11, B12, B13, A05, A06, A07, A10, A11 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Temporary solution for matrix delay */ #define IGNORE_ATOMIC_BLOCK diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json index 128a990b46..8306bcdab3 100644 --- a/keyboards/massdrop/alt/info.json +++ b/keyboards/massdrop/alt/info.json @@ -8,6 +8,11 @@ "pid": "0xEED3", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["B04", "B05", "B06", "B07", "B08", "B09", "B10", "B11", "B12", "B13", "A05", "A06", "A07", "A10", "A11"], + "rows": ["A00", "A01", "A02", "A03", "A04"] + }, + "diode_direction": "COL2ROW", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h index aadc0a915b..33991d4c8f 100644 --- a/keyboards/massdrop/ctrl/config.h +++ b/keyboards/massdrop/ctrl/config.h @@ -21,12 +21,6 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define SERIAL_NUM "Unavailable" -#define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 } -#define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Temporary solution for matrix delay */ #define IGNORE_ATOMIC_BLOCK diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index 34c60ca088..1e21627f28 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -8,6 +8,11 @@ "pid": "0xEED2", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["A00", "A01", "A02", "A03", "A04", "A05", "A06", "A07"], + "rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h index 0869e77a7a..d5aefdcdd3 100644 --- a/keyboards/massdrop/thekey/config.h +++ b/keyboards/massdrop/thekey/config.h @@ -16,15 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { D4 } -#define MATRIX_COL_PINS { D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json index 56fe74729c..71fac9f31b 100644 --- a/keyboards/massdrop/thekey/info.json +++ b/keyboards/massdrop/thekey/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0"], + "rows": ["D4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h index 3f7dc30ac1..d26d586264 100644 --- a/keyboards/massdrop/thekey_v2/config.h +++ b/keyboards/massdrop/thekey_v2/config.h @@ -16,15 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - */ -#define MATRIX_ROW_PINS { D4 } -#define MATRIX_COL_PINS { D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN B1 #define RGBLED_NUM 5 #define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3} diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json index 19ae416b6e..01604e6f2e 100644 --- a/keyboards/massdrop/thekey_v2/info.json +++ b/keyboards/massdrop/thekey_v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0"], + "rows": ["D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/masterworks/classy_tkl/rev_a/config.h b/keyboards/masterworks/classy_tkl/rev_a/config.h index e8920b5b85..5f1fd650f1 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/config.h +++ b/keyboards/masterworks/classy_tkl/rev_a/config.h @@ -17,25 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS \ - { C7, F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS \ - { B4, D7, D6, D4, C6, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0, E6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/masterworks/classy_tkl/rev_a/info.json b/keyboards/masterworks/classy_tkl/rev_a/info.json index 89f227fbf7..ecbdd0f0ba 100644 --- a/keyboards/masterworks/classy_tkl/rev_a/info.json +++ b/keyboards/masterworks/classy_tkl/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "D7", "D6", "D4", "C6", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "F7"], + "rows": ["C7", "F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matchstickworks/southpad/config.h b/keyboards/matchstickworks/southpad/config.h deleted file mode 100644 index 93f155fa3e..0000000000 --- a/keyboards/matchstickworks/southpad/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2021 Logan Butler - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B5, B6, B7, C7, C6 } -#define MATRIX_COL_PINS { B0, B1, B2, B4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json index 3c88dc453c..6715c441a0 100644 --- a/keyboards/matchstickworks/southpad/info.json +++ b/keyboards/matchstickworks/southpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B4"], + "rows": ["B3", "B5", "B6", "B7", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index ff49f9aac5..77077bad34 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -19,14 +19,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, C7, C6, D5, D2, D4, D7, B7, D1 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, B5, B6, B3, B2, B1, D0, B4, D6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index 84b8dc38eb..b5020cb3db 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -8,6 +8,11 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"], + "rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h index ea2e015af4..21177855ec 100644 --- a/keyboards/matrix/falcon/config.h +++ b/keyboards/matrix/falcon/config.h @@ -15,12 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F1, B7, F7, F5, F4} -#define MATRIX_COL_PINS { F6, B3, B2, B1, B0, C7, C6, B6, B5, B4, D7, D6, D4} - -#define DIODE_DIRECTION ROW2COL - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json index e52ffa1c74..c692e1c4ee 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/info.json @@ -8,6 +8,11 @@ "pid": "0x474E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F1", "B7", "F7", "F5", "F4"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "E2" }, diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h index 9df2a43d50..415ab3dbdd 100644 --- a/keyboards/matrix/m12og/rev2/config.h +++ b/keyboards/matrix/m12og/rev2/config.h @@ -4,14 +4,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, F0, B7, C7, D3, B0, D1 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, B6, B5, B4, D7, D0, D2, D6, D4, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #ifdef RGB_DI_PIN diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json index af7e96d719..1036980434 100644 --- a/keyboards/matrix/m12og/rev2/info.json +++ b/keyboards/matrix/m12og/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8712", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"], + "rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h index 69b54b5bd0..487bdb7dea 100644 --- a/keyboards/matrix/me/config.h +++ b/keyboards/matrix/me/config.h @@ -15,11 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS {D3, D5, D4, D6, B5, B4} -#define MATRIX_COL_PINS {B7, B3, B2, B1, B0, F0, F1, F4, F5, F6, F7, C7, C6, B6, D7} -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json index cfe0ad22d4..ecf1640811 100644 --- a/keyboards/matrix/me/info.json +++ b/keyboards/matrix/me/info.json @@ -8,6 +8,11 @@ "pid": "0x454D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D7"], + "rows": ["D3", "D5", "D4", "D6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "scroll_lock": "D2" diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index a5688556f2..d5e609918f 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -11,11 +11,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 -#define MATRIX_ROW_PINS { B0, A1, C14, C13, A0} -#define MATRIX_COL_PINS { C15, B10, B7, B6, B5, B4, A15, A10, A9, A8, B15, B14, B13, B12, B2} - -#define DIODE_DIRECTION COL2ROW - // i2c setting #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/matthewdias/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h deleted file mode 100644 index 81acfef553..0000000000 --- a/keyboards/matthewdias/m3n3van/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2021 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 - - -/* m3n3van PCB default pin-out */ -#define MATRIX_ROW_PINS { B5, B6, C6, C7 } -#define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, E6, D3, D0, D1, D2, D4, D6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json index ffe44159a0..5b7cafa2da 100644 --- a/keyboards/matthewdias/m3n3van/info.json +++ b/keyboards/matthewdias/m3n3van/info.json @@ -8,6 +8,11 @@ "pid": "0x2323", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "E6", "D3", "D0", "D1", "D2", "D4", "D6"], + "rows": ["B5", "B6", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "D7"} diff --git a/keyboards/matthewdias/minim/config.h b/keyboards/matthewdias/minim/config.h deleted file mode 100644 index b39f67e82a..0000000000 --- a/keyboards/matthewdias/minim/config.h +++ /dev/null @@ -1,42 +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 - - -/* minim PCB default pin-out */ -#define MATRIX_ROW_PINS { D6, D7, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, B0, D1, B1, D2, B2, D3, D5, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json index d6b12a0975..f0aa07e6e9 100644 --- a/keyboards/matthewdias/minim/info.json +++ b/keyboards/matthewdias/minim/info.json @@ -8,6 +8,11 @@ "pid": "0xAAAA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F1", "F7", "F0", "B0", "D1", "B1", "D2", "B2", "D3", "D5", "B3"], + "rows": ["D6", "D7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matthewdias/model_v/config.h b/keyboards/matthewdias/model_v/config.h deleted file mode 100644 index 1821ec0b06..0000000000 --- a/keyboards/matthewdias/model_v/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2021 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 - - -/* model-v PCB default pin-out */ -#define MATRIX_ROW_PINS { D3, D5, D6, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/info.json index 7c9f24c892..eee9c69b3d 100644 --- a/keyboards/matthewdias/model_v/info.json +++ b/keyboards/matthewdias/model_v/info.json @@ -7,6 +7,11 @@ "pid": "0x6D76", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"], + "rows": ["D3", "D5", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matthewdias/txuu/config.h b/keyboards/matthewdias/txuu/config.h deleted file mode 100644 index 88b02f4b55..0000000000 --- a/keyboards/matthewdias/txuu/config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2021 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 - - -/* m3n3van PCB default pin-out */ -#define MATRIX_ROW_PINS { B1, B0, F7, F4, F1 } -#define MATRIX_COL_PINS { F0, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/info.json index f71b1ed80b..c01871e836 100644 --- a/keyboards/matthewdias/txuu/info.json +++ b/keyboards/matthewdias/txuu/info.json @@ -7,6 +7,11 @@ "pid": "0x2809", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B1", "B0", "F7", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/maxipad/promicro/config.h b/keyboards/maxipad/promicro/config.h deleted file mode 100644 index fba2d442ea..0000000000 --- a/keyboards/maxipad/promicro/config.h +++ /dev/null @@ -1,33 +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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maxipad/promicro/info.json b/keyboards/maxipad/promicro/info.json index 4369a04103..1499162155 100644 --- a/keyboards/maxipad/promicro/info.json +++ b/keyboards/maxipad/promicro/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F4", "C6", "D7", "F5", "B4", "B5"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/maxipad/teensy2/config.h b/keyboards/maxipad/teensy2/config.h deleted file mode 100644 index a222115a0c..0000000000 --- a/keyboards/maxipad/teensy2/config.h +++ /dev/null @@ -1,33 +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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 } -#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/maxipad/teensy2/info.json b/keyboards/maxipad/teensy2/info.json index 0b2db81c11..d7f78b4175 100644 --- a/keyboards/maxipad/teensy2/info.json +++ b/keyboards/maxipad/teensy2/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["F6", "C6", "D7", "F5", "B4", "B5"], + "rows": ["B6", "F7", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h index 3756899498..3bc544746e 100644 --- a/keyboards/maxr1998/pulse4k/config.h +++ b/keyboards/maxr1998/pulse4k/config.h @@ -17,14 +17,6 @@ #pragma once - -/* Matrix pins */ -#define MATRIX_ROW_PINS { B4, E6 } -#define MATRIX_COL_PINS { B7, B3, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Combo setup */ #define COMBO_COUNT 1 #define COMBO_TERM 150 diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json index 93827a1a64..bfea52ad4d 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "F0"], + "rows": ["B4", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"}, diff --git a/keyboards/mb44/config.h b/keyboards/mb44/config.h deleted file mode 100644 index 365fed7340..0000000000 --- a/keyboards/mb44/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 melonbred - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D6, D5, D4 } -#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mb44/info.json b/keyboards/mb44/info.json index 865f05674f..e12e2dfc94 100644 --- a/keyboards/mb44/info.json +++ b/keyboards/mb44/info.json @@ -8,6 +8,11 @@ "pid": "0x6D62", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"], + "rows": ["D1", "D6", "D5", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"} diff --git a/keyboards/mc_76k/config.h b/keyboards/mc_76k/config.h index 6b70bdd6b8..3616da4ede 100644 --- a/keyboards/mc_76k/config.h +++ b/keyboards/mc_76k/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C7, C6, B6, B0, D1, D0 } -#define MATRIX_COL_PINS { D5, D3, D4, B1, D6, D7, B4, B5, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mc_76k/info.json b/keyboards/mc_76k/info.json index 791d798ff9..419ed2edf3 100644 --- a/keyboards/mc_76k/info.json +++ b/keyboards/mc_76k/info.json @@ -8,6 +8,11 @@ "pid": "0x4D43", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D4", "B1", "D6", "D7", "B4", "B5", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["C7", "C6", "B6", "B0", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechanickeys/miniashen40/config.h b/keyboards/mechanickeys/miniashen40/config.h deleted file mode 100644 index 012ca89fae..0000000000 --- a/keyboards/mechanickeys/miniashen40/config.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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B1, B2, B3, B4 } -#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json index 30e2ecab36..73d6b3aa1a 100644 --- a/keyboards/mechanickeys/miniashen40/info.json +++ b/keyboards/mechanickeys/miniashen40/info.json @@ -8,6 +8,11 @@ "pid": "0x6D6E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C4", "C3", "D0", "C2", "D1", "C1", "C0", "D4", "B0", "D7", "D6", "B5"], + "rows": ["B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h index c86a3af0f1..9611e47e2b 100644 --- a/keyboards/mechanickeys/undead60m/config.h +++ b/keyboards/mechanickeys/undead60m/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json index 9bee50289c..92593c3bfc 100644 --- a/keyboards/mechanickeys/undead60m/info.json +++ b/keyboards/mechanickeys/undead60m/info.json @@ -8,6 +8,11 @@ "pid": "0x3C4D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5"} diff --git a/keyboards/mechbrewery/mb65h/config.h b/keyboards/mechbrewery/mb65h/config.h deleted file mode 100644 index e27625de97..0000000000 --- a/keyboards/mechbrewery/mb65h/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2022 MechBrewery - * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@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 - - -#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechbrewery/mb65h/info.json b/keyboards/mechbrewery/mb65h/info.json index e96a92660d..ffdcf08edd 100644 --- a/keyboards/mechbrewery/mb65h/info.json +++ b/keyboards/mechbrewery/mb65h/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"], + "rows": ["B7", "D0", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h index 7023e30ced..a9375a9833 100644 --- a/keyboards/mechbrewery/mb65s/config.h +++ b/keyboards/mechbrewery/mb65s/config.h @@ -17,13 +17,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json index 7692ac996c..1890c71def 100644 --- a/keyboards/mechbrewery/mb65s/info.json +++ b/keyboards/mechbrewery/mb65s/info.json @@ -8,6 +8,11 @@ "pid": "0x3635", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"], + "rows": ["B7", "D0", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D4", "on_state": 0 diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h index 493f54b3f7..71131d32ac 100644 --- a/keyboards/mechkeys/acr60/config.h +++ b/keyboards/mechkeys/acr60/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json index 816e74a2bb..71287af893 100644 --- a/keyboards/mechkeys/acr60/info.json +++ b/keyboards/mechkeys/acr60/info.json @@ -8,6 +8,11 @@ "pid": "0xCA60", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h index bb3b38500c..9908ffa03e 100755 --- a/keyboards/mechkeys/alu84/config.h +++ b/keyboards/mechkeys/alu84/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, B7 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, F5, D4, B1, B0, B5, B4, D7, D6, B3, F4, F6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) # define RGBLED_NUM 16 diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json index aaf9cc7ac1..ba3272e4cf 100644 --- a/keyboards/mechkeys/alu84/info.json +++ b/keyboards/mechkeys/alu84/info.json @@ -8,6 +8,11 @@ "pid": "0xCA75", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "F5", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F6"], + "rows": ["D0", "D1", "D2", "D3", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h index b345f44269..644ebeda46 100755 --- a/keyboards/mechkeys/espectro/config.h +++ b/keyboards/mechkeys/espectro/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 } -#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json index 1361065e75..b12beb60ff 100644 --- a/keyboards/mechkeys/espectro/info.json +++ b/keyboards/mechkeys/espectro/info.json @@ -8,6 +8,11 @@ "pid": "0xCA96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], + "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h index 3da5747d2b..7d6fc121ce 100644 --- a/keyboards/mechkeys/mechmini/v1/config.h +++ b/keyboards/mechkeys/mechmini/v1/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 } -#define DIODE_DIRECTION COL2ROW - /* RGB underglow */ // The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards. // The same pin is used on the JJ40, at least. diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json index 751be56e38..84c13147af 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/info.json @@ -8,6 +8,11 @@ "pid": "0xCA40", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h index c318669851..35421a3b29 100755 --- a/keyboards/mechkeys/mechmini/v2/config.h +++ b/keyboards/mechkeys/mechmini/v2/config.h @@ -15,14 +15,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B3, B1, B0, D5, B7, C7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json index 58ad7525db..d5f75aedce 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/info.json @@ -8,6 +8,11 @@ "pid": "0xCA40", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6" }, diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h index 065c3006c6..7b63a204c3 100644 --- a/keyboards/mechkeys/mk60/config.h +++ b/keyboards/mechkeys/mk60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json index 42d9c3bd24..07eb87850c 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 6, diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index e7f24e3985..4eeeb96c19 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #define FORCE_NKRO diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h index fbda4b7db2..1aee08380c 100644 --- a/keyboards/mechllama/g35/v1/config.h +++ b/keyboards/mechllama/g35/v1/config.h @@ -17,7 +17,4 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 } - #define RGBLED_NUM 41 diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json index 90ac25f360..c5d4c69e7b 100644 --- a/keyboards/mechllama/g35/v1/info.json +++ b/keyboards/mechllama/g35/v1/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.1" - } + }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "F0", "D5"], + "rows": ["F5", "F6", "F4", "F1", "D4"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h index cd4d6e991c..7c15560a1a 100644 --- a/keyboards/mechllama/g35/v2/config.h +++ b/keyboards/mechllama/g35/v2/config.h @@ -17,7 +17,4 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 } -#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 } - #define RGBLED_NUM 6 diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json index e557e4d307..563625f428 100644 --- a/keyboards/mechllama/g35/v2/info.json +++ b/keyboards/mechllama/g35/v2/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.2" - } + }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "D5"], + "rows": ["F5", "F4", "F1", "F0", "D4"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h deleted file mode 100644 index 2ec0afd47b..0000000000 --- a/keyboards/mechlovin/adelais/rgb_led/config.h +++ /dev/null @@ -1,21 +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 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index f668bd88ed..658e29ccf3 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,8 +1,5 @@ #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } - #define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT 91 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index f098bdbf95..81adcf57e4 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index d9d75a4b9e..ac91d0f950 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,8 +1,5 @@ #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } - #define RGB_DI_PIN A15 #define RGBLED_NUM 23 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 7dcd0f1765..afb0b3d017 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC2" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A4", "pin_b": "A3"} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 7457fd50a7..d3e4fc6ba1 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2} -#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define WS2812_SPI SPID1 // default: SPID1 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 3f83750e3a..d44e6b2371 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0xAEC3" }, + "matrix_pins": { + "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"], + "rows": ["A4", "A3", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index e1081a9560..fc7e2ad9b6 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index a5f20190d1..2c4386a862 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Adelais", + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], + "rows": ["B1", "A0", "C13", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h deleted file mode 100644 index 768ea4744f..0000000000 --- a/keyboards/mechlovin/delphine/config.h +++ /dev/null @@ -1,34 +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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 } -#define MATRIX_COL_PINS { F7, D7, D6, D2 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 4495943544..7e53ebf464 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,6 +6,11 @@ "usb": { "vid": "0x4D4C" }, + "matrix_pins": { + "cols": ["F7", "D7", "D6", "D2"], + "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "num_lock": "B5" }, diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index 951eab595b..0cf3af4a8a 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -17,24 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3} - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #ifdef RGB_DI_PIN # define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index bb7491ff19..5fac5b9aa6 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -8,6 +8,11 @@ "pid": "0x0180", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B12", "B13", "B14", "A8", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C13", "pin_b": "C14"} diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h deleted file mode 100644 index b10cdfb013..0000000000 --- a/keyboards/mechlovin/hannah60rgb/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 } - -#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 2ed43a3fc2..f0e2f9a41a 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 798e67ee78..f66b378aae 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index e96bc8bc85..1686c861fb 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -17,21 +17,5 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD4 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index 74ae965fb7..88a3f39719 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -3,6 +3,11 @@ "pin": "B8", "breathing": true }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B9", "on_state": 0 diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index be1d769e67..0b9d78276a 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 } -#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index ae5f966622..3ddc706922 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index cfb43e786c..dc59167ddb 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index 14219cb9b6..ccb9088232 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h deleted file mode 100644 index 028be1fb52..0000000000 --- a/keyboards/mechlovin/hex4b/config.h +++ /dev/null @@ -1,33 +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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h deleted file mode 100644 index 1baf1aa2ea..0000000000 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ /dev/null @@ -1,33 +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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 } -#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 } diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index cec380a91f..1e9a7d5776 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"], + "rows": ["B7", "A2", "A1", "A3", "A4", "A5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 5, diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index c0486dd0b7..14dfffbed3 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -17,19 +17,4 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 } - #define BACKLIGHT_PWM_DRIVER PWMD4 diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json index 7d9a2cb40a..8609be01c3 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"], + "rows": ["A4", "B12", "B13", "B14", "B15", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "levels": 5, diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h index b0791490a2..a22137acf7 100644 --- a/keyboards/mechlovin/hex6c/config.h +++ b/keyboards/mechlovin/hex6c/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index 387043bde6..2e82a83785 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -8,6 +8,11 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A15", "pin_b": "A2"} diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h index e03ee6dded..2265fff2d1 100644 --- a/keyboards/mechlovin/infinity87/rev1/config.h +++ b/keyboards/mechlovin/infinity87/rev1/config.h @@ -16,10 +16,5 @@ #pragma once -#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 } - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 - -#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index be094e09ae..dbe7cb83f9 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index a609587210..10fc42f830 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 } -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 } - - -#define DIODE_DIRECTION COL2ROW - //rgb matrix setting // This is a 7-bit address, that gets left-shifted and bit 0 // set to 0 for write, 1 for read (as per I2C protocol) diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index 604fa512ed..332606561c 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"], + "rows": ["A10", "A13", "A14", "C13", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index 11ae35100b..1fda2d3097 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 } -#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7,B1, B2, B10, B3, B14, B15 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 37ccd27537..e9b25efaa9 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -8,6 +8,11 @@ "pid": "0x8802", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], + "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B0", "breathing": true diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h index e0900333cd..a8a1936209 100644 --- a/keyboards/mechlovin/infinityce/config.h +++ b/keyboards/mechlovin/infinityce/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D7, D6, B6, B1, C6, C7 } -#define MATRIX_COL_PINS { B5, B4, B0, D5, D4, D1, D0, E6, F7, F6, F5, F4, F1, F0, B2, D3, D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLED_NUM 31 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index 1ab5cad305..332be74aff 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -8,6 +8,11 @@ "pid": "0x8801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"], + "rows": ["D7", "D6", "B6", "B1", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h index afc0a4af7d..d685b92631 100644 --- a/keyboards/mechlovin/jay60/config.h +++ b/keyboards/mechlovin/jay60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C2, C1, C0, D7, A1 } -#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, C3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json index f64b25c9e7..f06f4b2fea 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/info.json @@ -8,6 +8,11 @@ "pid": "0x0600", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], + "rows": ["C2", "C1", "C0", "D7", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D4" }, diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h index 6a6dc97744..bb94525e06 100644 --- a/keyboards/mechlovin/kanu/config.h +++ b/keyboards/mechlovin/kanu/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B6, D3, C6, C7 } -#define MATRIX_COL_PINS { E6, B1, B3, F0, F1, F4, F5, F6, F7, D5, D4, B4, D6, D7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 628a78e1a5..ac86aaa269 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -8,6 +8,11 @@ "pid": "0x4B4E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], + "rows": ["B5", "B6", "D3", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h index b05cc594e4..aadc6fcaaa 100644 --- a/keyboards/mechlovin/kay60/config.h +++ b/keyboards/mechlovin/kay60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D3, D2, B1, B5} -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json index a12cb83719..39c7083afd 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"], + "rows": ["D5", "D3", "D2", "B1", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h index d3cacf757a..c6168d930f 100644 --- a/keyboards/mechlovin/kay65/config.h +++ b/keyboards/mechlovin/kay65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B7, D3, D5, D4, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, E6, B0, D2, D1, D0, B3, B2, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json index 3bfc5c66e5..f827f435ed 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/info.json @@ -8,6 +8,11 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"], + "rows": ["B7", "D3", "D5", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D6", "on_state": 0 diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h deleted file mode 100644 index 94a281c2f8..0000000000 --- a/keyboards/mechlovin/mechlovin9/config.h +++ /dev/null @@ -1,21 +0,0 @@ - -/* -Copyright 2021 Mechlovin' 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 - - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index c5e997d425..3686536dfb 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -17,18 +17,5 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 } - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json index 66b4a3c2ed..14fd177986 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -4,6 +4,11 @@ "pid": "0x6509", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], + "rows": ["A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h deleted file mode 100644 index f550a2e39a..0000000000 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ /dev/null @@ -1,31 +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 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } -#define MATRIX_COL_PINS { B2, B1, B0, B3, B4, B5, D0, D1, D5, D6, D7, C0, C3, C2, C1 } diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json index c0e94e7638..52ac4d0c29 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -4,6 +4,11 @@ "pid": "0x6509", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "B3", "B4", "B5", "D0", "D1", "D5", "D6", "D7", "C0", "C3", "C2", "C1"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h index 89e8a32d4f..a193206552 100644 --- a/keyboards/mechlovin/olly/octagon/config.h +++ b/keyboards/mechlovin/olly/octagon/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B0, B12, A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define RGBLED_NUM 26 diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 9adec5281c..117239c476 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,6 +8,11 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], + "rows": ["B0", "B12", "A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layout_aliases": { diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h index 225795d3c0..44e13fa7f2 100644 --- a/keyboards/mechlovin/olly/orion/config.h +++ b/keyboards/mechlovin/olly/orion/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A8, A9, A10, B11, C13, C14 } -#define MATRIX_COL_PINS { B14, B13, B12, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, A15, B3, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B15 # define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json index 89433dfd1b..de4ed5e986 100644 --- a/keyboards/mechlovin/olly/orion/info.json +++ b/keyboards/mechlovin/olly/orion/info.json @@ -8,6 +8,11 @@ "pid": "0xD870", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"], + "rows": ["A8", "A9", "A10", "B11", "C13", "C14"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B10", "num_lock": "A13", diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 1540505bad..75887406ac 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, F0, F5, F6, F7 } -#define MATRIX_COL_PINS { E6, B1, B3, D0, D1, D2, D3, D5, F4, F1, D4, D6, D7, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLED_NUM 12 diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index 19246528e7..133bbbea7a 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -8,6 +8,11 @@ "pid": "0x6501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "F0", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h deleted file mode 100644 index 0dca95dfee..0000000000 --- a/keyboards/mechlovin/th1800/config.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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, B7, D0, D1, D5, D6 } -#define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index 02efb8dc03..d42f6dbef6 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -8,6 +8,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"], + "rows": ["B6", "B7", "D0", "D1", "D5", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "num_lock": "A2", diff --git a/keyboards/mechlovin/tmkl/config.h b/keyboards/mechlovin/tmkl/config.h index 54cd52de76..e604c6bcfa 100644 --- a/keyboards/mechlovin/tmkl/config.h +++ b/keyboards/mechlovin/tmkl/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A8, A4, A5, A3, A2, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 } - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index 5cdd06aa12..d6be668d13 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -7,6 +7,11 @@ "pid": "0xC601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], + "rows": ["A8", "A4", "A5", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h index 17467fd9fe..ff9aea4a02 100644 --- a/keyboards/mechlovin/zed60/config.h +++ b/keyboards/mechlovin/zed60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B10, B2, B1, B0, A2 } -#define MATRIX_COL_PINS { A10, A3, A9, A8, B15, B14, B13, B12, B5, B4, B3, A15, B7, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN A7 #define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json index 3c0c450c69..fd1c52d07d 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/info.json @@ -8,6 +8,11 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"], + "rows": ["B10", "B2", "B1", "B0", "A2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A4" }, diff --git a/keyboards/mechlovin/zed65/config.h b/keyboards/mechlovin/zed65/config.h deleted file mode 100644 index 40392b609a..0000000000 --- a/keyboards/mechlovin/zed65/config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -Copyright 2022 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 233d2b8fd0..9f8d4f46f5 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B12, A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B2, B1, A15, B3, B9, B8, B7, B6, B5, B4 } - - #ifdef LED_MATRIX_ENABLE // This is a 7-bit address, that gets left-shifted and bit 0 // set to 0 for write, 1 for read (as per I2C protocol) diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index 75fcb44ae3..e27910459c 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -8,6 +8,11 @@ "pid": "0x6503", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], + "rows": ["B12", "A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "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":"0,15", "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":"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,14", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "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":"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,15", "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,14", "x":14, "y":3}, {"label":"3,15", "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,6", "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,13", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}] diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h b/keyboards/mechlovin/zed65/no_backlight/cor65/config.h deleted file mode 100644 index 890026c2fc..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2022 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 - - -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A6, A5, A4, A3, A2, C13, B7, B6, B5, B4, B3 } diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json index 2f0ea4817f..06777fa219 100644 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json @@ -8,6 +8,11 @@ "pid": "0x6504", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "A2", "C13", "B7", "B6", "B5", "B4", "B3"], + "rows": ["B12", "B13", "B14", "B15", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B9", "on_state": 0 diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h index 4739a7c2b1..6786e3b953 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/config.h @@ -17,8 +17,4 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 } -#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 } - #define TAP_CODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json index f14d88910b..a014cfb554 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json @@ -8,6 +8,11 @@ "pid": "0x6601", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], + "rows": ["B13", "B14", "A8", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B8"}, diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h index 67c1ffb2d6..7c9062f319 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B13, B14, A8, A1, A0 } -#define MATRIX_COL_PINS { B11, B12, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, B3, A15, B5 } - - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 #define RGBLED_NUM 24 diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json index e023f83396..518c781713 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json @@ -8,6 +8,11 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], + "rows": ["B13", "B14", "A8", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C14" }, diff --git a/keyboards/mechstudio/dawn/config.h b/keyboards/mechstudio/dawn/config.h deleted file mode 100644 index 4270fca037..0000000000 --- a/keyboards/mechstudio/dawn/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020 David 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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,D1,D6,D4} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D5,D3,D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json index 4b4d6c5c26..e8bbcbb1ae 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D2"], + "rows": ["B1", "B2", "B3", "D1", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F0" diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h index 41a6be19a4..7c6f10131d 100644 --- a/keyboards/mechstudio/ud_40_ortho/config.h +++ b/keyboards/mechstudio/ud_40_ortho/config.h @@ -16,15 +16,6 @@ #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {C2,B4,B5,B6} -#define MATRIX_COL_PINS {C5,D0,B3,B2,B1,B0,D6,D5,D4,D3,D2,D1} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLED_NUM 10 diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index a517137f96..e5f367653d 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"], + "rows": ["C2", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B7", "esc_output": "F0" diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h index 10bf4dd23e..a8c1b6243a 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -7,22 +7,6 @@ /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */ #define DIP_SWITCH_PINS { A0 } -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B12, B10, B13, B1, B14 } -#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index 0adaf90bf7..460df8c60a 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -8,6 +8,11 @@ "pid": "0x170E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B12", "B10", "B13", "B1", "B14"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h index 070fe36eb7..f9f13d9ac0 100755 --- a/keyboards/mechwild/mercutio/config.h +++ b/keyboards/mechwild/mercutio/config.h @@ -17,16 +17,8 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D4, C3, C0, C1, C2} -#define MATRIX_COL_PINS { B0, D7, D6, D5, B1, B2, B3} - #define TAP_CODE_DELAY 10 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Define custom font */ #define OLED_FONT_H "lib/mercutiofont.c" diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json index 98c815c6a8..20207a6ef6 100644 --- a/keyboards/mechwild/mercutio/info.json +++ b/keyboards/mechwild/mercutio/info.json @@ -8,6 +8,11 @@ "pid": "0x1703", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"], + "rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index 92a8dfa323..a91a4bf79c 100644 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ b/keyboards/mechwild/mokulua/mirrored/config.h @@ -3,16 +3,8 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c" #define MASTER_LEFT diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 29d2497cc1..e3e7308a19 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -8,6 +8,11 @@ "pid": "0x170C", "device_version": "1.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "B2"} diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index b720c271b2..f33d6c5944 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/standard/config.h @@ -3,16 +3,8 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c" #define MASTER_LEFT diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index d3451698f6..c3b9ea2120 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -8,6 +8,11 @@ "pid": "0x170B", "device_version": "1.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "B2"} diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index d3158c3306..68217b33bf 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -17,16 +17,8 @@ along with this program. If not, see . #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 } -#define MATRIX_COL_PINS { B5, D7, C6, D4, B6 } - #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c" #define RGB_DI_PIN F4 diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index 92af56f0dd..b396b4a6af 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -8,6 +8,11 @@ "pid": "0x1705", "device_version": "3.0.1" }, + "matrix_pins": { + "cols": ["B5", "D7", "C6", "D4", "B6"], + "rows": ["F5", "B2", "B3", "B1", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B4"}, diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index 72efdae1e2..a130b99d1e 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -17,25 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 } -#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 } - #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A0 #ifdef RGB_DI_PIN diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index cbe9f7cfa8..f6d6ed10d9 100644 --- a/keyboards/mechwild/obe/info.json +++ b/keyboards/mechwild/obe/info.json @@ -8,6 +8,11 @@ "pid": "0x1707", "device_version": "2.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"], + "rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B4"} diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index bf2e1a0b58..13e8bbfed2 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -18,19 +18,6 @@ */ #define TAPPING_TERM 0 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B12, B13, B14, B15 } -#define MATRIX_COL_PINS { B10, A8, B4, B5 } - /* spi config */ #define SPI_DRIVER SPID1 #define SPI_SCK_PIN A5 @@ -44,9 +31,6 @@ #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A3 #ifdef RGB_DI_PIN diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 825def96a2..0d45c97d50 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -8,6 +8,11 @@ "pid": "0x170F", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B10", "A8", "B4", "B5"], + "rows": ["B12", "B13", "B14", "B15"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0"}, diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index 88b160a980..b427adc33c 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -17,25 +17,8 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B8, B4, B3, B9, A15, B12, B13, B14, B15, A8 } -#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4 } - #define TAP_CODE_DELAY 10 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A1 #ifdef RGB_DI_PIN diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json index eb7d2d9f54..1bed5452b0 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -8,6 +8,11 @@ "pid": "0x1709", "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A3", "pin_b": "A2"} diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h index 2066e16662..e5f456306d 100644 --- a/keyboards/mehkee96/config.h +++ b/keyboards/mehkee96/config.h @@ -1,10 +1,5 @@ #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json index 40f4cd71b4..4ccfe90762 100644 --- a/keyboards/mehkee96/info.json +++ b/keyboards/mehkee96/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h index 4c05b1d83b..e5cc1f3e5b 100644 --- a/keyboards/meletrix/zoom65/config.h +++ b/keyboards/meletrix/zoom65/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } -#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json index 0968df4794..8c11abe429 100644 --- a/keyboards/meletrix/zoom65/info.json +++ b/keyboards/meletrix/zoom65/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "D5", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0", "resolution": 2} diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h index 4c05b1d83b..e5cc1f3e5b 100644 --- a/keyboards/meletrix/zoom65_lite/config.h +++ b/keyboards/meletrix/zoom65_lite/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } -#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json index d5dcd621ef..97598af127 100644 --- a/keyboards/meletrix/zoom65_lite/info.json +++ b/keyboards/meletrix/zoom65_lite/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "D5", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0", "resolution": 2} diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h index c016ab1f56..fd83302d27 100644 --- a/keyboards/meletrix/zoom87/config.h +++ b/keyboards/meletrix/zoom87/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json index c60f7f8799..d5824818f9 100644 --- a/keyboards/meletrix/zoom87/info.json +++ b/keyboards/meletrix/zoom87/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h index 62af5154e6..072419e163 100755 --- a/keyboards/melgeek/mach80/rev1/config.h +++ b/keyboards/melgeek/mach80/rev1/config.h @@ -16,23 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_MATRIX_LED_COUNT 97 #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json new file mode 100644 index 0000000000..af9f7c2669 --- /dev/null +++ b/keyboards/melgeek/mach80/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h index b42d96691a..10d3bde47a 100755 --- a/keyboards/melgeek/mach80/rev2/config.h +++ b/keyboards/melgeek/mach80/rev2/config.h @@ -16,23 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_MATRIX_LED_COUNT 94 #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json new file mode 100644 index 0000000000..af9f7c2669 --- /dev/null +++ b/keyboards/melgeek/mach80/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/melgeek/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h index c3f72d006a..ea29d94b9b 100644 --- a/keyboards/melgeek/mj61/rev1/config.h +++ b/keyboards/melgeek/mj61/rev1/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 63 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json new file mode 100644 index 0000000000..67a4a004d6 --- /dev/null +++ b/keyboards/melgeek/mj61/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h index 422d4847e4..0cd072eb4b 100644 --- a/keyboards/melgeek/mj61/rev2/config.h +++ b/keyboards/melgeek/mj61/rev2/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 71 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json new file mode 100644 index 0000000000..62c5827117 --- /dev/null +++ b/keyboards/melgeek/mj61/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj63/rev1/config.h b/keyboards/melgeek/mj63/rev1/config.h index 31c4e0f148..8abf7f5595 100644 --- a/keyboards/melgeek/mj63/rev1/config.h +++ b/keyboards/melgeek/mj63/rev1/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 65 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json new file mode 100644 index 0000000000..67a4a004d6 --- /dev/null +++ b/keyboards/melgeek/mj63/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj63/rev2/config.h b/keyboards/melgeek/mj63/rev2/config.h index 422d4847e4..0cd072eb4b 100644 --- a/keyboards/melgeek/mj63/rev2/config.h +++ b/keyboards/melgeek/mj63/rev2/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 71 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json new file mode 100644 index 0000000000..62c5827117 --- /dev/null +++ b/keyboards/melgeek/mj63/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h index a0048f6912..ab8fcd6e09 100644 --- a/keyboards/melgeek/mj64/rev1/config.h +++ b/keyboards/melgeek/mj64/rev1/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 66 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json new file mode 100644 index 0000000000..67a4a004d6 --- /dev/null +++ b/keyboards/melgeek/mj64/rev1/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h index a0048f6912..ab8fcd6e09 100644 --- a/keyboards/melgeek/mj64/rev2/config.h +++ b/keyboards/melgeek/mj64/rev2/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, A10, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 66 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json new file mode 100644 index 0000000000..67a4a004d6 --- /dev/null +++ b/keyboards/melgeek/mj64/rev2/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h index bcb2110b60..a5a1fbf3e0 100644 --- a/keyboards/melgeek/mj64/rev3/config.h +++ b/keyboards/melgeek/mj64/rev3/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 72 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json new file mode 100644 index 0000000000..62c5827117 --- /dev/null +++ b/keyboards/melgeek/mj64/rev3/info.json @@ -0,0 +1,7 @@ +{ + "matrix_pins": { + "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/info.json index f7a24f9a55..fc2a5923d0 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/info.json @@ -8,6 +8,11 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "B14"], + "rows": ["B12", "B11", "B10", "B1", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/melgeek/mj65/rev3/config.h b/keyboards/melgeek/mj65/rev3/config.h index 24ed74f4b6..7fc5f0afd1 100644 --- a/keyboards/melgeek/mj65/rev3/config.h +++ b/keyboards/melgeek/mj65/rev3/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } -#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1, B14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 76 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index a093ab8d37..7150128436 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B6, B5, B4, D7, D6, D4, D5, F7, D2, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C6 #ifdef RGB_DI_PIN diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json index ccd7165a72..1c36053897 100644 --- a/keyboards/melgeek/mj6xy/rev3/info.json +++ b/keyboards/melgeek/mj6xy/rev3/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F7", "D2", "D1", "D0"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "B7", diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json index a7930598f7..033da3766c 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/info.json @@ -8,6 +8,11 @@ "pid": "0x0068", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 7cb916e4fb..2a93a475cf 100755 --- a/keyboards/melgeek/mojo68/rev1/config.h +++ b/keyboards/melgeek/mojo68/rev1/config.h @@ -16,22 +16,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B0 ,B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 68 #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/info.json index 185b3414fc..b03b0bd032 100644 --- a/keyboards/melgeek/mojo75/info.json +++ b/keyboards/melgeek/mojo75/info.json @@ -8,6 +8,11 @@ "pid": "0x7075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], + "rows": ["B11", "B10", "B1", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h index 6bbda5752a..44435f2220 100644 --- a/keyboards/melgeek/mojo75/rev1/config.h +++ b/keyboards/melgeek/mojo75/rev1/config.h @@ -16,23 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B11, B10, B1, B0, A7, A6 } -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 92 #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json index 9c33a5d3a2..b3792ca9b3 100644 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/info.json @@ -8,6 +8,11 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], + "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/melgeek/tegic/rev1/config.h b/keyboards/melgeek/tegic/rev1/config.h index e1d22a6384..bba7c01f5f 100755 --- a/keyboards/melgeek/tegic/rev1/config.h +++ b/keyboards/melgeek/tegic/rev1/config.h @@ -16,23 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_MATRIX_LED_COUNT 91 //#define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h index 6824b665b4..3c19a6f93c 100644 --- a/keyboards/melgeek/z70ultra/config.h +++ b/keyboards/melgeek/z70ultra/config.h @@ -16,10 +16,6 @@ #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_LED_PROCESS_LIMIT 4 diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/info.json index a7042fe04b..2eaccdae02 100644 --- a/keyboards/melgeek/z70ultra/info.json +++ b/keyboards/melgeek/z70ultra/info.json @@ -8,6 +8,11 @@ "pid": "0x6570", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "A10", "B5", "B4", "B3", "A15", "A2", "A1", "A0", "C15", "C14", "C13"], + "rows": ["B12", "B13", "B14", "B15", "A3", "B9"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/melgeek/z70ultra/rev1/config.h b/keyboards/melgeek/z70ultra/rev1/config.h deleted file mode 100644 index 64dacfff18..0000000000 --- a/keyboards/melgeek/z70ultra/rev1/config.h +++ /dev/null @@ -1,32 +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 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A3, B9 } -#define MATRIX_COL_PINS { B11, B10, B1, A10, B5, B4, B3, A15, A2, A1, A0, C15, C14, C13 } - diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h index cf96f9f4de..d876570c80 100644 --- a/keyboards/meme/config.h +++ b/keyboards/meme/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C2, D0, D1, D4, D5, D6, B0, B1, B2, B3 } -#define MATRIX_COL_PINS { D3, D2, B5, B6, C7, C6, C5, C4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/meme/info.json b/keyboards/meme/info.json index 500c76ebdf..f76f55e621 100644 --- a/keyboards/meme/info.json +++ b/keyboards/meme/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "B5", "B6", "C7", "C6", "C5", "C4"], + "rows": ["C2", "D0", "D1", "D4", "D5", "D6", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h index 7c1f14f2d2..fb0353c631 100644 --- a/keyboards/meow48/config.h +++ b/keyboards/meow48/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define OLED_BRIGHTNESS 100 #define RGB_DI_PIN D3 diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json index ba3d696cb0..c219c14a1e 100644 --- a/keyboards/meow48/info.json +++ b/keyboards/meow48/info.json @@ -7,7 +7,12 @@ "device_version": "1.0.0", "pid": "0xF048", "vid": "0xF048" - }, + }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h index 9518361db0..edaab9eb0d 100644 --- a/keyboards/meow65/config.h +++ b/keyboards/meow65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, B6, B5, B7, F7 } -#define MATRIX_COL_PINS { F5, F6, B0, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json index 729fb3287c..7dc2b961f8 100644 --- a/keyboards/meow65/info.json +++ b/keyboards/meow65/info.json @@ -8,6 +8,11 @@ "pid": "0x4D36", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "B0", "F4", "F1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C7"], + "rows": ["C6", "B6", "B5", "B7", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h deleted file mode 100644 index 7bf2b1b33b..0000000000 --- a/keyboards/merge/iso_macro/config.h +++ /dev/null @@ -1,24 +0,0 @@ - /* Copyright 2021 duoshock - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License 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 MATRIX_ROW_PINS { F4, F5, F6} -#define MATRIX_COL_PINS { B4, B5, B6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index bc4269755f..a5db1935cb 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"}, diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 9dcfb6e074..dec57f0dbd 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,9 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B1, B2 } -#define MATRIX_COL_PINS { B3, B4 } - #define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING @@ -36,6 +33,3 @@ #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 55b68a4510..983d4e61fc 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,11 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B4"], + "rows": ["B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index c249a1816a..4ee40b4071 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index e548d63151..a8816d8dd0 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -8,6 +8,11 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 238e5f6d43..ed66f143c0 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index e3e1359c92..f67817659b 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -8,6 +8,11 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h index 6d21adc774..b02c9578cd 100644 --- a/keyboards/merge/uma/config.h +++ b/keyboards/merge/uma/config.h @@ -16,11 +16,5 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define SPLIT_MODS_ENABLE diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json index 1363705253..d6a07150f6 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/info.json @@ -8,6 +8,11 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6" }, diff --git a/keyboards/mesa/mesa_tkl/config.h b/keyboards/mesa/mesa_tkl/config.h index 3db70ee092..5ebe5ccc58 100644 --- a/keyboards/mesa/mesa_tkl/config.h +++ b/keyboards/mesa/mesa_tkl/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D1, D0, B0, C6, C7 } -#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0, B1, B2, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mesa/mesa_tkl/info.json b/keyboards/mesa/mesa_tkl/info.json index b940ffb7f5..45fe5b49a5 100644 --- a/keyboards/mesa/mesa_tkl/info.json +++ b/keyboards/mesa/mesa_tkl/info.json @@ -8,6 +8,11 @@ "pid": "0x8001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3"], + "rows": ["D2", "D1", "D0", "B0", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h index a0df182439..c5f295bfee 100644 --- a/keyboards/meson/config.h +++ b/keyboards/meson/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { F7, C6, F6, F5 } -#define MATRIX_COL_PINS { D4, D7, E6, B3, B2, B6, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USE_I2C #define RGB_DI_PIN B5 diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json index 869a2ccb7a..7bcd3acbac 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/info.json @@ -7,6 +7,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"], + "rows": ["F7", "C6", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h deleted file mode 100644 index 916b315725..0000000000 --- a/keyboards/metamechs/timberwolf/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2020 Croktopus - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_COL_PINS { B2, D1, D2, C7, F5, F6, F7, F0, E6 } -#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, F4, F1, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json index ba389e31f1..cc5aca28d6 100644 --- a/keyboards/metamechs/timberwolf/info.json +++ b/keyboards/metamechs/timberwolf/info.json @@ -8,6 +8,11 @@ "pid": "0x5754", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D2", "C7", "F5", "F6", "F7", "F0", "E6"], + "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F4", "F1", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 16 diff --git a/keyboards/mikeneko65/config.h b/keyboards/mikeneko65/config.h index f3e7d79932..42ab44fce1 100644 --- a/keyboards/mikeneko65/config.h +++ b/keyboards/mikeneko65/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, C7 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B6, B5, B4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mikeneko65/info.json b/keyboards/mikeneko65/info.json index 0ae602b096..01f4b3354f 100644 --- a/keyboards/mikeneko65/info.json +++ b/keyboards/mikeneko65/info.json @@ -8,6 +8,11 @@ "pid": "0x6D54", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D4", "D6", "D7", "B6", "B5", "B4"], + "rows": ["D0", "D1", "D2", "D3", "C7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h index b2aee68f70..4bd9748ab5 100644 --- a/keyboards/miller/gm862/config.h +++ b/keyboards/miller/gm862/config.h @@ -1,21 +1,5 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS {F0, F1, F4, F5, B4} -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json index 9f3d247305..eb74b083ef 100644 --- a/keyboards/miller/gm862/info.json +++ b/keyboards/miller/gm862/info.json @@ -8,6 +8,11 @@ "pid": "0x0223", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], + "rows": ["F0", "F1", "F4", "F5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h index ab1d6e7c51..7d416ae8db 100644 --- a/keyboards/millipad/config.h +++ b/keyboards/millipad/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_RESYNC_ENABLE #define FORCE_NKRO diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 9469f2baba..02f10ea9a2 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/info.json @@ -8,6 +8,11 @@ "pid": "0x1A1B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "D7", "D6", "D4"], + "rows": ["C6", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"} diff --git a/keyboards/mini_elixivy/config.h b/keyboards/mini_elixivy/config.h index fafc795574..d90fdba271 100644 --- a/keyboards/mini_elixivy/config.h +++ b/keyboards/mini_elixivy/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B6, E6, F6, C7 } -#define MATRIX_COL_PINS { F7, F5, F4, F1, F0, B7, D0, D1, D2, D3, D4, D6, D7, B4, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/info.json index 3567b555ac..de5220f1c9 100644 --- a/keyboards/mini_elixivy/info.json +++ b/keyboards/mini_elixivy/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F5", "F4", "F1", "F0", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B4", "C6"], + "rows": ["B5", "B6", "E6", "F6", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "D5"} diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h index 1773beff05..d90fdba271 100644 --- a/keyboards/mini_ten_key_plus/config.h +++ b/keyboards/mini_ten_key_plus/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, B1, B5, B4, E6 } -#define MATRIX_COL_PINS { F5, F4, B6, D7, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json index e69e49b06b..089668ec14 100644 --- a/keyboards/mini_ten_key_plus/info.json +++ b/keyboards/mini_ten_key_plus/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "B6", "D7", "C6"], + "rows": ["D4", "B1", "B5", "B4", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "F6", "resolution": 2} diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 4024ac6f45..49328d78ba 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -16,15 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D2, F1, F0 } - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index f3fd4717ec..8655546ea5 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -9,6 +9,11 @@ "pid": "0x1306", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"], + "rows": ["D3", "B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mino/hotswap/config.h b/keyboards/mino/hotswap/config.h index 841abc16f5..45fec5af48 100644 --- a/keyboards/mino/hotswap/config.h +++ b/keyboards/mino/hotswap/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D3, C6, D4, D2} -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mino/hotswap/info.json b/keyboards/mino/hotswap/info.json index 4e932f4939..be4f161ed6 100644 --- a/keyboards/mino/hotswap/info.json +++ b/keyboards/mino/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"], + "rows": ["D3", "C6", "D4", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h index 2839e63b1a..051193bd9f 100644 --- a/keyboards/mint60/config.h +++ b/keyboards/mint60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { D4, B3, B1, F7, B2, B6, F6, F5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json index f8011a5920..b2b795b4a8 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h index e5768a480d..dd6c07768b 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B7, D2, D3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define RGB_DI_PIN B1 diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index bc577e22fe..fd64d9fa14 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -8,6 +8,11 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"], + "rows": ["B0", "B7", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index 2c71926b81..e38f18b40a 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -// pins -#define MATRIX_ROW_PINS { D2, D3, D5, F0 } -#define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6} - -// diode mode -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define MK_3_SPEED #define TERMINAL_HELP diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index 922e4117e6..c7cb97c0b3 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -8,6 +8,11 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["D2", "D3", "D5", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 3}, diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h index 1021ddf951..4efe1466c6 100644 --- a/keyboards/misterknife/knife66/config.h +++ b/keyboards/misterknife/knife66/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { B15, A8, A3, A2, A1 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN A9 #ifdef RGB_DI_PIN diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json index 4a7bc23c35..e019cf6ae8 100644 --- a/keyboards/misterknife/knife66/info.json +++ b/keyboards/misterknife/knife66/info.json @@ -8,6 +8,11 @@ "pid": "0x4172", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B15", "A8", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h index 4974254844..d13ee6a334 100644 --- a/keyboards/misterknife/knife66_iso/config.h +++ b/keyboards/misterknife/knife66_iso/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, B9, B8, B7, B6, B5, B4, B3, A15 } -#define MATRIX_ROW_PINS { B15, A8, A3, A2, A1 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN A9 #ifdef RGB_DI_PIN diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json index b3c84a65bc..a1658c460b 100644 --- a/keyboards/misterknife/knife66_iso/info.json +++ b/keyboards/misterknife/knife66_iso/info.json @@ -8,6 +8,11 @@ "pid": "0x4173", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B15", "A8", "A3", "A2", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h index def4cc581c..1e01cae3a3 100644 --- a/keyboards/miuni32/config.h +++ b/keyboards/miuni32/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F4, D7} -#define MATRIX_COL_PINS { C6, C7, F7, F6, F1, E6, B7, B3, B2, B1, B0} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json index 7dd62adb5a..6b217f74ab 100644 --- a/keyboards/miuni32/info.json +++ b/keyboards/miuni32/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F1", "E6", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F4", "D7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h index bd9c4b6e4e..c95e4a5a95 100644 --- a/keyboards/ml/gas75/config.h +++ b/keyboards/ml/gas75/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D5, D4, D7, D6, B4 } -#define MATRIX_COL_PINS { D1, D2, B5, B6, C6, C7, F7, F6, F5, F4, E6, B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json index 2687ada0d9..1b2255ae99 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "E6", "B0", "B1", "B2", "B3"], + "rows": ["D3", "D5", "D4", "D7", "D6", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"} diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 8daaa6e9f8..70e1beb43e 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index 04c1bb4509..b872354f60 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -15,12 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { A6, A7, B0, B10 } -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 } - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json index ecfa4dc940..1e5a70aa92 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6261", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], + "rows": ["A6", "A7", "B0", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index 82e327451d..70e1beb43e 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -15,10 +15,6 @@ */ #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 7805e6e82b..426e65609d 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -15,11 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS \ - { A6, A7, B0, B1, B10 } -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index e9e03cb189..4af7c4b11d 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6161", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], + "rows": ["A6", "A7", "B0", "B1", "B10"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 8daaa6e9f8..70e1beb43e 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index a835d8c4f3..3dc80b50ef 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -15,18 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, A6, A7, B1, A5 } -#define MATRIX_COL_PINS \ - { B14, A10, A15, B3, B4, B5 } - -#define MATRIX_ROW_PINS_RIGHT \ - { B1, A4, A5, A6, A7 } - -#define MATRIX_COL_PINS_RIGHT \ - { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout - #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 237b933eb0..f33c5d04dd 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], + "rows": ["B0", "A6", "A7", "B1", "A5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} @@ -16,6 +21,12 @@ "split": { "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], + "rows": ["B1", "A4", "A5", "A6", "A7"] + } } }, "processor": "STM32F401", diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 2bb9334497..9d5cd08e3e 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -15,18 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS \ - { B0, A6, A7, B1, A5 } -#define MATRIX_COL_PINS \ - { B14, A10, A15, B3, B4, B5 } - -#define MATRIX_ROW_PINS_RIGHT \ - { B1, A4, A5, A6, A7 } - -#define MATRIX_COL_PINS_RIGHT \ - { B0, A3, A2, A1, B7, B5 } // cols are from right to left to match the layout - #define SPLIT_LAYER_STATE_ENABLE #define SPLIT_LED_STATE_ENABLE diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index 4e281733e1..5ab7696dbe 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x6362", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], + "rows": ["B0", "A6", "A7", "B1", "A5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B8"} @@ -16,6 +21,12 @@ "split": { "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B0", "A3", "A2", "A1", "B7", "B5"], + "rows": ["B1", "A4", "A5", "A6", "A7"] + } } }, "processor": "STM32F411", diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 3810f998d2..bdb0c16621 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -17,8 +17,5 @@ along with this program. If not, see . #pragma once - -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index d58ee7627f..83380e9aa4 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B11, B0, B1, A2, A3 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index f4d8ba7578..a638ec0b99 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -3,6 +3,11 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"], + "rows": ["B11", "B0", "B1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A8", "pin_b": "A9"} diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index 8094879b1c..2d595fc4be 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B11, B0, B1, A2, A3 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 } - #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 7d265197ca..00263c47f5 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -3,6 +3,11 @@ "pid": "0x6061", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "B6", "C15", "A0", "A7", "B10"], + "rows": ["B11", "B0", "B1", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A8", "pin_b": "A9"} diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index 4a71449cb0..d535b8c229 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B10, A5, A6, A7, B0 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index 39c26191c6..7118b12af0 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -3,6 +3,11 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A15", "B3", "B4", "B5", "B9", "B8", "B7", "A1", "A2", "A3", "A4", "B1"], + "rows": ["B10", "A5", "A6", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B6"} diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index a8b9b596d5..69bdff7cdd 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -// 0 1 2 3 4 -#define MATRIX_ROW_PINS \ - { B10, A5, A6, A7, B0 } -// 0 1 2 3 4 5 6 7 8 9 10 11 12 -#define MATRIX_COL_PINS \ - { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 } - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index 91af43a6a1..1cfe298f8f 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -3,6 +3,11 @@ "pid": "0x6062", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B14", "A8", "A10", "A15", "B3", "B4", "B5", "B7", "A1", "A2", "A3", "A4", "B1"], + "rows": ["B10", "A5", "A6", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "B6"} diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h index 2149df4a93..24b79416a8 100644 --- a/keyboards/mmkzoo65/config.h +++ b/keyboards/mmkzoo65/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B2, B3, B7, E6, B0 } -#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO /* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/ diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json index 5d613fee01..bd98fdbd35 100644 --- a/keyboards/mmkzoo65/info.json +++ b/keyboards/mmkzoo65/info.json @@ -8,6 +8,11 @@ "pid": "0x6505", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B2", "B3", "B7", "E6", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mnk1800s/config.h b/keyboards/mnk1800s/config.h index 5c277a3f48..79fdc4275f 100755 --- a/keyboards/mnk1800s/config.h +++ b/keyboards/mnk1800s/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B13, B12, A7, A6, A5 } -#define MATRIX_COL_PINS { B10, B2, B1, B0, B14, B15, A8, A9, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/mnk1800s/info.json b/keyboards/mnk1800s/info.json index 26fab96ba9..619911f907 100755 --- a/keyboards/mnk1800s/info.json +++ b/keyboards/mnk1800s/info.json @@ -8,6 +8,11 @@ "pid": "0x3138", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B13", "B12", "A7", "A6", "A5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mnk50/config.h b/keyboards/mnk50/config.h index d238bd0564..79fdc4275f 100755 --- a/keyboards/mnk50/config.h +++ b/keyboards/mnk50/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B12, B13, A10, A6 } -#define MATRIX_COL_PINS { B14, B15, A8, A9, A13, A14, A15, B3, B4, B5, B6, B7, B8, B9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/mnk50/info.json b/keyboards/mnk50/info.json index 26b900d70a..882dfad7d3 100755 --- a/keyboards/mnk50/info.json +++ b/keyboards/mnk50/info.json @@ -8,6 +8,11 @@ "pid": "0x4D35", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], + "rows": ["B12", "B13", "A10", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mnk75/config.h b/keyboards/mnk75/config.h index f2c84192d4..79fdc4275f 100755 --- a/keyboards/mnk75/config.h +++ b/keyboards/mnk75/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 } -#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/mnk75/info.json b/keyboards/mnk75/info.json index 71ff32beb1..91a1c8f21e 100755 --- a/keyboards/mnk75/info.json +++ b/keyboards/mnk75/info.json @@ -8,6 +8,11 @@ "pid": "0x4D37", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"], + "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h index 54a640366b..55a7a8457e 100644 --- a/keyboards/mntre/config.h +++ b/keyboards/mntre/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { D5, F7, E6, C7, B3, B2, B1, B0, F0, F1, F4, F5, F6, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_CUSTOM_RESOLUTION 0x400 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json index 36426c3cc1..7fae38f4ad 100644 --- a/keyboards/mntre/info.json +++ b/keyboards/mntre/info.json @@ -8,6 +8,11 @@ "pid": "0x1302", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"], + "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "max_brightness": 84 diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index da995299e4..52f0c6784d 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9} -#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index 4d27f46223..33e953ba25 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -8,6 +8,11 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "matrix_pins": { + "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], + "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6" }, diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index 62faefd168..52f0c6784d 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9 } -#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index c6ea41bee0..ea042a2df6 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -8,6 +8,11 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "matrix_pins": { + "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], + "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6" }, diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 173c679f1f..ed3faacae0 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { C7 , A8 , A10, A4 , A5 , A6 , C10, A7, C4 , C5 , A15, B0 , B1 , B12, B10, B13 } -#define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json index 53c7ccace4..c744b3512d 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -8,6 +8,11 @@ "pid": "0x6583", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "A8", "A10", "A4", "A5", "A6", "C10", "A7", "C4", "C5", "A15", "B0", "B1", "B12", "B10", "B13"], + "rows": ["A3", "B14", "B15", "C9", "C6", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index 2b0b122a6b..640cc43a5a 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - //C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 -#define MATRIX_COL_PINS { C8, C7, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } - //R0, R1, R2, R3, R4, R5 , R6 -#define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json index f7d265707e..e481cc09e7 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/info.json @@ -8,6 +8,11 @@ "pid": "0x7572", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C7", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], + "rows": ["C5", "B0", "B14", "B15", "A8", "C9", "A15"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 6c90b66be5..b8307f4396 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - // C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 -#define MATRIX_COL_PINS { C8, A8, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } - // R0, R1, R2, R3, R4, R5 , R6 -#define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index f046a8dffd..a3f2fd77ec 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,11 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "A8", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], + "rows": ["C5", "B0", "B14", "B15", "C7", "C9", "A15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 20, diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 6b59fc9872..72ad307905 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { A10, A15, B3, B9, A3, A4 } -#define MATRIX_COL_PINS { B8, B7, B6, B5, B4, A2, A1, A0, F1, F0, C15, C14, C13, A7, A6, A5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index e7558244ce..05fa106877 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -8,6 +8,11 @@ "pid": "0x0081", "device_version": "0.7.2" }, + "matrix_pins": { + "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], + "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index a94585c926..48f5444fc2 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -8,6 +8,11 @@ "pid": "0x0080", "device_version": "0.8.3" }, + "matrix_pins": { + "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], + "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index dcfd8d1614..d553d5d894 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 51788340ca..3c948f5eb4 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -8,6 +8,11 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], + "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "on_state": 0 diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index d7f5dd663b..5793fa00a7 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,6 +8,11 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], + "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "on_state": 0 diff --git a/keyboards/mokey/ginkgo65hot/config.h b/keyboards/mokey/ginkgo65hot/config.h deleted file mode 100644 index c3f836fd12..0000000000 --- a/keyboards/mokey/ginkgo65hot/config.h +++ /dev/null @@ -1,19 +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 - - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json index 31427c7cb3..347d4f840d 100644 --- a/keyboards/mokey/ginkgo65hot/info.json +++ b/keyboards/mokey/ginkgo65hot/info.json @@ -8,6 +8,11 @@ "pid": "0x3366", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 6, diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h deleted file mode 100644 index 51dbcc0bf7..0000000000 --- a/keyboards/mokey/ibis80/config.h +++ /dev/null @@ -1,22 +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 - - -#define MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/ibis80/info.json b/keyboards/mokey/ibis80/info.json index df1771d5e8..73fa6c086f 100644 --- a/keyboards/mokey/ibis80/info.json +++ b/keyboards/mokey/ibis80/info.json @@ -8,6 +8,11 @@ "pid": "0x3380", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], + "rows": ["B0", "B1", "B2", "E6", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/mokey/mokey63/config.h b/keyboards/mokey/mokey63/config.h deleted file mode 100644 index 4347c233c3..0000000000 --- a/keyboards/mokey/mokey63/config.h +++ /dev/null @@ -1,22 +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 - - -#define MATRIX_ROW_PINS { B5, B6, B2, B3, B1 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json index 0a29380114..6da3bc3133 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/info.json @@ -8,6 +8,11 @@ "pid": "0x063A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B5", "B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h deleted file mode 100644 index 4946ac2a9b..0000000000 --- a/keyboards/mokey/mokey64/config.h +++ /dev/null @@ -1,22 +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 - - -#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json index b31ef95cfd..36126d9243 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/info.json @@ -8,6 +8,11 @@ "pid": "0x001A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D2", "D1", "D3", "D5", "D4", "D6", "D7", "B6"], + "rows": ["B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mokey/xox70/config.h b/keyboards/mokey/xox70/config.h deleted file mode 100644 index 12780d9be9..0000000000 --- a/keyboards/mokey/xox70/config.h +++ /dev/null @@ -1,20 +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 - - -#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 } -#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json index f2dc99719a..021f719740 100644 --- a/keyboards/mokey/xox70/info.json +++ b/keyboards/mokey/xox70/info.json @@ -8,6 +8,11 @@ "pid": "0x3370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], + "rows": ["F7", "B7", "F5", "F1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"], diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h deleted file mode 100644 index 12780d9be9..0000000000 --- a/keyboards/mokey/xox70hot/config.h +++ /dev/null @@ -1,20 +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 - - -#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 } -#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json index 132ade0c9d..d7dd16bb75 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json @@ -8,6 +8,11 @@ "pid": "0x3371", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "C7", "F4", "F5", "F1", "B6", "D0", "D2", "D3", "D1", "D7", "D4", "D5", "D6", "B4", "B5", "C6", "B7"], + "rows": ["F7", "B7", "F5", "F1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h index 9812cd5b83..1755979bbc 100755 --- a/keyboards/molecule/config.h +++ b/keyboards/molecule/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, F5, F6, B6 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* OLED */ #define OLED_TIMEOUT 0 diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json index dd4a2773ca..aff7852107 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h index 5425085bb6..a8482aaef1 100644 --- a/keyboards/momoka_ergo/config.h +++ b/keyboards/momoka_ergo/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW #define SELECT_SOFT_SERIAL_SPEED 5 #define RGB_DI_PIN C7 diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json index 3c1eefd090..e362a3fa92 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, diff --git a/keyboards/momokai/tap_duo/config.h b/keyboards/momokai/tap_duo/config.h index ca447bf9c6..d366b2ec11 100644 --- a/keyboards/momokai/tap_duo/config.h +++ b/keyboards/momokai/tap_duo/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { E0 } -#define MATRIX_COL_PINS { E6, B2, D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW - - // Tweak how the mouse cursor moves. https://docs.qmk.fm/#/feature_mouse_keys // Accelerated mode (default). #define MOUSEKEY_DELAY 10 diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index b23740befa..968224c2c9 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B2", "D1", "D2", "D3"], + "rows": ["E0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h index 7a38599d11..c3d1ebab68 100644 --- a/keyboards/momokai/tap_trio/config.h +++ b/keyboards/momokai/tap_trio/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { E0 } -#define MATRIX_COL_PINS { E6, B2, B7, D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW - - //TODO: implement RGB Matrix #define RGB_DI_PIN F0 // #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index 63e6257ee8..c0406d73ce 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B2", "B7", "D1", "D2", "D3"], + "rows": ["E0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h index 2d319c4fdf..30181978df 100644 --- a/keyboards/monarch/config.h +++ b/keyboards/monarch/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B10, B2, B1, B0, A5, A7, A4, A3, B6 } -#define MATRIX_ROW_PINS { A15, B3, B11, A2, A1, B9 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/monarch/info.json b/keyboards/monarch/info.json index 95fafb5eb4..14bfde3f3a 100644 --- a/keyboards/monarch/info.json +++ b/keyboards/monarch/info.json @@ -8,6 +8,11 @@ "pid": "0x43C1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A5", "A7", "A4", "A3", "B6"], + "rows": ["A15", "B3", "B11", "A2", "A1", "B9"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 24, diff --git a/keyboards/monoflex60/config.h b/keyboards/monoflex60/config.h deleted file mode 100644 index 6de9ac8ee6..0000000000 --- a/keyboards/monoflex60/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2022 Ivan Gromov (@key10iq) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5 } -#define MATRIX_COL_PINS { B7, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/info.json index 771c5aac66..b849109756 100644 --- a/keyboards/monoflex60/info.json +++ b/keyboards/monoflex60/info.json @@ -8,6 +8,11 @@ "pid": "0x60EB", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D1", "D0", "D3", "D2", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": [ diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h index d03610af38..4b4bad4056 100644 --- a/keyboards/monstargear/xo87/rgb/config.h +++ b/keyboards/monstargear/xo87/rgb/config.h @@ -16,9 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { E6,E7, E3, B0, B1 ,A2} -#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 } -#define DIODE_DIRECTION ROW2COL #define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 110 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json index 8176bac03f..73723f3141 100644 --- a/keyboards/monstargear/xo87/rgb/info.json +++ b/keyboards/monstargear/xo87/rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x584F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], + "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb646", "bootloader": "lufa-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h index 65c76647ab..347f14488f 100644 --- a/keyboards/monstargear/xo87/solderable/config.h +++ b/keyboards/monstargear/xo87/solderable/config.h @@ -19,15 +19,11 @@ #define brightnessMax 8 -#define MATRIX_ROW_PINS { E6,E7,E3,B0,B1,A2} -#define MATRIX_COL_PINS { C5,C3,C1,E1,D6,D2,B7,B3,F6,F7,F3,A5,A1,E2,C7,A6 } - #define KEYLED_ROWS 6 #define KEYLED_COLS 16 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 } #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 } -#define DIODE_DIRECTION ROW2COL #define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 21 #define DRIVER_COUNT 2 diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json index f3a8ca1657..669c8c1592 100644 --- a/keyboards/monstargear/xo87/solderable/info.json +++ b/keyboards/monstargear/xo87/solderable/info.json @@ -8,6 +8,11 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], + "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] + }, + "diode_direction": "ROW2COL", "backlight": { "driver": "custom", "pin": "F0" diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h index 6063a52f09..274c715a93 100644 --- a/keyboards/montsinger/rebound/rev1/config.h +++ b/keyboards/montsinger/rebound/rev1/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { D1, B5, B2, B6 } -#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json index d7d6cf0d07..d65fb21767 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D1", "B5", "B2", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h index cbf4c9b8df..274c715a93 100644 --- a/keyboards/montsinger/rebound/rev2/config.h +++ b/keyboards/montsinger/rebound/rev2/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { D1, B5, B2, B6, B0 } -#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json index 8c2aec4e4d..e463402970 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D1", "B5", "B2", "B6", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h index 00506c85bc..274c715a93 100644 --- a/keyboards/montsinger/rebound/rev3/config.h +++ b/keyboards/montsinger/rebound/rev3/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { F4, F5, D1, D0, B0 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json index 2f9338afc3..496b2e9dc6 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["F4", "F5", "D1", "D0", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"} diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h index 58cf478e13..3caa3c9aca 100644 --- a/keyboards/montsinger/rebound/rev4/config.h +++ b/keyboards/montsinger/rebound/rev4/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { D1, D0, D4, C6, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, B2, B3, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index dd76ea25e9..dfd093eb84 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], + "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h index fb1d814501..274c715a93 100644 --- a/keyboards/montsinger/rewind/config.h +++ b/keyboards/montsinger/rewind/config.h @@ -14,25 +14,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on -diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { B5, B4, D2, D3, B2 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json index 6df88109e8..9878a204c7 100644 --- a/keyboards/montsinger/rewind/info.json +++ b/keyboards/montsinger/rewind/info.json @@ -8,6 +8,11 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["B5", "B4", "D2", "D3", "B2"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h index d19633a9ad..5b0945d4d4 100644 --- a/keyboards/morizon/config.h +++ b/keyboards/morizon/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json index b012a2ecc6..4d4e0aa69b 100644 --- a/keyboards/morizon/info.json +++ b/keyboards/morizon/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h index 992b89937c..2aca1d46b3 100644 --- a/keyboards/mountainblocks/mb17/config.h +++ b/keyboards/mountainblocks/mb17/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F4, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F7, E6, D7, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/info.json index 56cb02fa28..516d307d2d 100644 --- a/keyboards/mountainblocks/mb17/info.json +++ b/keyboards/mountainblocks/mb17/info.json @@ -8,6 +8,11 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "E6", "D7", "C6"], + "rows": ["F4", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h index fef54ac0e1..60a9555a78 100644 --- a/keyboards/mss_studio/m63_rgb/config.h +++ b/keyboards/mss_studio/m63_rgb/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B4, A0, A2, A3 } -#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json index 45b0723102..388400c0e5 100644 --- a/keyboards/mss_studio/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], + "rows": ["B3", "B4", "A0", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h index 6f095b6aa4..4711bb62a6 100644 --- a/keyboards/mss_studio/m64_rgb/config.h +++ b/keyboards/mss_studio/m64_rgb/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B4, A0, A2, A3 } -#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Forcing to use NKRO instead 6KRO */ #define FORCE_NKRO diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json index ec168e049b..7637456e0a 100644 --- a/keyboards/mss_studio/m64_rgb/info.json +++ b/keyboards/mss_studio/m64_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], + "rows": ["B3", "B4", "A0", "A2", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h index bd4c880e3b..355454f9d4 100644 --- a/keyboards/mt/blocked65/config.h +++ b/keyboards/mt/blocked65/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index c16d04cd5b..f2b399b9b9 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 6 diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h index 8a77b3dc7b..32a2dfb2d3 100644 --- a/keyboards/mt/mt40/config.h +++ b/keyboards/mt/mt40/config.h @@ -31,27 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -/* #define CC6 0x63 // C3 */ -/* #define CB6 0x37 // B7 */ -/* #define CC7 0x62 // C2 */ - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* #define LOCKING_SUPPORT_ENABLE */ /* Locking resynchronize hack */ diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json index 730cdf6c24..d632160093 100644 --- a/keyboards/mt/mt40/info.json +++ b/keyboards/mt/mt40/info.json @@ -8,6 +8,11 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index d989525a1b..e7c1302a0b 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 } -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json index 20acbceedb..1eb2212598 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], + "rows": ["D7", "D6", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h index 0eba561a04..394193bcdd 100644 --- a/keyboards/mt/mt84/config.h +++ b/keyboards/mt/mt84/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2, D4 } -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json index ad101223aa..b35a609a8c 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"], + "rows": ["D7", "D6", "D5", "D3", "D2", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h index 8a5dbe68f8..d6697fc076 100644 --- a/keyboards/mt/mt980/config.h +++ b/keyboards/mt/mt980/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index 59afd26650..3a99cc6cb7 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h index 65ca63af7e..29eb3ae608 100644 --- a/keyboards/mt/ncr80/hotswap/config.h +++ b/keyboards/mt/ncr80/hotswap/config.h @@ -17,21 +17,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json index ed288b9e8d..8eaa0519cf 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x2002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C6", "num_lock": "B5", diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h deleted file mode 100644 index c6828a9323..0000000000 --- a/keyboards/mt/ncr80/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 Jordan Duabe - * 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json index 2005f45d48..aea6232991 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h index a1b98373b4..114c8feab4 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ b/keyboards/mtbkeys/mtb60/hotswap/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pinout */ -#define MATRIX_ROW_PINS { D6, D7, B4, B5, D5 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, B7, B6, F7, C6, C7, F6, F4, F1, F0, F5, E6 } - -/* diode direction: COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Pin WS2812 RGB LEDs are connected to */ #define RGB_DI_PIN D4 diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json index 6f5da086d0..d2ece9ff7f 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/info.json +++ b/keyboards/mtbkeys/mtb60/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"], + "rows": ["D6", "D7", "B4", "B5", "D5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h index 4d14b392f0..3ab3171076 100644 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ b/keyboards/mtbkeys/mtb60/solder/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pinout */ -#define MATRIX_ROW_PINS { D0, D1, F4, F1, D2 } -#define MATRIX_COL_PINS { E6, F0, F5, F6, F7, D5, D3, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* diode direction: COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Pin WS2812 RGB LEDs are connected to */ #define RGB_DI_PIN B0 diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json index 2f97a88913..552985d562 100644 --- a/keyboards/mtbkeys/mtb60/solder/info.json +++ b/keyboards/mtbkeys/mtb60/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D0", "D1", "F4", "F1", "D2"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index b54258280b..4059817b74 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], + "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"} @@ -21,6 +26,12 @@ {"pin_a": "F6", "pin_b": "F7"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["D6", "D7", "D3", "B2", "B1", "B0"], + "rows": ["B3", "B7", "D4", "B6", "C6", "C7"] + } } }, "processor": "atmega32u4", diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index f334ebc63f..156f708632 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -21,24 +21,6 @@ along with this program. If not, see . #define EE_HANDS #define SPLIT_USB_DETECT -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B4, D5, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { C6, B6, B5, D7, D6, D4 } -#define MATRIX_ROW_PINS_RIGHT { B3, B7, D4, B6, C6, C7 } -#define MATRIX_COL_PINS_RIGHT { D6, D7, D3, B2, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index 290871bde5..b4d733a212 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { A3, A5, A6, A7, B0 } -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, A4, A2, A1, B6, B5, B4, B3, A15 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define FORCE_NKRO diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index ec0d58b07e..f33b5d2ccc 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -6,6 +6,11 @@ "pid": "0x3201", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A4", "A2", "A1", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A3", "A5", "A6", "A7", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "B11", "pin_b": "B10"} diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h index 79d1d5e1b2..6ed183cb4c 100644 --- a/keyboards/mwstudio/mw65_black/config.h +++ b/keyboards/mwstudio/mw65_black/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D7, B4, B3, B6 } -#define MATRIX_COL_PINS { B0, B1, B2, D0, D1, D2, D3, D5, C6, F7, F4, F6, F5, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C7 #ifdef RGB_DI_PIN #define RGBLED_NUM 21 diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json index 23151df686..1a53a22195 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/info.json @@ -8,6 +8,11 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"], + "rows": ["D4", "D7", "B4", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "D6"} diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h index 2a90d77ee9..94388ff316 100644 --- a/keyboards/mwstudio/mw65_rgb/config.h +++ b/keyboards/mwstudio/mw65_rgb/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, B7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, C7, F7, F6, F5, F4, F1, F0, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Matrix config */ #define RGB_DI_PIN B3 diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index ee00dd70c1..8cace68cce 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["D0", "D1", "D2", "D3", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"} diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h index 4cb7a8a22c..cbfaa2221d 100644 --- a/keyboards/mwstudio/mw75/config.h +++ b/keyboards/mwstudio/mw75/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5, B0} -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index 866f488a6e..f7497ec325 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -8,6 +8,11 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D5", "B0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"} diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h index b5f4500d58..387015e937 100644 --- a/keyboards/mwstudio/mw75r2/config.h +++ b/keyboards/mwstudio/mw75r2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5} -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D4, D6, F7, F6, E6, F0, F1, F4, F5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index 4d794246eb..e479c68c96 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -8,6 +8,11 @@ "pid": "0x7502", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"], + "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B2"} diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h index 14ed456ecf..1a372c72f5 100644 --- a/keyboards/mxss/config.h +++ b/keyboards/mxss/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* matrix pin configuration */ -#define MATRIX_ROW_PINS { F4, F1, F7, B1, B7 } -#define MATRIX_COL_PINS { D7, D6, D4, D0, C6, B6, D1, B5, D2, B4, D3, D5, B0, B2, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Basic RGB configuration */ #define RGB_DI_PIN C7 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json index 8bc0277016..70bb5c5f76 100644 --- a/keyboards/mxss/info.json +++ b/keyboards/mxss/info.json @@ -8,6 +8,11 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "D6", "D4", "D0", "C6", "B6", "D1", "B5", "D2", "B4", "D3", "D5", "B0", "B2", "B3"], + "rows": ["F4", "F1", "F7", "B1", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mysticworks/wyvern/config.h b/keyboards/mysticworks/wyvern/config.h index 3d2aab65c7..d025a3d4de 100644 --- a/keyboards/mysticworks/wyvern/config.h +++ b/keyboards/mysticworks/wyvern/config.h @@ -16,14 +16,6 @@ #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS {D0,D1,D5,D3,F7,F6,F5,F4,F1,F0} -#define MATRIX_COL_PINS {E6,B0,D4,D6,D7,B4,B5,B6,C6,C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/info.json index f2307c1f03..2150a691a8 100644 --- a/keyboards/mysticworks/wyvern/info.json +++ b/keyboards/mysticworks/wyvern/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D0", "D1", "D5", "D3", "F7", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { -- cgit v1.3.1 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/25keys/zinc/rev1/rev1.c | 1 - keyboards/25keys/zinc/reva/reva.c | 1 - keyboards/25keys/zinc/zinc.c | 1 - keyboards/25keys/zinc/zinc.h | 10 ----- keyboards/40percentclub/i75/i75.c | 16 -------- keyboards/40percentclub/i75/i75.h | 24 ------------ keyboards/40percentclub/i75/promicro/promicro.c | 16 -------- keyboards/40percentclub/i75/promicro/promicro.h | 1 - keyboards/40percentclub/i75/teensy2/teensy2.c | 16 -------- keyboards/40percentclub/i75/teensy2/teensy2.h | 1 - keyboards/40percentclub/polyandry/polyandry.c | 16 -------- keyboards/40percentclub/polyandry/polyandry.h | 24 ------------ .../40percentclub/polyandry/promicro/promicro.c | 16 -------- .../40percentclub/polyandry/promicro/promicro.h | 2 +- .../40percentclub/polyandry/teensy2/teensy2.c | 16 -------- .../40percentclub/polyandry/teensy2/teensy2.h | 2 +- keyboards/acheron/apollo/87h/87h.c | 16 -------- keyboards/acheron/apollo/87h/87h.h | 24 ------------ keyboards/acheron/athena/athena.c | 16 -------- keyboards/acheron/athena/athena.h | 24 ------------ keyboards/acheron/elongate/beta/beta.c | 17 --------- keyboards/acheron/elongate/elongate.c | 14 ------- keyboards/acheron/elongate/elongate.h | 25 ------------- keyboards/acheron/shark/alpha/alpha.c | 16 -------- keyboards/acheron/shark/shark.c | 14 ------- keyboards/acheron/shark/shark.h | 9 ----- keyboards/adkb96/adkb96.c | 2 +- keyboards/adkb96/adkb96.h | 7 ---- keyboards/adkb96/rev1/rev1.c | 1 - keyboards/adkb96/rev1/rev1.h | 2 +- keyboards/aeboards/constellation/constellation.c | 20 ---------- keyboards/aeboards/constellation/constellation.h | 28 -------------- keyboards/aeboards/constellation/rev1/rev1.c | 18 --------- keyboards/aeboards/constellation/rev3/rev3.c | 18 --------- keyboards/aeboards/satellite/satellite.c | 19 ---------- keyboards/aeboards/satellite/satellite.h | 23 ------------ keyboards/afternoonlabs/breeze/breeze.c | 17 --------- keyboards/afternoonlabs/breeze/breeze.h | 24 ------------ keyboards/afternoonlabs/breeze/rev0/rev0.c | 17 --------- keyboards/afternoonlabs/breeze/rev0/rev0.h | 2 - keyboards/afternoonlabs/breeze/rev1/rev1.c | 17 --------- keyboards/afternoonlabs/breeze/rev1/rev1.h | 2 - keyboards/afternoonlabs/gust/gust.c | 17 --------- keyboards/afternoonlabs/gust/gust.h | 21 ----------- keyboards/afternoonlabs/gust/rev1/rev1.c | 17 --------- keyboards/afternoonlabs/gust/rev1/rev1.h | 2 - keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c | 17 --------- keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h | 21 ----------- keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c | 17 --------- keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h | 2 - .../afternoonlabs/southern_breeze/rev1/rev1.c | 17 --------- .../afternoonlabs/southern_breeze/rev1/rev1.h | 2 - .../southern_breeze/southern_breeze.c | 17 --------- .../southern_breeze/southern_breeze.h | 21 ----------- keyboards/afternoonlabs/summer_breeze/rev1/rev1.c | 17 --------- keyboards/afternoonlabs/summer_breeze/rev1/rev1.h | 2 - .../afternoonlabs/summer_breeze/summer_breeze.c | 17 --------- .../afternoonlabs/summer_breeze/summer_breeze.h | 21 ----------- keyboards/alt34/alt34.c | 18 --------- keyboards/alt34/alt34.h | 24 ------------ keyboards/alt34/rev1/rev1.c | 18 --------- keyboards/alt34/rev1/rev1.h | 1 - keyboards/arabica37/arabica37.c | 1 - keyboards/arabica37/arabica37.h | 5 --- keyboards/arabica37/rev1/rev1.c | 1 - keyboards/arabica37/rev1/rev1.h | 2 - keyboards/atreus/astar/astar.c | 16 -------- keyboards/atreus/astar/astar.h | 17 --------- keyboards/atreus/astar_mirrored/astar_mirrored.c | 16 -------- keyboards/atreus/astar_mirrored/astar_mirrored.h | 17 --------- keyboards/atreus/atreus.c | 17 --------- keyboards/atreus/atreus.h | 14 ------- keyboards/atreus/f103/f103.c | 17 --------- keyboards/atreus/f103/f103.h | 17 --------- keyboards/atreus/feather/feather.c | 16 -------- keyboards/atreus/feather/feather.h | 17 --------- keyboards/atreus/promicro/promicro.c | 16 -------- keyboards/atreus/promicro/promicro.h | 17 --------- keyboards/atreus/teensy2/teensy2.c | 16 -------- keyboards/atreus/teensy2/teensy2.h | 17 --------- keyboards/atreyu/atreyu.c | 17 --------- keyboards/atreyu/atreyu.h | 23 ------------ keyboards/avalanche/avalanche.c | 2 +- keyboards/avalanche/avalanche.h | 16 -------- keyboards/avalanche/v1/v1.c | 4 -- keyboards/avalanche/v1/v1.h | 2 - keyboards/avalanche/v2/v2.c | 4 -- keyboards/avalanche/v2/v2.h | 2 - keyboards/avalanche/v3/v3.c | 4 -- keyboards/avalanche/v3/v3.h | 2 - keyboards/avalanche/v4/v4.c | 2 +- keyboards/avalanche/v4/v4.h | 2 - keyboards/basekeys/slice/rev1/rev1.c | 16 -------- keyboards/basekeys/slice/rev1/rev1.h | 2 - keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c | 16 -------- keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h | 2 - keyboards/basekeys/slice/slice.c | 16 -------- keyboards/basekeys/slice/slice.h | 25 ------------- keyboards/bear_face/bear_face.c | 18 --------- keyboards/bear_face/bear_face.h | 26 ------------- keyboards/bear_face/v1/v1.c | 2 +- keyboards/bear_face/v2/v2.c | 2 +- keyboards/bemeier/bmek/bmek.h | 8 ---- keyboards/bemeier/bmek/rev1/rev1.c | 16 -------- keyboards/bemeier/bmek/rev1/rev1.h | 18 --------- keyboards/bemeier/bmek/rev2/rev2.c | 16 -------- keyboards/bemeier/bmek/rev2/rev2.h | 18 --------- keyboards/bemeier/bmek/rev3/rev3.c | 16 -------- keyboards/bemeier/bmek/rev3/rev3.h | 24 ------------ keyboards/biacco42/ergo42/ergo42.c | 2 +- keyboards/biacco42/ergo42/ergo42.h | 7 ---- keyboards/biacco42/ergo42/rev1/rev1.c | 1 - keyboards/biacco42/ergo42/rev1/rev1.h | 2 - keyboards/boston_meetup/2019/2019.c | 2 +- keyboards/boston_meetup/2019/2019.h | 19 ---------- keyboards/boston_meetup/boston_meetup.c | 2 - keyboards/boston_meetup/boston_meetup.h | 7 +--- keyboards/buzzard/buzzard.c | 3 -- keyboards/buzzard/buzzard.h | 9 ----- keyboards/buzzard/rev1/rev1.h | 2 +- keyboards/chocofly/chocofly.c | 2 +- keyboards/chocofly/chocofly.h | 10 ----- keyboards/chocofly/v1/v1.c | 4 -- keyboards/chocofly/v1/v1.h | 2 - keyboards/clickety_split/leeloo/leeloo.c | 2 +- keyboards/clickety_split/leeloo/leeloo.h | 24 ------------ keyboards/clickety_split/leeloo/rev1/rev1.c | 18 --------- keyboards/clueboard/66_hotswap/66_hotswap.c | 1 - keyboards/clueboard/66_hotswap/66_hotswap.h | 9 ----- keyboards/clueboard/66_hotswap/gen1/gen1.c | 2 +- keyboards/clueboard/66_hotswap/gen1/gen1.h | 18 --------- .../clueboard/66_hotswap/prototype/prototype.c | 2 +- .../clueboard/66_hotswap/prototype/prototype.h | 3 -- keyboards/converter/usb_usb/ble/ble.c | 1 - keyboards/converter/usb_usb/ble/ble.h | 3 -- keyboards/converter/usb_usb/hasu/hasu.c | 1 - keyboards/converter/usb_usb/hasu/hasu.h | 3 -- keyboards/converter/usb_usb/pro_micro/pro_micro.c | 1 - keyboards/converter/usb_usb/pro_micro/pro_micro.h | 3 -- keyboards/converter/usb_usb/usb_usb.c | 1 - keyboards/converter/usb_usb/usb_usb.h | 8 ---- keyboards/cozykeys/bloomer/bloomer.c | 17 --------- keyboards/cozykeys/bloomer/bloomer.h | 23 ------------ keyboards/cozykeys/bloomer/v2/v2.c | 17 --------- keyboards/cozykeys/bloomer/v3/v3.c | 17 --------- keyboards/cozykeys/speedo/speedo.c | 17 --------- keyboards/cozykeys/speedo/speedo.h | 23 ------------ keyboards/cozykeys/speedo/v2/v2.c | 17 --------- keyboards/cozykeys/speedo/v3/v3.c | 17 --------- keyboards/crkbd/crkbd.c | 2 +- keyboards/crkbd/crkbd.h | 28 -------------- keyboards/crkbd/r2g/r2g.h | 1 - keyboards/crkbd/rev1/rev1.h | 1 - keyboards/dailycraft/bat43/bat43.c | 17 --------- keyboards/dailycraft/bat43/bat43.h | 10 ----- keyboards/dailycraft/bat43/rev1/rev1.c | 17 --------- keyboards/dailycraft/bat43/rev2/rev2.c | 17 --------- keyboards/dailycraft/claw44/claw44.c | 1 - keyboards/dailycraft/claw44/claw44.h | 5 --- keyboards/dailycraft/claw44/rev1/rev1.c | 1 - keyboards/dailycraft/sandbox/rev1/rev1.c | 17 --------- keyboards/dailycraft/sandbox/rev2/rev2.c | 17 --------- keyboards/dailycraft/sandbox/sandbox.c | 2 +- keyboards/dailycraft/sandbox/sandbox.h | 26 ------------- keyboards/dailycraft/wings42/rev1/rev1.c | 17 --------- .../dailycraft/wings42/rev1_extkeys/rev1_extkeys.c | 17 --------- keyboards/dailycraft/wings42/rev2/rev2.c | 17 --------- keyboards/dailycraft/wings42/wings42.c | 17 --------- keyboards/dailycraft/wings42/wings42.h | 30 --------------- keyboards/deltasplit75/deltasplit75.c | 1 - keyboards/deltasplit75/deltasplit75.h | 7 ---- keyboards/deltasplit75/v2/v2.c | 1 - keyboards/deltasplit75/v2/v2.h | 2 - keyboards/drhigsby/ogurec/left_pm/left_pm.h | 2 +- keyboards/drhigsby/ogurec/ogurec.c | 16 -------- keyboards/drhigsby/ogurec/ogurec.h | 24 ------------ keyboards/drhigsby/ogurec/right_pm/right_pm.h | 2 +- keyboards/durgod/dgk6x/galaxy/config.h | 2 + keyboards/durgod/dgk6x/galaxy/galaxy.h | 2 - keyboards/durgod/dgk6x/hades/config.h | 2 + keyboards/durgod/dgk6x/hades/hades.h | 2 - keyboards/durgod/dgk6x/venus/config.h | 2 + keyboards/durgod/dgk6x/venus/venus.h | 2 - keyboards/dztech/dz65rgb/dz65rgb.c | 17 --------- keyboards/dztech/dz65rgb/dz65rgb.h | 28 -------------- keyboards/eco/config.h | 7 ---- keyboards/eco/eco.c | 1 - keyboards/eco/eco.h | 9 ----- keyboards/eco/rev1/rev1.c | 1 - keyboards/eco/rev1/rev1.h | 2 - keyboards/eco/rev2/rev2.c | 1 - keyboards/eco/rev2/rev2.h | 2 - keyboards/eek/eek.c | 2 +- keyboards/eek/eek.h | 24 ------------ keyboards/eek/silk_down/silk_down.h | 2 +- keyboards/eek/silk_up/silk_up.h | 2 +- keyboards/ergodox_ez/ergodox_ez.h | 6 --- keyboards/ergodox_ez/glow/glow.h | 23 ------------ keyboards/ergodox_ez/shine/shine.h | 23 ------------ keyboards/ergoslab/ergoslab.c | 1 - keyboards/ergoslab/ergoslab.h | 7 ---- keyboards/ergoslab/rev1/rev1.h | 2 - keyboards/ergotravel/ergotravel.c | 1 - keyboards/ergotravel/ergotravel.h | 7 ---- keyboards/ergotravel/rev1/rev1.c | 1 - keyboards/ergotravel/rev1/rev1.h | 2 - keyboards/fortitude60/fortitude60.c | 1 - keyboards/fortitude60/fortitude60.h | 7 ---- keyboards/fortitude60/rev1/rev1.c | 1 - keyboards/fortitude60/rev1/rev1.h | 2 - keyboards/fungo/fungo.c | 18 --------- keyboards/fungo/fungo.h | 23 ------------ keyboards/fungo/rev1/rev1.c | 17 --------- keyboards/fungo/rev1/rev1.h | 1 - keyboards/gmmk/gmmk2/p65/p65.c | 17 --------- keyboards/gmmk/gmmk2/p65/p65.h | 25 ------------- keyboards/gmmk/gmmk2/p96/p96.c | 17 --------- keyboards/gmmk/gmmk2/p96/p96.h | 25 ------------- keyboards/gmmk/pro/pro.c | 2 +- keyboards/gmmk/pro/pro.h | 29 --------------- keyboards/gmmk/pro/rev1/ansi/ansi.h | 2 +- keyboards/gmmk/pro/rev1/iso/iso.h | 2 +- keyboards/gmmk/pro/rev2/ansi/ansi.h | 2 +- keyboards/gmmk/pro/rev2/iso/iso.h | 2 +- keyboards/hadron/hadron.c | 2 - keyboards/hadron/hadron.h | 8 ---- keyboards/hadron/ver2/ver2.c | 2 +- keyboards/hadron/ver2/ver2.h | 3 -- keyboards/hadron/ver3/ver3.c | 2 +- keyboards/hadron/ver3/ver3.h | 18 --------- keyboards/handwired/qc60/proto/proto.c | 17 --------- keyboards/handwired/qc60/proto/proto.h | 2 - keyboards/handwired/qc60/qc60.c | 1 - keyboards/handwired/qc60/qc60.h | 7 ---- keyboards/handwired/split65/promicro/promicro.c | 16 -------- keyboards/handwired/split65/promicro/promicro.h | 2 +- keyboards/handwired/split65/split65.c | 2 +- keyboards/handwired/split65/split65.h | 24 ------------ keyboards/handwired/split65/stm32/stm32.c | 16 -------- keyboards/handwired/split65/stm32/stm32.h | 2 +- keyboards/handwired/stef9998/split_5x7/rev1/rev1.c | 17 --------- keyboards/handwired/stef9998/split_5x7/rev1/rev1.h | 2 +- keyboards/handwired/stef9998/split_5x7/split_5x7.c | 2 +- keyboards/handwired/stef9998/split_5x7/split_5x7.h | 23 ------------ .../tractyl_manuform/4x6_right/4x6_right.h | 1 - .../tractyl_manuform/5x6_right/5x6_right.h | 14 ------- .../5x6_right/arduinomicro/arduinomicro.h | 19 ---------- .../tractyl_manuform/5x6_right/elite_c/elite_c.h | 19 ---------- .../tractyl_manuform/5x6_right/f303/f303.c | 17 --------- .../tractyl_manuform/5x6_right/f303/f303.h | 19 ---------- .../tractyl_manuform/5x6_right/f411/f411.c | 2 +- .../tractyl_manuform/5x6_right/f411/f411.h | 19 ---------- .../5x6_right/teensy2pp/teensy2pp.h | 19 ---------- keyboards/handwired/uthol/rev3/rev3.c | 18 --------- keyboards/handwired/uthol/uthol.c | 18 --------- keyboards/handwired/uthol/uthol.h | 11 ------ keyboards/helix/helix.c | 1 - keyboards/helix/helix.h | 19 ---------- keyboards/helix/pico/pico.c | 2 +- keyboards/helix/pico/pico.h | 2 +- keyboards/helix/rev2/rev2.c | 2 +- keyboards/helix/rev2/rev2.h | 2 +- keyboards/helix/rev3_4rows/rev3_4rows.c | 2 +- keyboards/helix/rev3_5rows/rev3_5rows.c | 2 +- keyboards/horrortroll/caticorn/caticorn.c | 17 --------- keyboards/horrortroll/caticorn/caticorn.h | 25 ------------- keyboards/ibnuda/squiggle/rev1/rev1.c | 1 - keyboards/ibnuda/squiggle/rev1/rev1.h | 2 - keyboards/ibnuda/squiggle/squiggle.c | 17 --------- keyboards/ibnuda/squiggle/squiggle.h | 23 ------------ keyboards/jacky_studio/bear_65/bear_65.c | 17 --------- keyboards/jacky_studio/bear_65/bear_65.h | 25 ------------- keyboards/jacky_studio/bear_65/rev1/rev1.h | 2 +- keyboards/jacky_studio/bear_65/rev2/rev2.h | 2 +- keyboards/jian/handwired/handwired.h | 2 +- keyboards/jian/jian.c | 1 - keyboards/jian/jian.h | 19 ---------- keyboards/jian/nsrev2/nsrev2.h | 2 +- keyboards/jian/rev1/rev1.h | 2 +- keyboards/jian/rev2/rev2.h | 2 +- keyboards/jiran/jiran.c | 1 - keyboards/jiran/jiran.h | 11 ------ keyboards/jiran/rev1/rev1.c | 1 - keyboards/jiran/rev1/rev1.h | 1 - keyboards/jiran/rev2/rev2.c | 1 - keyboards/jiran/rev2/rev2.h | 1 - keyboards/jorne/jorne.c | 2 +- keyboards/jorne/jorne.h | 9 ----- keyboards/jorne/rev1/rev1.c | 3 -- keyboards/jorne/rev1/rev1.h | 2 +- keyboards/kakunpc/business_card/alpha/alpha.c | 16 -------- keyboards/kakunpc/business_card/beta/beta.c | 16 -------- keyboards/kakunpc/business_card/business_card.c | 16 -------- keyboards/kakunpc/business_card/business_card.h | 25 ------------- keyboards/kapl/kapl.c | 3 -- keyboards/kapl/kapl.h | 8 ---- keyboards/kapl/rev1/rev1.c | 2 +- keyboards/kapl/rev1/rev1.h | 2 +- keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c | 17 --------- keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h | 28 -------------- keyboards/kbdfans/kbd75/kbd75.c | 4 -- keyboards/kbdfans/kbd75/kbd75.h | 12 ------ keyboards/kbdfans/kbd75/rev1/rev1.c | 4 -- keyboards/kbdfans/kbd75/rev1/rev1.h | 2 +- keyboards/kbdfans/kbd75/rev2/rev2.c | 4 -- keyboards/kbdfans/kbd75/rev2/rev2.h | 2 +- keyboards/keebio/convolution/convolution.c | 2 +- keyboards/keebio/convolution/convolution.h | 22 ----------- keyboards/keebio/convolution/rev1/rev1.h | 1 - keyboards/keebio/dsp40/dsp40.c | 17 --------- keyboards/keebio/dsp40/dsp40.h | 21 ----------- keyboards/keebio/dsp40/rev1/rev1.h | 1 - keyboards/keebio/foldkb/foldkb.c | 17 --------- keyboards/keebio/foldkb/foldkb.h | 23 ------------ keyboards/keebio/foldkb/rev1/rev1.c | 2 +- keyboards/keebio/foldkb/rev1/rev1.h | 1 - keyboards/keebio/fourier/fourier.c | 1 - keyboards/keebio/fourier/fourier.h | 4 -- keyboards/keebio/iris/iris.c | 1 - keyboards/keebio/iris/iris.h | 26 ------------- keyboards/keebio/iris/rev1/rev1.h | 2 - keyboards/keebio/iris/rev1_led/rev1_led.h | 2 - keyboards/keebio/iris/rev2/rev2.h | 2 - keyboards/keebio/iris/rev3/rev3.h | 1 - keyboards/keebio/iris/rev4/rev4.h | 1 - keyboards/keebio/iris/rev5/rev5.h | 1 - keyboards/keebio/iris/rev6/rev6.h | 1 - keyboards/keebio/iris/rev6a/rev6a.h | 1 - keyboards/keebio/iris/rev6b/rev6b.h | 1 - keyboards/keebio/iris/rev7/rev7.h | 1 - keyboards/keebio/kbo5000/kbo5000.c | 1 - keyboards/keebio/kbo5000/kbo5000.h | 7 ---- keyboards/keebio/kbo5000/rev1/rev1.c | 2 +- keyboards/keebio/kbo5000/rev1/rev1.h | 1 - keyboards/keebio/levinson/levinson.c | 2 +- keyboards/keebio/levinson/levinson.h | 11 ------ keyboards/keebio/levinson/rev1/rev1.c | 1 - keyboards/keebio/levinson/rev1/rev1.h | 2 - keyboards/keebio/levinson/rev2/rev2.c | 2 +- keyboards/keebio/levinson/rev2/rev2.h | 2 - keyboards/keebio/levinson/rev3/rev3.c | 2 +- keyboards/keebio/levinson/rev3/rev3.h | 2 - keyboards/keebio/nyquist/nyquist.c | 1 - keyboards/keebio/nyquist/nyquist.h | 13 ------- keyboards/keebio/nyquist/rev1/rev1.c | 1 - keyboards/keebio/nyquist/rev1/rev1.h | 2 - keyboards/keebio/nyquist/rev2/rev2.h | 2 - keyboards/keebio/nyquist/rev3/rev3.h | 1 - keyboards/keebio/quefrency/quefrency.c | 1 - keyboards/keebio/quefrency/quefrency.h | 19 ---------- keyboards/keebio/quefrency/rev1/rev1.c | 2 +- keyboards/keebio/quefrency/rev1/rev1.h | 2 - keyboards/keebio/quefrency/rev2/rev2.c | 2 +- keyboards/keebio/quefrency/rev2/rev2.h | 1 - keyboards/keebio/quefrency/rev3/rev3.c | 2 +- keyboards/keebio/quefrency/rev3/rev3.h | 1 - keyboards/keebio/quefrency/rev4/rev4.c | 2 +- keyboards/keebio/quefrency/rev4/rev4.h | 1 - keyboards/keebio/quefrency/rev5/rev5.c | 2 +- keyboards/keebio/quefrency/rev5/rev5.h | 1 - keyboards/keebio/rorschach/rev1/rev1.c | 1 - keyboards/keebio/rorschach/rev1/rev1.h | 2 - keyboards/keebio/rorschach/rorschach.c | 1 - keyboards/keebio/rorschach/rorschach.h | 7 ---- keyboards/keebio/sinc/rev1/rev1.h | 1 - keyboards/keebio/sinc/rev2/rev2.h | 1 - keyboards/keebio/sinc/rev3/rev3.h | 1 - keyboards/keebio/sinc/sinc.c | 2 +- keyboards/keebio/sinc/sinc.h | 28 -------------- keyboards/keebio/viterbi/rev1/rev1.c | 1 - keyboards/keebio/viterbi/rev1/rev1.h | 1 - keyboards/keebio/viterbi/rev2/rev2.c | 2 +- keyboards/keebio/viterbi/rev2/rev2.h | 1 - keyboards/keebio/viterbi/viterbi.c | 1 - keyboards/keebio/viterbi/viterbi.h | 12 ------ keyboards/keycapsss/kimiko/kimiko.c | 2 +- keyboards/keycapsss/kimiko/kimiko.h | 22 ----------- keyboards/keycapsss/kimiko/rev1/rev1.c | 17 --------- keyboards/keycapsss/kimiko/rev1/rev1.h | 2 +- keyboards/keychron/q1/ansi/ansi.c | 2 +- keyboards/keychron/q1/ansi/ansi.h | 19 ---------- keyboards/keychron/q1/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q1/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q1/iso/iso.c | 2 +- keyboards/keychron/q1/iso/iso.h | 19 ---------- keyboards/keychron/q1/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q1/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q1/q1.c | 2 +- keyboards/keychron/q1/q1.h | 29 --------------- keyboards/keychron/q10/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q10/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q10/q10.c | 2 +- keyboards/keychron/q10/q10.h | 25 ------------- keyboards/keychron/q2/ansi/ansi.c | 2 +- keyboards/keychron/q2/ansi/ansi.h | 19 ---------- keyboards/keychron/q2/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q2/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q2/iso/iso.c | 2 +- keyboards/keychron/q2/iso/iso.h | 19 ---------- keyboards/keychron/q2/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q2/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q2/q2.c | 2 +- keyboards/keychron/q2/q2.h | 29 --------------- keyboards/keychron/q3/ansi/ansi.c | 2 +- keyboards/keychron/q3/ansi/ansi.h | 19 ---------- keyboards/keychron/q3/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q3/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q3/iso/iso.c | 2 +- keyboards/keychron/q3/iso/iso.h | 19 ---------- keyboards/keychron/q3/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q3/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q3/jis/jis.c | 2 +- keyboards/keychron/q3/jis/jis.h | 19 ---------- keyboards/keychron/q3/jis_encoder/jis_encoder.c | 2 +- keyboards/keychron/q3/jis_encoder/jis_encoder.h | 19 ---------- keyboards/keychron/q3/q3.c | 2 +- keyboards/keychron/q3/q3.h | 33 ----------------- keyboards/keychron/q4/ansi_v1/ansi_v1.c | 2 +- keyboards/keychron/q4/ansi_v1/ansi_v1.h | 19 ---------- keyboards/keychron/q4/ansi_v2/ansi_v2.h | 19 ---------- keyboards/keychron/q4/iso/iso.c | 2 +- keyboards/keychron/q4/iso/iso.h | 19 ---------- keyboards/keychron/q4/q4.c | 2 +- keyboards/keychron/q4/q4.h | 27 -------------- keyboards/keychron/q5/ansi/ansi.c | 2 +- keyboards/keychron/q5/ansi/ansi.h | 19 ---------- keyboards/keychron/q5/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q5/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q5/iso/iso.c | 2 +- keyboards/keychron/q5/iso/iso.h | 19 ---------- keyboards/keychron/q5/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q5/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q5/q5.c | 2 +- keyboards/keychron/q5/q5.h | 29 --------------- keyboards/keychron/q6/ansi/ansi.c | 2 +- keyboards/keychron/q6/ansi/ansi.h | 19 ---------- keyboards/keychron/q6/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q6/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q6/iso/iso.c | 2 +- keyboards/keychron/q6/iso/iso.h | 19 ---------- keyboards/keychron/q6/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q6/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q6/q6.c | 2 +- keyboards/keychron/q6/q6.h | 29 --------------- keyboards/keychron/q8/ansi/ansi.h | 19 ---------- keyboards/keychron/q8/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q8/iso/iso.h | 19 ---------- keyboards/keychron/q8/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q8/q8.c | 2 +- keyboards/keychron/q8/q8.h | 29 --------------- keyboards/keychron/q9/ansi/ansi.c | 2 +- keyboards/keychron/q9/ansi/ansi.h | 19 ---------- keyboards/keychron/q9/ansi_encoder/ansi_encoder.c | 2 +- keyboards/keychron/q9/ansi_encoder/ansi_encoder.h | 19 ---------- keyboards/keychron/q9/iso/iso.c | 2 +- keyboards/keychron/q9/iso/iso.h | 19 ---------- keyboards/keychron/q9/iso_encoder/iso_encoder.c | 2 +- keyboards/keychron/q9/iso_encoder/iso_encoder.h | 19 ---------- keyboards/keychron/q9/q9.c | 2 +- keyboards/keychron/q9/q9.h | 29 --------------- keyboards/kinesis/alvicstep/alvicstep.c | 2 +- keyboards/kinesis/alvicstep/alvicstep.h | 9 ++++- keyboards/kinesis/kinesis.c | 1 - keyboards/kinesis/kinesis.h | 26 ------------- keyboards/kinesis/kint2pp/kint2pp.c | 1 - keyboards/kinesis/nguyenvietyen/nguyenvietyen.c | 1 - keyboards/kinesis/stapelberg/stapelberg.c | 1 - keyboards/kudox/columner/columner.c | 0 keyboards/kudox/kudox.c | 16 -------- keyboards/kudox/kudox.h | 32 ---------------- keyboards/kudox/rev1/rev1.c | 1 - keyboards/kudox/rev1/rev1.h | 1 - keyboards/kudox/rev2/rev2.c | 0 keyboards/kudox/rev3/rev3.c | 0 keyboards/kudox_full/kudox_full.c | 2 +- keyboards/kudox_full/kudox_full.h | 10 ----- keyboards/kudox_full/rev1/rev1.c | 4 -- keyboards/kudox_game/kudox_game.c | 16 -------- keyboards/kudox_game/kudox_game.h | 26 ------------- keyboards/kudox_game/rev1/rev1.c | 1 - keyboards/kudox_game/rev1/rev1.h | 2 - keyboards/kudox_game/rev2/rev2.c | 1 - keyboards/kudox_game/rev2/rev2.h | 2 - keyboards/lets_split/lets_split.c | 2 +- keyboards/lets_split/lets_split.h | 11 ------ keyboards/lets_split/rev1/rev1.c | 1 - keyboards/lets_split/rev1/rev1.h | 2 - keyboards/lets_split/rev2/rev2.c | 1 - keyboards/lets_split/rev2/rev2.h | 2 - keyboards/lets_split/sockets/sockets.c | 1 - keyboards/lets_split/sockets/sockets.h | 2 - keyboards/lfkeyboards/lfk78/revb/revb.h | 2 + keyboards/lfkeyboards/lfk78/revc/revc.h | 2 + keyboards/lfkeyboards/lfk78/revj/revj.h | 2 + keyboards/lfkeyboards/smk65/revb/revb.c | 2 +- keyboards/lfkeyboards/smk65/smk65.h | 23 ------------ keyboards/lily58/glow_enc/glow_enc.c | 16 -------- keyboards/lily58/glow_enc/glow_enc.h | 2 - keyboards/lily58/lib/host_led_state_reader.c | 1 - keyboards/lily58/lib/keylogger.c | 1 - keyboards/lily58/lib/layer_state_reader.c | 1 - keyboards/lily58/lib/logo_reader.c | 2 - keyboards/lily58/lib/mode_icon_reader.c | 1 - keyboards/lily58/lib/timelogger.c | 1 - keyboards/lily58/light/light.c | 16 -------- keyboards/lily58/light/light.h | 2 - keyboards/lily58/lily58.c | 1 - keyboards/lily58/lily58.h | 9 ----- keyboards/lily58/rev1/rev1.c | 1 - keyboards/lily58/rev1/rev1.h | 2 - keyboards/lime/lime.c | 2 +- keyboards/lime/lime.h | 21 ----------- keyboards/lime/rev1/rev1.c | 2 +- keyboards/malevolti/lyra/lyra.c | 2 +- keyboards/malevolti/lyra/lyra.h | 23 ------------ keyboards/malevolti/lyra/rev1/rev1.c | 19 ---------- keyboards/malevolti/lyra/rev1/rev1.h | 2 +- keyboards/malevolti/superlyra/rev1/rev1.c | 17 --------- keyboards/malevolti/superlyra/rev1/rev1.h | 2 +- keyboards/malevolti/superlyra/superlyra.c | 17 --------- keyboards/malevolti/superlyra/superlyra.h | 23 ------------ keyboards/maple_computing/ivy/ivy.c | 1 - keyboards/maple_computing/ivy/ivy.h | 7 ---- keyboards/maple_computing/ivy/rev1/rev1.c | 1 - keyboards/maple_computing/ivy/rev1/rev1.h | 2 +- keyboards/maple_computing/launchpad/launchpad.c | 1 - keyboards/maple_computing/launchpad/launchpad.h | 7 ---- keyboards/maple_computing/launchpad/rev1/rev1.c | 1 - keyboards/maple_computing/launchpad/rev1/rev1.h | 2 - keyboards/maple_computing/lets_split_eh/eh/eh.c | 1 - keyboards/maple_computing/lets_split_eh/eh/eh.h | 2 - .../maple_computing/lets_split_eh/lets_split_eh.c | 2 +- .../maple_computing/lets_split_eh/lets_split_eh.h | 7 ---- keyboards/maple_computing/minidox/minidox.c | 1 - keyboards/maple_computing/minidox/minidox.h | 7 ---- keyboards/maple_computing/minidox/rev1/rev1.c | 1 - keyboards/maxipad/maxipad.c | 16 -------- keyboards/maxipad/maxipad.h | 6 --- keyboards/maxipad/promicro/promicro.c | 16 -------- keyboards/maxipad/promicro/promicro.h | 20 ---------- keyboards/maxipad/teensy2/teensy2.c | 16 -------- keyboards/maxipad/teensy2/teensy2.h | 19 ---------- keyboards/mechkeys/mechmini/mechmini.c | 17 --------- keyboards/mechkeys/mechmini/mechmini.h | 25 ------------- keyboards/mechkeys/mechmini/v1/v1.c | 18 --------- keyboards/mechkeys/mechmini/v1/v1.h | 2 +- keyboards/mechkeys/mechmini/v2/v2.c | 1 - keyboards/mechkeys/mechmini/v2/v2.h | 2 +- keyboards/mechlovin/adelais/adelais.c | 2 +- keyboards/mechlovin/adelais/adelais.h | 35 ------------------ keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c | 2 +- keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c | 2 +- keyboards/mechlovin/hannah60rgb/hannah60rgb.h | 24 ------------ keyboards/mechlovin/hannah60rgb/rev1/rev1.c | 2 +- keyboards/mechlovin/hannah65/hannah65.c | 17 --------- keyboards/mechlovin/hannah65/hannah65.h | 23 ------------ keyboards/mechlovin/hannah910/hannah910.c | 2 +- keyboards/mechlovin/hannah910/hannah910.h | 26 ------------- .../mechlovin/zed65/no_backlight/cor65/cor65.c | 19 ---------- .../mechlovin/zed65/no_backlight/retro66/retro66.c | 19 ---------- keyboards/mechlovin/zed65/zed65.c | 18 --------- keyboards/mechlovin/zed65/zed65.h | 30 --------------- keyboards/mechwild/obe/obe.h | 4 -- keyboards/mino/hotswap/hotswap.c | 17 --------- keyboards/mino/mino.c | 16 -------- keyboards/mino/mino.h | 23 ------------ keyboards/mode/m80v1/m80h/m80h.c | 14 ------- keyboards/mode/m80v1/m80h/m80h.h | 2 +- keyboards/mode/m80v1/m80s/m80s.c | 14 ------- keyboards/mode/m80v1/m80s/m80s.h | 2 +- keyboards/mode/m80v1/m80v1.c | 14 ------- keyboards/mode/m80v1/m80v1.h | 9 ----- keyboards/mode/m80v2/m80v2.c | 18 --------- keyboards/mode/m80v2/m80v2.h | 26 ------------- keyboards/mode/m80v2/m80v2h/m80v2h.c | 18 --------- keyboards/mode/m80v2/m80v2h/m80v2h.h | 2 +- keyboards/mode/m80v2/m80v2s/m80v2s.c | 18 --------- keyboards/mode/m80v2/m80v2s/m80v2s.h | 2 +- keyboards/montsinger/rebound/rebound.c | 1 - keyboards/montsinger/rebound/rebound.h | 29 --------------- keyboards/omkbd/ergodash/ergodash.c | 1 - keyboards/omkbd/ergodash/ergodash.h | 11 ------ keyboards/omkbd/ergodash/mini/mini.c | 2 +- keyboards/omkbd/ergodash/mini/mini.h | 2 - keyboards/omkbd/ergodash/rev1/rev1.c | 2 +- keyboards/omkbd/ergodash/rev1/rev1.h | 2 - keyboards/omkbd/runner3680/3x6/3x6.c | 1 - keyboards/omkbd/runner3680/3x6/3x6.h | 2 - keyboards/omkbd/runner3680/3x7/3x7.c | 1 - keyboards/omkbd/runner3680/3x7/3x7.h | 2 - keyboards/omkbd/runner3680/3x8/3x8.c | 1 - keyboards/omkbd/runner3680/3x8/3x8.h | 2 - keyboards/omkbd/runner3680/4x6/4x6.c | 1 - keyboards/omkbd/runner3680/4x6/4x6.h | 2 - keyboards/omkbd/runner3680/4x7/4x7.c | 1 - keyboards/omkbd/runner3680/4x7/4x7.h | 2 - keyboards/omkbd/runner3680/4x8/4x8.c | 1 - keyboards/omkbd/runner3680/4x8/4x8.h | 2 - keyboards/omkbd/runner3680/5x6/5x6.c | 1 - keyboards/omkbd/runner3680/5x6/5x6.h | 2 - keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h | 2 - keyboards/omkbd/runner3680/5x7/5x7.c | 1 - keyboards/omkbd/runner3680/5x7/5x7.h | 2 - keyboards/omkbd/runner3680/5x8/5x8.c | 1 - keyboards/omkbd/runner3680/5x8/5x8.h | 2 - keyboards/omkbd/runner3680/runner3680.c | 1 - keyboards/omkbd/runner3680/runner3680.h | 43 ---------------------- keyboards/orthodox/orthodox.c | 1 - keyboards/orthodox/orthodox.h | 13 ------- keyboards/orthodox/rev1/rev1.c | 2 +- keyboards/orthodox/rev1/rev1.h | 2 - keyboards/orthodox/rev3/rev3.c | 2 +- keyboards/orthodox/rev3/rev3.h | 2 - keyboards/orthodox/rev3_teensy/rev3_teensy.c | 2 +- keyboards/orthodox/rev3_teensy/rev3_teensy.h | 2 - keyboards/peej/rosaline/config.h | 3 ++ keyboards/peej/rosaline/ortho/ortho.h | 7 ++-- keyboards/peej/rosaline/rosaline.c | 2 +- keyboards/peej/rosaline/rosaline.h | 30 --------------- keyboards/peej/rosaline/staggered/staggered.h | 7 ++-- keyboards/pico/65keys/65keys.c | 0 keyboards/pico/65keys/65keys.h | 1 - keyboards/pico/70keys/70keys.c | 0 keyboards/pico/70keys/70keys.h | 1 - keyboards/pico/pico.c | 16 -------- keyboards/pico/pico.h | 26 ------------- keyboards/pinky/3/3.c | 1 - keyboards/pinky/3/3.h | 2 - keyboards/pinky/4/4.c | 1 - keyboards/pinky/4/4.h | 2 - keyboards/pinky/pinky.c | 16 -------- keyboards/pinky/pinky.h | 25 ------------- keyboards/ploopyco/trackball/rev1/rev1.h | 21 ----------- keyboards/ploopyco/trackball/rev1_005/rev1_005.h | 21 ----------- keyboards/ploopyco/trackball/trackball.h | 5 --- .../ploopyco/trackball_mini/rev1_001/rev1_001.h | 22 ----------- .../ploopyco/trackball_mini/rev1_002/rev1_002.h | 22 ----------- .../ploopyco/trackball_nano/rev1_001/rev1_001.h | 22 ----------- .../ploopyco/trackball_thumb/rev1_001/rev1_001.h | 21 ----------- .../ploopyco/trackball_thumb/trackball_thumb.h | 3 -- keyboards/primekb/prime_l/prime_l.c | 17 --------- keyboards/primekb/prime_l/prime_l.h | 26 ------------- keyboards/primekb/prime_l/v1/v1.h | 2 +- keyboards/primekb/prime_l/v2/v2.h | 2 +- keyboards/program_yoink/ortho/ortho.c | 17 --------- keyboards/program_yoink/ortho/ortho.h | 2 +- keyboards/program_yoink/program_yoink.c | 2 +- keyboards/program_yoink/program_yoink.h | 25 ------------- keyboards/program_yoink/staggered/staggered.c | 17 --------- keyboards/program_yoink/staggered/staggered.h | 2 +- keyboards/qwertyydox/qwertyydox.c | 1 - keyboards/qwertyydox/qwertyydox.h | 7 ---- keyboards/qwertyydox/rev1/rev1.c | 1 - keyboards/qwertyydox/rev1/rev1.h | 2 +- keyboards/rate/pistachio/pistachio.c | 18 --------- keyboards/rate/pistachio/pistachio.h | 25 ------------- keyboards/rate/pistachio/rev1/rev1.c | 18 --------- keyboards/rate/pistachio/rev2/rev2.c | 19 ---------- keyboards/recompile_keys/nomu30/nomu30.c | 16 -------- keyboards/recompile_keys/nomu30/nomu30.h | 5 --- keyboards/recompile_keys/nomu30/rev1/rev1.c | 17 --------- keyboards/recompile_keys/nomu30/rev1/rev1.h | 19 ---------- keyboards/recompile_keys/nomu30/rev2/rev2.c | 17 --------- keyboards/recompile_keys/nomu30/rev2/rev2.h | 19 ---------- keyboards/redox/redox.c | 16 -------- keyboards/redox/redox.h | 25 ------------- keyboards/redox/rev1/proton_c/proton_c.c | 4 -- keyboards/redox/rev1/proton_c/proton_c.h | 6 --- keyboards/redox/rev1/rev1.c | 1 - keyboards/redox/rev1/rev1.h | 6 --- keyboards/rgbkb/sol/rev1/rev1.h | 1 - keyboards/rgbkb/sol/rev2/rev2.h | 1 - keyboards/rgbkb/sol/sol.c | 1 - keyboards/rgbkb/sol/sol.h | 6 --- keyboards/rura66/rev1/rev1.c | 2 +- keyboards/rura66/rura66.c | 16 -------- keyboards/rura66/rura66.h | 22 ----------- keyboards/salicylic_acid3/7skb/7skb.c | 1 - keyboards/salicylic_acid3/7skb/7skb.h | 7 ---- keyboards/salicylic_acid3/7skb/rev1/rev1.c | 1 - keyboards/salicylic_acid3/7skb/rev1/rev1.h | 2 - keyboards/salicylic_acid3/getta25/getta25.c | 1 - keyboards/salicylic_acid3/getta25/getta25.h | 7 ---- keyboards/salicylic_acid3/getta25/rev1/rev1.c | 1 - keyboards/salicylic_acid3/getta25/rev1/rev1.h | 2 +- keyboards/salicylic_acid3/jisplit89/jisplit89.c | 18 --------- keyboards/salicylic_acid3/jisplit89/jisplit89.h | 22 ----------- keyboards/salicylic_acid3/jisplit89/rev1/rev1.c | 18 --------- keyboards/salicylic_acid3/jisplit89/rev1/rev1.h | 2 - keyboards/salicylic_acid3/naked48/naked48.c | 18 --------- keyboards/salicylic_acid3/naked48/naked48.h | 24 ------------ keyboards/salicylic_acid3/naked48/rev1/rev1.c | 2 +- keyboards/salicylic_acid3/naked48/rev1/rev1.h | 2 - keyboards/salicylic_acid3/naked60/naked60.c | 18 --------- keyboards/salicylic_acid3/naked60/naked60.h | 24 ------------ keyboards/salicylic_acid3/naked60/rev1/rev1.c | 18 --------- keyboards/salicylic_acid3/naked60/rev1/rev1.h | 2 - keyboards/salicylic_acid3/naked64/naked64.c | 1 - keyboards/salicylic_acid3/naked64/naked64.h | 7 ---- keyboards/salicylic_acid3/naked64/rev1/rev1.c | 1 - keyboards/salicylic_acid3/naked64/rev1/rev1.h | 2 +- keyboards/salicylic_acid3/setta21/rev1/rev1.h | 2 +- keyboards/salicylic_acid3/setta21/setta21.c | 1 - keyboards/salicylic_acid3/setta21/setta21.h | 7 ---- keyboards/sofle/keyhive/keyhive.c | 19 ---------- keyboards/sofle/rev1/rev1.c | 2 +- keyboards/sofle/sofle.c | 2 +- keyboards/sofle/sofle.h | 7 ---- keyboards/spacetime/rev1/rev1.c | 16 -------- keyboards/spacetime/spacetime.c | 1 - keyboards/spacetime/spacetime.h | 11 ------ keyboards/splitkb/kyria/kyria.h | 25 ------------- keyboards/splitkb/kyria/rev1/proton_c/proton_c.c | 17 --------- keyboards/splitkb/kyria/rev1/proton_c/proton_c.h | 19 ---------- keyboards/splitkb/kyria/rev1/rev1.h | 5 +-- keyboards/splitkb/kyria/rev2/proton_c/proton_c.c | 17 --------- keyboards/splitkb/kyria/rev2/proton_c/proton_c.h | 19 ---------- keyboards/splitkb/kyria/rev2/rev2.h | 5 +-- keyboards/splitkb/kyria/rev3/rev3.c | 2 +- keyboards/splitty/rev1/rev1.c | 17 --------- keyboards/splitty/rev1/rev1.h | 2 +- keyboards/studiokestra/galatea/galatea.c | 17 --------- keyboards/studiokestra/galatea/galatea.h | 25 ------------- keyboards/studiokestra/galatea/rev1/rev1.c | 17 --------- keyboards/studiokestra/galatea/rev2/rev2.c | 17 --------- keyboards/uzu42/rev1/rev1.c | 4 -- keyboards/uzu42/rev1/rev1.h | 2 - keyboards/uzu42/uzu42.h | 2 + keyboards/vitamins_included/rev1/rev1.c | 1 - keyboards/vitamins_included/rev1/rev1.h | 3 -- keyboards/vitamins_included/rev2/rev2.c | 2 +- keyboards/vitamins_included/rev2/rev2.h | 2 - keyboards/vitamins_included/vitamins_included.c | 2 +- keyboards/vitamins_included/vitamins_included.h | 6 --- keyboards/whale/sk/sk.c | 1 - keyboards/whale/sk/sk.h | 7 ---- keyboards/whale/sk/v3/v3.h | 2 - keyboards/xelus/dawn60/dawn60.c | 1 - keyboards/xelus/dawn60/dawn60.h | 24 ------------ keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c | 10 ++--- keyboards/xelus/pachi/rgb/rgb.c | 16 -------- keyboards/xelus/pachi/rgb/rgb.h | 24 ------------ keyboards/xelus/rs60/rev1/rev1.c | 16 -------- keyboards/xelus/rs60/rev2_0/rev2_0.c | 16 -------- keyboards/xelus/rs60/rev2_1/rev2_1.c | 16 -------- keyboards/xelus/rs60/rs60.c | 16 -------- keyboards/xelus/rs60/rs60.h | 26 ------------- keyboards/ymdk/ymd75/rev1/rev1.c | 18 --------- keyboards/ymdk/ymd75/rev2/rev2.c | 18 --------- keyboards/ymdk/ymd75/rev3/rev3.c | 18 --------- keyboards/ymdk/ymd75/ymd75.c | 1 - keyboards/ymdk/ymd75/ymd75.h | 11 ------ keyboards/yosino58/lib/host_led_state_reader.c | 1 - keyboards/yosino58/lib/keylogger.c | 1 - keyboards/yosino58/lib/layer_state_reader.c | 1 - keyboards/yosino58/lib/logo_reader.c | 2 - keyboards/yosino58/lib/mode_icon_reader.c | 1 - keyboards/yosino58/lib/timelogger.c | 1 - keyboards/yosino58/rev1/rev1.c | 1 - keyboards/yosino58/yosino58.c | 1 - keyboards/yosino58/yosino58.h | 5 --- keyboards/yushakobo/navpad/10/10.c | 17 --------- keyboards/yushakobo/navpad/10/10.h | 26 ------------- keyboards/yushakobo/navpad/10/rev0/rev0.c | 17 --------- keyboards/yushakobo/navpad/10/rev0/rev0.h | 2 + keyboards/yushakobo/navpad/10/rev1/rev1.c | 17 --------- keyboards/yushakobo/navpad/10/rev1/rev1.h | 2 + keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c | 17 --------- 768 files changed, 194 insertions(+), 6991 deletions(-) delete mode 100644 keyboards/25keys/zinc/rev1/rev1.c delete mode 100644 keyboards/25keys/zinc/reva/reva.c delete mode 100644 keyboards/25keys/zinc/zinc.c delete mode 100644 keyboards/25keys/zinc/zinc.h delete mode 100644 keyboards/40percentclub/i75/i75.c delete mode 100644 keyboards/40percentclub/i75/i75.h delete mode 100644 keyboards/40percentclub/i75/promicro/promicro.c delete mode 100644 keyboards/40percentclub/i75/teensy2/teensy2.c delete mode 100644 keyboards/40percentclub/polyandry/polyandry.c delete mode 100644 keyboards/40percentclub/polyandry/polyandry.h delete mode 100644 keyboards/40percentclub/polyandry/promicro/promicro.c delete mode 100644 keyboards/40percentclub/polyandry/teensy2/teensy2.c delete mode 100644 keyboards/acheron/apollo/87h/87h.c delete mode 100644 keyboards/acheron/apollo/87h/87h.h delete mode 100644 keyboards/acheron/athena/athena.c delete mode 100644 keyboards/acheron/athena/athena.h delete mode 100644 keyboards/acheron/elongate/beta/beta.c delete mode 100644 keyboards/acheron/elongate/elongate.c delete mode 100644 keyboards/acheron/elongate/elongate.h delete mode 100644 keyboards/acheron/shark/alpha/alpha.c delete mode 100644 keyboards/acheron/shark/shark.c delete mode 100644 keyboards/acheron/shark/shark.h delete mode 100644 keyboards/adkb96/adkb96.h delete mode 100644 keyboards/adkb96/rev1/rev1.c delete mode 100755 keyboards/aeboards/constellation/constellation.c delete mode 100755 keyboards/aeboards/constellation/constellation.h delete mode 100755 keyboards/aeboards/constellation/rev1/rev1.c delete mode 100755 keyboards/aeboards/constellation/rev3/rev3.c delete mode 100644 keyboards/aeboards/satellite/satellite.c delete mode 100644 keyboards/aeboards/satellite/satellite.h delete mode 100644 keyboards/afternoonlabs/breeze/breeze.c delete mode 100644 keyboards/afternoonlabs/breeze/breeze.h delete mode 100644 keyboards/afternoonlabs/breeze/rev0/rev0.c delete mode 100644 keyboards/afternoonlabs/breeze/rev1/rev1.c delete mode 100644 keyboards/afternoonlabs/gust/gust.c delete mode 100644 keyboards/afternoonlabs/gust/gust.h delete mode 100644 keyboards/afternoonlabs/gust/rev1/rev1.c delete mode 100644 keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c delete mode 100644 keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rev1.c delete mode 100644 keyboards/afternoonlabs/southern_breeze/southern_breeze.c delete mode 100644 keyboards/afternoonlabs/southern_breeze/southern_breeze.h delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/rev1.c delete mode 100644 keyboards/afternoonlabs/summer_breeze/summer_breeze.c delete mode 100644 keyboards/afternoonlabs/summer_breeze/summer_breeze.h delete mode 100644 keyboards/alt34/alt34.c delete mode 100644 keyboards/alt34/alt34.h delete mode 100644 keyboards/alt34/rev1/rev1.c delete mode 100644 keyboards/arabica37/arabica37.c delete mode 100644 keyboards/arabica37/arabica37.h delete mode 100644 keyboards/arabica37/rev1/rev1.c delete mode 100644 keyboards/atreus/astar/astar.c delete mode 100644 keyboards/atreus/astar/astar.h delete mode 100644 keyboards/atreus/astar_mirrored/astar_mirrored.c delete mode 100644 keyboards/atreus/astar_mirrored/astar_mirrored.h delete mode 100644 keyboards/atreus/atreus.c delete mode 100644 keyboards/atreus/f103/f103.c delete mode 100644 keyboards/atreus/f103/f103.h delete mode 100644 keyboards/atreus/feather/feather.c delete mode 100644 keyboards/atreus/feather/feather.h delete mode 100644 keyboards/atreus/promicro/promicro.c delete mode 100644 keyboards/atreus/promicro/promicro.h delete mode 100644 keyboards/atreus/teensy2/teensy2.c delete mode 100644 keyboards/atreus/teensy2/teensy2.h delete mode 100644 keyboards/atreyu/atreyu.c delete mode 100644 keyboards/atreyu/atreyu.h delete mode 100644 keyboards/avalanche/avalanche.h delete mode 100644 keyboards/avalanche/v1/v1.c delete mode 100644 keyboards/avalanche/v2/v2.c delete mode 100644 keyboards/avalanche/v3/v3.c delete mode 100644 keyboards/basekeys/slice/rev1/rev1.c delete mode 100644 keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c delete mode 100644 keyboards/basekeys/slice/slice.c delete mode 100644 keyboards/basekeys/slice/slice.h delete mode 100644 keyboards/bear_face/bear_face.c delete mode 100644 keyboards/bear_face/bear_face.h delete mode 100755 keyboards/bemeier/bmek/rev1/rev1.c delete mode 100755 keyboards/bemeier/bmek/rev1/rev1.h delete mode 100755 keyboards/bemeier/bmek/rev2/rev2.c delete mode 100755 keyboards/bemeier/bmek/rev2/rev2.h delete mode 100755 keyboards/bemeier/bmek/rev3/rev3.c delete mode 100755 keyboards/bemeier/bmek/rev3/rev3.h delete mode 100644 keyboards/biacco42/ergo42/ergo42.h delete mode 100644 keyboards/biacco42/ergo42/rev1/rev1.c delete mode 100644 keyboards/boston_meetup/2019/2019.h delete mode 100644 keyboards/boston_meetup/boston_meetup.c delete mode 100644 keyboards/buzzard/buzzard.c delete mode 100644 keyboards/buzzard/buzzard.h delete mode 100644 keyboards/chocofly/chocofly.h delete mode 100644 keyboards/chocofly/v1/v1.c delete mode 100644 keyboards/clickety_split/leeloo/leeloo.h delete mode 100644 keyboards/clickety_split/leeloo/rev1/rev1.c delete mode 100644 keyboards/clueboard/66_hotswap/66_hotswap.c delete mode 100644 keyboards/clueboard/66_hotswap/66_hotswap.h delete mode 100644 keyboards/clueboard/66_hotswap/gen1/gen1.h delete mode 100644 keyboards/clueboard/66_hotswap/prototype/prototype.h delete mode 100644 keyboards/converter/usb_usb/ble/ble.c delete mode 100644 keyboards/converter/usb_usb/ble/ble.h delete mode 100644 keyboards/converter/usb_usb/hasu/hasu.c delete mode 100644 keyboards/converter/usb_usb/hasu/hasu.h delete mode 100644 keyboards/converter/usb_usb/pro_micro/pro_micro.c delete mode 100644 keyboards/converter/usb_usb/pro_micro/pro_micro.h delete mode 100644 keyboards/converter/usb_usb/usb_usb.c delete mode 100644 keyboards/cozykeys/bloomer/bloomer.c delete mode 100644 keyboards/cozykeys/bloomer/bloomer.h delete mode 100644 keyboards/cozykeys/bloomer/v2/v2.c delete mode 100644 keyboards/cozykeys/bloomer/v3/v3.c delete mode 100644 keyboards/cozykeys/speedo/speedo.c delete mode 100644 keyboards/cozykeys/speedo/speedo.h delete mode 100644 keyboards/cozykeys/speedo/v2/v2.c delete mode 100644 keyboards/cozykeys/speedo/v3/v3.c delete mode 100644 keyboards/crkbd/crkbd.h delete mode 100644 keyboards/dailycraft/bat43/bat43.c delete mode 100644 keyboards/dailycraft/bat43/bat43.h delete mode 100644 keyboards/dailycraft/bat43/rev1/rev1.c delete mode 100644 keyboards/dailycraft/bat43/rev2/rev2.c delete mode 100644 keyboards/dailycraft/claw44/claw44.c delete mode 100644 keyboards/dailycraft/claw44/claw44.h delete mode 100644 keyboards/dailycraft/claw44/rev1/rev1.c delete mode 100644 keyboards/dailycraft/sandbox/rev1/rev1.c delete mode 100644 keyboards/dailycraft/sandbox/rev2/rev2.c delete mode 100644 keyboards/dailycraft/sandbox/sandbox.h delete mode 100644 keyboards/dailycraft/wings42/rev1/rev1.c delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c delete mode 100644 keyboards/dailycraft/wings42/rev2/rev2.c delete mode 100644 keyboards/dailycraft/wings42/wings42.c delete mode 100644 keyboards/dailycraft/wings42/wings42.h delete mode 100644 keyboards/deltasplit75/deltasplit75.c delete mode 100644 keyboards/deltasplit75/deltasplit75.h delete mode 100644 keyboards/deltasplit75/v2/v2.c delete mode 100644 keyboards/drhigsby/ogurec/ogurec.c delete mode 100644 keyboards/drhigsby/ogurec/ogurec.h delete mode 100644 keyboards/dztech/dz65rgb/dz65rgb.c delete mode 100644 keyboards/dztech/dz65rgb/dz65rgb.h delete mode 100644 keyboards/eco/eco.c delete mode 100644 keyboards/eco/eco.h delete mode 100644 keyboards/eco/rev1/rev1.c delete mode 100644 keyboards/eco/rev2/rev2.c delete mode 100644 keyboards/eek/eek.h delete mode 100644 keyboards/ergodox_ez/glow/glow.h delete mode 100644 keyboards/ergodox_ez/shine/shine.h delete mode 100644 keyboards/ergoslab/ergoslab.c delete mode 100644 keyboards/ergoslab/ergoslab.h delete mode 100644 keyboards/ergotravel/ergotravel.c delete mode 100644 keyboards/ergotravel/ergotravel.h delete mode 100644 keyboards/ergotravel/rev1/rev1.c delete mode 100644 keyboards/fortitude60/fortitude60.c delete mode 100644 keyboards/fortitude60/fortitude60.h delete mode 100644 keyboards/fortitude60/rev1/rev1.c delete mode 100644 keyboards/fungo/fungo.c delete mode 100644 keyboards/fungo/fungo.h delete mode 100644 keyboards/fungo/rev1/rev1.c delete mode 100644 keyboards/gmmk/gmmk2/p65/p65.c delete mode 100644 keyboards/gmmk/gmmk2/p65/p65.h delete mode 100644 keyboards/gmmk/gmmk2/p96/p96.c delete mode 100644 keyboards/gmmk/gmmk2/p96/p96.h delete mode 100644 keyboards/gmmk/pro/pro.h delete mode 100644 keyboards/hadron/hadron.c delete mode 100644 keyboards/hadron/ver2/ver2.h delete mode 100644 keyboards/hadron/ver3/ver3.h delete mode 100644 keyboards/handwired/qc60/proto/proto.c delete mode 100644 keyboards/handwired/qc60/qc60.c delete mode 100644 keyboards/handwired/qc60/qc60.h delete mode 100644 keyboards/handwired/split65/promicro/promicro.c delete mode 100644 keyboards/handwired/split65/split65.h delete mode 100644 keyboards/handwired/split65/stm32/stm32.c delete mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rev1.c delete mode 100644 keyboards/handwired/stef9998/split_5x7/split_5x7.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h delete mode 100644 keyboards/handwired/uthol/rev3/rev3.c delete mode 100644 keyboards/handwired/uthol/uthol.c delete mode 100644 keyboards/helix/helix.c delete mode 100644 keyboards/helix/helix.h delete mode 100644 keyboards/horrortroll/caticorn/caticorn.c delete mode 100644 keyboards/horrortroll/caticorn/caticorn.h delete mode 100644 keyboards/ibnuda/squiggle/rev1/rev1.c delete mode 100644 keyboards/ibnuda/squiggle/squiggle.c delete mode 100644 keyboards/ibnuda/squiggle/squiggle.h delete mode 100644 keyboards/jacky_studio/bear_65/bear_65.c delete mode 100644 keyboards/jacky_studio/bear_65/bear_65.h delete mode 100644 keyboards/jian/jian.c delete mode 100644 keyboards/jian/jian.h delete mode 100644 keyboards/jiran/jiran.c delete mode 100644 keyboards/jiran/jiran.h delete mode 100644 keyboards/jiran/rev1/rev1.c delete mode 100644 keyboards/jiran/rev2/rev2.c delete mode 100644 keyboards/jorne/jorne.h delete mode 100644 keyboards/jorne/rev1/rev1.c delete mode 100644 keyboards/kakunpc/business_card/alpha/alpha.c delete mode 100644 keyboards/kakunpc/business_card/beta/beta.c delete mode 100644 keyboards/kakunpc/business_card/business_card.c delete mode 100644 keyboards/kakunpc/business_card/business_card.h delete mode 100644 keyboards/kapl/kapl.c delete mode 100644 keyboards/kapl/kapl.h delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h delete mode 100644 keyboards/kbdfans/kbd75/kbd75.c delete mode 100644 keyboards/kbdfans/kbd75/kbd75.h delete mode 100644 keyboards/kbdfans/kbd75/rev1/rev1.c delete mode 100644 keyboards/kbdfans/kbd75/rev2/rev2.c delete mode 100644 keyboards/keebio/convolution/convolution.h delete mode 100644 keyboards/keebio/dsp40/dsp40.c delete mode 100644 keyboards/keebio/dsp40/dsp40.h delete mode 100644 keyboards/keebio/foldkb/foldkb.c delete mode 100644 keyboards/keebio/foldkb/foldkb.h delete mode 100644 keyboards/keebio/fourier/fourier.c delete mode 100644 keyboards/keebio/iris/iris.c delete mode 100644 keyboards/keebio/iris/iris.h delete mode 100644 keyboards/keebio/kbo5000/kbo5000.c delete mode 100644 keyboards/keebio/kbo5000/kbo5000.h delete mode 100644 keyboards/keebio/levinson/levinson.h delete mode 100644 keyboards/keebio/levinson/rev1/rev1.c delete mode 100644 keyboards/keebio/nyquist/nyquist.c delete mode 100644 keyboards/keebio/nyquist/nyquist.h delete mode 100644 keyboards/keebio/nyquist/rev1/rev1.c delete mode 100644 keyboards/keebio/quefrency/quefrency.c delete mode 100644 keyboards/keebio/quefrency/quefrency.h delete mode 100644 keyboards/keebio/rorschach/rev1/rev1.c delete mode 100644 keyboards/keebio/rorschach/rorschach.c delete mode 100644 keyboards/keebio/rorschach/rorschach.h delete mode 100644 keyboards/keebio/sinc/sinc.h delete mode 100644 keyboards/keebio/viterbi/rev1/rev1.c delete mode 100644 keyboards/keebio/viterbi/viterbi.c delete mode 100644 keyboards/keebio/viterbi/viterbi.h delete mode 100644 keyboards/keycapsss/kimiko/kimiko.h delete mode 100644 keyboards/keycapsss/kimiko/rev1/rev1.c delete mode 100644 keyboards/keychron/q1/ansi/ansi.h delete mode 100644 keyboards/keychron/q1/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q1/iso/iso.h delete mode 100644 keyboards/keychron/q1/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q1/q1.h delete mode 100644 keyboards/keychron/q10/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q10/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q10/q10.h delete mode 100644 keyboards/keychron/q2/ansi/ansi.h delete mode 100644 keyboards/keychron/q2/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q2/iso/iso.h delete mode 100644 keyboards/keychron/q2/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q2/q2.h delete mode 100644 keyboards/keychron/q3/ansi/ansi.h delete mode 100644 keyboards/keychron/q3/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q3/iso/iso.h delete mode 100644 keyboards/keychron/q3/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q3/jis/jis.h delete mode 100644 keyboards/keychron/q3/jis_encoder/jis_encoder.h delete mode 100644 keyboards/keychron/q3/q3.h delete mode 100644 keyboards/keychron/q4/ansi_v1/ansi_v1.h delete mode 100644 keyboards/keychron/q4/ansi_v2/ansi_v2.h delete mode 100644 keyboards/keychron/q4/iso/iso.h delete mode 100644 keyboards/keychron/q4/q4.h delete mode 100644 keyboards/keychron/q5/ansi/ansi.h delete mode 100644 keyboards/keychron/q5/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q5/iso/iso.h delete mode 100644 keyboards/keychron/q5/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q5/q5.h delete mode 100644 keyboards/keychron/q6/ansi/ansi.h delete mode 100644 keyboards/keychron/q6/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q6/iso/iso.h delete mode 100644 keyboards/keychron/q6/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q6/q6.h delete mode 100644 keyboards/keychron/q8/ansi/ansi.h delete mode 100644 keyboards/keychron/q8/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q8/iso/iso.h delete mode 100644 keyboards/keychron/q8/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q8/q8.h delete mode 100644 keyboards/keychron/q9/ansi/ansi.h delete mode 100644 keyboards/keychron/q9/ansi_encoder/ansi_encoder.h delete mode 100644 keyboards/keychron/q9/iso/iso.h delete mode 100644 keyboards/keychron/q9/iso_encoder/iso_encoder.h delete mode 100644 keyboards/keychron/q9/q9.h delete mode 100644 keyboards/kinesis/kinesis.c delete mode 100644 keyboards/kinesis/kinesis.h delete mode 100644 keyboards/kinesis/kint2pp/kint2pp.c delete mode 100644 keyboards/kinesis/nguyenvietyen/nguyenvietyen.c delete mode 100644 keyboards/kinesis/stapelberg/stapelberg.c delete mode 100644 keyboards/kudox/columner/columner.c delete mode 100644 keyboards/kudox/kudox.c delete mode 100644 keyboards/kudox/kudox.h delete mode 100644 keyboards/kudox/rev1/rev1.c delete mode 100644 keyboards/kudox/rev2/rev2.c delete mode 100644 keyboards/kudox/rev3/rev3.c delete mode 100644 keyboards/kudox_full/kudox_full.h delete mode 100644 keyboards/kudox_full/rev1/rev1.c delete mode 100644 keyboards/kudox_game/kudox_game.c delete mode 100644 keyboards/kudox_game/kudox_game.h delete mode 100644 keyboards/kudox_game/rev1/rev1.c delete mode 100644 keyboards/kudox_game/rev2/rev2.c delete mode 100644 keyboards/lets_split/lets_split.h delete mode 100644 keyboards/lets_split/rev1/rev1.c delete mode 100644 keyboards/lets_split/rev2/rev2.c delete mode 100644 keyboards/lets_split/sockets/sockets.c delete mode 100644 keyboards/lfkeyboards/smk65/smk65.h delete mode 100644 keyboards/lily58/glow_enc/glow_enc.c delete mode 100644 keyboards/lily58/light/light.c delete mode 100644 keyboards/lily58/lily58.c delete mode 100644 keyboards/lily58/lily58.h delete mode 100644 keyboards/lily58/rev1/rev1.c delete mode 100644 keyboards/lime/lime.h delete mode 100644 keyboards/malevolti/lyra/lyra.h delete mode 100644 keyboards/malevolti/lyra/rev1/rev1.c delete mode 100644 keyboards/malevolti/superlyra/rev1/rev1.c delete mode 100644 keyboards/malevolti/superlyra/superlyra.c delete mode 100644 keyboards/malevolti/superlyra/superlyra.h delete mode 100644 keyboards/maple_computing/ivy/ivy.c delete mode 100644 keyboards/maple_computing/ivy/ivy.h delete mode 100644 keyboards/maple_computing/ivy/rev1/rev1.c delete mode 100644 keyboards/maple_computing/launchpad/launchpad.c delete mode 100644 keyboards/maple_computing/launchpad/launchpad.h delete mode 100644 keyboards/maple_computing/launchpad/rev1/rev1.c delete mode 100644 keyboards/maple_computing/lets_split_eh/eh/eh.c delete mode 100644 keyboards/maple_computing/lets_split_eh/lets_split_eh.h delete mode 100644 keyboards/maple_computing/minidox/minidox.c delete mode 100644 keyboards/maple_computing/minidox/minidox.h delete mode 100644 keyboards/maple_computing/minidox/rev1/rev1.c delete mode 100644 keyboards/maxipad/maxipad.c delete mode 100644 keyboards/maxipad/promicro/promicro.c delete mode 100644 keyboards/maxipad/promicro/promicro.h delete mode 100644 keyboards/maxipad/teensy2/teensy2.c delete mode 100644 keyboards/maxipad/teensy2/teensy2.h delete mode 100644 keyboards/mechkeys/mechmini/mechmini.c delete mode 100644 keyboards/mechkeys/mechmini/mechmini.h delete mode 100644 keyboards/mechkeys/mechmini/v1/v1.c delete mode 100755 keyboards/mechkeys/mechmini/v2/v2.c delete mode 100644 keyboards/mechlovin/adelais/adelais.h delete mode 100644 keyboards/mechlovin/hannah60rgb/hannah60rgb.h delete mode 100644 keyboards/mechlovin/hannah65/hannah65.c delete mode 100644 keyboards/mechlovin/hannah65/hannah65.h delete mode 100644 keyboards/mechlovin/hannah910/hannah910.h delete mode 100644 keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c delete mode 100644 keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c delete mode 100644 keyboards/mechlovin/zed65/zed65.c delete mode 100644 keyboards/mechlovin/zed65/zed65.h delete mode 100644 keyboards/mino/hotswap/hotswap.c delete mode 100644 keyboards/mino/mino.c delete mode 100644 keyboards/mino/mino.h delete mode 100644 keyboards/mode/m80v1/m80h/m80h.c delete mode 100644 keyboards/mode/m80v1/m80s/m80s.c delete mode 100644 keyboards/mode/m80v1/m80v1.c delete mode 100644 keyboards/mode/m80v1/m80v1.h delete mode 100644 keyboards/mode/m80v2/m80v2.c delete mode 100644 keyboards/mode/m80v2/m80v2.h delete mode 100644 keyboards/mode/m80v2/m80v2h/m80v2h.c delete mode 100644 keyboards/mode/m80v2/m80v2s/m80v2s.c delete mode 100644 keyboards/montsinger/rebound/rebound.c delete mode 100644 keyboards/montsinger/rebound/rebound.h delete mode 100644 keyboards/omkbd/ergodash/ergodash.c delete mode 100644 keyboards/omkbd/ergodash/ergodash.h delete mode 100644 keyboards/omkbd/runner3680/3x6/3x6.c delete mode 100644 keyboards/omkbd/runner3680/3x7/3x7.c delete mode 100644 keyboards/omkbd/runner3680/3x8/3x8.c delete mode 100644 keyboards/omkbd/runner3680/4x6/4x6.c delete mode 100644 keyboards/omkbd/runner3680/4x7/4x7.c delete mode 100644 keyboards/omkbd/runner3680/4x8/4x8.c delete mode 100644 keyboards/omkbd/runner3680/5x6/5x6.c delete mode 100644 keyboards/omkbd/runner3680/5x7/5x7.c delete mode 100644 keyboards/omkbd/runner3680/5x8/5x8.c delete mode 100644 keyboards/omkbd/runner3680/runner3680.c delete mode 100644 keyboards/omkbd/runner3680/runner3680.h delete mode 100644 keyboards/orthodox/orthodox.c delete mode 100644 keyboards/orthodox/orthodox.h delete mode 100644 keyboards/peej/rosaline/rosaline.h delete mode 100644 keyboards/pico/65keys/65keys.c delete mode 100644 keyboards/pico/70keys/70keys.c delete mode 100644 keyboards/pico/pico.c delete mode 100644 keyboards/pico/pico.h delete mode 100644 keyboards/pinky/3/3.c delete mode 100644 keyboards/pinky/4/4.c delete mode 100644 keyboards/pinky/pinky.c delete mode 100644 keyboards/pinky/pinky.h delete mode 100644 keyboards/ploopyco/trackball/rev1/rev1.h delete mode 100644 keyboards/ploopyco/trackball/rev1_005/rev1_005.h delete mode 100644 keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h delete mode 100644 keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h delete mode 100644 keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h delete mode 100644 keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h delete mode 100644 keyboards/primekb/prime_l/prime_l.c delete mode 100644 keyboards/primekb/prime_l/prime_l.h delete mode 100644 keyboards/program_yoink/ortho/ortho.c delete mode 100644 keyboards/program_yoink/program_yoink.h delete mode 100644 keyboards/program_yoink/staggered/staggered.c delete mode 100644 keyboards/qwertyydox/qwertyydox.c delete mode 100644 keyboards/qwertyydox/qwertyydox.h delete mode 100644 keyboards/qwertyydox/rev1/rev1.c delete mode 100644 keyboards/rate/pistachio/pistachio.c delete mode 100644 keyboards/rate/pistachio/pistachio.h delete mode 100644 keyboards/rate/pistachio/rev1/rev1.c delete mode 100644 keyboards/rate/pistachio/rev2/rev2.c delete mode 100644 keyboards/recompile_keys/nomu30/nomu30.c delete mode 100644 keyboards/recompile_keys/nomu30/rev1/rev1.c delete mode 100644 keyboards/recompile_keys/nomu30/rev1/rev1.h delete mode 100644 keyboards/recompile_keys/nomu30/rev2/rev2.c delete mode 100644 keyboards/recompile_keys/nomu30/rev2/rev2.h delete mode 100644 keyboards/redox/redox.c delete mode 100644 keyboards/redox/redox.h delete mode 100644 keyboards/redox/rev1/proton_c/proton_c.c delete mode 100644 keyboards/redox/rev1/proton_c/proton_c.h delete mode 100644 keyboards/redox/rev1/rev1.c delete mode 100644 keyboards/rgbkb/sol/rev1/rev1.h delete mode 100644 keyboards/rgbkb/sol/rev2/rev2.h delete mode 100644 keyboards/rgbkb/sol/sol.c delete mode 100644 keyboards/rura66/rura66.c delete mode 100644 keyboards/rura66/rura66.h delete mode 100644 keyboards/salicylic_acid3/7skb/7skb.c delete mode 100644 keyboards/salicylic_acid3/7skb/7skb.h delete mode 100644 keyboards/salicylic_acid3/7skb/rev1/rev1.c delete mode 100644 keyboards/salicylic_acid3/getta25/getta25.c delete mode 100644 keyboards/salicylic_acid3/getta25/getta25.h delete mode 100644 keyboards/salicylic_acid3/getta25/rev1/rev1.c delete mode 100644 keyboards/salicylic_acid3/jisplit89/jisplit89.c delete mode 100644 keyboards/salicylic_acid3/jisplit89/jisplit89.h delete mode 100644 keyboards/salicylic_acid3/jisplit89/rev1/rev1.c delete mode 100644 keyboards/salicylic_acid3/naked48/naked48.c delete mode 100644 keyboards/salicylic_acid3/naked48/naked48.h delete mode 100644 keyboards/salicylic_acid3/naked60/naked60.c delete mode 100644 keyboards/salicylic_acid3/naked60/naked60.h delete mode 100644 keyboards/salicylic_acid3/naked60/rev1/rev1.c delete mode 100644 keyboards/salicylic_acid3/naked64/naked64.c delete mode 100644 keyboards/salicylic_acid3/naked64/naked64.h delete mode 100644 keyboards/salicylic_acid3/naked64/rev1/rev1.c delete mode 100644 keyboards/salicylic_acid3/setta21/setta21.c delete mode 100644 keyboards/salicylic_acid3/setta21/setta21.h delete mode 100755 keyboards/sofle/keyhive/keyhive.c delete mode 100644 keyboards/sofle/sofle.h delete mode 100644 keyboards/spacetime/rev1/rev1.c delete mode 100644 keyboards/spacetime/spacetime.c delete mode 100644 keyboards/spacetime/spacetime.h delete mode 100644 keyboards/splitkb/kyria/kyria.h delete mode 100644 keyboards/splitkb/kyria/rev1/proton_c/proton_c.c delete mode 100644 keyboards/splitkb/kyria/rev1/proton_c/proton_c.h delete mode 100644 keyboards/splitkb/kyria/rev2/proton_c/proton_c.c delete mode 100644 keyboards/splitkb/kyria/rev2/proton_c/proton_c.h delete mode 100644 keyboards/splitty/rev1/rev1.c delete mode 100644 keyboards/studiokestra/galatea/galatea.c delete mode 100644 keyboards/studiokestra/galatea/galatea.h delete mode 100644 keyboards/studiokestra/galatea/rev1/rev1.c delete mode 100644 keyboards/studiokestra/galatea/rev2/rev2.c delete mode 100644 keyboards/uzu42/rev1/rev1.c delete mode 100644 keyboards/vitamins_included/rev1/rev1.c delete mode 100644 keyboards/vitamins_included/rev1/rev1.h delete mode 100644 keyboards/vitamins_included/rev2/rev2.h delete mode 100644 keyboards/whale/sk/sk.c delete mode 100644 keyboards/whale/sk/sk.h delete mode 100644 keyboards/xelus/dawn60/dawn60.c delete mode 100644 keyboards/xelus/dawn60/dawn60.h delete mode 100644 keyboards/xelus/pachi/rgb/rgb.c delete mode 100644 keyboards/xelus/pachi/rgb/rgb.h delete mode 100644 keyboards/xelus/rs60/rev1/rev1.c delete mode 100644 keyboards/xelus/rs60/rev2_0/rev2_0.c delete mode 100644 keyboards/xelus/rs60/rev2_1/rev2_1.c delete mode 100644 keyboards/xelus/rs60/rs60.c delete mode 100644 keyboards/xelus/rs60/rs60.h delete mode 100644 keyboards/ymdk/ymd75/rev1/rev1.c delete mode 100644 keyboards/ymdk/ymd75/rev2/rev2.c delete mode 100644 keyboards/ymdk/ymd75/rev3/rev3.c delete mode 100644 keyboards/ymdk/ymd75/ymd75.c delete mode 100644 keyboards/ymdk/ymd75/ymd75.h delete mode 100644 keyboards/yosino58/rev1/rev1.c delete mode 100644 keyboards/yosino58/yosino58.c delete mode 100644 keyboards/yosino58/yosino58.h delete mode 100644 keyboards/yushakobo/navpad/10/10.c delete mode 100644 keyboards/yushakobo/navpad/10/10.h delete mode 100644 keyboards/yushakobo/navpad/10/rev0/rev0.c delete mode 100644 keyboards/yushakobo/navpad/10/rev1/rev1.c delete mode 100644 keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c (limited to 'keyboards/maple_computing') diff --git a/keyboards/25keys/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c deleted file mode 100644 index 139919d5a6..0000000000 --- a/keyboards/25keys/zinc/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "zinc.h" diff --git a/keyboards/25keys/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c deleted file mode 100644 index 139919d5a6..0000000000 --- a/keyboards/25keys/zinc/reva/reva.c +++ /dev/null @@ -1 +0,0 @@ -#include "zinc.h" diff --git a/keyboards/25keys/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c deleted file mode 100644 index 139919d5a6..0000000000 --- a/keyboards/25keys/zinc/zinc.c +++ /dev/null @@ -1 +0,0 @@ -#include "zinc.h" diff --git a/keyboards/25keys/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h deleted file mode 100644 index 8a80538e4c..0000000000 --- a/keyboards/25keys/zinc/zinc.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_25keys_zinc_reva - #include "reva.h" -#endif -#ifdef KEYBOARD_25keys_zinc_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c deleted file mode 100644 index 28684e7144..0000000000 --- a/keyboards/40percentclub/i75/i75.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "i75.h" diff --git a/keyboards/40percentclub/i75/i75.h b/keyboards/40percentclub/i75/i75.h deleted file mode 100644 index a31c9f6e6f..0000000000 --- a/keyboards/40percentclub/i75/i75.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_40percentclub_i75_promicro - #include "promicro.h" -#elif KEYBOARD_40percentclub_i75_teensy2 - #include "teensy2.h" -#endif diff --git a/keyboards/40percentclub/i75/promicro/promicro.c b/keyboards/40percentclub/i75/promicro/promicro.c deleted file mode 100644 index 28684e7144..0000000000 --- a/keyboards/40percentclub/i75/promicro/promicro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "i75.h" diff --git a/keyboards/40percentclub/i75/promicro/promicro.h b/keyboards/40percentclub/i75/promicro/promicro.h index 29394855a6..0a617ac36c 100644 --- a/keyboards/40percentclub/i75/promicro/promicro.h +++ b/keyboards/40percentclub/i75/promicro/promicro.h @@ -16,7 +16,6 @@ #pragma once -#include "i75.h" #include "quantum.h" /* This a shortcut to help you visually see your layout. diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.c b/keyboards/40percentclub/i75/teensy2/teensy2.c deleted file mode 100644 index 28684e7144..0000000000 --- a/keyboards/40percentclub/i75/teensy2/teensy2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "i75.h" diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.h b/keyboards/40percentclub/i75/teensy2/teensy2.h index 29394855a6..0a617ac36c 100644 --- a/keyboards/40percentclub/i75/teensy2/teensy2.h +++ b/keyboards/40percentclub/i75/teensy2/teensy2.h @@ -16,7 +16,6 @@ #pragma once -#include "i75.h" #include "quantum.h" /* This a shortcut to help you visually see your layout. diff --git a/keyboards/40percentclub/polyandry/polyandry.c b/keyboards/40percentclub/polyandry/polyandry.c deleted file mode 100644 index 2b4be589b8..0000000000 --- a/keyboards/40percentclub/polyandry/polyandry.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "polyandry.h" diff --git a/keyboards/40percentclub/polyandry/polyandry.h b/keyboards/40percentclub/polyandry/polyandry.h deleted file mode 100644 index 5baf87ba62..0000000000 --- a/keyboards/40percentclub/polyandry/polyandry.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_40percentclub_polyandry_promicro - #include "promicro.h" -#elif KEYBOARD_40percentclub_polyandry_teensy2 - #include "teensy2.h" -#endif diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.c b/keyboards/40percentclub/polyandry/promicro/promicro.c deleted file mode 100644 index ea1dd51788..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/promicro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "promicro.h" diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h index 0a6f8b36b8..e2a9dbcf35 100644 --- a/keyboards/40percentclub/polyandry/promicro/promicro.h +++ b/keyboards/40percentclub/polyandry/promicro/promicro.h @@ -15,7 +15,7 @@ */ #pragma once -#include "polyandry.h" +#include "quantum.h" #define LAYOUT_ortho_4x3( \ K000, K001, K002, \ diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.c b/keyboards/40percentclub/polyandry/teensy2/teensy2.c deleted file mode 100644 index 33cfb6e553..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/teensy2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "teensy2.h" diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h index ce7790434b..dd6ef3f6bb 100644 --- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h +++ b/keyboards/40percentclub/polyandry/teensy2/teensy2.h @@ -20,7 +20,7 @@ //I DO NOT HAVE A TEENSY 2.0 TO TEST WITH. //I believe this should still work - but it's not a sure thing. -#include "polyandry.h" +#include "quantum.h" #define LAYOUT_ortho_4x3( \ K000, K001, K002, \ diff --git a/keyboards/acheron/apollo/87h/87h.c b/keyboards/acheron/apollo/87h/87h.c deleted file mode 100644 index 3d3f364ba8..0000000000 --- a/keyboards/acheron/apollo/87h/87h.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Alvaro "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 "87h.h" diff --git a/keyboards/acheron/apollo/87h/87h.h b/keyboards/acheron/apollo/87h/87h.h deleted file mode 100644 index 535575f451..0000000000 --- a/keyboards/acheron/apollo/87h/87h.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2022 Alvaro "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" - -#if defined(KEYBOARD_acheron_apollo_87h_gamma) - #include "gamma.h" -#elif defined(KEYBOARD_acheron_apollo_87h_delta) - #include "delta.h" -#endif diff --git a/keyboards/acheron/athena/athena.c b/keyboards/acheron/athena/athena.c deleted file mode 100644 index aa5fae94f6..0000000000 --- a/keyboards/acheron/athena/athena.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Alvaro "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 "athena.h" diff --git a/keyboards/acheron/athena/athena.h b/keyboards/acheron/athena/athena.h deleted file mode 100644 index 0dd55ba8f1..0000000000 --- a/keyboards/acheron/athena/athena.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2022 Alvaro "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" - -#if defined(KEYBOARD_acheron_athena_alpha) - #include "alpha.h" -#elif defined(KEYBOARD_acheron_athena_beta) - #include "beta.h" -#endif diff --git a/keyboards/acheron/elongate/beta/beta.c b/keyboards/acheron/elongate/beta/beta.c deleted file mode 100644 index ffa13d4fe1..0000000000 --- a/keyboards/acheron/elongate/beta/beta.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "beta.h" diff --git a/keyboards/acheron/elongate/elongate.c b/keyboards/acheron/elongate/elongate.c deleted file mode 100644 index 9bf0d893a9..0000000000 --- a/keyboards/acheron/elongate/elongate.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2021 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. - */ - -#include "elongate.h" diff --git a/keyboards/acheron/elongate/elongate.h b/keyboards/acheron/elongate/elongate.h deleted file mode 100644 index 2e58871643..0000000000 --- a/keyboards/acheron/elongate/elongate.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020-2022 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" - -#if defined(KEYBOARD_acheron_elongate_beta) - #include "beta.h" -#elif defined(KEYBOARD_acheron_elongate_delta) - #include "delta.h" -#endif diff --git a/keyboards/acheron/shark/alpha/alpha.c b/keyboards/acheron/shark/alpha/alpha.c deleted file mode 100644 index e841f3fbd5..0000000000 --- a/keyboards/acheron/shark/alpha/alpha.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Á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 "alpha.h" diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c deleted file mode 100644 index 1a660019e2..0000000000 --- a/keyboards/acheron/shark/shark.c +++ /dev/null @@ -1,14 +0,0 @@ - /* Copyright 2022 Álvaro "Gondolindrim" Volpato - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "shark.h" diff --git a/keyboards/acheron/shark/shark.h b/keyboards/acheron/shark/shark.h deleted file mode 100644 index 0f65419885..0000000000 --- a/keyboards/acheron/shark/shark.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_acheron_shark_alpha) - #include "alpha.h" -#elif defined(KEYBOARD_acheron_shark_beta) - #include "beta.h" -#endif diff --git a/keyboards/adkb96/adkb96.c b/keyboards/adkb96/adkb96.c index 93230ee00c..591a17c082 100644 --- a/keyboards/adkb96/adkb96.c +++ b/keyboards/adkb96/adkb96.c @@ -1,4 +1,4 @@ -#include "adkb96.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/adkb96/adkb96.h b/keyboards/adkb96/adkb96.h deleted file mode 100644 index 5a47f16aad..0000000000 --- a/keyboards/adkb96/adkb96.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_adkb96_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c deleted file mode 100644 index 594c532994..0000000000 --- a/keyboards/adkb96/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "adkb96.h" diff --git a/keyboards/adkb96/rev1/rev1.h b/keyboards/adkb96/rev1/rev1.h index ff893e6da6..03a9211bb9 100644 --- a/keyboards/adkb96/rev1/rev1.h +++ b/keyboards/adkb96/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "adkb96.h" +#include "quantum.h" // Keymap with right side flipped // (TRRS jack on both halves are to the right) diff --git a/keyboards/aeboards/constellation/constellation.c b/keyboards/aeboards/constellation/constellation.c deleted file mode 100755 index 0b8354d071..0000000000 --- a/keyboards/aeboards/constellation/constellation.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Nothing to see here, move along... ;-) - -#include "constellation.h" diff --git a/keyboards/aeboards/constellation/constellation.h b/keyboards/aeboards/constellation/constellation.h deleted file mode 100755 index 3724b29d6a..0000000000 --- a/keyboards/aeboards/constellation/constellation.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_aeboards_constellation_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_aeboards_constellation_rev2) - #include "rev2.h" -#elif defined(KEYBOARD_aeboards_constellation_rev3) - #include "rev3.h" -#endif diff --git a/keyboards/aeboards/constellation/rev1/rev1.c b/keyboards/aeboards/constellation/rev1/rev1.c deleted file mode 100755 index 6e8f0a1192..0000000000 --- a/keyboards/aeboards/constellation/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/aeboards/constellation/rev3/rev3.c b/keyboards/aeboards/constellation/rev3/rev3.c deleted file mode 100755 index 5c4257c9b9..0000000000 --- a/keyboards/aeboards/constellation/rev3/rev3.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev3.h" diff --git a/keyboards/aeboards/satellite/satellite.c b/keyboards/aeboards/satellite/satellite.c deleted file mode 100644 index 97750559db..0000000000 --- a/keyboards/aeboards/satellite/satellite.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Nothing to see here, move along... ;-) - -#include "satellite.h" diff --git a/keyboards/aeboards/satellite/satellite.h b/keyboards/aeboards/satellite/satellite.h deleted file mode 100644 index fcd03d72e4..0000000000 --- a/keyboards/aeboards/satellite/satellite.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_aeboards_satellite_rev1) - #include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/breeze/breeze.c b/keyboards/afternoonlabs/breeze/breeze.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/breeze.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/breeze.h b/keyboards/afternoonlabs/breeze/breeze.h deleted file mode 100644 index 9a98bb9e69..0000000000 --- a/keyboards/afternoonlabs/breeze/breeze.h +++ /dev/null @@ -1,24 +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 - -#ifdef KEYBOARD_afternoonlabs_breeze_rev0 -# include "rev0.h" -#endif -#ifdef KEYBOARD_afternoonlabs_breeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.c b/keyboards/afternoonlabs/breeze/rev0/rev0.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rev0.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h index b7d7025be3..4ef5fd3286 100644 --- a/keyboards/afternoonlabs/breeze/rev0/rev0.h +++ b/keyboards/afternoonlabs/breeze/rev0/rev0.h @@ -16,8 +16,6 @@ #pragma once -#include "breeze.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.c b/keyboards/afternoonlabs/breeze/rev1/rev1.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h index b7d7025be3..4ef5fd3286 100644 --- a/keyboards/afternoonlabs/breeze/rev1/rev1.h +++ b/keyboards/afternoonlabs/breeze/rev1/rev1.h @@ -16,8 +16,6 @@ #pragma once -#include "breeze.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/afternoonlabs/gust/gust.c b/keyboards/afternoonlabs/gust/gust.c deleted file mode 100644 index ee2a9fa5ca..0000000000 --- a/keyboards/afternoonlabs/gust/gust.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "gust.h" diff --git a/keyboards/afternoonlabs/gust/gust.h b/keyboards/afternoonlabs/gust/gust.h deleted file mode 100644 index 886dc3786f..0000000000 --- a/keyboards/afternoonlabs/gust/gust.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_afternoonlabs_gust_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.c b/keyboards/afternoonlabs/gust/rev1/rev1.c deleted file mode 100644 index ee2a9fa5ca..0000000000 --- a/keyboards/afternoonlabs/gust/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "gust.h" diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h index 22c1910a1f..635a5877bb 100644 --- a/keyboards/afternoonlabs/gust/rev1/rev1.h +++ b/keyboards/afternoonlabs/gust/rev1/rev1.h @@ -16,8 +16,6 @@ #pragma once -#include "gust.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c deleted file mode 100644 index 35268ecf6f..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "oceanbreeze.h" diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h deleted file mode 100644 index f51f55de13..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_afternoonlabs_oceanbreeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c deleted file mode 100644 index 35268ecf6f..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "oceanbreeze.h" diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h index 36de22ec18..08d175f8c0 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h @@ -16,8 +16,6 @@ #pragma once -#include "oceanbreeze.h" - #include "quantum.h" #define XXX KC_NO diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c deleted file mode 100644 index 65597253e4..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h index eeecc06308..b8a83f6aad 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h +++ b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h @@ -16,8 +16,6 @@ #pragma once -#include "southern_breeze.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c b/keyboards/afternoonlabs/southern_breeze/southern_breeze.c deleted file mode 100644 index cac867cafa..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "southern_breeze.h" diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h b/keyboards/afternoonlabs/southern_breeze/southern_breeze.h deleted file mode 100644 index a6923d6b1e..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_afternoonlabs_southern_breeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c deleted file mode 100644 index 65597253e4..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h index 6ab28066c3..5fda55504c 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h +++ b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h @@ -16,8 +16,6 @@ #pragma once -#include "summer_breeze.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c b/keyboards/afternoonlabs/summer_breeze/summer_breeze.c deleted file mode 100644 index 844b8c33a3..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "summer_breeze.h" diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h b/keyboards/afternoonlabs/summer_breeze/summer_breeze.h deleted file mode 100644 index 0f3776b832..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_afternoonlabs_summer_breeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/alt34/alt34.c b/keyboards/alt34/alt34.c deleted file mode 100644 index f71f8092c9..0000000000 --- a/keyboards/alt34/alt34.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "alt34.h" diff --git a/keyboards/alt34/alt34.h b/keyboards/alt34/alt34.h deleted file mode 100644 index 0d0bdd3fd4..0000000000 --- a/keyboards/alt34/alt34.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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_alt34_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/alt34/rev1/rev1.c b/keyboards/alt34/rev1/rev1.c deleted file mode 100644 index f71f8092c9..0000000000 --- a/keyboards/alt34/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "alt34.h" diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h index 5600b0d5ad..115415bb5f 100644 --- a/keyboards/alt34/rev1/rev1.h +++ b/keyboards/alt34/rev1/rev1.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "alt34.h" #include "quantum.h" #define ____ KC_NO diff --git a/keyboards/arabica37/arabica37.c b/keyboards/arabica37/arabica37.c deleted file mode 100644 index 22fc63b0e9..0000000000 --- a/keyboards/arabica37/arabica37.c +++ /dev/null @@ -1 +0,0 @@ -#include "arabica37.h" diff --git a/keyboards/arabica37/arabica37.h b/keyboards/arabica37/arabica37.h deleted file mode 100644 index 3255e71d10..0000000000 --- a/keyboards/arabica37/arabica37.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_arabica37_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/arabica37/rev1/rev1.c b/keyboards/arabica37/rev1/rev1.c deleted file mode 100644 index 22fc63b0e9..0000000000 --- a/keyboards/arabica37/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "arabica37.h" diff --git a/keyboards/arabica37/rev1/rev1.h b/keyboards/arabica37/rev1/rev1.h index 316de77f1d..8d247242f6 100644 --- a/keyboards/arabica37/rev1/rev1.h +++ b/keyboards/arabica37/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "arabica37.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/atreus/astar/astar.c b/keyboards/atreus/astar/astar.c deleted file mode 100644 index 19490deb99..0000000000 --- a/keyboards/atreus/astar/astar.c +++ /dev/null @@ -1,16 +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 . - */ -#include "atreus.h" diff --git a/keyboards/atreus/astar/astar.h b/keyboards/atreus/astar/astar.h deleted file mode 100644 index bf74ceb17f..0000000000 --- a/keyboards/atreus/astar/astar.h +++ /dev/null @@ -1,17 +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 diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.c b/keyboards/atreus/astar_mirrored/astar_mirrored.c deleted file mode 100644 index b8eacded63..0000000000 --- a/keyboards/atreus/astar_mirrored/astar_mirrored.c +++ /dev/null @@ -1,16 +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 . - */ -#include "astar_mirrored.h" diff --git a/keyboards/atreus/astar_mirrored/astar_mirrored.h b/keyboards/atreus/astar_mirrored/astar_mirrored.h deleted file mode 100644 index bf74ceb17f..0000000000 --- a/keyboards/atreus/astar_mirrored/astar_mirrored.h +++ /dev/null @@ -1,17 +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 diff --git a/keyboards/atreus/atreus.c b/keyboards/atreus/atreus.c deleted file mode 100644 index 33bb5f35ad..0000000000 --- a/keyboards/atreus/atreus.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "atreus.h" diff --git a/keyboards/atreus/atreus.h b/keyboards/atreus/atreus.h index 2753434535..2a966b8641 100644 --- a/keyboards/atreus/atreus.h +++ b/keyboards/atreus/atreus.h @@ -18,20 +18,6 @@ #include "quantum.h" #define ___ KC_NO -#ifdef KEYBOARD_atreus_astar - #include "astar.h" -#elif KEYBOARD_atreus_astar_mirrored - #include "astar_mirrored.h" -#elif KEYBOARD_atreus_feather - #include "feather.h" -#elif KEYBOARD_atreus_teensy2 - #include "teensy2.h" -#elif KEYBOARD_atreus_promicro - #include "promicro.h" -#elif KEYBOARD_atreus_f103 - #include "f103.h" -#endif - // This a shortcut to help you visually see your layout. // The first section contains all of the arguments. // The second converts the arguments into a two-dimensional array. diff --git a/keyboards/atreus/f103/f103.c b/keyboards/atreus/f103/f103.c deleted file mode 100644 index acac0ed71c..0000000000 --- a/keyboards/atreus/f103/f103.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "f103.h" diff --git a/keyboards/atreus/f103/f103.h b/keyboards/atreus/f103/f103.h deleted file mode 100644 index 305b26798b..0000000000 --- a/keyboards/atreus/f103/f103.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 diff --git a/keyboards/atreus/feather/feather.c b/keyboards/atreus/feather/feather.c deleted file mode 100644 index ceebc51c23..0000000000 --- a/keyboards/atreus/feather/feather.c +++ /dev/null @@ -1,16 +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 . - */ -#include "feather.h" diff --git a/keyboards/atreus/feather/feather.h b/keyboards/atreus/feather/feather.h deleted file mode 100644 index bf74ceb17f..0000000000 --- a/keyboards/atreus/feather/feather.h +++ /dev/null @@ -1,17 +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 diff --git a/keyboards/atreus/promicro/promicro.c b/keyboards/atreus/promicro/promicro.c deleted file mode 100644 index ad08ac9f01..0000000000 --- a/keyboards/atreus/promicro/promicro.c +++ /dev/null @@ -1,16 +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 . - */ -#include "promicro.h" diff --git a/keyboards/atreus/promicro/promicro.h b/keyboards/atreus/promicro/promicro.h deleted file mode 100644 index bf74ceb17f..0000000000 --- a/keyboards/atreus/promicro/promicro.h +++ /dev/null @@ -1,17 +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 diff --git a/keyboards/atreus/teensy2/teensy2.c b/keyboards/atreus/teensy2/teensy2.c deleted file mode 100644 index 19490deb99..0000000000 --- a/keyboards/atreus/teensy2/teensy2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "atreus.h" diff --git a/keyboards/atreus/teensy2/teensy2.h b/keyboards/atreus/teensy2/teensy2.h deleted file mode 100644 index bf74ceb17f..0000000000 --- a/keyboards/atreus/teensy2/teensy2.h +++ /dev/null @@ -1,17 +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 diff --git a/keyboards/atreyu/atreyu.c b/keyboards/atreyu/atreyu.c deleted file mode 100644 index 0c5a97d18a..0000000000 --- a/keyboards/atreyu/atreyu.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "atreyu.h" diff --git a/keyboards/atreyu/atreyu.h b/keyboards/atreyu/atreyu.h deleted file mode 100644 index 64db24a4ee..0000000000 --- a/keyboards/atreyu/atreyu.h +++ /dev/null @@ -1,23 +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 - -#if defined(KEYBOARD_atreyu_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_atreyu_rev2) -# include "rev2.h" -#endif diff --git a/keyboards/avalanche/avalanche.c b/keyboards/avalanche/avalanche.c index 7efdf591d5..53bc5bd6aa 100644 --- a/keyboards/avalanche/avalanche.c +++ b/keyboards/avalanche/avalanche.c @@ -1,7 +1,7 @@ // Copyright 2022 Vitaly Volkov (@vlkv) // SPDX-License-Identifier: GPL-2.0-or-later -#include "avalanche.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/avalanche/avalanche.h b/keyboards/avalanche/avalanche.h deleted file mode 100644 index 916019f0d0..0000000000 --- a/keyboards/avalanche/avalanche.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#ifdef KEYBOARD_avalanche_v1 - #include "v1.h" -#elif KEYBOARD_avalanche_v2 - #include "v2.h" -#elif KEYBOARD_avalanche_v3 - #include "v3.h" -#elif KEYBOARD_avalanche_v4 - #include "v4.h" -#endif - -#include "quantum.h" diff --git a/keyboards/avalanche/v1/v1.c b/keyboards/avalanche/v1/v1.c deleted file mode 100644 index 1a0cff2e51..0000000000 --- a/keyboards/avalanche/v1/v1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "avalanche.h" diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h index a8f55c7536..dd6c921e69 100644 --- a/keyboards/avalanche/v1/v1.h +++ b/keyboards/avalanche/v1/v1.h @@ -3,8 +3,6 @@ #pragma once -#include "avalanche.h" - #include "quantum.h" #define L__ KC_NO diff --git a/keyboards/avalanche/v2/v2.c b/keyboards/avalanche/v2/v2.c deleted file mode 100644 index 1a0cff2e51..0000000000 --- a/keyboards/avalanche/v2/v2.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "avalanche.h" diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h index 6832becdf7..f8319c3ef4 100644 --- a/keyboards/avalanche/v2/v2.h +++ b/keyboards/avalanche/v2/v2.h @@ -3,8 +3,6 @@ #pragma once -#include "avalanche.h" - #include "quantum.h" #define L__ KC_NO diff --git a/keyboards/avalanche/v3/v3.c b/keyboards/avalanche/v3/v3.c deleted file mode 100644 index 1a0cff2e51..0000000000 --- a/keyboards/avalanche/v3/v3.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "avalanche.h" diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h index fde80607b2..426f979e9b 100644 --- a/keyboards/avalanche/v3/v3.h +++ b/keyboards/avalanche/v3/v3.h @@ -3,8 +3,6 @@ #pragma once -#include "avalanche.h" - #include "quantum.h" #define L__ KC_NO diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c index 69c64fc53c..e5a651ce4a 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 "avalanche.h" +#include "v4.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 index fde80607b2..426f979e9b 100644 --- a/keyboards/avalanche/v4/v4.h +++ b/keyboards/avalanche/v4/v4.h @@ -3,8 +3,6 @@ #pragma once -#include "avalanche.h" - #include "quantum.h" #define L__ KC_NO diff --git a/keyboards/basekeys/slice/rev1/rev1.c b/keyboards/basekeys/slice/rev1/rev1.c deleted file mode 100644 index a3c8f66fe0..0000000000 --- a/keyboards/basekeys/slice/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 2Moons - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/basekeys/slice/rev1/rev1.h b/keyboards/basekeys/slice/rev1/rev1.h index 26a5da31bc..f4d631eb6b 100644 --- a/keyboards/basekeys/slice/rev1/rev1.h +++ b/keyboards/basekeys/slice/rev1/rev1.h @@ -15,8 +15,6 @@ */ #pragma once -#include "slice.h" - #include "quantum.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c deleted file mode 100644 index 9ab3d2539a..0000000000 --- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 2Moons - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1_rgb.h" diff --git a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h index fdc5331585..0b0ea725e7 100644 --- a/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h +++ b/keyboards/basekeys/slice/rev1_rgb/rev1_rgb.h @@ -15,8 +15,6 @@ */ #pragma once -#include "slice.h" - #include "quantum.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/keyboards/basekeys/slice/slice.c b/keyboards/basekeys/slice/slice.c deleted file mode 100644 index 2d7d111f9a..0000000000 --- a/keyboards/basekeys/slice/slice.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 2Moons - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "slice.h" diff --git a/keyboards/basekeys/slice/slice.h b/keyboards/basekeys/slice/slice.h deleted file mode 100644 index bc3eb813a2..0000000000 --- a/keyboards/basekeys/slice/slice.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 2Moons - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_basekeys_slice_rev1 - #include "rev1.h" -#endif - -#ifdef KEYBOARD_basekeys_slice_rev1_rgb - #include "rev1_rgb.h" -#endif diff --git a/keyboards/bear_face/bear_face.c b/keyboards/bear_face/bear_face.c deleted file mode 100644 index 30aa5140d4..0000000000 --- a/keyboards/bear_face/bear_face.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 chemicalwill - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "bear_face.h" diff --git a/keyboards/bear_face/bear_face.h b/keyboards/bear_face/bear_face.h deleted file mode 100644 index c63b2bd012..0000000000 --- a/keyboards/bear_face/bear_face.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 chemicalwill - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_bear_face_v1) -# include "v1.h" -#elif defined(KEYBOARD_bear_face_v2) -# include "v2.h" -#endif diff --git a/keyboards/bear_face/v1/v1.c b/keyboards/bear_face/v1/v1.c index 443b3016d7..3f10d10994 100644 --- a/keyboards/bear_face/v1/v1.c +++ b/keyboards/bear_face/v1/v1.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 "bear_face.h" +#include "v1.h" void keyboard_pre_init_kb(void) { //Sets LED pin as output diff --git a/keyboards/bear_face/v2/v2.c b/keyboards/bear_face/v2/v2.c index 443b3016d7..cf97145688 100644 --- a/keyboards/bear_face/v2/v2.c +++ b/keyboards/bear_face/v2/v2.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 "bear_face.h" +#include "v2.h" void keyboard_pre_init_kb(void) { //Sets LED pin as output diff --git a/keyboards/bemeier/bmek/bmek.h b/keyboards/bemeier/bmek/bmek.h index 4249d02566..26c95737e6 100755 --- a/keyboards/bemeier/bmek/bmek.h +++ b/keyboards/bemeier/bmek/bmek.h @@ -17,14 +17,6 @@ #include "quantum.h" -#if defined(KEYBOARD_bemeier_bmek_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_bemeier_bmek_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_bemeier_bmek_rev3) -# include "rev3.h" -#endif - #define XXX KC_NO // makes the switch matrix easier to read // This layout is supported by all revisions diff --git a/keyboards/bemeier/bmek/rev1/rev1.c b/keyboards/bemeier/bmek/rev1/rev1.c deleted file mode 100755 index 24f0dcdb94..0000000000 --- a/keyboards/bemeier/bmek/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/bemeier/bmek/rev1/rev1.h b/keyboards/bemeier/bmek/rev1/rev1.h deleted file mode 100755 index 1c46169bdc..0000000000 --- a/keyboards/bemeier/bmek/rev1/rev1.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" diff --git a/keyboards/bemeier/bmek/rev2/rev2.c b/keyboards/bemeier/bmek/rev2/rev2.c deleted file mode 100755 index 97ee43e318..0000000000 --- a/keyboards/bemeier/bmek/rev2/rev2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/bemeier/bmek/rev2/rev2.h b/keyboards/bemeier/bmek/rev2/rev2.h deleted file mode 100755 index 1c46169bdc..0000000000 --- a/keyboards/bemeier/bmek/rev2/rev2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" diff --git a/keyboards/bemeier/bmek/rev3/rev3.c b/keyboards/bemeier/bmek/rev3/rev3.c deleted file mode 100755 index 6193ab51b4..0000000000 --- a/keyboards/bemeier/bmek/rev3/rev3.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev3.h" diff --git a/keyboards/bemeier/bmek/rev3/rev3.h b/keyboards/bemeier/bmek/rev3/rev3.h deleted file mode 100755 index f769927193..0000000000 --- a/keyboards/bemeier/bmek/rev3/rev3.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -/* -PCB rev3 has a number of layout options that rev2 and rev1 don't have, -however, to me just using "ALL_67" for all for all keymaps seems easier to -maintain than adding all possible permutations of layout options here. -*/ diff --git a/keyboards/biacco42/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c index bd7a7ffe19..1407d91689 100644 --- a/keyboards/biacco42/ergo42/ergo42.c +++ b/keyboards/biacco42/ergo42/ergo42.c @@ -1,4 +1,4 @@ -#include "ergo42.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/biacco42/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h deleted file mode 100644 index 265e605e6c..0000000000 --- a/keyboards/biacco42/ergo42/ergo42.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_biacco42_ergo42_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/biacco42/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c deleted file mode 100644 index 626a0893bb..0000000000 --- a/keyboards/biacco42/ergo42/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergo42.h" diff --git a/keyboards/biacco42/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h index 9a5aec4d26..5d92ba6752 100644 --- a/keyboards/biacco42/ergo42/rev1/rev1.h +++ b/keyboards/biacco42/ergo42/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "ergo42.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c index e558048f6a..1097c58de2 100644 --- a/keyboards/boston_meetup/2019/2019.c +++ b/keyboards/boston_meetup/2019/2019.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 "2019.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE #include "rgb_matrix.h" diff --git a/keyboards/boston_meetup/2019/2019.h b/keyboards/boston_meetup/2019/2019.h deleted file mode 100644 index fbba5c3154..0000000000 --- a/keyboards/boston_meetup/2019/2019.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 ishtob - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "boston_meetup.h" - diff --git a/keyboards/boston_meetup/boston_meetup.c b/keyboards/boston_meetup/boston_meetup.c deleted file mode 100644 index a9201ac852..0000000000 --- a/keyboards/boston_meetup/boston_meetup.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "boston_meetup.h" - diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h index e1d9d92060..4b000a1ca5 100644 --- a/keyboards/boston_meetup/boston_meetup.h +++ b/keyboards/boston_meetup/boston_meetup.h @@ -1,7 +1,7 @@ #pragma once -#ifdef KEYBOARD_boston_meetup_2019 - #include "2019.h" +#include "quantum.h" + #define LAYOUT( \ K00, \ K10, K11, K12, K13, \ @@ -14,6 +14,3 @@ { K20, K21, K22, K23 }, \ { K30, K31, K32, K33 } \ } -#endif - -#include "quantum.h" \ No newline at end of file diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c deleted file mode 100644 index 00ad12a23e..0000000000 --- a/keyboards/buzzard/buzzard.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2021 Christoph Rehmann (crehmann) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "buzzard.h" diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h deleted file mode 100644 index f094e4af39..0000000000 --- a/keyboards/buzzard/buzzard.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Christoph Rehmann (crehmann) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_buzzard_rev1) -# include "rev1.h" -#endif \ No newline at end of file diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h index c73e9164f0..74c5fef08e 100644 --- a/keyboards/buzzard/rev1/rev1.h +++ b/keyboards/buzzard/rev1/rev1.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "buzzard.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/chocofly/chocofly.c b/keyboards/chocofly/chocofly.c index 8ae38602ab..0f00afe2f9 100644 --- a/keyboards/chocofly/chocofly.c +++ b/keyboards/chocofly/chocofly.c @@ -1,7 +1,7 @@ // Copyright 2022 Vitaly Volkov (@vlkv) // SPDX-License-Identifier: GPL-2.0-or-later -#include "chocofly.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/chocofly/chocofly.h b/keyboards/chocofly/chocofly.h deleted file mode 100644 index 7d94774625..0000000000 --- a/keyboards/chocofly/chocofly.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#ifdef KEYBOARD_chocofly_v1 - #include "v1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/chocofly/v1/v1.c b/keyboards/chocofly/v1/v1.c deleted file mode 100644 index 6c142b7453..0000000000 --- a/keyboards/chocofly/v1/v1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "v1.h" diff --git a/keyboards/chocofly/v1/v1.h b/keyboards/chocofly/v1/v1.h index 5f07f6c325..bf3c93f8be 100644 --- a/keyboards/chocofly/v1/v1.h +++ b/keyboards/chocofly/v1/v1.h @@ -3,8 +3,6 @@ #pragma once -#include "chocofly.h" - #include "quantum.h" #define K__ KC_NO diff --git a/keyboards/clickety_split/leeloo/leeloo.c b/keyboards/clickety_split/leeloo/leeloo.c index ea3902d899..864f31cbb7 100644 --- a/keyboards/clickety_split/leeloo/leeloo.c +++ b/keyboards/clickety_split/leeloo/leeloo.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "leeloo.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/clickety_split/leeloo/leeloo.h b/keyboards/clickety_split/leeloo/leeloo.h deleted file mode 100644 index 98cfddae34..0000000000 --- a/keyboards/clickety_split/leeloo/leeloo.h +++ /dev/null @@ -1,24 +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" - -#if defined(KEYBOARD_clickety_split_leeloo_rev1) -# include "rev1.h" -#endif diff --git a/keyboards/clickety_split/leeloo/rev1/rev1.c b/keyboards/clickety_split/leeloo/rev1/rev1.c deleted file mode 100644 index 31e27144fb..0000000000 --- a/keyboards/clickety_split/leeloo/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "leeloo.h" diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.c b/keyboards/clueboard/66_hotswap/66_hotswap.c deleted file mode 100644 index cc38050a9e..0000000000 --- a/keyboards/clueboard/66_hotswap/66_hotswap.c +++ /dev/null @@ -1 +0,0 @@ -#include "66_hotswap.h" diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.h b/keyboards/clueboard/66_hotswap/66_hotswap.h deleted file mode 100644 index a1ea44841f..0000000000 --- a/keyboards/clueboard/66_hotswap/66_hotswap.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_clueboard_66_hotswap_gen1 - #include "gen1.h" -#endif - -#ifdef KEYBOARD_clueboard_66_hotswap_prototype - #include "prototype.h" -#endif diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c index 72b8b8bbab..a935884a0b 100644 --- a/keyboards/clueboard/66_hotswap/gen1/gen1.c +++ b/keyboards/clueboard/66_hotswap/gen1/gen1.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 "gen1.h" +#include "quantum.h" #ifdef LED_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.h b/keyboards/clueboard/66_hotswap/gen1/gen1.h deleted file mode 100644 index 98f9ba1424..0000000000 --- a/keyboards/clueboard/66_hotswap/gen1/gen1.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2017 Clueboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once -#include "quantum.h" - diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c index 4ce3dd65f7..c89fbafbff 100644 --- a/keyboards/clueboard/66_hotswap/prototype/prototype.c +++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c @@ -1,4 +1,4 @@ -#include "prototype.h" +#include "quantum.h" #include "print.h" void backlight_init_ports(void) { diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.h b/keyboards/clueboard/66_hotswap/prototype/prototype.h deleted file mode 100644 index 1277cfbbab..0000000000 --- a/keyboards/clueboard/66_hotswap/prototype/prototype.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -#include "quantum.h" - diff --git a/keyboards/converter/usb_usb/ble/ble.c b/keyboards/converter/usb_usb/ble/ble.c deleted file mode 100644 index 387eb8166c..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.c +++ /dev/null @@ -1 +0,0 @@ -#include "ble.h" diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.c b/keyboards/converter/usb_usb/hasu/hasu.c deleted file mode 100644 index 3357735ffd..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.c +++ /dev/null @@ -1 +0,0 @@ -#include "hasu.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.c b/keyboards/converter/usb_usb/pro_micro/pro_micro.c deleted file mode 100644 index f10142f81a..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.c +++ /dev/null @@ -1 +0,0 @@ -#include "pro_micro.h" diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c deleted file mode 100644 index e8f224ad46..0000000000 --- a/keyboards/converter/usb_usb/usb_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h index bcd8b52974..87f70bc07a 100644 --- a/keyboards/converter/usb_usb/usb_usb.h +++ b/keyboards/converter/usb_usb/usb_usb.h @@ -19,14 +19,6 @@ along with this program. If not, see . #include "quantum.h" -#if defined(KEYBOARD_converter_usb_usb_ble) -# include "ble.h" -#elif defined(KEYBOARD_converter_usb_usb_hasu) -# include "hasu.h" -#elif defined(KEYBOARD_converter_usb_usb_pro_micro) -# include "pro_micro.h" -#endif - #define XXX KC_NO #define ______ KC_TRNS diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c deleted file mode 100644 index b8612504b1..0000000000 --- a/keyboards/cozykeys/bloomer/bloomer.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "bloomer.h" diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h deleted file mode 100644 index f85b80889f..0000000000 --- a/keyboards/cozykeys/bloomer/bloomer.h +++ /dev/null @@ -1,23 +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 - -#if defined(KEYBOARD_cozykeys_bloomer_v2) - #include "v2.h" -#elif defined(KEYBOARD_cozykeys_bloomer_v3) - #include "v3.h" -#endif diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c deleted file mode 100644 index 47dd093734..0000000000 --- a/keyboards/cozykeys/bloomer/v2/v2.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "v2.h" diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c deleted file mode 100644 index 080cacd791..0000000000 --- a/keyboards/cozykeys/bloomer/v3/v3.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "v3.h" diff --git a/keyboards/cozykeys/speedo/speedo.c b/keyboards/cozykeys/speedo/speedo.c deleted file mode 100644 index 852459f8c6..0000000000 --- a/keyboards/cozykeys/speedo/speedo.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "speedo.h" diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h deleted file mode 100644 index 2a2adff423..0000000000 --- a/keyboards/cozykeys/speedo/speedo.h +++ /dev/null @@ -1,23 +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 - -#ifdef KEYBOARD_cozykeys_speedo_v2 - #include "v2.h" -#elif KEYBOARD_cozykeys_speedo_v3 - #include "v3.h" -#endif diff --git a/keyboards/cozykeys/speedo/v2/v2.c b/keyboards/cozykeys/speedo/v2/v2.c deleted file mode 100644 index 1cab752140..0000000000 --- a/keyboards/cozykeys/speedo/v2/v2.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "v2.h" diff --git a/keyboards/cozykeys/speedo/v3/v3.c b/keyboards/cozykeys/speedo/v3/v3.c deleted file mode 100644 index f35be99e22..0000000000 --- a/keyboards/cozykeys/speedo/v3/v3.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "v3.h" diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c index 6220c9822a..aadc0bacf0 100644 --- a/keyboards/crkbd/crkbd.c +++ b/keyboards/crkbd/crkbd.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "crkbd.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/crkbd/crkbd.h b/keyboards/crkbd/crkbd.h deleted file mode 100644 index 3fae1a400c..0000000000 --- a/keyboards/crkbd/crkbd.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@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 - -#ifdef KEYBOARD_crkbd_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_crkbd_r2g -# include "r2g.h" -#endif - - -#include "quantum.h" diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h index 126c4b8998..fd3cf557a7 100644 --- a/keyboards/crkbd/r2g/r2g.h +++ b/keyboards/crkbd/r2g/r2g.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "crkbd.h" #include "quantum.h" // clang-format off diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h index 126c4b8998..fd3cf557a7 100644 --- a/keyboards/crkbd/rev1/rev1.h +++ b/keyboards/crkbd/rev1/rev1.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "crkbd.h" #include "quantum.h" // clang-format off diff --git a/keyboards/dailycraft/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c deleted file mode 100644 index 5d52c672b6..0000000000 --- a/keyboards/dailycraft/bat43/bat43.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bat43.h" diff --git a/keyboards/dailycraft/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h deleted file mode 100644 index 046788a0a1..0000000000 --- a/keyboards/dailycraft/bat43/bat43.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_bat43_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_bat43_rev2 - #include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/dailycraft/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c deleted file mode 100644 index cff7598740..0000000000 --- a/keyboards/dailycraft/bat43/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/dailycraft/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c deleted file mode 100644 index cffc0acd32..0000000000 --- a/keyboards/dailycraft/bat43/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" diff --git a/keyboards/dailycraft/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c deleted file mode 100644 index d87103065c..0000000000 --- a/keyboards/dailycraft/claw44/claw44.c +++ /dev/null @@ -1 +0,0 @@ -#include "claw44.h" diff --git a/keyboards/dailycraft/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h deleted file mode 100644 index 76ecda6e90..0000000000 --- a/keyboards/dailycraft/claw44/claw44.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_claw44_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/dailycraft/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/dailycraft/claw44/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.c b/keyboards/dailycraft/sandbox/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.c b/keyboards/dailycraft/sandbox/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c index 0b576a8291..51a9f88a6d 100644 --- a/keyboards/dailycraft/sandbox/sandbox.c +++ b/keyboards/dailycraft/sandbox/sandbox.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "sandbox.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/dailycraft/sandbox/sandbox.h b/keyboards/dailycraft/sandbox/sandbox.h deleted file mode 100644 index e9c9ff99c3..0000000000 --- a/keyboards/dailycraft/sandbox/sandbox.h +++ /dev/null @@ -1,26 +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" - -#ifdef KEYBOARD_dailycraft_sandbox_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_sandbox_rev2 -# include "rev2.h" -#endif diff --git a/keyboards/dailycraft/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c deleted file mode 100644 index 3d0d203704..0000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1_extkeys.h" diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" diff --git a/keyboards/dailycraft/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c deleted file mode 100644 index 824b6cfbb6..0000000000 --- a/keyboards/dailycraft/wings42/wings42.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "wings42.h" diff --git a/keyboards/dailycraft/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h deleted file mode 100644 index d839f04884..0000000000 --- a/keyboards/dailycraft/wings42/wings42.h +++ /dev/null @@ -1,30 +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" - -#ifdef KEYBOARD_dailycraft_wings42_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys -# include "rev1_extkeys.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev2 -# include "rev2.h" -#endif - diff --git a/keyboards/deltasplit75/deltasplit75.c b/keyboards/deltasplit75/deltasplit75.c deleted file mode 100644 index 6a73db4cd6..0000000000 --- a/keyboards/deltasplit75/deltasplit75.c +++ /dev/null @@ -1 +0,0 @@ -#include "deltasplit75.h" \ No newline at end of file diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h deleted file mode 100644 index b78d857344..0000000000 --- a/keyboards/deltasplit75/deltasplit75.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_deltasplit75_v2 -# include "v2.h" -#endif diff --git a/keyboards/deltasplit75/v2/v2.c b/keyboards/deltasplit75/v2/v2.c deleted file mode 100644 index caf7c6f0f2..0000000000 --- a/keyboards/deltasplit75/v2/v2.c +++ /dev/null @@ -1 +0,0 @@ -#include "v2.h" diff --git a/keyboards/deltasplit75/v2/v2.h b/keyboards/deltasplit75/v2/v2.h index bab6a47cd9..0373a6fe02 100644 --- a/keyboards/deltasplit75/v2/v2.h +++ b/keyboards/deltasplit75/v2/v2.h @@ -1,7 +1,5 @@ #pragma once -#include "deltasplit75.h" - #include "quantum.h" //matrix is defined in a weird way here; the layout on both sides are asymmetrical, but the "matrix" is symmetrical but with empty gaps diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h index ecf87a2a49..3a397dda5f 100644 --- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h +++ b/keyboards/drhigsby/ogurec/left_pm/left_pm.h @@ -15,7 +15,7 @@ */ #pragma once -#include "ogurec.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/drhigsby/ogurec/ogurec.c b/keyboards/drhigsby/ogurec/ogurec.c deleted file mode 100644 index 6b2efa56b6..0000000000 --- a/keyboards/drhigsby/ogurec/ogurec.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "ogurec.h" diff --git a/keyboards/drhigsby/ogurec/ogurec.h b/keyboards/drhigsby/ogurec/ogurec.h deleted file mode 100644 index 154d5d6cfe..0000000000 --- a/keyboards/drhigsby/ogurec/ogurec.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 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" - -#if defined(KEYBOARD_drhigsby_ogurec_left_pm) -# include "left_pm.h" -#elif defined(KEYBOARD_drhigsby_ogurec_right_pm) -# include "right_pm.h" -#endif diff --git a/keyboards/drhigsby/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h index e413a835bc..2ad2fe32c9 100644 --- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h +++ b/keyboards/drhigsby/ogurec/right_pm/right_pm.h @@ -15,7 +15,7 @@ */ #pragma once -#include "ogurec.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h index b60b78ea81..f68a595cae 100644 --- a/keyboards/durgod/dgk6x/galaxy/config.h +++ b/keyboards/durgod/dgk6x/galaxy/config.h @@ -20,3 +20,5 @@ #define DRIVER_1_LED_TOTAL 58 #define DRIVER_2_LED_TOTAL 26 #endif + +#define CAPS_LED 46 diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.h b/keyboards/durgod/dgk6x/galaxy/galaxy.h index 3ba96aaf7b..3a2da6f863 100644 --- a/keyboards/durgod/dgk6x/galaxy/galaxy.h +++ b/keyboards/durgod/dgk6x/galaxy/galaxy.h @@ -17,8 +17,6 @@ #include "quantum.h" -#define CAPS_LED 46 - #define XXX KC_NO // This a shortcut to help you visually see your layout. diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h index b1b29b182a..47f6da5988 100644 --- a/keyboards/durgod/dgk6x/hades/config.h +++ b/keyboards/durgod/dgk6x/hades/config.h @@ -20,3 +20,5 @@ #define DRIVER_1_LED_TOTAL 58 #define DRIVER_2_LED_TOTAL 10 #endif + +#define CAPS_LED 30 diff --git a/keyboards/durgod/dgk6x/hades/hades.h b/keyboards/durgod/dgk6x/hades/hades.h index 630f7e92b5..a1840dff0f 100644 --- a/keyboards/durgod/dgk6x/hades/hades.h +++ b/keyboards/durgod/dgk6x/hades/hades.h @@ -17,8 +17,6 @@ #include "quantum.h" -#define CAPS_LED 30 - #define XXX KC_NO // This a shortcut to help you visually see your layout. diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h index 0709407c88..ab3f57914e 100644 --- a/keyboards/durgod/dgk6x/venus/config.h +++ b/keyboards/durgod/dgk6x/venus/config.h @@ -20,3 +20,5 @@ #define DRIVER_1_LED_TOTAL 53 #define DRIVER_2_LED_TOTAL 8 #endif + +#define CAPS_LED 28 diff --git a/keyboards/durgod/dgk6x/venus/venus.h b/keyboards/durgod/dgk6x/venus/venus.h index 6103c531dc..7d1635b777 100644 --- a/keyboards/durgod/dgk6x/venus/venus.h +++ b/keyboards/durgod/dgk6x/venus/venus.h @@ -17,8 +17,6 @@ #include "quantum.h" -#define CAPS_LED 28 - #define XXX KC_NO // This a shortcut to help you visually see your layout. diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c deleted file mode 100644 index 8340d8fcee..0000000000 --- a/keyboards/dztech/dz65rgb/dz65rgb.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "dz65rgb.h" diff --git a/keyboards/dztech/dz65rgb/dz65rgb.h b/keyboards/dztech/dz65rgb/dz65rgb.h deleted file mode 100644 index 734a1cff3f..0000000000 --- a/keyboards/dztech/dz65rgb/dz65rgb.h +++ /dev/null @@ -1,28 +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 - -#ifdef KEYBOARD_dztech_dz65rgb_v1 - #include "v1.h" -#endif -#ifdef KEYBOARD_dztech_dz65rgb_v2 - #include "v2.h" -#endif -#ifdef KEYBOARD_dztech_dz65rgb_v3 - #include "v3.h" -#endif -#include "quantum.h" diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index ce0e92216f..b9449c4714 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -37,10 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "rev2/config.h" -#endif diff --git a/keyboards/eco/eco.c b/keyboards/eco/eco.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/eco.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h deleted file mode 100644 index 885bf982d7..0000000000 --- a/keyboards/eco/eco.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_eco_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_eco_rev2) -# include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/eco/rev1/rev1.c b/keyboards/eco/rev1/rev1.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h index a6ceafb815..ea17dc6a55 100644 --- a/keyboards/eco/rev1/rev1.h +++ b/keyboards/eco/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../eco.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/eco/rev2/rev2.c b/keyboards/eco/rev2/rev2.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h index a6ceafb815..ea17dc6a55 100644 --- a/keyboards/eco/rev2/rev2.h +++ b/keyboards/eco/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "../eco.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/eek/eek.c b/keyboards/eek/eek.c index 372956257a..8e7a19f820 100644 --- a/keyboards/eek/eek.c +++ b/keyboards/eek/eek.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 "eek.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/eek/eek.h b/keyboards/eek/eek.h deleted file mode 100644 index 4e4133d884..0000000000 --- a/keyboards/eek/eek.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 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" - -#if defined(KEYBOARD_eek_silk_down) -# include "silk_down.h" -#elif defined(KEYBOARD_eek_silk_up) -# include "silk_up.h" -#endif diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h index c8ececd939..23ff61e58f 100644 --- a/keyboards/eek/silk_down/silk_down.h +++ b/keyboards/eek/silk_down/silk_down.h @@ -15,7 +15,7 @@ */ #pragma once -#include "eek.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h index 8b9fe39596..eebcc8fd2e 100644 --- a/keyboards/eek/silk_up/silk_up.h +++ b/keyboards/eek/silk_up/silk_up.h @@ -15,7 +15,7 @@ */ #pragma once -#include "eek.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 2dbfdbba73..8551c8f3a1 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -25,12 +25,6 @@ along with this program. If not, see . #include #include "i2c_master.h" -#if defined(KEYBOARD_ergodox_ez_glow) -# include "glow.h" -#elif defined(KEYBOARD_ergodox_ez_shine) -# include "shine.h" -#endif - // I2C aliases and register addresses (see "mcp23018.md") #define I2C_ADDR 0b0100000 #define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE ) diff --git a/keyboards/ergodox_ez/glow/glow.h b/keyboards/ergodox_ez/glow/glow.h deleted file mode 100644 index da7a6073ef..0000000000 --- a/keyboards/ergodox_ez/glow/glow.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2013 Oleg Kostyuk -Copyright 2015 ZSA Technology Labs Inc (@zsa) -Copyright 2020 Christopher Courtney (@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 "ergodox_ez.h" diff --git a/keyboards/ergodox_ez/shine/shine.h b/keyboards/ergodox_ez/shine/shine.h deleted file mode 100644 index da7a6073ef..0000000000 --- a/keyboards/ergodox_ez/shine/shine.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2013 Oleg Kostyuk -Copyright 2015 ZSA Technology Labs Inc (@zsa) -Copyright 2020 Christopher Courtney (@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 "ergodox_ez.h" diff --git a/keyboards/ergoslab/ergoslab.c b/keyboards/ergoslab/ergoslab.c deleted file mode 100644 index 6f2796c07c..0000000000 --- a/keyboards/ergoslab/ergoslab.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergoslab.h" diff --git a/keyboards/ergoslab/ergoslab.h b/keyboards/ergoslab/ergoslab.h deleted file mode 100644 index 8b02490543..0000000000 --- a/keyboards/ergoslab/ergoslab.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_ergoslab_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h index bf99a17b23..d7fd53a31e 100644 --- a/keyboards/ergoslab/rev1/rev1.h +++ b/keyboards/ergoslab/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "ergoslab.h" - #include "quantum.h" #define LAYOUT_ergoslab( \ diff --git a/keyboards/ergotravel/ergotravel.c b/keyboards/ergotravel/ergotravel.c deleted file mode 100644 index 2ada434c19..0000000000 --- a/keyboards/ergotravel/ergotravel.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergotravel.h" diff --git a/keyboards/ergotravel/ergotravel.h b/keyboards/ergotravel/ergotravel.h deleted file mode 100644 index 314775495b..0000000000 --- a/keyboards/ergotravel/ergotravel.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_ergotravel_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/ergotravel/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h index e4393cff4d..c241c2d599 100644 --- a/keyboards/ergotravel/rev1/rev1.h +++ b/keyboards/ergotravel/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "ergotravel.h" - #include "quantum.h" #define XXX KC_NO diff --git a/keyboards/fortitude60/fortitude60.c b/keyboards/fortitude60/fortitude60.c deleted file mode 100644 index d35b286d11..0000000000 --- a/keyboards/fortitude60/fortitude60.c +++ /dev/null @@ -1 +0,0 @@ -#include "fortitude60.h" diff --git a/keyboards/fortitude60/fortitude60.h b/keyboards/fortitude60/fortitude60.h deleted file mode 100644 index 0ad157f2d2..0000000000 --- a/keyboards/fortitude60/fortitude60.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_fortitude60_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/fortitude60/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h index ed62b2683e..7445cfa906 100644 --- a/keyboards/fortitude60/rev1/rev1.h +++ b/keyboards/fortitude60/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "fortitude60.h" - #include "quantum.h" // Standard Keymap diff --git a/keyboards/fungo/fungo.c b/keyboards/fungo/fungo.c deleted file mode 100644 index 1446234b36..0000000000 --- a/keyboards/fungo/fungo.c +++ /dev/null @@ -1,18 +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 . - */ - - #include "fungo.h" - diff --git a/keyboards/fungo/fungo.h b/keyboards/fungo/fungo.h deleted file mode 100644 index dd267c3463..0000000000 --- a/keyboards/fungo/fungo.h +++ /dev/null @@ -1,23 +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" - -#ifdef KEYBOARD_fungo_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/fungo/rev1/rev1.c b/keyboards/fungo/rev1/rev1.c deleted file mode 100644 index 5fd3a11049..0000000000 --- a/keyboards/fungo/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - - #include "fungo.h" diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h index bb5fadcd9a..bcb5ae345f 100644 --- a/keyboards/fungo/rev1/rev1.h +++ b/keyboards/fungo/rev1/rev1.h @@ -16,7 +16,6 @@ #pragma once -#include "fungo.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/gmmk/gmmk2/p65/p65.c b/keyboards/gmmk/gmmk2/p65/p65.c deleted file mode 100644 index d7e06f6488..0000000000 --- a/keyboards/gmmk/gmmk2/p65/p65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "p65.h" diff --git a/keyboards/gmmk/gmmk2/p65/p65.h b/keyboards/gmmk/gmmk2/p65/p65.h deleted file mode 100644 index 7a6339c2e0..0000000000 --- a/keyboards/gmmk/gmmk2/p65/p65.h +++ /dev/null @@ -1,25 +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" - -#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi) -# include "ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso) -# include "iso/iso.h" -#endif // GMMK V2 revisions diff --git a/keyboards/gmmk/gmmk2/p96/p96.c b/keyboards/gmmk/gmmk2/p96/p96.c deleted file mode 100644 index 47edcfe1ad..0000000000 --- a/keyboards/gmmk/gmmk2/p96/p96.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "p96.h" diff --git a/keyboards/gmmk/gmmk2/p96/p96.h b/keyboards/gmmk/gmmk2/p96/p96.h deleted file mode 100644 index e7b37d6816..0000000000 --- a/keyboards/gmmk/gmmk2/p96/p96.h +++ /dev/null @@ -1,25 +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" - -#if defined(KEYBOARD_gmmk_gmmk2_p96_ansi) -# include "ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso) -# include "iso/iso.h" -#endif // GMMK V2 revisions diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c index 6aed1d6e18..3df15d71f2 100644 --- a/keyboards/gmmk/pro/pro.c +++ b/keyboards/gmmk/pro/pro.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 "pro.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h deleted file mode 100644 index c83d6c99c5..0000000000 --- a/keyboards/gmmk/pro/pro.h +++ /dev/null @@ -1,29 +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" - -#if defined(KEYBOARD_gmmk_pro_rev1_ansi) -# include "rev1/ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_pro_rev1_iso) -# include "rev1/iso/iso.h" -#elif defined(KEYBOARD_gmmk_pro_rev2_ansi) -# include "rev2/ansi/ansi.h" -#elif defined(KEYBOARD_gmmk_pro_rev2_iso) -# include "rev2/iso/iso.h" -#endif // GMMK Pro revisions diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h index ab08d66592..9a6ae0f49e 100644 --- a/keyboards/gmmk/pro/rev1/ansi/ansi.h +++ b/keyboards/gmmk/pro/rev1/ansi/ansi.h @@ -16,7 +16,7 @@ #pragma once -#include "pro.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h index 353bcbe875..ad3b46cb97 100644 --- a/keyboards/gmmk/pro/rev1/iso/iso.h +++ b/keyboards/gmmk/pro/rev1/iso/iso.h @@ -16,7 +16,7 @@ #pragma once -#include "pro.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.h b/keyboards/gmmk/pro/rev2/ansi/ansi.h index 2f8a28b940..b4a67dfd18 100644 --- a/keyboards/gmmk/pro/rev2/ansi/ansi.h +++ b/keyboards/gmmk/pro/rev2/ansi/ansi.h @@ -16,7 +16,7 @@ #pragma once -#include "pro.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h index a5844e10eb..3c1291ff1b 100644 --- a/keyboards/gmmk/pro/rev2/iso/iso.h +++ b/keyboards/gmmk/pro/rev2/iso/iso.h @@ -16,7 +16,7 @@ #pragma once -#include "pro.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/hadron/hadron.c b/keyboards/hadron/hadron.c deleted file mode 100644 index fa5065b327..0000000000 --- a/keyboards/hadron/hadron.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "hadron.h" - diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h index 349311270e..7cc3c9702c 100644 --- a/keyboards/hadron/hadron.h +++ b/keyboards/hadron/hadron.h @@ -2,14 +2,6 @@ #include "quantum.h" -#if defined(KEYBOARD_hadron_ver0) -# include "ver0.h" -#elif defined(KEYBOARD_hadron_ver2) -# include "ver2.h" -#elif defined(KEYBOARD_hadron_ver3) -# include "ver3.h" -#endif - #define XXX KC_NO #define LAYOUT( \ diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c index abf21d4256..583ac84a01 100644 --- a/keyboards/hadron/ver2/ver2.c +++ b/keyboards/hadron/ver2/ver2.c @@ -1,4 +1,4 @@ -#include "ver2.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; } diff --git a/keyboards/hadron/ver2/ver2.h b/keyboards/hadron/ver2/ver2.h deleted file mode 100644 index 8127b497f7..0000000000 --- a/keyboards/hadron/ver2/ver2.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "hadron.h" diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c index 4c5a2e0c9a..d337fd9681 100644 --- a/keyboards/hadron/ver3/ver3.c +++ b/keyboards/hadron/ver3/ver3.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 "ver3.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/hadron/ver3/ver3.h b/keyboards/hadron/ver3/ver3.h deleted file mode 100644 index 1ad44b871f..0000000000 --- a/keyboards/hadron/ver3/ver3.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2018 ishtob - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "hadron.h" diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c deleted file mode 100644 index fe08df8599..0000000000 --- a/keyboards/handwired/qc60/proto/proto.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 Michael Pio Mayol - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "qc60.h" diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h index 1ab9a235ae..8ba28c7250 100644 --- a/keyboards/handwired/qc60/proto/proto.h +++ b/keyboards/handwired/qc60/proto/proto.h @@ -16,8 +16,6 @@ #pragma once -#include "qc60.h" - #include "quantum.h" // readability diff --git a/keyboards/handwired/qc60/qc60.c b/keyboards/handwired/qc60/qc60.c deleted file mode 100644 index dfa77cf086..0000000000 --- a/keyboards/handwired/qc60/qc60.c +++ /dev/null @@ -1 +0,0 @@ -#include "qc60.h" diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h deleted file mode 100644 index e26811ae72..0000000000 --- a/keyboards/handwired/qc60/qc60.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_handwired_qc60_proto) -# include "proto.h" -#endif diff --git a/keyboards/handwired/split65/promicro/promicro.c b/keyboards/handwired/split65/promicro/promicro.c deleted file mode 100644 index 2f7e1ebab4..0000000000 --- a/keyboards/handwired/split65/promicro/promicro.c +++ /dev/null @@ -1,16 +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 . - */ -#include "promicro.h" diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h index 204f0b88de..8c4e656cf2 100644 --- a/keyboards/handwired/split65/promicro/promicro.h +++ b/keyboards/handwired/split65/promicro/promicro.h @@ -15,7 +15,7 @@ */ #pragma once -#include "split65.h" +#include "quantum.h" #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ diff --git a/keyboards/handwired/split65/split65.c b/keyboards/handwired/split65/split65.c index 9d0831c025..a32af1f140 100644 --- a/keyboards/handwired/split65/split65.c +++ b/keyboards/handwired/split65/split65.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 "split65.h" +#include "quantum.h" // OLED Code inspired by https://github.com/qmk/qmk_firmware/blob/master/keyboards/splitkb/kyria/rev1/rev1.c diff --git a/keyboards/handwired/split65/split65.h b/keyboards/handwired/split65/split65.h deleted file mode 100644 index 7f60ab0bde..0000000000 --- a/keyboards/handwired/split65/split65.h +++ /dev/null @@ -1,24 +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" - -#if defined(KEYBOARD_handwired_split65_stm32) - #include "stm32.h" -#elif defined(KEYBOARD_handwired_split65_promicro) - #include "promicro.h" -#endif diff --git a/keyboards/handwired/split65/stm32/stm32.c b/keyboards/handwired/split65/stm32/stm32.c deleted file mode 100644 index 2fa511206e..0000000000 --- a/keyboards/handwired/split65/stm32/stm32.c +++ /dev/null @@ -1,16 +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 . - */ -#include "stm32.h" diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h index 27f03b3e26..be3dd1639b 100644 --- a/keyboards/handwired/split65/stm32/stm32.h +++ b/keyboards/handwired/split65/stm32/stm32.h @@ -15,7 +15,7 @@ */ #pragma once -#include "split65.h" +#include "quantum.h" #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c deleted file mode 100644 index cf8e7d9fa3..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "split_5x7.h" diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h index 9ffed66727..828c515484 100644 --- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h +++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h @@ -16,7 +16,7 @@ along with this program. If not, see . */ #pragma once -#include "split_5x7.h" +#include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c index 5e19d47175..18543078c7 100644 --- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c +++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.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 "split_5x7.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.h b/keyboards/handwired/stef9998/split_5x7/split_5x7.h deleted file mode 100644 index 55ed1cc98f..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/split_5x7.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2017 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 - -#if defined(KEYBOARD_handwired_stef9998_split_5x7_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h index 66b5880785..ee06096909 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h @@ -17,7 +17,6 @@ #pragma once #include "tractyl_manuform.h" -#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h index 10b8767056..bec356066a 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h @@ -18,20 +18,6 @@ #include "tractyl_manuform.h" -#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f411) -# include "f411.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f303) -# include "f303.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_teensy2pp) -# include "teensy2pp.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c) -# include "elite_c.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro) -# include "arduinomicro.h" -#endif - -#include "quantum.h" - #define ___ KC_NO // clang-format off diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c deleted file mode 100644 index d094801938..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "f303.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 09f1b57008..b073cb3c60 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "f411.h" +#include "5x6_right.h" void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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 "5x6_right.h" diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c deleted file mode 100644 index 6c06387ee8..0000000000 --- a/keyboards/handwired/uthol/rev3/rev3.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 QMK_KEYBOARD_H diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c deleted file mode 100644 index 2b02e899d4..0000000000 --- a/keyboards/handwired/uthol/uthol.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "uthol.h" diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h index 3e1cbdc72b..6130f7f1b2 100644 --- a/keyboards/handwired/uthol/uthol.h +++ b/keyboards/handwired/uthol/uthol.h @@ -19,17 +19,6 @@ #include "quantum.h" -/************************************************** -** Include headers specific to keyboard revision ** -**************************************************/ -#if defined(KEYBOARD_uthol_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_uthol_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_uthol_rev2) -# include "rev3.h" -#endif - #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, \ diff --git a/keyboards/helix/helix.c b/keyboards/helix/helix.c deleted file mode 100644 index 539abd5349..0000000000 --- a/keyboards/helix/helix.c +++ /dev/null @@ -1 +0,0 @@ -#include "helix.h" diff --git a/keyboards/helix/helix.h b/keyboards/helix/helix.h deleted file mode 100644 index b900d975d2..0000000000 --- a/keyboards/helix/helix.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_helix_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_helix_rev2 - #include "rev2.h" -#endif -#ifdef KEYBOARD_helix_rev3_5rows - #include "rev3_5rows.h" -#endif -#ifdef KEYBOARD_helix_rev3_4rows - #include "rev3_4rows.h" -#endif -#ifdef KEYBOARD_helix_pico - #include "pico.h" -#endif diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c index 4cd1953632..cc98fe8f61 100644 --- a/keyboards/helix/pico/pico.c +++ b/keyboards/helix/pico/pico.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 "helix.h" +#include "pico.h" // Each keymap.c should use is_keyboard_master() instead of 'is_master'. // But keep 'is_master' for a while for backwards compatibility diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h index 3e51d54d84..e555691583 100644 --- a/keyboards/helix/pico/pico.h +++ b/keyboards/helix/pico/pico.h @@ -15,7 +15,7 @@ */ #pragma once -#include "helix.h" +#include "quantum.h" // Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'. // But keep 'is_master' for a while for backwards compatibility diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c index 2bbe9a28e2..ded22bbe93 100644 --- a/keyboards/helix/rev2/rev2.c +++ b/keyboards/helix/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 "helix.h" +#include "rev2.h" // Each keymap.c should use is_keyboard_master() instead of 'is_master'. // But keep 'is_master' for a while for backwards compatibility diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h index fccbaf1ac4..dd1d74a298 100644 --- a/keyboards/helix/rev2/rev2.h +++ b/keyboards/helix/rev2/rev2.h @@ -15,7 +15,7 @@ */ #pragma once -#include "helix.h" +#include "quantum.h" bool is_mac_mode(void); void set_mac_mode_kb(bool macmode); diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c index 704f915510..ff61027a96 100644 --- a/keyboards/helix/rev3_4rows/rev3_4rows.c +++ b/keyboards/helix/rev3_4rows/rev3_4rows.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "helix.h" +#include "rev3_4rows.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 704f915510..28fa314a7b 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 "helix.h" +#include "rev3_5rows.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/horrortroll/caticorn/caticorn.c b/keyboards/horrortroll/caticorn/caticorn.c deleted file mode 100644 index b416eefdde..0000000000 --- a/keyboards/horrortroll/caticorn/caticorn.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "caticorn.h" diff --git a/keyboards/horrortroll/caticorn/caticorn.h b/keyboards/horrortroll/caticorn/caticorn.h deleted file mode 100644 index 87e1202dec..0000000000 --- a/keyboards/horrortroll/caticorn/caticorn.h +++ /dev/null @@ -1,25 +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" - -#if defined(KEYBOARD_horrortroll_caticorn_rev1_hotswap) - #include "hotswap.h" -#elif defined(KEYBOARD_horrortroll_caticorn_rev1_solder) - #include "solder.h" -#endif diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h index 73cb7abd2f..7d2ce91cdd 100644 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ b/keyboards/ibnuda/squiggle/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "squiggle.h" - #include "quantum.h" #define ___ KC_NO diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c deleted file mode 100644 index 7c73aabf51..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "squiggle.h" diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h deleted file mode 100644 index 4ed95e707c..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 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 - -#ifdef KEYBOARD_ibnuda_squiggle_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c deleted file mode 100644 index a2ae572b82..0000000000 --- a/keyboards/jacky_studio/bear_65/bear_65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bear_65.h" diff --git a/keyboards/jacky_studio/bear_65/bear_65.h b/keyboards/jacky_studio/bear_65/bear_65.h deleted file mode 100644 index be8a14a86f..0000000000 --- a/keyboards/jacky_studio/bear_65/bear_65.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_jacky_studio_bear_65_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_jacky_studio_bear_65_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h index 901efe70b7..872436fcd4 100644 --- a/keyboards/jacky_studio/bear_65/rev1/rev1.h +++ b/keyboards/jacky_studio/bear_65/rev1/rev1.h @@ -16,7 +16,7 @@ #pragma once -#include "bear_65.h" +#include "quantum.h" #define LAYOUT_all( \ K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \ diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h index 31cc430504..61f5a9d6fe 100644 --- a/keyboards/jacky_studio/bear_65/rev2/rev2.h +++ b/keyboards/jacky_studio/bear_65/rev2/rev2.h @@ -16,7 +16,7 @@ #pragma once -#include "bear_65.h" +#include "quantum.h" #define LAYOUT_wk_full( \ K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \ diff --git a/keyboards/jian/handwired/handwired.h b/keyboards/jian/handwired/handwired.h index 9b388b94ae..7d961690d2 100644 --- a/keyboards/jian/handwired/handwired.h +++ b/keyboards/jian/handwired/handwired.h @@ -1,6 +1,6 @@ #pragma once -#include "jian.h" +#include "quantum.h" #define XXX KC_NO #define LAYOUT( \ diff --git a/keyboards/jian/jian.c b/keyboards/jian/jian.c deleted file mode 100644 index e85b8554f0..0000000000 --- a/keyboards/jian/jian.c +++ /dev/null @@ -1 +0,0 @@ -#include "jian.h" diff --git a/keyboards/jian/jian.h b/keyboards/jian/jian.h deleted file mode 100644 index d09d056e9b..0000000000 --- a/keyboards/jian/jian.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_jian_handwired - #include "handwired.h" -#endif - -#ifdef KEYBOARD_jian_rev1 - #include "rev1.h" -#endif - -#ifdef KEYBOARD_jian_rev2 -#include "rev2.h" -#endif - -#ifdef KEYBOARD_jian_nsrev2 - #include "nsrev2.h" -#endif diff --git a/keyboards/jian/nsrev2/nsrev2.h b/keyboards/jian/nsrev2/nsrev2.h index 9dfb7240b1..80dd6def0c 100644 --- a/keyboards/jian/nsrev2/nsrev2.h +++ b/keyboards/jian/nsrev2/nsrev2.h @@ -1,6 +1,6 @@ #pragma once -#include "jian.h" +#include "quantum.h" #define XXX KC_NO diff --git a/keyboards/jian/rev1/rev1.h b/keyboards/jian/rev1/rev1.h index ee55de6287..bba95a1dd7 100644 --- a/keyboards/jian/rev1/rev1.h +++ b/keyboards/jian/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "jian.h" +#include "quantum.h" #define XXX KC_NO diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h index d71fc8495d..7abf46e303 100644 --- a/keyboards/jian/rev2/rev2.h +++ b/keyboards/jian/rev2/rev2.h @@ -1,6 +1,6 @@ #pragma once -#include "jian.h" +#include "quantum.h" #define XXX KC_NO diff --git a/keyboards/jiran/jiran.c b/keyboards/jiran/jiran.c deleted file mode 100644 index 71a8504c5b..0000000000 --- a/keyboards/jiran/jiran.c +++ /dev/null @@ -1 +0,0 @@ -#include "jiran.h" diff --git a/keyboards/jiran/jiran.h b/keyboards/jiran/jiran.h deleted file mode 100644 index c8ae32b135..0000000000 --- a/keyboards/jiran/jiran.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_jiran_rev1 - #include "rev1.h" -#endif - -#ifdef KEYBOARD_jiran_rev2 -#include "rev2.h" -#endif diff --git a/keyboards/jiran/rev1/rev1.c b/keyboards/jiran/rev1/rev1.c deleted file mode 100644 index 9aedcc130a..0000000000 --- a/keyboards/jiran/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" \ No newline at end of file diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h index 6d5ea99dac..d243bd366b 100644 --- a/keyboards/jiran/rev1/rev1.h +++ b/keyboards/jiran/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "jiran.h" #include "quantum.h" diff --git a/keyboards/jiran/rev2/rev2.c b/keyboards/jiran/rev2/rev2.c deleted file mode 100644 index b1af81707d..0000000000 --- a/keyboards/jiran/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev2.h" diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h index 616497b3ca..01ffe1a48e 100644 --- a/keyboards/jiran/rev2/rev2.h +++ b/keyboards/jiran/rev2/rev2.h @@ -1,6 +1,5 @@ #pragma once -#include "jiran.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/jorne/jorne.c b/keyboards/jorne/jorne.c index fec24d476c..d00fc2f8fc 100644 --- a/keyboards/jorne/jorne.c +++ b/keyboards/jorne/jorne.c @@ -1,6 +1,6 @@ // Copyright 2021 Joric (@joric) // SPDX-License-Identifier: GPL-2.0-or-later -#include "jorne.h" +#include "quantum.h" #ifdef OLED_ENABLE static void render_logo(void) { diff --git a/keyboards/jorne/jorne.h b/keyboards/jorne/jorne.h deleted file mode 100644 index 7c2478c563..0000000000 --- a/keyboards/jorne/jorne.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef KEYBOARD_jorne_rev1 -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/jorne/rev1/rev1.c b/keyboards/jorne/rev1/rev1.c deleted file mode 100644 index f120ef87f8..0000000000 --- a/keyboards/jorne/rev1/rev1.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h index af4ef8e3b3..0158032e5e 100644 --- a/keyboards/jorne/rev1/rev1.h +++ b/keyboards/jorne/rev1/rev1.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "jorne.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/kakunpc/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/business_card/alpha/alpha.c +++ /dev/null @@ -1,16 +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 . - */ -#include "alpha.h" diff --git a/keyboards/kakunpc/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c deleted file mode 100644 index 7a9aa1b9bd..0000000000 --- a/keyboards/kakunpc/business_card/beta/beta.c +++ /dev/null @@ -1,16 +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 . - */ -#include "beta.h" diff --git a/keyboards/kakunpc/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c deleted file mode 100644 index 01beb28220..0000000000 --- a/keyboards/kakunpc/business_card/business_card.c +++ /dev/null @@ -1,16 +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 . - */ -#include "business_card.h" diff --git a/keyboards/kakunpc/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h deleted file mode 100644 index 125c3080d6..0000000000 --- a/keyboards/kakunpc/business_card/business_card.h +++ /dev/null @@ -1,25 +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 - -#ifdef KEYBOARD_kakunpc_business_card_alpha - #include "alpha.h" -#endif -#ifdef KEYBOARD_kakunpc_business_card_beta - #include "beta.h" -#endif - -#include "quantum.h" diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c deleted file mode 100644 index 165900e142..0000000000 --- a/keyboards/kapl/kapl.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 Alexander Lozyuk (@keyzog) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "kapl.h" diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h deleted file mode 100644 index 019e3267d4..0000000000 --- a/keyboards/kapl/kapl.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 Alexander Lozyuk (@keyzog) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once -#include "quantum.h" - -#ifdef KEYBOARD_kapl_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c index b51021307e..e0e32cf5e8 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 "kapl.h" +#include "rev1.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 index 68649a7991..686ff89e92 100644 --- a/keyboards/kapl/rev1/rev1.h +++ b/keyboards/kapl/rev1/rev1.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "kapl.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c deleted file mode 100644 index 7a105ae549..0000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mkiirgb.h" diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h deleted file mode 100644 index dadc230626..0000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h +++ /dev/null @@ -1,28 +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 - -#if defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v1) - #include "v1.h" -#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v2) - #include "v2.h" -#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v3) - #include "v3.h" -#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v4) - #include "v4.h" -#endif -#include "quantum.h" diff --git a/keyboards/kbdfans/kbd75/kbd75.c b/keyboards/kbdfans/kbd75/kbd75.c deleted file mode 100644 index 1a1bffa360..0000000000 --- a/keyboards/kbdfans/kbd75/kbd75.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "kbd75.h" diff --git a/keyboards/kbdfans/kbd75/kbd75.h b/keyboards/kbdfans/kbd75/kbd75.h deleted file mode 100644 index a2c5d9e4c3..0000000000 --- a/keyboards/kbdfans/kbd75/kbd75.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2017-2019 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_kbdfans_kbd75_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_kbdfans_kbd75_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c deleted file mode 100644 index e7ba9f3722..0000000000 --- a/keyboards/kbdfans/kbd75/rev1/rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019-2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev1.h" diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.h b/keyboards/kbdfans/kbd75/rev1/rev1.h index ac7b38ed02..22333324e4 100644 --- a/keyboards/kbdfans/kbd75/rev1/rev1.h +++ b/keyboards/kbdfans/kbd75/rev1/rev1.h @@ -3,7 +3,7 @@ #pragma once -#include "kbd75.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c deleted file mode 100644 index 352d837437..0000000000 --- a/keyboards/kbdfans/kbd75/rev2/rev2.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019-2020 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev2.h" diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.h b/keyboards/kbdfans/kbd75/rev2/rev2.h index f37be40094..dba3cc2fab 100644 --- a/keyboards/kbdfans/kbd75/rev2/rev2.h +++ b/keyboards/kbdfans/kbd75/rev2/rev2.h @@ -3,7 +3,7 @@ #pragma once -#include "kbd75.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/keebio/convolution/convolution.c b/keyboards/keebio/convolution/convolution.c index 884f3e7e5b..fc726e277a 100644 --- a/keyboards/keebio/convolution/convolution.c +++ b/keyboards/keebio/convolution/convolution.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 "convolution.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/keebio/convolution/convolution.h b/keyboards/keebio/convolution/convolution.h deleted file mode 100644 index fcf299b815..0000000000 --- a/keyboards/keebio/convolution/convolution.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 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" - -#ifdef KEYBOARD_keebio_convolution_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keebio/convolution/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h index c50074c3f3..3bbc40146a 100644 --- a/keyboards/keebio/convolution/rev1/rev1.h +++ b/keyboards/keebio/convolution/rev1/rev1.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "convolution.h" #include "quantum.h" #define LAYOUT_65xt( \ diff --git a/keyboards/keebio/dsp40/dsp40.c b/keyboards/keebio/dsp40/dsp40.c deleted file mode 100644 index 745cd386d4..0000000000 --- a/keyboards/keebio/dsp40/dsp40.c +++ /dev/null @@ -1,17 +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 . -*/ - -#include "dsp40.h" diff --git a/keyboards/keebio/dsp40/dsp40.h b/keyboards/keebio/dsp40/dsp40.h deleted file mode 100644 index ec5e5fbbcb..0000000000 --- a/keyboards/keebio/dsp40/dsp40.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_keebio_dsp40_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h index f03792175e..bc0a86d302 100644 --- a/keyboards/keebio/dsp40/rev1/rev1.h +++ b/keyboards/keebio/dsp40/rev1/rev1.h @@ -15,7 +15,6 @@ */ #pragma once -#include "dsp40.h" #include "quantum.h" #define LAYOUT_ortho_4x12( \ diff --git a/keyboards/keebio/foldkb/foldkb.c b/keyboards/keebio/foldkb/foldkb.c deleted file mode 100644 index 97641bf992..0000000000 --- a/keyboards/keebio/foldkb/foldkb.c +++ /dev/null @@ -1,17 +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 . -*/ - -#include "foldkb.h" diff --git a/keyboards/keebio/foldkb/foldkb.h b/keyboards/keebio/foldkb/foldkb.h deleted file mode 100644 index bd02a4ef9d..0000000000 --- a/keyboards/keebio/foldkb/foldkb.h +++ /dev/null @@ -1,23 +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" - -#ifdef KEYBOARD_keebio_foldkb_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c index a0dfb31b52..efb9fd53fc 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 "foldkb.h" +#include "rev1.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 index d07152538a..7349258f66 100644 --- a/keyboards/keebio/foldkb/rev1/rev1.h +++ b/keyboards/keebio/foldkb/rev1/rev1.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "foldkb.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/fourier/fourier.c b/keyboards/keebio/fourier/fourier.c deleted file mode 100644 index 1bd47f98bc..0000000000 --- a/keyboards/keebio/fourier/fourier.c +++ /dev/null @@ -1 +0,0 @@ -#include "fourier.h" diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h index b99dd57c2e..1bc5e1653c 100644 --- a/keyboards/keebio/fourier/fourier.h +++ b/keyboards/keebio/fourier/fourier.h @@ -1,9 +1,5 @@ #pragma once -#ifdef KEYBOARD_fourier_rev1 - #include "rev1.h" -#endif - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/iris.c b/keyboards/keebio/iris/iris.c deleted file mode 100644 index fb28b3a6d6..0000000000 --- a/keyboards/keebio/iris/iris.c +++ /dev/null @@ -1 +0,0 @@ -#include "iris.h" diff --git a/keyboards/keebio/iris/iris.h b/keyboards/keebio/iris/iris.h deleted file mode 100644 index b7be3fc59e..0000000000 --- a/keyboards/keebio/iris/iris.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_keebio_iris_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_keebio_iris_rev1_led) - #include "rev1_led.h" -#elif defined(KEYBOARD_keebio_iris_rev2) - #include "rev2.h" -#elif defined(KEYBOARD_keebio_iris_rev3) - #include "rev3.h" -#elif defined(KEYBOARD_keebio_iris_rev4) - #include "rev4.h" -#elif defined(KEYBOARD_keebio_iris_rev5) - #include "rev5.h" -#elif defined(KEYBOARD_keebio_iris_rev6) - #include "rev6.h" -#elif defined(KEYBOARD_keebio_iris_rev6a) - #include "rev6a.h" -#elif defined(KEYBOARD_keebio_iris_rev6b) - #include "rev6b.h" -#elif defined(KEYBOARD_keebio_iris_rev7) - #include "rev7.h" -#endif - -#include "quantum.h" -#include "via.h" diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h index 888ddb7a43..d94716242c 100644 --- a/keyboards/keebio/iris/rev1/rev1.h +++ b/keyboards/keebio/iris/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "iris.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h index 888ddb7a43..d94716242c 100644 --- a/keyboards/keebio/iris/rev1_led/rev1_led.h +++ b/keyboards/keebio/iris/rev1_led/rev1_led.h @@ -1,7 +1,5 @@ #pragma once -#include "iris.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h index 888ddb7a43..d94716242c 100644 --- a/keyboards/keebio/iris/rev2/rev2.h +++ b/keyboards/keebio/iris/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "iris.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h index 3b4ff9f5b7..c808c4bef3 100644 --- a/keyboards/keebio/iris/rev3/rev3.h +++ b/keyboards/keebio/iris/rev3/rev3.h @@ -1,6 +1,5 @@ #pragma once -#include "iris.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h index ea60d7a690..0e99bd501a 100644 --- a/keyboards/keebio/iris/rev4/rev4.h +++ b/keyboards/keebio/iris/rev4/rev4.h @@ -1,6 +1,5 @@ #pragma once -#include "iris.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev5/rev5.h +++ b/keyboards/keebio/iris/rev5/rev5.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev6/rev6.h +++ b/keyboards/keebio/iris/rev6/rev6.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev6a/rev6a.h b/keyboards/keebio/iris/rev6a/rev6a.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev6a/rev6a.h +++ b/keyboards/keebio/iris/rev6a/rev6a.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev6b/rev6b.h +++ b/keyboards/keebio/iris/rev6b/rev6b.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/iris/rev7/rev7.h b/keyboards/keebio/iris/rev7/rev7.h index d13e24410e..cbc032ad31 100644 --- a/keyboards/keebio/iris/rev7/rev7.h +++ b/keyboards/keebio/iris/rev7/rev7.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "iris.h" #include "quantum.h" diff --git a/keyboards/keebio/kbo5000/kbo5000.c b/keyboards/keebio/kbo5000/kbo5000.c deleted file mode 100644 index c46093537e..0000000000 --- a/keyboards/keebio/kbo5000/kbo5000.c +++ /dev/null @@ -1 +0,0 @@ -#include "kbo5000.h" diff --git a/keyboards/keebio/kbo5000/kbo5000.h b/keyboards/keebio/kbo5000/kbo5000.h deleted file mode 100644 index 33f1998eb0..0000000000 --- a/keyboards/keebio/kbo5000/kbo5000.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_kbo5000_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c index 904c85242b..f0f4ae730d 100644 --- a/keyboards/keebio/kbo5000/rev1/rev1.c +++ b/keyboards/keebio/kbo5000/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "kbo5000.h" +#include "rev1.h" #include "split_util.h" void matrix_init_kb(void) { diff --git a/keyboards/keebio/kbo5000/rev1/rev1.h b/keyboards/keebio/kbo5000/rev1/rev1.h index 63239d3463..56d827871c 100644 --- a/keyboards/keebio/kbo5000/rev1/rev1.h +++ b/keyboards/keebio/kbo5000/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "kbo5000.h" #include "quantum.h" #define LAYOUT_ansi( \ diff --git a/keyboards/keebio/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c index b361640bcf..6f1a050e80 100644 --- a/keyboards/keebio/levinson/levinson.c +++ b/keyboards/keebio/levinson/levinson.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h deleted file mode 100644 index fd022ab518..0000000000 --- a/keyboards/keebio/levinson/levinson.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_levinson_rev1 - #include "rev1.h" -#elif KEYBOARD_keebio_levinson_rev2 - #include "rev2.h" -#elif KEYBOARD_keebio_levinson_rev3 - #include "rev3.h" -#endif diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c deleted file mode 100644 index 72df88710a..0000000000 --- a/keyboards/keebio/levinson/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "levinson.h" diff --git a/keyboards/keebio/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h index 7459813929..14db8b445b 100644 --- a/keyboards/keebio/levinson/rev1/rev1.h +++ b/keyboards/keebio/levinson/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "levinson.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c index b569fbd9fb..8fb49f97b3 100644 --- a/keyboards/keebio/levinson/rev2/rev2.c +++ b/keyboards/keebio/levinson/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "rev2.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h index 7459813929..14db8b445b 100644 --- a/keyboards/keebio/levinson/rev2/rev2.h +++ b/keyboards/keebio/levinson/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "levinson.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c index b569fbd9fb..c464270517 100644 --- a/keyboards/keebio/levinson/rev3/rev3.c +++ b/keyboards/keebio/levinson/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "rev3.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h index 6a00edd9a7..d6a0ef4227 100644 --- a/keyboards/keebio/levinson/rev3/rev3.h +++ b/keyboards/keebio/levinson/rev3/rev3.h @@ -1,7 +1,5 @@ #pragma once -#include "levinson.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/nyquist/nyquist.c b/keyboards/keebio/nyquist/nyquist.c deleted file mode 100644 index 2face09d42..0000000000 --- a/keyboards/keebio/nyquist/nyquist.c +++ /dev/null @@ -1 +0,0 @@ -#include "nyquist.h" diff --git a/keyboards/keebio/nyquist/nyquist.h b/keyboards/keebio/nyquist/nyquist.h deleted file mode 100644 index 63d7680f06..0000000000 --- a/keyboards/keebio/nyquist/nyquist.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_keebio_nyquist_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_keebio_nyquist_rev2 - #include "rev2.h" -#endif -#ifdef KEYBOARD_keebio_nyquist_rev3 - #include "rev3.h" -#endif - -#include "quantum.h" diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/keebio/nyquist/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/keebio/nyquist/rev1/rev1.h b/keyboards/keebio/nyquist/rev1/rev1.h index 2ada41ba92..7bbfb34e4f 100644 --- a/keyboards/keebio/nyquist/rev1/rev1.h +++ b/keyboards/keebio/nyquist/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "nyquist.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/keebio/nyquist/rev2/rev2.h b/keyboards/keebio/nyquist/rev2/rev2.h index 2ada41ba92..7bbfb34e4f 100644 --- a/keyboards/keebio/nyquist/rev2/rev2.h +++ b/keyboards/keebio/nyquist/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "nyquist.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h index aa60609f28..648c774730 100644 --- a/keyboards/keebio/nyquist/rev3/rev3.h +++ b/keyboards/keebio/nyquist/rev3/rev3.h @@ -1,6 +1,5 @@ #pragma once -#include "nyquist.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/quefrency/quefrency.c b/keyboards/keebio/quefrency/quefrency.c deleted file mode 100644 index d713a0ff3a..0000000000 --- a/keyboards/keebio/quefrency/quefrency.c +++ /dev/null @@ -1 +0,0 @@ -#include "quefrency.h" diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h deleted file mode 100644 index d9a14c439c..0000000000 --- a/keyboards/keebio/quefrency/quefrency.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_quefrency_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_keebio_quefrency_rev2 - #include "rev2.h" -#endif -#ifdef KEYBOARD_keebio_quefrency_rev3 - #include "rev3.h" -#endif -#ifdef KEYBOARD_keebio_quefrency_rev4 - #include "rev4.h" -#endif -#ifdef KEYBOARD_keebio_quefrency_rev5 - #include "rev5.h" -#endif diff --git a/keyboards/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c index 6704b062f5..f34f85b2cc 100644 --- a/keyboards/keebio/quefrency/rev1/rev1.c +++ b/keyboards/keebio/quefrency/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "quefrency.h" +#include "rev1.h" void eeconfig_init_kb(void) { #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/keebio/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h index 1c3581b3a9..89a9c4a19d 100644 --- a/keyboards/keebio/quefrency/rev1/rev1.h +++ b/keyboards/keebio/quefrency/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "quefrency.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c index 4e3e75a21f..3992687b7a 100644 --- a/keyboards/keebio/quefrency/rev2/rev2.c +++ b/keyboards/keebio/quefrency/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "quefrency.h" +#include "rev2.h" #include "split_util.h" void matrix_init_kb(void) { diff --git a/keyboards/keebio/quefrency/rev2/rev2.h b/keyboards/keebio/quefrency/rev2/rev2.h index 31d1052fac..e9814575b2 100644 --- a/keyboards/keebio/quefrency/rev2/rev2.h +++ b/keyboards/keebio/quefrency/rev2/rev2.h @@ -1,6 +1,5 @@ #pragma once -#include "quefrency.h" #include "quantum.h" #define LAYOUT_60( \ diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c index 52ce977ac7..24791f75d0 100644 --- a/keyboards/keebio/quefrency/rev3/rev3.c +++ b/keyboards/keebio/quefrency/rev3/rev3.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 "quefrency.h" +#include "rev3.h" #include "split_util.h" void matrix_init_kb(void) { diff --git a/keyboards/keebio/quefrency/rev3/rev3.h b/keyboards/keebio/quefrency/rev3/rev3.h index 12f76d5c85..120186f9c0 100644 --- a/keyboards/keebio/quefrency/rev3/rev3.h +++ b/keyboards/keebio/quefrency/rev3/rev3.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "quefrency.h" #include "quantum.h" #define LAYOUT_60( \ diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c index 66d73a934a..78e48dcf70 100644 --- a/keyboards/keebio/quefrency/rev4/rev4.c +++ b/keyboards/keebio/quefrency/rev4/rev4.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 "quefrency.h" +#include "rev4.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/keebio/quefrency/rev4/rev4.h b/keyboards/keebio/quefrency/rev4/rev4.h index 2284a6da43..4f51cc8f32 100644 --- a/keyboards/keebio/quefrency/rev4/rev4.h +++ b/keyboards/keebio/quefrency/rev4/rev4.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "quefrency.h" #include "quantum.h" #define LAYOUT_60( \ diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c index 66d73a934a..a94fecd967 100644 --- a/keyboards/keebio/quefrency/rev5/rev5.c +++ b/keyboards/keebio/quefrency/rev5/rev5.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 "quefrency.h" +#include "rev5.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/keebio/quefrency/rev5/rev5.h b/keyboards/keebio/quefrency/rev5/rev5.h index 2284a6da43..4f51cc8f32 100644 --- a/keyboards/keebio/quefrency/rev5/rev5.h +++ b/keyboards/keebio/quefrency/rev5/rev5.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "quefrency.h" #include "quantum.h" #define LAYOUT_60( \ diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/keebio/rorschach/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h index c06cd337a4..32c421c7d0 100644 --- a/keyboards/keebio/rorschach/rev1/rev1.h +++ b/keyboards/keebio/rorschach/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "rorschach.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/rorschach/rorschach.c b/keyboards/keebio/rorschach/rorschach.c deleted file mode 100644 index 49e2917890..0000000000 --- a/keyboards/keebio/rorschach/rorschach.c +++ /dev/null @@ -1 +0,0 @@ -#include "rorschach.h" diff --git a/keyboards/keebio/rorschach/rorschach.h b/keyboards/keebio/rorschach/rorschach.h deleted file mode 100644 index f11093f074..0000000000 --- a/keyboards/keebio/rorschach/rorschach.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_keebio_rorschach_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/keebio/sinc/rev1/rev1.h b/keyboards/keebio/sinc/rev1/rev1.h index b8c9f7a14f..45d7ab05d1 100644 --- a/keyboards/keebio/sinc/rev1/rev1.h +++ b/keyboards/keebio/sinc/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "sinc.h" #include "quantum.h" #define XXX KC_NO diff --git a/keyboards/keebio/sinc/rev2/rev2.h b/keyboards/keebio/sinc/rev2/rev2.h index f73af295b2..8960cf7579 100644 --- a/keyboards/keebio/sinc/rev2/rev2.h +++ b/keyboards/keebio/sinc/rev2/rev2.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "sinc.h" #include "quantum.h" #define LAYOUT_75( \ diff --git a/keyboards/keebio/sinc/rev3/rev3.h b/keyboards/keebio/sinc/rev3/rev3.h index 57d072398a..b863ddfe20 100644 --- a/keyboards/keebio/sinc/rev3/rev3.h +++ b/keyboards/keebio/sinc/rev3/rev3.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#include "sinc.h" #include "quantum.h" #define LAYOUT_75( \ diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c index 9b2f6da512..d50eb82019 100644 --- a/keyboards/keebio/sinc/sinc.c +++ b/keyboards/keebio/sinc/sinc.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 "sinc.h" +#include "quantum.h" #include "split_util.h" #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h deleted file mode 100644 index 4607d8125c..0000000000 --- a/keyboards/keebio/sinc/sinc.h +++ /dev/null @@ -1,28 +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" - -#ifdef KEYBOARD_keebio_sinc_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_keebio_sinc_rev2 - #include "rev2.h" -#endif -#ifdef KEYBOARD_keebio_sinc_rev3 - #include "rev3.h" -#endif diff --git a/keyboards/keebio/viterbi/rev1/rev1.c b/keyboards/keebio/viterbi/rev1/rev1.c deleted file mode 100644 index 509e42dc51..0000000000 --- a/keyboards/keebio/viterbi/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "viterbi.h" diff --git a/keyboards/keebio/viterbi/rev1/rev1.h b/keyboards/keebio/viterbi/rev1/rev1.h index 08055df9f8..95776a7aeb 100644 --- a/keyboards/keebio/viterbi/rev1/rev1.h +++ b/keyboards/keebio/viterbi/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "viterbi.h" #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c index a72cc44436..6158903e22 100644 --- a/keyboards/keebio/viterbi/rev2/rev2.c +++ b/keyboards/keebio/viterbi/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "viterbi.h" +#include "rev2.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h index 9feeaffef1..a48c13d46b 100644 --- a/keyboards/keebio/viterbi/rev2/rev2.h +++ b/keyboards/keebio/viterbi/rev2/rev2.h @@ -1,6 +1,5 @@ #pragma once -#include "viterbi.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/keebio/viterbi/viterbi.c b/keyboards/keebio/viterbi/viterbi.c deleted file mode 100644 index 509e42dc51..0000000000 --- a/keyboards/keebio/viterbi/viterbi.c +++ /dev/null @@ -1 +0,0 @@ -#include "viterbi.h" diff --git a/keyboards/keebio/viterbi/viterbi.h b/keyboards/keebio/viterbi/viterbi.h deleted file mode 100644 index b17b322410..0000000000 --- a/keyboards/keebio/viterbi/viterbi.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_viterbi_rev1 - #include "rev1.h" -#elif KEYBOARD_keebio_viterbi_rev2 - #include "rev2.h" -#endif - -#define LAYOUT_ortho_5x14 LAYOUT - diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c index c35cb62544..041387ad53 100644 --- a/keyboards/keycapsss/kimiko/kimiko.c +++ b/keyboards/keycapsss/kimiko/kimiko.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 "kimiko.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keycapsss/kimiko/kimiko.h b/keyboards/keycapsss/kimiko/kimiko.h deleted file mode 100644 index 948f397a90..0000000000 --- a/keyboards/keycapsss/kimiko/kimiko.h +++ /dev/null @@ -1,22 +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 - -#ifdef KEYBOARD_keycapsss_kimiko_rev1 -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.c b/keyboards/keycapsss/kimiko/rev1/rev1.c deleted file mode 100644 index bc93aad0af..0000000000 --- a/keyboards/keycapsss/kimiko/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.h b/keyboards/keycapsss/kimiko/rev1/rev1.h index 619eed8f38..3359a39838 100644 --- a/keyboards/keycapsss/kimiko/rev1/rev1.h +++ b/keyboards/keycapsss/kimiko/rev1/rev1.h @@ -16,7 +16,7 @@ #pragma once -#include "kimiko.h" +#include "quantum.h" #define LAYOUT( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1/ansi/ansi.c index fc22d1aff3..ee586fef93 100644 --- a/keyboards/keychron/q1/ansi/ansi.c +++ b/keyboards/keychron/q1/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/keychron/q1/ansi/ansi.h b/keyboards/keychron/q1/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c index 5909b993e3..bc559b3541 100644 --- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1/iso/iso.c index c8e3165bd3..619d89dffc 100644 --- a/keyboards/keychron/q1/iso/iso.c +++ b/keyboards/keychron/q1/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q1/iso/iso.h b/keyboards/keychron/q1/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c index c6563ad318..c6b091fff1 100644 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h deleted file mode 100644 index d62d707b4a..0000000000 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" \ No newline at end of file diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c index aa0789e852..3df62c4339 100644 --- a/keyboards/keychron/q1/q1.c +++ b/keyboards/keychron/q1/q1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q1.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b0111111111111101, diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h deleted file mode 100644 index d706779910..0000000000 --- a/keyboards/keychron/q1/q1.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q1_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q1_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q1_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q1_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.h b/keyboards/keychron/q10/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q10/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c index c823e6939f..455a2a25f2 100644 --- a/keyboards/keychron/q10/q10.c +++ b/keyboards/keychron/q10/q10.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q10.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b1111111111111111, diff --git a/keyboards/keychron/q10/q10.h b/keyboards/keychron/q10/q10.h deleted file mode 100644 index 80e747aca3..0000000000 --- a/keyboards/keychron/q10/q10.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q10_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q10_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c index 5c5acb3fd8..28f91269c4 100644 --- a/keyboards/keychron/q2/ansi/ansi.c +++ b/keyboards/keychron/q2/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/ansi/ansi.h b/keyboards/keychron/q2/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c index c926a5bf75..28f91269c4 100644 --- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c index 7f8d388b0e..1f2c76468e 100644 --- a/keyboards/keychron/q2/iso/iso.c +++ b/keyboards/keychron/q2/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/iso/iso.h b/keyboards/keychron/q2/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c index af7b818149..1f2c76468e 100644 --- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.h b/keyboards/keychron/q2/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c index 13b2238d17..7ff85556de 100644 --- a/keyboards/keychron/q2/q2.c +++ b/keyboards/keychron/q2/q2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q2.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b1111111111111111, diff --git a/keyboards/keychron/q2/q2.h b/keyboards/keychron/q2/q2.h deleted file mode 100644 index a256ceae6a..0000000000 --- a/keyboards/keychron/q2/q2.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q2_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q2_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q2_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q2_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c index beff3bc5ec..432a914058 100644 --- a/keyboards/keychron/q3/ansi/ansi.c +++ b/keyboards/keychron/q3/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/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c index 13f6c26d2d..f873f77d12 100644 --- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c index e753a39c1b..d747d55115 100644 --- a/keyboards/keychron/q3/iso/iso.c +++ b/keyboards/keychron/q3/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/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c index 02aac01ddc..d2bb169aac 100644 --- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c index 20983c6a5f..f262d3c7d8 100644 --- a/keyboards/keychron/q3/jis/jis.c +++ b/keyboards/keychron/q3/jis/jis.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "jis.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/jis/jis.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c index efaf5fc5f2..0a97c5ca68 100644 --- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c +++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "jis_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/jis_encoder/jis_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c index 120013e77e..2bf8bf08a0 100644 --- a/keyboards/keychron/q3/q3.c +++ b/keyboards/keychron/q3/q3.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q3.h" +#include "quantum.h" #include "rgb_matrix.h" // clang-format off diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h deleted file mode 100644 index bc2d458bb7..0000000000 --- a/keyboards/keychron/q3/q3.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q3_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q3_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q3_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q3_iso_encoder) -# include "iso_encoder.h" -#elif defined(KEYBOARD_keychron_q3_jis) -# include "jis.h" -#elif defined(KEYBOARD_keychron_q3_jis_encoder) -# include "jis_encoder.h" -#endif diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.c b/keyboards/keychron/q4/ansi_v1/ansi_v1.c index e651744262..88599103ef 100644 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.c +++ b/keyboards/keychron/q4/ansi_v1/ansi_v1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_v1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.h b/keyboards/keychron/q4/ansi_v1/ansi_v1.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" \ No newline at end of file diff --git a/keyboards/keychron/q4/ansi_v2/ansi_v2.h b/keyboards/keychron/q4/ansi_v2/ansi_v2.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q4/ansi_v2/ansi_v2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c index c1d1982b94..24cbcfd745 100644 --- a/keyboards/keychron/q4/iso/iso.c +++ b/keyboards/keychron/q4/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/keychron/q4/iso/iso.h b/keyboards/keychron/q4/iso/iso.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" \ No newline at end of file diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c index 6d31e45607..c3cb67bcc2 100644 --- a/keyboards/keychron/q4/q4.c +++ b/keyboards/keychron/q4/q4.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q4.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b11111111111111, diff --git a/keyboards/keychron/q4/q4.h b/keyboards/keychron/q4/q4.h deleted file mode 100644 index 34aa4a8505..0000000000 --- a/keyboards/keychron/q4/q4.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q4_ansi_v1) -# include "ansi_v1.h" -#elif defined(KEYBOARD_keychron_q4_ansi_v2) -# include "ansi_v2.h" -#elif defined(KEYBOARD_keychron_q4_iso) -# include "iso.h" -#endif diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c index 6aeb46c07d..dda563cd79 100644 --- a/keyboards/keychron/q5/ansi/ansi.c +++ b/keyboards/keychron/q5/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/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c index 43c27433b2..4d3cc0f036 100644 --- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c index b57474f535..65924abd76 100644 --- a/keyboards/keychron/q5/iso/iso.c +++ b/keyboards/keychron/q5/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/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c index 8ae11bc36b..22ba9e2d4e 100644 --- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c index 4130dcebe3..7a1cabcd1a 100644 --- a/keyboards/keychron/q5/q5.c +++ b/keyboards/keychron/q5/q5.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q5.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111111, diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h deleted file mode 100644 index 70ccc8dcfa..0000000000 --- a/keyboards/keychron/q5/q5.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q5_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q5_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q5_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q5_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c index 982996d347..a81d5f9e9f 100644 --- a/keyboards/keychron/q6/ansi/ansi.c +++ b/keyboards/keychron/q6/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/keychron/q6/ansi/ansi.h b/keyboards/keychron/q6/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c index 6cf593dd25..6fbece3678 100644 --- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c index d8c4add867..f2081177e9 100644 --- a/keyboards/keychron/q6/iso/iso.c +++ b/keyboards/keychron/q6/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/keychron/q6/iso/iso.h b/keyboards/keychron/q6/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c index c6a21a6223..e9a6f6edfc 100644 --- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.h b/keyboards/keychron/q6/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c index d2f9d2aa4e..8a9750e9de 100644 --- a/keyboards/keychron/q6/q6.c +++ b/keyboards/keychron/q6/q6.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q6.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b11111111111111111111, diff --git a/keyboards/keychron/q6/q6.h b/keyboards/keychron/q6/q6.h deleted file mode 100644 index 9e878e700c..0000000000 --- a/keyboards/keychron/q6/q6.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q6_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q6_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q6_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q6_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q8/ansi/ansi.h b/keyboards/keychron/q8/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q8/iso/iso.h b/keyboards/keychron/q8/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c index d86ced3d1b..a653bdc8b9 100644 --- a/keyboards/keychron/q8/q8.c +++ b/keyboards/keychron/q8/q8.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q8.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111, diff --git a/keyboards/keychron/q8/q8.h b/keyboards/keychron/q8/q8.h deleted file mode 100644 index 02981db19c..0000000000 --- a/keyboards/keychron/q8/q8.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q8_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q8_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q8_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q8_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c index e10c4de25b..b98149a5f8 100644 --- a/keyboards/keychron/q9/ansi/ansi.c +++ b/keyboards/keychron/q9/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/keychron/q9/ansi/ansi.h b/keyboards/keychron/q9/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q9/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c index 24c401473d..de0eda1c02 100644 --- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h deleted file mode 100644 index 366d3f39c2..0000000000 --- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 1010 @ Keychron (https://www.keychron.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 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c index e038e8581f..0e258e8c63 100644 --- a/keyboards/keychron/q9/iso/iso.c +++ b/keyboards/keychron/q9/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/keychron/q9/iso/iso.h b/keyboards/keychron/q9/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q9/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.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" diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c index 7f6db9a128..0804f33671 100644 --- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.h b/keyboards/keychron/q9/iso_encoder/iso_encoder.h deleted file mode 100644 index 366d3f39c2..0000000000 --- a/keyboards/keychron/q9/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 1010 @ Keychron (https://www.keychron.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 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c index 2f98a72974..51dea886f1 100644 --- a/keyboards/keychron/q9/q9.c +++ b/keyboards/keychron/q9/q9.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "q9.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111, diff --git a/keyboards/keychron/q9/q9.h b/keyboards/keychron/q9/q9.h deleted file mode 100644 index d6a0ef1bea..0000000000 --- a/keyboards/keychron/q9/q9.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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" - -#if defined(KEYBOARD_keychron_q9_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q9_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q9_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q9_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c index a2a62df36a..274ac083c5 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.c +++ b/keyboards/kinesis/alvicstep/alvicstep.c @@ -1,4 +1,4 @@ -#include "kinesis.h" +#include "alvicstep.h" // begin section origin https://github.com/alvicstep/tmk_keyboard diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h index 053698770a..3b71e51678 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.h +++ b/keyboards/kinesis/alvicstep/alvicstep.h @@ -1,6 +1,13 @@ #pragma once -#include "../kinesis.h" +#include "quantum.h" + +void all_led_off(void); +void all_led_on(void); +void num_lock_led_on(void); +void caps_lock_led_on(void); +void scroll_lock_led_on(void); +void keypad_led_on(void); #define ___ KC_NO diff --git a/keyboards/kinesis/kinesis.c b/keyboards/kinesis/kinesis.c deleted file mode 100644 index 7a6a1be544..0000000000 --- a/keyboards/kinesis/kinesis.c +++ /dev/null @@ -1 +0,0 @@ -#include "kinesis.h" diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h deleted file mode 100644 index e3345ee27f..0000000000 --- a/keyboards/kinesis/kinesis.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_kinesis_alvicstep) -# include "alvicstep.h" -#elif defined(KEYBOARD_kinesis_stapelberg) -# include "stapelberg.h" -#elif defined(KEYBOARD_kinesis_kint2pp) -# include "kint2pp.h" -#elif defined(KEYBOARD_kinesis_nguyenvietyen) -# include "nguyenvietyen.h" -#elif defined(KEYBOARD_kinesis_kint36) -# include "kint36.h" -#elif defined(KEYBOARD_kinesis_kint41) -# include "kint41.h" -#elif defined(KEYBOARD_kinesis_kintlc) -# include "kintlc.h" -#endif - -#include "quantum.h" - -void all_led_off(void); -void all_led_on(void); -void num_lock_led_on(void); -void caps_lock_led_on(void); -void scroll_lock_led_on(void); -void keypad_led_on(void); diff --git a/keyboards/kinesis/kint2pp/kint2pp.c b/keyboards/kinesis/kint2pp/kint2pp.c deleted file mode 100644 index 856e29c31e..0000000000 --- a/keyboards/kinesis/kint2pp/kint2pp.c +++ /dev/null @@ -1 +0,0 @@ -#include "kint2pp.h" diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c deleted file mode 100644 index 3f01479389..0000000000 --- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.c +++ /dev/null @@ -1 +0,0 @@ -#include "nguyenvietyen.h" diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c deleted file mode 100644 index a69679eef9..0000000000 --- a/keyboards/kinesis/stapelberg/stapelberg.c +++ /dev/null @@ -1 +0,0 @@ -#include "stapelberg.h" diff --git a/keyboards/kudox/columner/columner.c b/keyboards/kudox/columner/columner.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/kudox/kudox.c b/keyboards/kudox/kudox.c deleted file mode 100644 index d7643747ad..0000000000 --- a/keyboards/kudox/kudox.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kudox.h" diff --git a/keyboards/kudox/kudox.h b/keyboards/kudox/kudox.h deleted file mode 100644 index ca61ea82d1..0000000000 --- a/keyboards/kudox/kudox.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef KEYBOARD_kudox_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_kudox_rev2 - #include "rev2.h" -#endif -#ifdef KEYBOARD_kudox_rev3 - #include "rev3.h" -#endif -#ifdef KEYBOARD_kudox_columner - #include "columner.h" -#endif - -#include "quantum.h" diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c deleted file mode 100644 index abcdf4843e..0000000000 --- a/keyboards/kudox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "kudox.h" diff --git a/keyboards/kudox/rev1/rev1.h b/keyboards/kudox/rev1/rev1.h index 7a97cce699..82373daa6f 100644 --- a/keyboards/kudox/rev1/rev1.h +++ b/keyboards/kudox/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "kudox.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/kudox/rev2/rev2.c b/keyboards/kudox/rev2/rev2.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/kudox/rev3/rev3.c b/keyboards/kudox/rev3/rev3.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kudox_full/kudox_full.c index d5ab31fc15..d69f679822 100644 --- a/keyboards/kudox_full/kudox_full.c +++ b/keyboards/kudox_full/kudox_full.c @@ -1,7 +1,7 @@ // Copyright 2021 Kumao Kobo (@kumaokobo) // SPDX-License-Identifier: GPL-2.0+ -#include "kudox_full.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE void eeconfig_init_kb(void) { diff --git a/keyboards/kudox_full/kudox_full.h b/keyboards/kudox_full/kudox_full.h deleted file mode 100644 index 78a4dcb474..0000000000 --- a/keyboards/kudox_full/kudox_full.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2021 Kumao Kobo (@kumaokobo) -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -#ifdef KEYBOARD_kudox_full_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/kudox_full/rev1/rev1.c b/keyboards/kudox_full/rev1/rev1.c deleted file mode 100644 index 8dfb941ba2..0000000000 --- a/keyboards/kudox_full/rev1/rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Kumao Kobo (@kumaokobo) -// SPDX-License-Identifier: GPL-2.0+ - -#include "rev1.h" diff --git a/keyboards/kudox_game/kudox_game.c b/keyboards/kudox_game/kudox_game.c deleted file mode 100644 index cf053afd06..0000000000 --- a/keyboards/kudox_game/kudox_game.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kudox_game.h" diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h deleted file mode 100644 index c76f086c87..0000000000 --- a/keyboards/kudox_game/kudox_game.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef KEYBOARD_kudox_game_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_kudox_game_rev2 - #include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c deleted file mode 100644 index 32356f8a4a..0000000000 --- a/keyboards/kudox_game/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "kudox_game.h" diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h index e630a51658..52b30cf61b 100644 --- a/keyboards/kudox_game/rev1/rev1.h +++ b/keyboards/kudox_game/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../kudox_game.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/kudox_game/rev2/rev2.c b/keyboards/kudox_game/rev2/rev2.c deleted file mode 100644 index 32356f8a4a..0000000000 --- a/keyboards/kudox_game/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "kudox_game.h" diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h index e630a51658..52b30cf61b 100644 --- a/keyboards/kudox_game/rev2/rev2.h +++ b/keyboards/kudox_game/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "../kudox_game.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index ee0c931be2..37e8b3ab9b 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c @@ -1,4 +1,4 @@ -#include "lets_split.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h deleted file mode 100644 index 90290e586f..0000000000 --- a/keyboards/lets_split/lets_split.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_lets_split_rev1 - #include "rev1.h" -#elif KEYBOARD_lets_split_rev2 - #include "rev2.h" -#elif KEYBOARD_lets_split_sockets - #include "sockets.h" -#endif diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c deleted file mode 100644 index 3caa114c22..0000000000 --- a/keyboards/lets_split/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "lets_split.h" diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 6a65954f22..da7bb4ff92 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "lets_split.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c deleted file mode 100644 index 3caa114c22..0000000000 --- a/keyboards/lets_split/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "lets_split.h" diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 47f085254a..14db8b445b 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "lets_split.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c deleted file mode 100644 index 3caa114c22..0000000000 --- a/keyboards/lets_split/sockets/sockets.c +++ /dev/null @@ -1 +0,0 @@ -#include "lets_split.h" diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h index 47f085254a..14db8b445b 100644 --- a/keyboards/lets_split/sockets/sockets.h +++ b/keyboards/lets_split/sockets/sockets.h @@ -1,7 +1,5 @@ #pragma once -#include "lets_split.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/lfkeyboards/lfk78/revb/revb.h b/keyboards/lfkeyboards/lfk78/revb/revb.h index aa48c26ed4..d81a2363cd 100644 --- a/keyboards/lfkeyboards/lfk78/revb/revb.h +++ b/keyboards/lfkeyboards/lfk78/revb/revb.h @@ -1,5 +1,7 @@ #pragma once +#include "lfk78.h" + // readability #define XXX KC_NO diff --git a/keyboards/lfkeyboards/lfk78/revc/revc.h b/keyboards/lfkeyboards/lfk78/revc/revc.h index 6a9dd87bf9..e7ab930d2f 100644 --- a/keyboards/lfkeyboards/lfk78/revc/revc.h +++ b/keyboards/lfkeyboards/lfk78/revc/revc.h @@ -1,5 +1,7 @@ #pragma once +#include "lfk78.h" + // readability #define XXX KC_NO diff --git a/keyboards/lfkeyboards/lfk78/revj/revj.h b/keyboards/lfkeyboards/lfk78/revj/revj.h index 6a9dd87bf9..e7ab930d2f 100644 --- a/keyboards/lfkeyboards/lfk78/revj/revj.h +++ b/keyboards/lfkeyboards/lfk78/revj/revj.h @@ -1,5 +1,7 @@ #pragma once +#include "lfk78.h" + // readability #define XXX KC_NO diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c index a1d9f61284..32dbce8fd5 100644 --- a/keyboards/lfkeyboards/smk65/revb/revb.c +++ b/keyboards/lfkeyboards/smk65/revb/revb.c @@ -15,7 +15,7 @@ along with this program. If not, see . #include #include #include -#include "smk65.h" +#include "revb.h" #include "debug.h" #include "issi.h" #include "TWIlib.h" diff --git a/keyboards/lfkeyboards/smk65/smk65.h b/keyboards/lfkeyboards/smk65/smk65.h deleted file mode 100644 index 534b763de6..0000000000 --- a/keyboards/lfkeyboards/smk65/smk65.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 LFKeyboards -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -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_lfkeyboards_smk65_revb - #include "revb.h" -#elif KEYBOARD_lfkeyboards_smk65_revf - #include "revf.h" -#endif diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c deleted file mode 100644 index 57a0df93db..0000000000 --- a/keyboards/lily58/glow_enc/glow_enc.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -Copyright 2020 Ben Roesner (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 . -*/ - -#include "lily58.h" - diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h index f9cc1c26b8..2a81dc0027 100644 --- a/keyboards/lily58/glow_enc/glow_enc.h +++ b/keyboards/lily58/glow_enc/glow_enc.h @@ -16,8 +16,6 @@ #pragma once -#include "lily58.h" - #include "quantum.h" diff --git a/keyboards/lily58/lib/host_led_state_reader.c b/keyboards/lily58/lib/host_led_state_reader.c index 6bdd4a5a9f..fbf9b99f70 100644 --- a/keyboards/lily58/lib/host_led_state_reader.c +++ b/keyboards/lily58/lib/host_led_state_reader.c @@ -1,7 +1,6 @@ #include #include "led.h" #include "host.h" -#include "lily58.h" char host_led_state_str[24]; diff --git a/keyboards/lily58/lib/keylogger.c b/keyboards/lily58/lib/keylogger.c index 2fc3e663ec..0d17e654f4 100644 --- a/keyboards/lily58/lib/keylogger.c +++ b/keyboards/lily58/lib/keylogger.c @@ -1,6 +1,5 @@ #include #include "action.h" -#include "lily58.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c index 868d8e5cb4..68516c8df2 100644 --- a/keyboards/lily58/lib/layer_state_reader.c +++ b/keyboards/lily58/lib/layer_state_reader.c @@ -1,7 +1,6 @@ #include QMK_KEYBOARD_H #include -#include "lily58.h" #define L_BASE 0 #define L_LOWER (1 << 1) diff --git a/keyboards/lily58/lib/logo_reader.c b/keyboards/lily58/lib/logo_reader.c index 9f8adb8466..039a538cc5 100644 --- a/keyboards/lily58/lib/logo_reader.c +++ b/keyboards/lily58/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "lily58.h" - const char *read_logo(void) { static char logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, diff --git a/keyboards/lily58/lib/mode_icon_reader.c b/keyboards/lily58/lib/mode_icon_reader.c index 27c6d92cd0..195ac71862 100644 --- a/keyboards/lily58/lib/mode_icon_reader.c +++ b/keyboards/lily58/lib/mode_icon_reader.c @@ -1,6 +1,5 @@ #include #include -#include "lily58.h" char mode_icon[24]; diff --git a/keyboards/lily58/lib/timelogger.c b/keyboards/lily58/lib/timelogger.c index b00c13cb0a..83fe9706dd 100644 --- a/keyboards/lily58/lib/timelogger.c +++ b/keyboards/lily58/lib/timelogger.c @@ -1,6 +1,5 @@ #include #include "timer.h" -#include "lily58.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/lily58/light/light.c b/keyboards/lily58/light/light.c deleted file mode 100644 index 57a0df93db..0000000000 --- a/keyboards/lily58/light/light.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -Copyright 2020 Ben Roesner (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 . -*/ - -#include "lily58.h" - diff --git a/keyboards/lily58/light/light.h b/keyboards/lily58/light/light.h index 833ad13d00..5d873e04cc 100644 --- a/keyboards/lily58/light/light.h +++ b/keyboards/lily58/light/light.h @@ -1,7 +1,5 @@ #pragma once -#include "lily58.h" - #include "quantum.h" diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c deleted file mode 100644 index 6108d70b90..0000000000 --- a/keyboards/lily58/lily58.c +++ /dev/null @@ -1 +0,0 @@ -#include "lily58.h" diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h deleted file mode 100644 index c082030032..0000000000 --- a/keyboards/lily58/lily58.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_lily58_rev1 - #include "rev1.h" -#elif KEYBOARD_lily58_light - #include "light.h" -#elif KEYBOARD_lily58_glow_enc - #include "glow_enc.h" -#endif diff --git a/keyboards/lily58/rev1/rev1.c b/keyboards/lily58/rev1/rev1.c deleted file mode 100644 index 6108d70b90..0000000000 --- a/keyboards/lily58/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "lily58.h" diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h index 776df4825a..436f4e710e 100644 --- a/keyboards/lily58/rev1/rev1.h +++ b/keyboards/lily58/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "lily58.h" - #include "quantum.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/lime/lime.c b/keyboards/lime/lime.c index 3f51811329..2a91587e57 100644 --- a/keyboards/lime/lime.c +++ b/keyboards/lime/lime.c @@ -1,4 +1,4 @@ -#include "lime.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE diff --git a/keyboards/lime/lime.h b/keyboards/lime/lime.h deleted file mode 100644 index 97cee454bc..0000000000 --- a/keyboards/lime/lime.h +++ /dev/null @@ -1,21 +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 - -#ifdef KEYBOARD_lime_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c index 4cc560623b..50c2e6dff6 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 "lime.h" +#include "rev1.h" /* Encoders */ #ifdef ENCODER_ENABLE diff --git a/keyboards/malevolti/lyra/lyra.c b/keyboards/malevolti/lyra/lyra.c index cd8d7c2e8b..0bc9b6b20f 100644 --- a/keyboards/malevolti/lyra/lyra.c +++ b/keyboards/malevolti/lyra/lyra.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 "lyra.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/malevolti/lyra/lyra.h b/keyboards/malevolti/lyra/lyra.h deleted file mode 100644 index 941f292c93..0000000000 --- a/keyboards/malevolti/lyra/lyra.h +++ /dev/null @@ -1,23 +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" - - -#ifdef KEYBOARD_malevolti_lyra_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/malevolti/lyra/rev1/rev1.c b/keyboards/malevolti/lyra/rev1/rev1.c deleted file mode 100644 index db31ea975c..0000000000 --- a/keyboards/malevolti/lyra/rev1/rev1.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "rev1.h" - - diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h index 81b862c5c6..021350f106 100644 --- a/keyboards/malevolti/lyra/rev1/rev1.h +++ b/keyboards/malevolti/lyra/rev1/rev1.h @@ -15,7 +15,7 @@ */ #pragma once -#include "lyra.h" +#include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c deleted file mode 100644 index 35b44aed16..0000000000 --- a/keyboards/malevolti/superlyra/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h index 8bc17d1173..fd3c819e11 100644 --- a/keyboards/malevolti/superlyra/rev1/rev1.h +++ b/keyboards/malevolti/superlyra/rev1/rev1.h @@ -15,7 +15,7 @@ */ #pragma once -#include "superlyra.h" +#include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/malevolti/superlyra/superlyra.c b/keyboards/malevolti/superlyra/superlyra.c deleted file mode 100644 index 045ec9a097..0000000000 --- a/keyboards/malevolti/superlyra/superlyra.c +++ /dev/null @@ -1,17 +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 . - */ -#include "superlyra.h" - diff --git a/keyboards/malevolti/superlyra/superlyra.h b/keyboards/malevolti/superlyra/superlyra.h deleted file mode 100644 index b3c0f16daf..0000000000 --- a/keyboards/malevolti/superlyra/superlyra.h +++ /dev/null @@ -1,23 +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" - - -#ifdef KEYBOARD_malevolti_superlyra_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/maple_computing/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c deleted file mode 100644 index 007ef67253..0000000000 --- a/keyboards/maple_computing/ivy/ivy.c +++ /dev/null @@ -1 +0,0 @@ -#include "ivy.h" diff --git a/keyboards/maple_computing/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h deleted file mode 100644 index 645c5e0ef7..0000000000 --- a/keyboards/maple_computing/ivy/ivy.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_maple_computing_ivy_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c deleted file mode 100644 index 007ef67253..0000000000 --- a/keyboards/maple_computing/ivy/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "ivy.h" diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h index ac338368ed..444224d2b6 100644 --- a/keyboards/maple_computing/ivy/rev1/rev1.h +++ b/keyboards/maple_computing/ivy/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "ivy.h" +#include "quantum.h" #define LAYOUT( \ K00, \ diff --git a/keyboards/maple_computing/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h deleted file mode 100644 index f2a1b40588..0000000000 --- a/keyboards/maple_computing/launchpad/launchpad.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_maple_computing_launchpad_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c deleted file mode 100644 index cc2812a76c..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "launchpad.h" diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h index 2ea6e7e775..54d72d5e54 100644 --- a/keyboards/maple_computing/launchpad/rev1/rev1.h +++ b/keyboards/maple_computing/launchpad/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../launchpad.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c deleted file mode 100644 index d5a312085d..0000000000 --- a/keyboards/maple_computing/lets_split_eh/eh/eh.c +++ /dev/null @@ -1 +0,0 @@ -#include "lets_split_eh.h" diff --git a/keyboards/maple_computing/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h index ff37229787..4b97256c1e 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/eh.h +++ b/keyboards/maple_computing/lets_split_eh/eh/eh.h @@ -1,7 +1,5 @@ #pragma once -#include "lets_split_eh.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c index 37075aa67d..37e8b3ab9b 100644 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.c +++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c @@ -1,4 +1,4 @@ -#include "lets_split_eh.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h deleted file mode 100644 index aae072e0b6..0000000000 --- a/keyboards/maple_computing/lets_split_eh/lets_split_eh.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_maple_computing_lets_split_eh_eh - #include "eh.h" -#endif diff --git a/keyboards/maple_computing/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c deleted file mode 100644 index b4bffbb3e4..0000000000 --- a/keyboards/maple_computing/minidox/minidox.c +++ /dev/null @@ -1 +0,0 @@ -#include "minidox.h" \ No newline at end of file diff --git a/keyboards/maple_computing/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h deleted file mode 100644 index bae36b5560..0000000000 --- a/keyboards/maple_computing/minidox/minidox.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_maple_computing_minidox_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/maple_computing/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c deleted file mode 100644 index 72b473933e..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "minidox.h" diff --git a/keyboards/maxipad/maxipad.c b/keyboards/maxipad/maxipad.c deleted file mode 100644 index 44a0c2b742..0000000000 --- a/keyboards/maxipad/maxipad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "maxipad.h" \ No newline at end of file diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h index e2a0805053..0442643dd0 100644 --- a/keyboards/maxipad/maxipad.h +++ b/keyboards/maxipad/maxipad.h @@ -19,12 +19,6 @@ #define ___ KC_NO -#ifdef KEYBOARD_maxipad_promicro - #include "promicro.h" -#elif KEYBOARD_maxipad_teensy2 - #include "teensy2.h" -#endif - /* This a shortcut to help you visually see your layout. * * The first section contains all of the arguments representing the physical diff --git a/keyboards/maxipad/promicro/promicro.c b/keyboards/maxipad/promicro/promicro.c deleted file mode 100644 index 4ecd974645..0000000000 --- a/keyboards/maxipad/promicro/promicro.c +++ /dev/null @@ -1,16 +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 . - */ -#include "maxipad.h" diff --git a/keyboards/maxipad/promicro/promicro.h b/keyboards/maxipad/promicro/promicro.h deleted file mode 100644 index 8f1419c9d7..0000000000 --- a/keyboards/maxipad/promicro/promicro.h +++ /dev/null @@ -1,20 +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 "maxipad.h" -#include "quantum.h" - diff --git a/keyboards/maxipad/teensy2/teensy2.c b/keyboards/maxipad/teensy2/teensy2.c deleted file mode 100644 index 4ecd974645..0000000000 --- a/keyboards/maxipad/teensy2/teensy2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "maxipad.h" diff --git a/keyboards/maxipad/teensy2/teensy2.h b/keyboards/maxipad/teensy2/teensy2.h deleted file mode 100644 index acb213acc8..0000000000 --- a/keyboards/maxipad/teensy2/teensy2.h +++ /dev/null @@ -1,19 +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 "maxipad.h" -#include "quantum.h" diff --git a/keyboards/mechkeys/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c deleted file mode 100644 index 46e29ba3e9..0000000000 --- a/keyboards/mechkeys/mechmini/mechmini.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Luiz Ribeiro - * Copyright 2018 TurboMech /u/TurboMech @A9entOran9e#6134 - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - *This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mechmini.h" diff --git a/keyboards/mechkeys/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h deleted file mode 100644 index 9420b3e161..0000000000 --- a/keyboards/mechkeys/mechmini/mechmini.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2017 Luiz Ribeiro - * Copyright 2018 TurboMech /u/TurboMech @A9entOran9e#6134 - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - *This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_mechkeys_mechmini_v1) -# include "v1.h" -#elif defined(KEYBOARD_mechkeys_mechmini_v2) -# include "v2.h" -#endif diff --git a/keyboards/mechkeys/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c deleted file mode 100644 index ba0e095209..0000000000 --- a/keyboards/mechkeys/mechmini/v1/v1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "v1.h" diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h index 07d1e683f7..6991930d6f 100644 --- a/keyboards/mechkeys/mechmini/v1/v1.h +++ b/keyboards/mechkeys/mechmini/v1/v1.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#include "../mechmini.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/mechkeys/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c deleted file mode 100755 index caf7c6f0f2..0000000000 --- a/keyboards/mechkeys/mechmini/v2/v2.c +++ /dev/null @@ -1 +0,0 @@ -#include "v2.h" diff --git a/keyboards/mechkeys/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h index a0a620675e..7e817ae9ab 100755 --- a/keyboards/mechkeys/mechmini/v2/v2.h +++ b/keyboards/mechkeys/mechmini/v2/v2.h @@ -15,7 +15,7 @@ #pragma once -#include "../mechmini.h" +#include "quantum.h" #define XXX KC_NO diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c index da954bce04..5758bb7322 100644 --- a/keyboards/mechlovin/adelais/adelais.c +++ b/keyboards/mechlovin/adelais/adelais.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "adelais.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE void keyboard_post_init_kb(void) { diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h deleted file mode 100644 index 6c3980a090..0000000000 --- a/keyboards/mechlovin/adelais/adelais.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" - -#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1 - #include "rev1.h" -#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3 - #include "rev3.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev3 - #include "rev3.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4 - #include "rev4.h" -#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c index 490599c43a..a86b1e5dd5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "adelais.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c index 20b4b69114..78bca55b8e 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "adelais.h" +#include "rev2.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h deleted file mode 100644 index 9944b12284..0000000000 --- a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2019 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" - -#if defined(KEYBOARD_mechlovin_hannah60rgb_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c index b61ac10b14..d8bad04c4f 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c +++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "hannah60rgb.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c deleted file mode 100644 index 92e0917ebe..0000000000 --- a/keyboards/mechlovin/hannah65/hannah65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hannah65.h" diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h deleted file mode 100644 index 99da5a2a1a..0000000000 --- a/keyboards/mechlovin/hannah65/hannah65.h +++ /dev/null @@ -1,23 +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" - -#if defined(KEYBOARD_mechlovin_hannah65_rev1) -# include "rev1.h" -#endif \ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c index fa5b04ea76..0208e16348 100644 --- a/keyboards/mechlovin/hannah910/hannah910.c +++ b/keyboards/mechlovin/hannah910/hannah910.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 "hannah910.h" +#include "quantum.h" void led_init_ports(void) { setPinOutput(B2); diff --git a/keyboards/mechlovin/hannah910/hannah910.h b/keyboards/mechlovin/hannah910/hannah910.h deleted file mode 100644 index 2cc38d0690..0000000000 --- a/keyboards/mechlovin/hannah910/hannah910.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 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" - -#ifdef KEYBOARD_mechlovin_hannah910_rev1 - #include "rev1.h" -#elif KEYBOARD_mechlovin_hannah910_rev2 - #include "rev2.h" -#elif KEYBOARD_mechlovin_hannah910_rev3 - #include "rev3.h" -#endif diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c b/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c deleted file mode 100644 index 632a595ece..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/cor65.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2022 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 . -*/ - -#include "cor65.h" - diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c b/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c deleted file mode 100644 index ffdf09db28..0000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/retro66.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2022 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 . -*/ - -#include "retro66.h" - diff --git a/keyboards/mechlovin/zed65/zed65.c b/keyboards/mechlovin/zed65/zed65.c deleted file mode 100644 index 289c98d068..0000000000 --- a/keyboards/mechlovin/zed65/zed65.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 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 . -*/ - -#include "zed65.h" diff --git a/keyboards/mechlovin/zed65/zed65.h b/keyboards/mechlovin/zed65/zed65.h deleted file mode 100644 index 85bd4eb3d2..0000000000 --- a/keyboards/mechlovin/zed65/zed65.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2022 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" - -#ifdef KEYBOARD_mechlovin_zed65_no_backlight_retro66 - #include "retro66.h" -#elif KEYBOARD_mechlovin_zed65_no_backlight_wearhaus66 - #include "wearhaus66.h" -#elif KEYBOARD_mechlovin_zed65_no_backlight_cor65 - #include "cor65.h" -#elif KEYBOARD_mechlovin_zed65_mono_led - #include "mono_led.h" -#endif diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h index b2b22b37e3..8c57aa283b 100644 --- a/keyboards/mechwild/obe/obe.h +++ b/keyboards/mechwild/obe/obe.h @@ -16,10 +16,6 @@ #pragma once -//#ifdef KEYBOARD_mechwild_obe_eeprom -//# include "eeprom.h" -//#endif - #include "quantum.h" /* This is a shortcut to help you visually see your layout. diff --git a/keyboards/mino/hotswap/hotswap.c b/keyboards/mino/hotswap/hotswap.c deleted file mode 100644 index 46f2f9aef0..0000000000 --- a/keyboards/mino/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 ShandonCodes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" diff --git a/keyboards/mino/mino.c b/keyboards/mino/mino.c deleted file mode 100644 index dc9e6d9c01..0000000000 --- a/keyboards/mino/mino.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 ShandonCodes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mino.h" \ No newline at end of file diff --git a/keyboards/mino/mino.h b/keyboards/mino/mino.h deleted file mode 100644 index fa98480c27..0000000000 --- a/keyboards/mino/mino.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2022 ShandonCodes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_mino_hotswap -# include "hotswap.h" -#endif \ No newline at end of file diff --git a/keyboards/mode/m80v1/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c deleted file mode 100644 index 6213a91363..0000000000 --- a/keyboards/mode/m80v1/m80h/m80h.c +++ /dev/null @@ -1,14 +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. - */ - -#include "m80h.h" diff --git a/keyboards/mode/m80v1/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h index 49f115fdc6..87867de6b4 100644 --- a/keyboards/mode/m80v1/m80h/m80h.h +++ b/keyboards/mode/m80v1/m80h/m80h.h @@ -13,7 +13,7 @@ #pragma once -#include "m80v1.h" +#include "quantum.h" #define LAYOUT_tkl_ansi( \ K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \ diff --git a/keyboards/mode/m80v1/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c deleted file mode 100644 index 1f532d0ce4..0000000000 --- a/keyboards/mode/m80v1/m80s/m80s.c +++ /dev/null @@ -1,14 +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. - */ - -#include "m80s.h" diff --git a/keyboards/mode/m80v1/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h index b5d1e4dd06..e1a5f990ba 100644 --- a/keyboards/mode/m80v1/m80s/m80s.h +++ b/keyboards/mode/m80v1/m80s/m80s.h @@ -13,7 +13,7 @@ #pragma once -#include "m80v1.h" +#include "quantum.h" #define LAYOUT_eighty_m80s( \ K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \ diff --git a/keyboards/mode/m80v1/m80v1.c b/keyboards/mode/m80v1/m80v1.c deleted file mode 100644 index 225ed9cc8d..0000000000 --- a/keyboards/mode/m80v1/m80v1.c +++ /dev/null @@ -1,14 +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. - */ - -#include "m80v1.h" diff --git a/keyboards/mode/m80v1/m80v1.h b/keyboards/mode/m80v1/m80v1.h deleted file mode 100644 index 704ea28439..0000000000 --- a/keyboards/mode/m80v1/m80v1.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_mode_m80v1_m80h) - #include "m80h.h" -#elif defined(KEYBOARD_mode_m80v1_m80s) - #include "m80s.h" -#endif // Mode80 solderable "S" and hotswap "H" revisions diff --git a/keyboards/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c deleted file mode 100644 index faad98b7a7..0000000000 --- a/keyboards/mode/m80v2/m80v2.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 "m80v2.h" diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h deleted file mode 100644 index c00f148e62..0000000000 --- a/keyboards/mode/m80v2/m80v2.h +++ /dev/null @@ -1,26 +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 . -*/ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_mode_m80v2_m80v2h) - #include "m80v2h.h" -#elif defined(KEYBOARD_mode_m80v2_m80v2s) - #include "m80v2s.h" -#endif diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c deleted file mode 100644 index 0d4e533c30..0000000000 --- a/keyboards/mode/m80v2/m80v2h/m80v2h.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 "m80v2h.h" diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h index 28d1d2784c..cacf25b114 100644 --- a/keyboards/mode/m80v2/m80v2h/m80v2h.h +++ b/keyboards/mode/m80v2/m80v2h/m80v2h.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#include "m80v2.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c deleted file mode 100644 index 7be89b1288..0000000000 --- a/keyboards/mode/m80v2/m80v2s/m80v2s.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 "m80v2s.h" diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h index 440b54583a..88f38d8b05 100644 --- a/keyboards/mode/m80v2/m80v2s/m80v2s.h +++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#include "m80v2.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/montsinger/rebound/rebound.c b/keyboards/montsinger/rebound/rebound.c deleted file mode 100644 index fbb10be713..0000000000 --- a/keyboards/montsinger/rebound/rebound.c +++ /dev/null @@ -1 +0,0 @@ -#include "rebound.h" diff --git a/keyboards/montsinger/rebound/rebound.h b/keyboards/montsinger/rebound/rebound.h deleted file mode 100644 index 6bddfb2c3a..0000000000 --- a/keyboards/montsinger/rebound/rebound.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_montsinger_rebound_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_montsinger_rebound_rev2) - #include "rev2.h" -#elif defined(KEYBOARD_montsinger_rebound_rev3) - #include "rev3.h" -#elif defined(KEYBOARD_montsinger_rebound_rev4) - #include "rev4.h" -#endif diff --git a/keyboards/omkbd/ergodash/ergodash.c b/keyboards/omkbd/ergodash/ergodash.c deleted file mode 100644 index 51e6dbf08f..0000000000 --- a/keyboards/omkbd/ergodash/ergodash.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergodash.h" diff --git a/keyboards/omkbd/ergodash/ergodash.h b/keyboards/omkbd/ergodash/ergodash.h deleted file mode 100644 index 8c8bd3cdc3..0000000000 --- a/keyboards/omkbd/ergodash/ergodash.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_omkbd_ergodash_rev1 - #include "rev1.h" -#endif // #ifdef KEYBOARD_ergodash_rev1 - -#ifdef KEYBOARD_omkbd_ergodash_mini - #include "mini.h" -#endif diff --git a/keyboards/omkbd/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c index 3aa9e74cce..e4a1c429f8 100644 --- a/keyboards/omkbd/ergodash/mini/mini.c +++ b/keyboards/omkbd/ergodash/mini/mini.c @@ -1,4 +1,4 @@ -#include "ergodash.h" +#include "mini.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h index e56cfb17a6..be69cce49b 100644 --- a/keyboards/omkbd/ergodash/mini/mini.h +++ b/keyboards/omkbd/ergodash/mini/mini.h @@ -1,7 +1,5 @@ #pragma once -#include "ergodash.h" - #include "quantum.h" #ifndef FLIP_HALF diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c index 00f81cae11..eb794f9ac7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.c +++ b/keyboards/omkbd/ergodash/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "ergodash.h" +#include "rev1.h" #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h index 206c0c9bb9..4a1ee020e7 100644 --- a/keyboards/omkbd/ergodash/rev1/rev1.h +++ b/keyboards/omkbd/ergodash/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "ergodash.h" - #include "quantum.h" #define XXX KC_NO diff --git a/keyboards/omkbd/runner3680/3x6/3x6.c b/keyboards/omkbd/runner3680/3x6/3x6.c deleted file mode 100644 index 1f375c3ecb..0000000000 --- a/keyboards/omkbd/runner3680/3x6/3x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x6.h" diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h index c197c6de2c..3d9fd779d8 100644 --- a/keyboards/omkbd/runner3680/3x6/3x6.h +++ b/keyboards/omkbd/runner3680/3x6/3x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/3x7/3x7.c b/keyboards/omkbd/runner3680/3x7/3x7.c deleted file mode 100644 index 5246953b58..0000000000 --- a/keyboards/omkbd/runner3680/3x7/3x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x7.h" diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h index 2e07bc3b35..db11b19c52 100644 --- a/keyboards/omkbd/runner3680/3x7/3x7.h +++ b/keyboards/omkbd/runner3680/3x7/3x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/3x8/3x8.c b/keyboards/omkbd/runner3680/3x8/3x8.c deleted file mode 100644 index 8ea77001c5..0000000000 --- a/keyboards/omkbd/runner3680/3x8/3x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "3x8.h" diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h index c5856d0034..cd3b81d973 100644 --- a/keyboards/omkbd/runner3680/3x8/3x8.h +++ b/keyboards/omkbd/runner3680/3x8/3x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c deleted file mode 100644 index 5e68c1a9fa..0000000000 --- a/keyboards/omkbd/runner3680/4x6/4x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6.h" diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h index dfc3a977b7..26bcca6de5 100644 --- a/keyboards/omkbd/runner3680/4x6/4x6.h +++ b/keyboards/omkbd/runner3680/4x6/4x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x7/4x7.c b/keyboards/omkbd/runner3680/4x7/4x7.c deleted file mode 100644 index 568fc2dacd..0000000000 --- a/keyboards/omkbd/runner3680/4x7/4x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x7.h" diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h index 7bd43e1114..50fbe3a5ce 100644 --- a/keyboards/omkbd/runner3680/4x7/4x7.h +++ b/keyboards/omkbd/runner3680/4x7/4x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/4x8/4x8.c b/keyboards/omkbd/runner3680/4x8/4x8.c deleted file mode 100644 index 2667548078..0000000000 --- a/keyboards/omkbd/runner3680/4x8/4x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x8.h" diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h index bc95b439b0..08fed12164 100644 --- a/keyboards/omkbd/runner3680/4x8/4x8.h +++ b/keyboards/omkbd/runner3680/4x8/4x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x6/5x6.c b/keyboards/omkbd/runner3680/5x6/5x6.c deleted file mode 100644 index 0e9d5481c4..0000000000 --- a/keyboards/omkbd/runner3680/5x6/5x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6.h" diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h index 5a6e70c209..8047894606 100644 --- a/keyboards/omkbd/runner3680/5x6/5x6.h +++ b/keyboards/omkbd/runner3680/5x6/5x6.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h index afceac0a89..756f90db4b 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h @@ -16,8 +16,6 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x7/5x7.c b/keyboards/omkbd/runner3680/5x7/5x7.c deleted file mode 100644 index aae28e450c..0000000000 --- a/keyboards/omkbd/runner3680/5x7/5x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x7.h" diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h index 451ecf6cd4..1fe3397c97 100644 --- a/keyboards/omkbd/runner3680/5x7/5x7.h +++ b/keyboards/omkbd/runner3680/5x7/5x7.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/5x8/5x8.c b/keyboards/omkbd/runner3680/5x8/5x8.c deleted file mode 100644 index 3958702572..0000000000 --- a/keyboards/omkbd/runner3680/5x8/5x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x8.h" diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h index de53a0eb29..b21b14259d 100644 --- a/keyboards/omkbd/runner3680/5x8/5x8.h +++ b/keyboards/omkbd/runner3680/5x8/5x8.h @@ -1,7 +1,5 @@ #pragma once -#include "runner3680.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/omkbd/runner3680/runner3680.c b/keyboards/omkbd/runner3680/runner3680.c deleted file mode 100644 index 7d8362363b..0000000000 --- a/keyboards/omkbd/runner3680/runner3680.c +++ /dev/null @@ -1 +0,0 @@ -#include "runner3680.h" diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h deleted file mode 100644 index 59afecfcfa..0000000000 --- a/keyboards/omkbd/runner3680/runner3680.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_omkbd_runner3680_5x8 - #include "5x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x7 - #include "5x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x6 - #include "5x6.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8 - #include "5x6_5x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x8 - #include "4x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x7 - #include "4x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_4x6 - #include "4x6.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x8 - #include "3x8.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x7 - #include "3x7.h" -#endif - -#ifdef KEYBOARD_omkbd_runner3680_3x6 - #include "3x6.h" -#endif diff --git a/keyboards/orthodox/orthodox.c b/keyboards/orthodox/orthodox.c deleted file mode 100644 index 0b366e9449..0000000000 --- a/keyboards/orthodox/orthodox.c +++ /dev/null @@ -1 +0,0 @@ -#include "orthodox.h" \ No newline at end of file diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h deleted file mode 100644 index ebf13debb7..0000000000 --- a/keyboards/orthodox/orthodox.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_orthodox_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_orthodox_rev3 -#include "rev3.h" -#endif -#ifdef KEYBOARD_orthodox_rev3_teensy -#include "rev3_teensy.h" -#endif diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c index 49deba4dbf..1101f4379b 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 "orthodox.h" +#include "rev1.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev1/rev1.h +++ b/keyboards/orthodox/rev1/rev1.h @@ -21,8 +21,6 @@ along with this program. If not, see . #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c index 49deba4dbf..79af5cd668 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 "orthodox.h" +#include "rev3.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev3/rev3.h +++ b/keyboards/orthodox/rev3/rev3.h @@ -21,8 +21,6 @@ along with this program. If not, see . #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c index 49deba4dbf..9faf94fd9a 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 "orthodox.h" +#include "rev3_teensy.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 index d9d0b78dfc..328cb46cc1 100644 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h +++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.h @@ -21,8 +21,6 @@ along with this program. If not, see . #pragma once -#include "orthodox.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h index 265558e515..18505def82 100644 --- a/keyboards/peej/rosaline/config.h +++ b/keyboards/peej/rosaline/config.h @@ -17,3 +17,6 @@ #pragma once #define USB_MAX_POWER_CONSUMPTION 100 + +#define LED1 C5 +#define LED2 C4 diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h index b3287784c3..30beb92831 100644 --- a/keyboards/peej/rosaline/ortho/ortho.h +++ b/keyboards/peej/rosaline/ortho/ortho.h @@ -16,7 +16,7 @@ #pragma once -#include "rosaline.h" +#include "quantum.h" /* * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -36,6 +36,8 @@ * └───────┘ └───────┘ */ +#define XXX KC_NO + #define LAYOUT_ortho_4x15( \ k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \ k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \ @@ -52,6 +54,3 @@ { k60, k61, k62, k63, k64, k65, k66, XXX }, \ { k70, k71, k72, k73, k74, k75, k76, XXX } \ } - -#define LED1 C5 -#define LED2 C4 diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c index 57141e8064..df0594da44 100644 --- a/keyboards/peej/rosaline/rosaline.c +++ b/keyboards/peej/rosaline/rosaline.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rosaline.h" +#include "quantum.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { writePin(LED1, record->event.pressed); diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h deleted file mode 100644 index 22125f3188..0000000000 --- a/keyboards/peej/rosaline/rosaline.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Paul James - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 - -#if defined(KEYBOARD_peej_rosaline_staggered) - #include "staggered.h" -#elif defined(KEYBOARD_peej_rosaline_ortho) - #include "ortho.h" -#endif - -#define LED1 C5 -#define LED2 C4 diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h index cc2703c834..98186320a5 100644 --- a/keyboards/peej/rosaline/staggered/staggered.h +++ b/keyboards/peej/rosaline/staggered/staggered.h @@ -16,7 +16,7 @@ #pragma once -#include "rosaline.h" +#include "quantum.h" /* * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ @@ -36,6 +36,8 @@ * └──────────┴───┴────────┴───┘ */ +#define XXX KC_NO + #define LAYOUT_all( \ k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \ k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36, k27, \ @@ -52,6 +54,3 @@ { XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \ { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ } - -#define LED1 C5 -#define LED2 C4 diff --git a/keyboards/pico/65keys/65keys.c b/keyboards/pico/65keys/65keys.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/pico/65keys/65keys.h b/keyboards/pico/65keys/65keys.h index 61e32efd2c..444d8d2ee5 100644 --- a/keyboards/pico/65keys/65keys.h +++ b/keyboards/pico/65keys/65keys.h @@ -1,6 +1,5 @@ #pragma once -#include "pico.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/pico/70keys/70keys.c b/keyboards/pico/70keys/70keys.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/pico/70keys/70keys.h b/keyboards/pico/70keys/70keys.h index 67f7161ca5..6235d8e136 100644 --- a/keyboards/pico/70keys/70keys.h +++ b/keyboards/pico/70keys/70keys.h @@ -1,6 +1,5 @@ #pragma once -#include "pico.h" #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/pico/pico.c b/keyboards/pico/pico.c deleted file mode 100644 index 7a7a7a6457..0000000000 --- a/keyboards/pico/pico.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pico.h" diff --git a/keyboards/pico/pico.h b/keyboards/pico/pico.h deleted file mode 100644 index 72024efd80..0000000000 --- a/keyboards/pico/pico.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Kumao Kobo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef KEYBOARD_pico_65keys - #include "65keys.h" -#endif -#ifdef KEYBOARD_pico_70keys - #include "70keys.h" -#endif - -#include "quantum.h" diff --git a/keyboards/pinky/3/3.c b/keyboards/pinky/3/3.c deleted file mode 100644 index 200510d0aa..0000000000 --- a/keyboards/pinky/3/3.c +++ /dev/null @@ -1 +0,0 @@ -#include "pinky.h" diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h index 64d61f760d..f492646176 100644 --- a/keyboards/pinky/3/3.h +++ b/keyboards/pinky/3/3.h @@ -1,7 +1,5 @@ #pragma once -#include "../pinky.h" - #include "quantum.h" #define LAYOUT_split_3x7_4( \ diff --git a/keyboards/pinky/4/4.c b/keyboards/pinky/4/4.c deleted file mode 100644 index 200510d0aa..0000000000 --- a/keyboards/pinky/4/4.c +++ /dev/null @@ -1 +0,0 @@ -#include "pinky.h" diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h index 50e31702f9..381ce82bce 100644 --- a/keyboards/pinky/4/4.h +++ b/keyboards/pinky/4/4.h @@ -1,7 +1,5 @@ #pragma once -#include "../pinky.h" - #include "quantum.h" #define LAYOUT_split_4x7_4( \ diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c deleted file mode 100644 index aa873c7a72..0000000000 --- a/keyboards/pinky/pinky.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 'Masayuki Sunahara' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pinky.h" diff --git a/keyboards/pinky/pinky.h b/keyboards/pinky/pinky.h deleted file mode 100644 index 67dfbe3370..0000000000 --- a/keyboards/pinky/pinky.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2018 'Masayuki Sunahara' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_pinky_3) -# include "3.h" -#elif defined(KEYBOARD_pinky_4) -# include "4.h" -#endif diff --git a/keyboards/ploopyco/trackball/rev1/rev1.h b/keyboards/ploopyco/trackball/rev1/rev1.h deleted file mode 100644 index a82c20a116..0000000000 --- a/keyboards/ploopyco/trackball/rev1/rev1.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball.h" diff --git a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h b/keyboards/ploopyco/trackball/rev1_005/rev1_005.h deleted file mode 100644 index a82c20a116..0000000000 --- a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball.h" diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h index 4cdae526aa..f4516222e0 100644 --- a/keyboards/ploopyco/trackball/trackball.h +++ b/keyboards/ploopyco/trackball/trackball.h @@ -21,11 +21,6 @@ #include "quantum.h" #include "analog.h" #include "opt_encoder.h" -#if defined(KEYBOARD_ploopyco_trackball_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_ploopyco_trackball_rev1_005) -# include "rev1_005.h" -#endif // Sensor defs #define OPT_ENC1 F0 diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h deleted file mode 100644 index 4f34e17dd4..0000000000 --- a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball_mini.h" diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h b/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h deleted file mode 100644 index 4f34e17dd4..0000000000 --- a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball_mini.h" diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h deleted file mode 100644 index 4f34e17dd4..0000000000 --- a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * Copyright 2019 Hiroyuki Okada - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball_mini.h" diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h deleted file mode 100644 index f43818665c..0000000000 --- a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright Colin Lam (Ploopy Corporation) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * Copyright 2019 Sunjun Kim - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "trackball_thumb.h" diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h index 356b8902db..8ee17634f1 100644 --- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h +++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h @@ -21,9 +21,6 @@ #include "quantum.h" #include "analog.h" #include "opt_encoder.h" -#if defined(KEYBOARD_ploopyco_trackball_thumb_rev1_001) -# include "rev1_001.h" -#endif // Sensor defs #define OPT_ENC1 F4 diff --git a/keyboards/primekb/prime_l/prime_l.c b/keyboards/primekb/prime_l/prime_l.c deleted file mode 100644 index 5a7a0a1008..0000000000 --- a/keyboards/primekb/prime_l/prime_l.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat - * 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 . - */ -#include "prime_l.h" \ No newline at end of file diff --git a/keyboards/primekb/prime_l/prime_l.h b/keyboards/primekb/prime_l/prime_l.h deleted file mode 100644 index 10b587b6a0..0000000000 --- a/keyboards/primekb/prime_l/prime_l.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat - * 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" - -#if defined(KEYBOARD_primekb_prime_l_v1) - #include "v1.h" -#elif defined(KEYBOARD_primekb_prime_l_v2) - #include "v2.h" -#endif diff --git a/keyboards/primekb/prime_l/v1/v1.h b/keyboards/primekb/prime_l/v1/v1.h index bb82bacf5b..4ee291679f 100644 --- a/keyboards/primekb/prime_l/v1/v1.h +++ b/keyboards/primekb/prime_l/v1/v1.h @@ -16,7 +16,7 @@ #pragma once -#include "prime_l.h" +#include "quantum.h" #define LAYOUT( \ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ diff --git a/keyboards/primekb/prime_l/v2/v2.h b/keyboards/primekb/prime_l/v2/v2.h index ebac56e76c..b0924d5d79 100644 --- a/keyboards/primekb/prime_l/v2/v2.h +++ b/keyboards/primekb/prime_l/v2/v2.h @@ -16,7 +16,7 @@ #pragma once -#include "prime_l.h" +#include "quantum.h" #define LAYOUT( \ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ diff --git a/keyboards/program_yoink/ortho/ortho.c b/keyboards/program_yoink/ortho/ortho.c deleted file mode 100644 index a8e1b732a9..0000000000 --- a/keyboards/program_yoink/ortho/ortho.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 melonbred - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ortho.h" diff --git a/keyboards/program_yoink/ortho/ortho.h b/keyboards/program_yoink/ortho/ortho.h index 964c0e363b..e847f16edc 100644 --- a/keyboards/program_yoink/ortho/ortho.h +++ b/keyboards/program_yoink/ortho/ortho.h @@ -16,7 +16,7 @@ #pragma once -#include "program_yoink.h" +#include "quantum.h" /* This is a shortcut to help you visually see your layout. * diff --git a/keyboards/program_yoink/program_yoink.c b/keyboards/program_yoink/program_yoink.c index 7733aa2ad5..d1373a5283 100644 --- a/keyboards/program_yoink/program_yoink.c +++ b/keyboards/program_yoink/program_yoink.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "program_yoink.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/program_yoink/program_yoink.h b/keyboards/program_yoink/program_yoink.h deleted file mode 100644 index d6a1d33b53..0000000000 --- a/keyboards/program_yoink/program_yoink.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 melonbred - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_program_yoink_staggered) - #include "staggered.h" -#elif defined(KEYBOARD_program_yoink_ortho) - #include "ortho.h" -#endif diff --git a/keyboards/program_yoink/staggered/staggered.c b/keyboards/program_yoink/staggered/staggered.c deleted file mode 100644 index 1bdb4a2162..0000000000 --- a/keyboards/program_yoink/staggered/staggered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 melonbred - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "staggered.h" diff --git a/keyboards/program_yoink/staggered/staggered.h b/keyboards/program_yoink/staggered/staggered.h index 1b35e28da7..15def50979 100644 --- a/keyboards/program_yoink/staggered/staggered.h +++ b/keyboards/program_yoink/staggered/staggered.h @@ -16,7 +16,7 @@ #pragma once -#include "program_yoink.h" +#include "quantum.h" /* This is a shortcut to help you visually see your layout. * diff --git a/keyboards/qwertyydox/qwertyydox.c b/keyboards/qwertyydox/qwertyydox.c deleted file mode 100644 index 53c3eca648..0000000000 --- a/keyboards/qwertyydox/qwertyydox.c +++ /dev/null @@ -1 +0,0 @@ -#include "qwertyydox.h" diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h deleted file mode 100644 index 9eb4073dfe..0000000000 --- a/keyboards/qwertyydox/qwertyydox.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_qwertyydox_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/qwertyydox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h index 22fc412a8b..d1c5588606 100644 --- a/keyboards/qwertyydox/rev1/rev1.h +++ b/keyboards/qwertyydox/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "qwertyydox.h" +#include "quantum.h" #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ diff --git a/keyboards/rate/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c deleted file mode 100644 index 2a850f64a4..0000000000 --- a/keyboards/rate/pistachio/pistachio.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "pistachio.h" - diff --git a/keyboards/rate/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h deleted file mode 100644 index 7bf2c59ad6..0000000000 --- a/keyboards/rate/pistachio/pistachio.h +++ /dev/null @@ -1,25 +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" - -#if defined(KEYBOARD_rate_pistachio_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_rate_pistachio_rev2) -# include "rev2.h" -#endif diff --git a/keyboards/rate/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c deleted file mode 100644 index 5824157f53..0000000000 --- a/keyboards/rate/pistachio/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "rev1.h" diff --git a/keyboards/rate/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c deleted file mode 100644 index c6e64a526d..0000000000 --- a/keyboards/rate/pistachio/rev2/rev2.c +++ /dev/null @@ -1,19 +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 . -*/ - - -#include "rev2.h" diff --git a/keyboards/recompile_keys/nomu30/nomu30.c b/keyboards/recompile_keys/nomu30/nomu30.c deleted file mode 100644 index 37a8614c11..0000000000 --- a/keyboards/recompile_keys/nomu30/nomu30.c +++ /dev/null @@ -1,16 +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 . - */ -#include "nomu30.h" diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h index 964eb2a65f..1b33c17be1 100644 --- a/keyboards/recompile_keys/nomu30/nomu30.h +++ b/keyboards/recompile_keys/nomu30/nomu30.h @@ -16,11 +16,6 @@ #pragma once #include "quantum.h" -#ifdef KEYBOARD_recompile_keys_nomu30_rev1 - #include "rev1.h" -#elif KEYBOARD_recompile_keys_nomu30_rev2 - #include "rev2.h" -#endif #define LAYOUT( \ K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.c b/keyboards/recompile_keys/nomu30/rev1/rev1.c deleted file mode 100644 index 8adf9859f8..0000000000 --- a/keyboards/recompile_keys/nomu30/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rev1.h" diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.h b/keyboards/recompile_keys/nomu30/rev1/rev1.h deleted file mode 100644 index fa161f267e..0000000000 --- a/keyboards/recompile_keys/nomu30/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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" diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.c b/keyboards/recompile_keys/nomu30/rev2/rev2.c deleted file mode 100644 index 5eabb33ac6..0000000000 --- a/keyboards/recompile_keys/nomu30/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rev2.h" diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.h b/keyboards/recompile_keys/nomu30/rev2/rev2.h deleted file mode 100644 index fa161f267e..0000000000 --- a/keyboards/recompile_keys/nomu30/rev2/rev2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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" diff --git a/keyboards/redox/redox.c b/keyboards/redox/redox.c deleted file mode 100644 index 7fa3545a47..0000000000 --- a/keyboards/redox/redox.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 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 . - */ -#include "redox.h" diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h deleted file mode 100644 index 4160096b28..0000000000 --- a/keyboards/redox/redox.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2017 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 - -#if defined(KEYBOARD_redox_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_redox_media) -# include "media.h" -#endif - -#include "quantum.h" diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c deleted file mode 100644 index 796e2c8c3d..0000000000 --- a/keyboards/redox/rev1/proton_c/proton_c.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 xerootg -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "proton_c.h" diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h deleted file mode 100644 index d8813d9c4d..0000000000 --- a/keyboards/redox/rev1/proton_c/proton_c.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 xerootg -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "rev1.h" diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c deleted file mode 100644 index b1ab15df32..0000000000 --- a/keyboards/redox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "redox.h" diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h index a3253e9411..4ad423d897 100644 --- a/keyboards/redox/rev1/rev1.h +++ b/keyboards/redox/rev1/rev1.h @@ -1,11 +1,5 @@ #pragma once -#include "redox.h" - -#if defined(KEYBOARD_redox_rev1_proton_c) -# include "proton_c.h" -#endif - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev1/rev1.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev2/rev2.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c deleted file mode 100644 index 5945cc60a4..0000000000 --- a/keyboards/rgbkb/sol/sol.c +++ /dev/null @@ -1 +0,0 @@ -#include "sol.h" diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h index e885dc78c4..695dc6db61 100644 --- a/keyboards/rgbkb/sol/sol.h +++ b/keyboards/rgbkb/sol/sol.h @@ -1,12 +1,6 @@ #pragma once #include "quantum.h" -#ifdef KEYBOARD_rgbkb_sol_rev1 -#include "rev1.h" -#else -#include "rev2.h" -#endif - #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \ diff --git a/keyboards/rura66/rev1/rev1.c b/keyboards/rura66/rev1/rev1.c index f42bdad44b..d1b6a4ff6a 100644 --- a/keyboards/rura66/rev1/rev1.c +++ b/keyboards/rura66/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rura66.h" +#include "rev1.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/rura66/rura66.c b/keyboards/rura66/rura66.c deleted file mode 100644 index 641643ef25..0000000000 --- a/keyboards/rura66/rura66.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 T.Shinohara - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rura66.h" diff --git a/keyboards/rura66/rura66.h b/keyboards/rura66/rura66.h deleted file mode 100644 index 9df9980b82..0000000000 --- a/keyboards/rura66/rura66.h +++ /dev/null @@ -1,22 +0,0 @@ - /* Copyright 2021 T.Shinohara - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" -#if defined(KEYBOARD_rura66_rev1) -# include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c deleted file mode 100644 index 3044e02233..0000000000 --- a/keyboards/salicylic_acid3/7skb/7skb.c +++ /dev/null @@ -1 +0,0 @@ -#include "7skb.h" diff --git a/keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h deleted file mode 100644 index 5043a46747..0000000000 --- a/keyboards/salicylic_acid3/7skb/7skb.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_7skb_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/7skb/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h index 8ab845240d..d523bf96e5 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h +++ b/keyboards/salicylic_acid3/7skb/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "7skb.h" - #include "quantum.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c deleted file mode 100644 index 4f8cc63b42..0000000000 --- a/keyboards/salicylic_acid3/getta25/getta25.c +++ /dev/null @@ -1 +0,0 @@ -#include "getta25.h" diff --git a/keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h deleted file mode 100644 index 67632bba4d..0000000000 --- a/keyboards/salicylic_acid3/getta25/getta25.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_getta25_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/getta25/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h index 98f4318a6a..f2c5b9b8ed 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h +++ b/keyboards/salicylic_acid3/getta25/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "getta25.h" +#include "quantum.h" /* * ,-----------------------. diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c deleted file mode 100644 index 0f03aa4ce2..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/jisplit89.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "jisplit89.h" diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h deleted file mode 100644 index 8de2326de6..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/jisplit89.h +++ /dev/null @@ -1,22 +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 - -#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c deleted file mode 100644 index 13e201e63a..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h index 71515f5ef6..7a1887dc2d 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "jisplit89.h" - #include "quantum.h" /* diff --git a/keyboards/salicylic_acid3/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c deleted file mode 100644 index c2a10ed3e6..0000000000 --- a/keyboards/salicylic_acid3/naked48/naked48.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "naked48.h" diff --git a/keyboards/salicylic_acid3/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h deleted file mode 100644 index bbfa6d2e84..0000000000 --- a/keyboards/salicylic_acid3/naked48/naked48.h +++ /dev/null @@ -1,24 +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" - -#ifdef KEYBOARD_salicylic_acid3_naked48_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c index 0129b6c1a3..5c9d8035c0 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c +++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.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 "naked48.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h index dc35f89342..d43e9f4fb3 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "naked48.h" - #include "quantum.h" #ifdef RGBLIGHT_ENABLE //rgb led driver diff --git a/keyboards/salicylic_acid3/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c deleted file mode 100644 index d1d46394f6..0000000000 --- a/keyboards/salicylic_acid3/naked60/naked60.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "naked60.h" diff --git a/keyboards/salicylic_acid3/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h deleted file mode 100644 index 9ad73df67f..0000000000 --- a/keyboards/salicylic_acid3/naked60/naked60.h +++ /dev/null @@ -1,24 +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" - -#ifdef KEYBOARD_salicylic_acid3_naked60_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c deleted file mode 100644 index d1d46394f6..0000000000 --- a/keyboards/salicylic_acid3/naked60/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "naked60.h" diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h index 12798022e9..fcb26d5fc2 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked60/rev1/rev1.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "naked60.h" - #include "quantum.h" diff --git a/keyboards/salicylic_acid3/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c deleted file mode 100644 index a2863f0477..0000000000 --- a/keyboards/salicylic_acid3/naked64/naked64.c +++ /dev/null @@ -1 +0,0 @@ -#include "naked64.h" diff --git a/keyboards/salicylic_acid3/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h deleted file mode 100644 index cb73e2142d..0000000000 --- a/keyboards/salicylic_acid3/naked64/naked64.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_naked64_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/naked64/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h index 0ac804ee0f..d8965556c7 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked64/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "naked64.h" +#include "quantum.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h index 772c843c57..c309296049 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h +++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "setta21.h" +#include "quantum.h" #define LAYOUT_numpad_6x4( \ L05, L15, L25, L35, \ diff --git a/keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c deleted file mode 100644 index 73c07682f7..0000000000 --- a/keyboards/salicylic_acid3/setta21/setta21.c +++ /dev/null @@ -1 +0,0 @@ -#include "setta21.h" diff --git a/keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h deleted file mode 100644 index 9e5b17e2c3..0000000000 --- a/keyboards/salicylic_acid3/setta21/setta21.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_setta21_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/sofle/keyhive/keyhive.c b/keyboards/sofle/keyhive/keyhive.c deleted file mode 100755 index 72e2d583f1..0000000000 --- a/keyboards/sofle/keyhive/keyhive.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "keyhive.h" diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c index 88a28e6a40..567f8301e3 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 "sofle.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE // Physical Layout diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c index cdb8c1671a..bd3f3e157c 100644 --- a/keyboards/sofle/sofle.c +++ b/keyboards/sofle/sofle.c @@ -1,4 +1,4 @@ -#include "sofle.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE diff --git a/keyboards/sofle/sofle.h b/keyboards/sofle/sofle.h deleted file mode 100644 index 90ee00bfd7..0000000000 --- a/keyboards/sofle/sofle.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_sofle_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_sofle_keyhive) -# include "keyhive.h" -#endif diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c deleted file mode 100644 index b9942a3511..0000000000 --- a/keyboards/spacetime/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Kyle Terry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/spacetime/spacetime.c b/keyboards/spacetime/spacetime.c deleted file mode 100644 index 7db11f1bc4..0000000000 --- a/keyboards/spacetime/spacetime.c +++ /dev/null @@ -1 +0,0 @@ -#include "spacetime.h" diff --git a/keyboards/spacetime/spacetime.h b/keyboards/spacetime/spacetime.h deleted file mode 100644 index 0235c2b254..0000000000 --- a/keyboards/spacetime/spacetime.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_spacetime_rev1 - #include "rev1.h" -#endif - -#ifdef KEYBOARD_spacetime_rev2 - #include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/splitkb/kyria/kyria.h b/keyboards/splitkb/kyria/kyria.h deleted file mode 100644 index 9018220eba..0000000000 --- a/keyboards/splitkb/kyria/kyria.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_splitkb_kyria_rev1) -# include "rev1.h" -#endif -#if defined(KEYBOARD_splitkb_kyria_rev2) -# include "rev2.h" -#endif diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c deleted file mode 100644 index 628fabb2e5..0000000000 --- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "proton_c.h" diff --git a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h deleted file mode 100644 index 718f5636ff..0000000000 --- a/keyboards/splitkb/kyria/rev1/proton_c/proton_c.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "rev1.h" diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h index 8a5fbeb21d..9b5ea58ead 100644 --- a/keyboards/splitkb/kyria/rev1/rev1.h +++ b/keyboards/splitkb/kyria/rev1/rev1.h @@ -15,10 +15,7 @@ */ #pragma once -#include "kyria.h" -#ifdef KEYBOARD_splitkb_kyria_rev1_proton_c -# include "proton_c.h" -#endif +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c deleted file mode 100644 index 9c74b45f77..0000000000 --- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "proton_c.h" diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h deleted file mode 100644 index 143b9e39dd..0000000000 --- a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "rev2.h" diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h index ed4169b0ed..89d69abc9a 100644 --- a/keyboards/splitkb/kyria/rev2/rev2.h +++ b/keyboards/splitkb/kyria/rev2/rev2.h @@ -15,10 +15,7 @@ */ #pragma once -#include "kyria.h" -#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c -# include "proton_c.h" -#endif +#include "quantum.h" /* This a shortcut to help you visually see your layout. * diff --git a/keyboards/splitkb/kyria/rev3/rev3.c b/keyboards/splitkb/kyria/rev3/rev3.c index 4ff592ef55..3dc5299377 100644 --- a/keyboards/splitkb/kyria/rev3/rev3.c +++ b/keyboards/splitkb/kyria/rev3/rev3.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include QMK_KEYBOARD_H +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE // clang-format off diff --git a/keyboards/splitty/rev1/rev1.c b/keyboards/splitty/rev1/rev1.c deleted file mode 100644 index 0cf9a1d9c3..0000000000 --- a/keyboards/splitty/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "splitty.h" diff --git a/keyboards/splitty/rev1/rev1.h b/keyboards/splitty/rev1/rev1.h index 9205165730..7d9e9e09dc 100644 --- a/keyboards/splitty/rev1/rev1.h +++ b/keyboards/splitty/rev1/rev1.h @@ -16,7 +16,7 @@ #pragma once -#include QMK_KEYBOARD_H +#include "splitty.h" // clang-format off #define LAYOUT( \ diff --git a/keyboards/studiokestra/galatea/galatea.c b/keyboards/studiokestra/galatea/galatea.c deleted file mode 100644 index 30e7939159..0000000000 --- a/keyboards/studiokestra/galatea/galatea.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "galatea.h" diff --git a/keyboards/studiokestra/galatea/galatea.h b/keyboards/studiokestra/galatea/galatea.h deleted file mode 100644 index a1f2aa77b5..0000000000 --- a/keyboards/studiokestra/galatea/galatea.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_studiokestra_galatea_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_studiokestra_galatea_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/studiokestra/galatea/rev1/rev1.c b/keyboards/studiokestra/galatea/rev1/rev1.c deleted file mode 100644 index f34f9f9200..0000000000 --- a/keyboards/studiokestra/galatea/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/studiokestra/galatea/rev2/rev2.c b/keyboards/studiokestra/galatea/rev2/rev2.c deleted file mode 100644 index 5e7125b0b6..0000000000 --- a/keyboards/studiokestra/galatea/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c deleted file mode 100644 index e22860d04b..0000000000 --- a/keyboards/uzu42/rev1/rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "uzu42.h" diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h index e4aba8b79b..156605f87a 100644 --- a/keyboards/uzu42/rev1/rev1.h +++ b/keyboards/uzu42/rev1/rev1.h @@ -5,8 +5,6 @@ #include "uzu42.h" -#include "quantum.h" - #define LAYOUT( \ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h index c23baac333..8678588bc3 100644 --- a/keyboards/uzu42/uzu42.h +++ b/keyboards/uzu42/uzu42.h @@ -3,6 +3,8 @@ #pragma once +#include "quantum.h" + #ifdef KEYBOARD_uzu42_rev1 #include "rev1.h" #endif diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/vitamins_included/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/vitamins_included/rev1/rev1.h b/keyboards/vitamins_included/rev1/rev1.h deleted file mode 100644 index 53ae64a6ea..0000000000 --- a/keyboards/vitamins_included/rev1/rev1.h +++ /dev/null @@ -1,3 +0,0 @@ - -#pragma once -#include QMK_KEYBOARD_H diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c index 15b47089e8..d34cdb4fc1 100644 --- a/keyboards/vitamins_included/rev2/rev2.c +++ b/keyboards/vitamins_included/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" bool is_keyboard_left(void) { #if defined(MASTER_LEFT) diff --git a/keyboards/vitamins_included/rev2/rev2.h b/keyboards/vitamins_included/rev2/rev2.h deleted file mode 100644 index 7e12888dda..0000000000 --- a/keyboards/vitamins_included/rev2/rev2.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include QMK_KEYBOARD_H diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c index e83c81633c..a6429d87e8 100644 --- a/keyboards/vitamins_included/vitamins_included.c +++ b/keyboards/vitamins_included/vitamins_included.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "vitamins_included.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h index 489e90977f..21509d9743 100644 --- a/keyboards/vitamins_included/vitamins_included.h +++ b/keyboards/vitamins_included/vitamins_included.h @@ -2,12 +2,6 @@ #include "quantum.h" -#ifdef KEYBOARD_vitamins_included_rev1 - #include "rev1.h" -#else - #include "rev2.h" -#endif - #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, \ diff --git a/keyboards/whale/sk/sk.c b/keyboards/whale/sk/sk.c deleted file mode 100644 index c151f73fb6..0000000000 --- a/keyboards/whale/sk/sk.c +++ /dev/null @@ -1 +0,0 @@ -#include "sk.h" diff --git a/keyboards/whale/sk/sk.h b/keyboards/whale/sk/sk.h deleted file mode 100644 index d9c75f15b2..0000000000 --- a/keyboards/whale/sk/sk.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_whale_sk_v3 - #include "v3.h" -#endif diff --git a/keyboards/whale/sk/v3/v3.h b/keyboards/whale/sk/v3/v3.h index 06ebc45dc9..a392705a83 100644 --- a/keyboards/whale/sk/v3/v3.h +++ b/keyboards/whale/sk/v3/v3.h @@ -1,7 +1,5 @@ #pragma once -#include "sk.h" - #include "quantum.h" #define LAYOUT_all( \ diff --git a/keyboards/xelus/dawn60/dawn60.c b/keyboards/xelus/dawn60/dawn60.c deleted file mode 100644 index 3e009b3bdf..0000000000 --- a/keyboards/xelus/dawn60/dawn60.c +++ /dev/null @@ -1 +0,0 @@ -#include "dawn60.h" diff --git a/keyboards/xelus/dawn60/dawn60.h b/keyboards/xelus/dawn60/dawn60.h deleted file mode 100644 index feec9b5e1d..0000000000 --- a/keyboards/xelus/dawn60/dawn60.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_xelus_dawn60_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_xelus_dawn60_rev1_qmk) - #include "rev1_qmk.h" -#endif diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c index c17160a659..951c0a22ff 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c +++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c @@ -14,13 +14,13 @@ * along with this program. If not, see . */ -#include -#include -#include -#include +#include "rev1_qmk.h" + +#include "i2c_master.h" +#include "led_tables.h" +#include "rgb_matrix.h" #include "drivers/led/issi/is31fl3731.h" #include "ws2812.h" -#include "rev1_qmk.h" #ifdef RGB_MATRIX_ENABLE LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; diff --git a/keyboards/xelus/pachi/rgb/rgb.c b/keyboards/xelus/pachi/rgb/rgb.c deleted file mode 100644 index 93ca8406de..0000000000 --- a/keyboards/xelus/pachi/rgb/rgb.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rgb.h" diff --git a/keyboards/xelus/pachi/rgb/rgb.h b/keyboards/xelus/pachi/rgb/rgb.h deleted file mode 100644 index 36ca2937a6..0000000000 --- a/keyboards/xelus/pachi/rgb/rgb.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_xelus_pachi_rgb_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_xelus_pachi_rgb_rev2) - #include "rev2.h" -#endif diff --git a/keyboards/xelus/rs60/rev1/rev1.c b/keyboards/xelus/rs60/rev1/rev1.c deleted file mode 100644 index d997ff979e..0000000000 --- a/keyboards/xelus/rs60/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.c b/keyboards/xelus/rs60/rev2_0/rev2_0.c deleted file mode 100644 index d2abbda521..0000000000 --- a/keyboards/xelus/rs60/rev2_0/rev2_0.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2_0.h" diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.c b/keyboards/xelus/rs60/rev2_1/rev2_1.c deleted file mode 100644 index dc234542b5..0000000000 --- a/keyboards/xelus/rs60/rev2_1/rev2_1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2_1.h" diff --git a/keyboards/xelus/rs60/rs60.c b/keyboards/xelus/rs60/rs60.c deleted file mode 100644 index cd2fa80061..0000000000 --- a/keyboards/xelus/rs60/rs60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rs60.h" diff --git a/keyboards/xelus/rs60/rs60.h b/keyboards/xelus/rs60/rs60.h deleted file mode 100644 index 5a52d37a7f..0000000000 --- a/keyboards/xelus/rs60/rs60.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_xelus_rs60_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_xelus_rs60_rev2_0) - #include "rev2_0.h" -#elif defined(KEYBOARD_xelus_rs60_rev2_1) - #include "rev2_1.h" -#endif diff --git a/keyboards/ymdk/ymd75/rev1/rev1.c b/keyboards/ymdk/ymd75/rev1/rev1.c deleted file mode 100644 index c1ad021b15..0000000000 --- a/keyboards/ymdk/ymd75/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ymd75.h" diff --git a/keyboards/ymdk/ymd75/rev2/rev2.c b/keyboards/ymdk/ymd75/rev2/rev2.c deleted file mode 100644 index c1ad021b15..0000000000 --- a/keyboards/ymdk/ymd75/rev2/rev2.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ymd75.h" diff --git a/keyboards/ymdk/ymd75/rev3/rev3.c b/keyboards/ymdk/ymd75/rev3/rev3.c deleted file mode 100644 index c1ad021b15..0000000000 --- a/keyboards/ymdk/ymd75/rev3/rev3.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ymd75.h" diff --git a/keyboards/ymdk/ymd75/ymd75.c b/keyboards/ymdk/ymd75/ymd75.c deleted file mode 100644 index 2fca021f78..0000000000 --- a/keyboards/ymdk/ymd75/ymd75.c +++ /dev/null @@ -1 +0,0 @@ -#include "ymd75.h" diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymdk/ymd75/ymd75.h deleted file mode 100644 index dbaf93e7db..0000000000 --- a/keyboards/ymdk/ymd75/ymd75.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_ymdk_ymd75_rev1) - #include "rev1.h" -#elif defined(KEYBOARD_ymdk_ymd75_rev2) - #include "rev2.h" -#elif defined(KEYBOARD_ymdk_ymd75_rev3) - #include "rev3.h" -#endif diff --git a/keyboards/yosino58/lib/host_led_state_reader.c b/keyboards/yosino58/lib/host_led_state_reader.c index 2a17e0a33b..abcfefffb4 100644 --- a/keyboards/yosino58/lib/host_led_state_reader.c +++ b/keyboards/yosino58/lib/host_led_state_reader.c @@ -1,5 +1,4 @@ #include -#include "yosino58.h" char host_led_state_str[24]; diff --git a/keyboards/yosino58/lib/keylogger.c b/keyboards/yosino58/lib/keylogger.c index c50de94c20..dc9c21406f 100644 --- a/keyboards/yosino58/lib/keylogger.c +++ b/keyboards/yosino58/lib/keylogger.c @@ -1,5 +1,4 @@ #include -#include "yosino58.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c index 7e5747cb75..2dec336b86 100644 --- a/keyboards/yosino58/lib/layer_state_reader.c +++ b/keyboards/yosino58/lib/layer_state_reader.c @@ -1,7 +1,6 @@ #include QMK_KEYBOARD_H #include -#include "yosino58.h" #define L_BASE 0 #define L_LOWER 8 diff --git a/keyboards/yosino58/lib/logo_reader.c b/keyboards/yosino58/lib/logo_reader.c index 96c9b897ef..b340979807 100644 --- a/keyboards/yosino58/lib/logo_reader.c +++ b/keyboards/yosino58/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "yosino58.h" - const char *read_logo(void) { static char logo[] = { 0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F, diff --git a/keyboards/yosino58/lib/mode_icon_reader.c b/keyboards/yosino58/lib/mode_icon_reader.c index 865d9537de..9dadd6ac86 100644 --- a/keyboards/yosino58/lib/mode_icon_reader.c +++ b/keyboards/yosino58/lib/mode_icon_reader.c @@ -1,5 +1,4 @@ #include -#include "yosino58.h" char mode_icon[24]; diff --git a/keyboards/yosino58/lib/timelogger.c b/keyboards/yosino58/lib/timelogger.c index ce8b0c270f..db75d77fac 100644 --- a/keyboards/yosino58/lib/timelogger.c +++ b/keyboards/yosino58/lib/timelogger.c @@ -1,5 +1,4 @@ #include -#include "yosino58.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c deleted file mode 100644 index 45534122b3..0000000000 --- a/keyboards/yosino58/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "yosino58.h" diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c deleted file mode 100644 index 85545f3f44..0000000000 --- a/keyboards/yosino58/yosino58.c +++ /dev/null @@ -1 +0,0 @@ -#include "yosino58.h" \ No newline at end of file diff --git a/keyboards/yosino58/yosino58.h b/keyboards/yosino58/yosino58.h deleted file mode 100644 index 5414c31bd8..0000000000 --- a/keyboards/yosino58/yosino58.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_yosino58_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/yushakobo/navpad/10/10.c b/keyboards/yushakobo/navpad/10/10.c deleted file mode 100644 index c1f6fc485d..0000000000 --- a/keyboards/yushakobo/navpad/10/10.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "10.h" diff --git a/keyboards/yushakobo/navpad/10/10.h b/keyboards/yushakobo/navpad/10/10.h deleted file mode 100644 index 5fd02cd073..0000000000 --- a/keyboards/yushakobo/navpad/10/10.h +++ /dev/null @@ -1,26 +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" - -#if defined(KEYBOARD_yushakobo_navpad_10_rev0) -# include "rev0.h" -#elif defined(KEYBOARD_yushakobo_navpad_10_rev1) -# include "rev1.h" -#endif diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.c b/keyboards/yushakobo/navpad/10/rev0/rev0.c deleted file mode 100644 index c1feab87a3..0000000000 --- a/keyboards/yushakobo/navpad/10/rev0/rev0.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev0.h" diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h index 97a651bc1c..7e2dbab462 100644 --- a/keyboards/yushakobo/navpad/10/rev0/rev0.h +++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h @@ -18,6 +18,8 @@ #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 diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.c b/keyboards/yushakobo/navpad/10/rev1/rev1.c deleted file mode 100644 index bf47612035..0000000000 --- a/keyboards/yushakobo/navpad/10/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h index 50fd54a026..b56b6f67cf 100644 --- a/keyboards/yushakobo/navpad/10/rev1/rev1.h +++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h @@ -18,6 +18,8 @@ #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 diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c deleted file mode 100644 index 8be5220d56..0000000000 --- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "10_helix_r.h" -- cgit v1.3.1 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/0_sixty/0_sixty.c | 17 -- keyboards/0xc7/61key/61key.c | 17 -- keyboards/0xcb/static/static.c | 17 -- keyboards/10bleoledhub/10bleoledhub.c | 17 -- keyboards/1upkeyboards/1up60hse/1up60hse.c | 16 -- keyboards/1upkeyboards/1up60hte/1up60hte.c | 18 --- keyboards/1upkeyboards/1up60rgb/1up60rgb.c | 1 - keyboards/1upkeyboards/sweet16/sweet16.c | 1 - keyboards/25keys/aleth42/rev0/rev0.c | 17 -- keyboards/25keys/aleth42/rev1/rev1.c | 17 -- keyboards/2key2crawl/2key2crawl.c | 1 - keyboards/30wer/30wer.c | 1 - keyboards/3w6/rev1/rev1.c | 17 -- keyboards/40percentclub/5x5/5x5.c | 1 - keyboards/40percentclub/gherkin/gherkin.c | 1 - keyboards/40percentclub/half_n_half/half_n_half.c | 16 -- keyboards/40percentclub/luddite/luddite.c | 1 - keyboards/40percentclub/mf68/mf68.c | 1 - keyboards/40percentclub/nori/nori.c | 16 -- keyboards/40percentclub/tomato/tomato.c | 1 - keyboards/45_ats/45_ats.c | 19 --- keyboards/4by3/4by3.c | 1 - keyboards/4pplet/aekiso60/rev_a/rev_a.c | 1 - keyboards/4pplet/aekiso60/rev_b/rev_b.c | 19 --- keyboards/4pplet/bootleg/rev_a/rev_a.c | 17 -- keyboards/4pplet/steezy60/rev_a/rev_a.c | 1 - keyboards/4pplet/waffling60/rev_a/rev_a.c | 17 -- keyboards/7c8/framework/framework.c | 17 -- keyboards/9key/9key.c | 1 - keyboards/abacus/abacus.c | 17 -- keyboards/abstract/ellipse/rev1/rev1.c | 16 -- keyboards/acekeyboard/titan60/titan60.c | 18 --- keyboards/acheron/arctic/arctic.c | 18 --- keyboards/acheron/keebspcb/keebspcb.c | 1 - keyboards/acheron/lasgweloth/lasgweloth.c | 18 --- keyboards/ada/ada1800mini/ada1800mini.c | 4 - keyboards/ada/infinity81/infinity81.c | 4 - keyboards/adelheid/adelheid.c | 16 -- keyboards/adm42/adm42.c | 17 -- keyboards/adpenrose/obi/obi.c | 5 - keyboards/adpenrose/shisaku/shisaku.c | 4 - keyboards/aeboards/aegis/aegis.c | 17 -- keyboards/ai03/andromeda/andromeda.c | 17 -- keyboards/ai03/equinox/equinox.c | 17 -- keyboards/ai03/jp60/jp60.c | 17 -- keyboards/ai03/lunar/lunar.c | 16 -- keyboards/ai03/orbit_x/orbit_x.c | 18 --- keyboards/ai03/polaris/polaris.c | 16 -- keyboards/ai03/quasar/quasar.c | 16 -- keyboards/ai03/soyuz/soyuz.c | 16 -- keyboards/ai03/voyager60_alps/voyager60_alps.c | 15 -- keyboards/akb/eb46/eb46.c | 16 -- keyboards/akb/raine/raine.c | 18 --- keyboards/akegata_denki/device_one/device_one.c | 1 - keyboards/al1/al1.c | 17 -- keyboards/alf/dc60/dc60.c | 16 -- keyboards/alf/x11/x11.c | 16 -- keyboards/alf/x2/x2.c | 17 -- keyboards/alfredslab/swift65/hotswap/hotswap.c | 19 --- keyboards/alfredslab/swift65/solder/solder.c | 17 -- keyboards/aliceh66/pianoforte/pianoforte.c | 17 -- keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c | 17 -- keyboards/alpha/alpha.c | 1 - keyboards/alpine65/alpine65.c | 18 --- keyboards/alps64/alps64.c | 17 -- keyboards/amag23/amag23.c | 17 -- keyboards/amjkeyboard/amj40/amj40.c | 17 -- keyboards/amjkeyboard/amj60/amj60.c | 17 -- keyboards/amjkeyboard/amj66/amj66.c | 16 -- keyboards/amjkeyboard/amj84/amj84.c | 4 - keyboards/amjkeyboard/amj96/amj96.c | 16 -- keyboards/amjkeyboard/amjpad/amjpad.c | 1 - keyboards/anomalykb/a65i/a65i.c | 17 -- keyboards/aos/tkl/tkl.c | 18 --- keyboards/aozora/aozora.c | 17 -- keyboards/aplyard/aplx6/rev1/rev1.c | 19 --- keyboards/aplyard/aplx6/rev2/rev2.c | 16 -- keyboards/ares/ares.c | 18 --- keyboards/arisu/arisu.c | 16 -- keyboards/atlas_65/atlas_65.c | 16 -- keyboards/atreus62/atreus62.c | 1 - keyboards/atxkb/1894/1894.c | 16 -- keyboards/aurora65/aurora65.c | 16 -- keyboards/aves60/aves60.c | 4 - keyboards/aves65/aves65.c | 18 --- .../axolstudio/foundation_gamma/foundation_gamma.c | 17 -- keyboards/axolstudio/helpo/helpo.c | 17 -- keyboards/axolstudio/yeti/soldered/soldered.c | 17 -- keyboards/aya/aya.c | 17 -- keyboards/b_sides/rev41lp/rev41lp.c | 17 -- keyboards/bacca70/bacca70.c | 17 -- keyboards/bantam44/bantam44.c | 1 - keyboards/barleycorn_smd/barleycorn_smd.c | 16 -- keyboards/barracuda/barracuda.c | 17 -- keyboards/basketweave/basketweave.c | 17 -- keyboards/bastardkb/tbk/tbk.c | 18 --- keyboards/beatervan/beatervan.c | 16 -- keyboards/bfake/bfake.c | 18 --- keyboards/biacco42/meishi/meishi.c | 16 -- keyboards/biacco42/meishi2/meishi2.c | 16 -- keyboards/bioi/f60/f60.c | 17 -- keyboards/blackplum/blackplum.c | 1 - keyboards/blank/blank01/blank01.c | 17 -- keyboards/blank_tehnologii/manibus/manibus.c | 16 -- keyboards/blaster75/blaster75.c | 17 -- keyboards/bluebell/swoop/swoop.c | 16 -- keyboards/boardrun/bizarre/bizarre.c | 16 -- keyboards/boardrun/classic/classic.c | 16 -- keyboards/bolsa/bolsalice/bolsalice.c | 18 --- keyboards/bop/bop.c | 17 -- keyboards/box75/box75.c | 18 --- keyboards/bpiphany/four_banger/four_banger.c | 1 - keyboards/bpiphany/hid_liber/hid_liber.c | 18 --- keyboards/bpiphany/kitten_paw/kitten_paw.c | 1 - keyboards/bpiphany/tiger_lily/tiger_lily.c | 1 - .../bpiphany/unloved_bastard/unloved_bastard.c | 16 -- keyboards/bt66tech/bt66tech60/bt66tech60.c | 18 --- keyboards/bthlabs/geekpad/geekpad.c | 16 -- keyboards/buildakb/potato65/potato65.c | 17 -- keyboards/buildakb/potato65hs/potato65hs.c | 17 -- keyboards/buildakb/potato65s/potato65s.c | 17 -- keyboards/cablecardesigns/cypher/rev6/rev6.c | 3 - keyboards/caffeinated/serpent65/serpent65.c | 16 -- keyboards/cannonkeys/adelie/adelie.c | 17 -- keyboards/cannonkeys/aella/aella.c | 1 - keyboards/cannonkeys/an_c/an_c.c | 1 - keyboards/cannonkeys/atlas/atlas.c | 1 - keyboards/cannonkeys/atlas_alps/atlas_alps.c | 17 -- keyboards/cannonkeys/brutalv2_65/brutalv2_65.c | 16 -- keyboards/cannonkeys/chimera65/chimera65.c | 1 - keyboards/cannonkeys/cloudline/cloudline.c | 4 - keyboards/cannonkeys/crin/crin.c | 17 -- .../cannonkeys/devastatingtkl/devastatingtkl.c | 1 - keyboards/cannonkeys/gentoo/gentoo.c | 16 -- keyboards/cannonkeys/gentoo_hs/gentoo_hs.c | 16 -- keyboards/cannonkeys/hoodrowg/hoodrowg.c | 17 -- keyboards/cannonkeys/instant60/instant60.c | 1 - keyboards/cannonkeys/instant65/instant65.c | 1 - keyboards/cannonkeys/iron165/iron165.c | 1 - .../cannonkeys/malicious_ergo/malicious_ergo.c | 16 -- keyboards/cannonkeys/nearfield/nearfield.c | 18 --- keyboards/cannonkeys/obliterated75/obliterated75.c | 1 - keyboards/cannonkeys/onyx/onyx.c | 17 -- keyboards/cannonkeys/ortho48/ortho48.c | 3 - keyboards/cannonkeys/ortho60/ortho60.c | 3 - keyboards/cannonkeys/practice60/practice60.c | 2 - keyboards/cannonkeys/practice65/practice65.c | 2 - keyboards/cannonkeys/rekt1800/rekt1800.c | 1 - keyboards/cannonkeys/sagittarius/sagittarius.c | 17 -- keyboards/cannonkeys/savage65/savage65.c | 1 - keyboards/cannonkeys/tmov2/tmov2.c | 1 - keyboards/cannonkeys/tsukuyomi/tsukuyomi.c | 17 -- keyboards/cannonkeys/vicious40/vicious40.c | 17 -- keyboards/capsunlocked/cu24/cu24.c | 16 -- keyboards/capsunlocked/cu65/cu65.c | 14 -- keyboards/capsunlocked/cu7/cu7.c | 14 -- keyboards/capsunlocked/cu80/v1/v1.c | 18 --- keyboards/catch22/catch22.c | 18 --- keyboards/cest73/tkm/tkm.c | 16 -- keyboards/chalice/chalice.c | 18 --- keyboards/chaos65/chaos65.c | 17 -- keyboards/charue/charon/charon.c | 17 -- keyboards/charue/sunsetter/sunsetter.c | 18 --- keyboards/charue/sunsetter_r2/sunsetter_r2.c | 4 - keyboards/chavdai40/rev1/rev1.c | 16 -- keyboards/chavdai40/rev2/rev2.c | 16 -- keyboards/checkerboards/axon40/axon40.c | 17 -- .../checkerboards/candybar_ortho/candybar_ortho.c | 17 -- keyboards/checkerboards/g_idb60/g_idb60.c | 18 --- keyboards/checkerboards/nop60/nop60.c | 18 --- keyboards/checkerboards/plexus75_he/plexus75_he.c | 17 -- keyboards/checkerboards/pursuit40/pursuit40.c | 17 -- .../checkerboards/ud40_ortho_alt/ud40_ortho_alt.c | 17 -- keyboards/cherrybstudio/cb1800/cb1800.c | 14 -- keyboards/cherrybstudio/cb65/cb65.c | 14 -- keyboards/cherrybstudio/cb87/cb87.c | 14 -- keyboards/cherrybstudio/cb87v2/cb87v2.c | 14 -- keyboards/chickenman/ciel/ciel.c | 17 -- keyboards/chlx/merro60/merro60.c | 19 --- keyboards/chlx/str_merro60/str_merro60.c | 18 --- keyboards/chocv/chocv.c | 17 -- keyboards/cipulot/kallos/kallos.c | 17 -- keyboards/cipulot/kawayo/kawayo.c | 17 -- keyboards/ckeys/handwire_101/handwire_101.c | 17 -- keyboards/ckeys/nakey/nakey.c | 15 -- keyboards/ckeys/washington/washington.c | 17 -- keyboards/clawsome/bookerboard/bookerboard.c | 16 -- keyboards/clawsome/coupe/coupe.c | 16 -- keyboards/clawsome/doodle/doodle.c | 17 -- keyboards/clawsome/fightpad/fightpad.c | 16 -- keyboards/clawsome/gamebuddy/v1_0/v1_0.c | 16 -- keyboards/clawsome/gamebuddy/v1_m/v1_m.c | 16 -- keyboards/clawsome/hatchback/hatchback.c | 17 -- keyboards/clawsome/luggage_rack/luggage_rack.c | 17 -- keyboards/clawsome/numeros/numeros.c | 16 -- keyboards/clawsome/roadster/roadster.c | 16 -- keyboards/clawsome/sedan/sedan.c | 16 -- keyboards/clawsome/sidekick/sidekick.c | 16 -- keyboards/clawsome/suv/suv.c | 17 -- keyboards/clueboard/2x1800/2018/2018.c | 16 -- keyboards/clueboard/2x1800/2018/2018.h | 19 --- keyboards/clueboard/60/60.c | 16 -- keyboards/clueboard/60/60.h | 19 --- keyboards/clueboard/66/rev1/rev1.c | 1 - keyboards/clueboard/66/rev1/rev1.h | 3 - keyboards/cmm_studio/fuji65/fuji65.c | 20 --- keyboards/cmm_studio/saka68/hotswap/hotswap.c | 17 -- keyboards/cmm_studio/saka68/solder/solder.c | 17 -- keyboards/coarse/cordillera/cordillera.c | 18 --- keyboards/coarse/ixora/ixora.c | 1 - keyboards/coarse/vinta/vinta.c | 1 - keyboards/compound/compound.c | 18 --- keyboards/contender/contender.c | 17 -- keyboards/converter/a1200/a1200.c | 16 -- keyboards/converter/adb_usb/adb_usb.c | 3 - keyboards/converter/hp_46010a/hp_46010a.c | 3 - keyboards/converter/ibm_terminal/ibm_terminal.c | 1 - keyboards/converter/m0110_usb/m0110_usb.c | 3 - .../modelm101_teensy2/modelm101_teensy2.c | 16 -- keyboards/converter/modelm_ssk/modelm_ssk.c | 19 --- .../numeric_keypad_iie/numeric_keypad_iie.c | 16 -- keyboards/converter/periboard_512/periboard_512.c | 17 -- .../converter/siemens_tastatur/siemens_tastatur.c | 17 -- keyboards/converter/xt_usb/xt_usb.c | 1 - keyboards/cool836a/cool836a.c | 17 -- .../copenhagen_click/click_pad_v1/click_pad_v1.c | 16 -- keyboards/coseyfannitutti/discipad/discipad.c | 16 -- keyboards/coseyfannitutti/discipline/discipline.c | 16 -- keyboards/coseyfannitutti/mullet/mullet.c | 16 -- keyboards/coseyfannitutti/mulletpad/mulletpad.c | 16 -- keyboards/coseyfannitutti/mysterium/mysterium.c | 16 -- keyboards/coseyfannitutti/romeo/romeo.c | 16 -- keyboards/craftwalk/craftwalk.c | 17 -- keyboards/crawlpad/crawlpad.c | 1 - keyboards/crazy_keyboard_68/crazy_keyboard_68.c | 17 -- keyboards/creatkeebs/glacier/glacier.c | 17 -- keyboards/creatkeebs/thera/thera.c | 17 -- keyboards/crimsonkeyboards/resume1800/resume1800.c | 16 -- keyboards/crin/crin.c | 18 --- keyboards/cutie_club/borsdorf/borsdorf.c | 17 -- .../cutie_club/giant_macro_pad/giant_macro_pad.c | 17 -- keyboards/cutie_club/keebcats/denis/denis.c | 17 -- keyboards/cutie_club/keebcats/dougal/dougal.c | 17 -- keyboards/cutie_club/novus/novus.c | 17 -- keyboards/cx60/cx60.c | 15 -- keyboards/cybergear/macro25/macro25.c | 17 -- keyboards/daji/seis_cinco/seis_cinco.c | 17 -- keyboards/db/db63/db63.c | 17 -- keyboards/dc01/arrow/arrow.c | 16 -- keyboards/dc01/left/left.c | 16 -- keyboards/dc01/numpad/numpad.c | 16 -- keyboards/dc01/right/right.c | 16 -- keyboards/delikeeb/flatbread60/flatbread60.c | 18 --- keyboards/delikeeb/vaguettelite/vaguettelite.c | 17 -- keyboards/delikeeb/vanana/rev1/rev1.c | 17 -- keyboards/delikeeb/vanana/rev2/rev2.c | 17 -- keyboards/delikeeb/vaneela/vaneela.c | 18 --- keyboards/delikeeb/vaneelaex/vaneelaex.c | 18 --- keyboards/delikeeb/waaffle/rev3/rev3.c | 17 -- keyboards/deltapad/deltapad.c | 17 -- keyboards/demiurge/demiurge.c | 18 --- keyboards/dm9records/ergoinu/ergoinu.c | 18 --- keyboards/dm9records/plaid/plaid.c | 16 -- keyboards/dm9records/tartan/tartan.c | 16 -- keyboards/dmqdesign/spin/spin.c | 16 -- keyboards/donutcables/budget96/budget96.c | 17 -- keyboards/donutcables/scrabblepad/scrabblepad.c | 16 -- keyboards/doodboard/duckboard/duckboard.c | 17 -- keyboards/doodboard/duckboard_r2/duckboard_r2.c | 17 -- keyboards/doro67/multi/multi.c | 16 -- keyboards/doro67/regular/regular.c | 16 -- keyboards/draculad/draculad.c | 18 --- keyboards/draytronics/daisy/daisy.c | 19 --- keyboards/draytronics/elise/elise.c | 18 --- keyboards/draytronics/elise_v2/elise_v2.c | 18 --- keyboards/draytronics/scarlet/scarlet.c | 19 --- keyboards/drewkeys/iskar/iskar.c | 17 -- keyboards/drhigsby/bkf/bkf.c | 16 -- keyboards/drhigsby/dubba175/dubba175.c | 16 -- keyboards/dtisaac/cg108/cg108.c | 17 -- keyboards/dtisaac/dtisaac01/dtisaac01.c | 17 -- keyboards/dumbo/dumbo.c | 16 -- keyboards/dyz/dyz40/dyz40.c | 16 -- keyboards/dyz/dyz60/dyz60.c | 16 -- keyboards/dyz/dyz60_hs/dyz60_hs.c | 16 -- keyboards/dyz/dyz_tkl/dyz_tkl.c | 16 -- keyboards/dyz/selka40/selka40.c | 16 -- keyboards/dz60/dz60.c | 1 - keyboards/dztech/duo_s/duo_s.c | 16 -- keyboards/dztech/dz96/dz96.c | 17 -- keyboards/dztech/endless80/endless80.c | 16 -- keyboards/e88/e88.c | 16 -- keyboards/earth_rover/earth_rover.c | 17 -- keyboards/eason/aeroboard/aeroboard.c | 4 - keyboards/eason/capsule65/capsule65.c | 17 -- keyboards/ebastler/isometria_75/rev1/rev1.c | 17 -- keyboards/edc40/edc40.c | 16 -- keyboards/edi/hardlight/mk1/mk1.c | 18 --- keyboards/edi/hardlight/mk2/mk2.c | 18 --- keyboards/edi/standaside/standaside.c | 1 - keyboards/edinburgh41/edinburgh41.c | 16 -- keyboards/efreet/efreet.c | 17 -- keyboards/ekow/akira/akira.c | 16 -- keyboards/emajesty/eiri/eiri.c | 17 -- keyboards/emi20/emi20.c | 17 -- keyboards/emptystring/nqg/nqg.c | 3 - keyboards/eniigmakeyboards/ek60/ek60.c | 18 --- keyboards/eniigmakeyboards/ek65/ek65.c | 18 --- keyboards/eniigmakeyboards/ek87/ek87.c | 17 -- keyboards/ep/40/40.c | 16 -- keyboards/ep/96/96.c | 16 -- keyboards/ep/comsn/hs68/hs68.c | 16 -- keyboards/ep/comsn/mollydooker/mollydooker.c | 16 -- keyboards/ep/comsn/tf_longeboye/tf__longeboye.c | 16 -- keyboards/epoch80/epoch80.c | 17 -- keyboards/ericrlau/numdiscipline/rev1/rev1.c | 17 -- keyboards/esca/getawayvan/getawayvan.c | 17 -- keyboards/esca/getawayvan_f042/getawayvan_f042.c | 17 -- keyboards/eternal_keypad/eternal_keypad.c | 17 -- keyboards/eu_isolation/eu_isolation.c | 16 -- .../sleepingdinosaur/sleepingdinosaur.c | 17 -- keyboards/evancookaudio/tenpad/tenpad.c | 17 -- keyboards/eve/meteor/meteor.c | 17 -- keyboards/evil80/evil80.c | 1 - keyboards/evyd13/atom47/rev2/rev2.c | 18 --- keyboards/evyd13/atom47/rev3/rev3.c | 18 --- keyboards/evyd13/atom47/rev4/rev4.c | 18 --- keyboards/evyd13/eon40/eon40.c | 16 -- keyboards/evyd13/eon65/eon65.c | 16 -- keyboards/evyd13/eon75/eon75.c | 16 -- keyboards/evyd13/eon87/eon87.c | 16 -- keyboards/evyd13/eon95/eon95.c | 16 -- keyboards/evyd13/gh80_1800/gh80_1800.c | 16 -- keyboards/evyd13/minitomic/minitomic.c | 16 -- keyboards/evyd13/mx5160/mx5160.c | 16 -- keyboards/evyd13/nt660/nt660.c | 16 -- keyboards/evyd13/nt750/nt750.c | 16 -- keyboards/evyd13/nt980/nt980.c | 17 -- keyboards/evyd13/omrontkl/omrontkl.c | 16 -- keyboards/evyd13/plain60/plain60.c | 1 - keyboards/evyd13/quackfire/quackfire.c | 16 -- keyboards/evyd13/solheim68/solheim68.c | 16 -- keyboards/evyd13/ta65/ta65.c | 1 - keyboards/evyd13/wasdat/wasdat.c | 16 -- keyboards/evyd13/wasdat_code/wasdat_code.c | 16 -- keyboards/evyd13/wonderland/wonderland.c | 1 - keyboards/exclusive/e65/e65.c | 17 -- keyboards/exclusive/e6v2/le/le.c | 1 - keyboards/exclusive/e6v2/le_bmc/le_bmc.c | 17 -- keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c | 17 -- keyboards/exclusive/e7v1/e7v1.c | 1 - keyboards/exclusive/e7v1se/e7v1se.c | 17 -- keyboards/exent/exent.c | 17 -- keyboards/eyeohdesigns/babyv/babyv.c | 17 -- keyboards/facew/facew.c | 18 --- keyboards/feels/feels65/feels65.c | 16 -- keyboards/ferris/0_1/0_1.c | 17 -- keyboards/ferris/0_2/0_2.c | 17 -- keyboards/ffkeebs/siris/siris.c | 17 -- keyboards/fjlabs/7vhotswap/7vhotswap.c | 14 -- keyboards/fjlabs/ad65/ad65.c | 14 -- keyboards/fjlabs/avalon/avalon.c | 14 -- keyboards/fjlabs/bks65/bks65.c | 14 -- keyboards/fjlabs/bks65solder/bks65solder.c | 14 -- keyboards/fjlabs/kf87/kf87.c | 14 -- keyboards/fjlabs/kyuu/kyuu.c | 14 -- keyboards/fjlabs/ldk65/ldk65.c | 14 -- keyboards/fjlabs/midway60/midway60.c | 14 -- keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c | 13 -- keyboards/fjlabs/peaker/peaker.c | 14 -- keyboards/fjlabs/polaris/polaris.c | 14 -- keyboards/fjlabs/ready100/ready100.c | 14 -- keyboards/fjlabs/sinanju/sinanju.c | 14 -- keyboards/fjlabs/sinanjuwk/sinanjuwk.c | 14 -- keyboards/fjlabs/solanis/solanis.c | 14 -- keyboards/fjlabs/swordfish/swordfish.c | 14 -- keyboards/fjlabs/tf60ansi/tf60ansi.c | 14 -- keyboards/fjlabs/tf60v2/tf60v2.c | 14 -- keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c | 14 -- keyboards/flehrad/downbubble/downbubble.c | 16 -- keyboards/flehrad/numbrero/numbrero.c | 1 - keyboards/flehrad/snagpad/snagpad.c | 1 - keyboards/flehrad/tradestation/tradestation.c | 16 -- keyboards/fleuron/fleuron.c | 16 -- keyboards/fluorite/fluorite.c | 16 -- keyboards/flx/lodestone/lodestone.c | 17 -- keyboards/flxlb/zplit/zplit.c | 17 -- keyboards/flygone60/rev3/rev3.c | 17 -- keyboards/foostan/cornelius/cornelius.c | 17 -- keyboards/foxlab/key65/hotswap/hotswap.c | 17 -- keyboards/foxlab/key65/universal/universal.c | 17 -- keyboards/foxlab/leaf60/hotswap/hotswap.c | 16 -- keyboards/foxlab/leaf60/universal/universal.c | 16 -- keyboards/foxlab/time80/time80.c | 17 -- keyboards/foxlab/time_re/hotswap/hotswap.c | 17 -- keyboards/foxlab/time_re/universal/universal.c | 17 -- keyboards/fr4/southpaw75/southpaw75.c | 17 -- keyboards/fr4/unix60/unix60.c | 17 -- keyboards/fractal/fractal.c | 1 - keyboards/free_willy/free_willy.c | 16 -- keyboards/friedrich/friedrich.c | 17 -- keyboards/frooastboard/nano/nano.c | 17 -- keyboards/ft/mars65/mars65.c | 8 - keyboards/ft/mars80/mars80.c | 17 -- keyboards/function96/v1/v1.c | 17 -- keyboards/function96/v2/v2.c | 17 -- keyboards/funky40/funky40.c | 1 - keyboards/gami_studio/lex60/lex60.c | 1 - keyboards/generic_panda/panda65_01/panda65_01.c | 17 -- keyboards/genone/eclipse_65/eclipse_65.c | 17 -- keyboards/genone/g1_65/g1_65.c | 17 -- keyboards/geonworks/frogmini/fmh/fmh.c | 17 -- keyboards/ggkeyboards/genesis/hotswap/hotswap.c | 17 -- keyboards/ggkeyboards/genesis/solder/solder.c | 17 -- keyboards/gh60/revc/revc.c | 1 - keyboards/gh60/satan/satan.c | 1 - keyboards/gh60/v1p3/v1p3.c | 16 -- keyboards/gh80_3000/gh80_3000.c | 1 - keyboards/gkeyboard/gkb_m16/gkb_m16.c | 17 -- keyboards/gl516/a52gl/a52gl.c | 18 --- keyboards/gl516/n51gl/n51gl.c | 18 --- keyboards/gon/nerd60/nerd60.c | 1 - keyboards/gon/nerdtkl/nerdtkl.c | 1 - keyboards/gowla/gowla.c | 1 - keyboards/gray_studio/aero75/aero75.c | 3 - keyboards/gray_studio/apollo80/apollo80.c | 18 --- keyboards/gray_studio/cod67/cod67.c | 16 -- keyboards/gray_studio/hb85/hb85.c | 19 --- keyboards/gray_studio/space65/space65.c | 16 -- keyboards/gray_studio/space65r3/space65r3.c | 3 - keyboards/gray_studio/think65/hotswap/hotswap.c | 16 -- keyboards/grid600/press/press.c | 16 -- keyboards/gummykey/gummykey.c | 4 - keyboards/gvalchca/ga150/ga150.c | 17 -- keyboards/gvalchca/spaccboard/spaccboard.c | 17 -- keyboards/h0oni/hotduck/hotduck.c | 18 --- keyboards/han60/han60.c | 17 -- .../108key_trackpoint/108key_trackpoint.c | 1 - keyboards/handwired/10k/10k.c | 18 --- keyboards/handwired/3dfoxc/3dfoxc.c | 17 -- keyboards/handwired/3dortho14u/rev1/rev1.c | 4 - keyboards/handwired/3dortho14u/rev2/rev2.c | 4 - keyboards/handwired/3dp660/3dp660.c | 17 -- keyboards/handwired/412_64/412_64.c | 1 - keyboards/handwired/6macro/6macro.c | 16 -- keyboards/handwired/acacia/acacia.c | 17 -- keyboards/handwired/aim65/aim65.c | 17 -- keyboards/handwired/amigopunk/amigopunk.c | 17 -- keyboards/handwired/aplx2/aplx2.c | 19 --- keyboards/handwired/aranck/aranck.c | 16 -- keyboards/handwired/arrow_pad/arrow_pad.c | 1 - keyboards/handwired/axon/axon.c | 18 --- keyboards/handwired/baredev/rev1/rev1.c | 17 -- keyboards/handwired/bigmac/bigmac.c | 17 -- keyboards/handwired/bolek/bolek.c | 17 -- .../boss566y/redragon_vara/redragon_vara.c | 16 -- keyboards/handwired/brain/brain.c | 1 - keyboards/handwired/bstk100/bstk100.c | 18 --- keyboards/handwired/cans12er/cans12er.c | 1 - keyboards/handwired/carpolly/carpolly.c | 20 --- keyboards/handwired/chiron/chiron.c | 16 -- keyboards/handwired/ck4x4/ck4x4.c | 1 - keyboards/handwired/cmd60/cmd60.c | 1 - keyboards/handwired/co60/rev1/rev1.c | 16 -- keyboards/handwired/co60/rev6/rev6.c | 17 -- keyboards/handwired/co60/rev7/rev7.c | 17 -- keyboards/handwired/concertina/64key/64key.c | 17 -- keyboards/handwired/consolekeyboard/18key/18key.c | 16 -- keyboards/handwired/consolekeyboard/20key/20key.c | 16 -- keyboards/handwired/consolekeyboard/27key/27key.c | 16 -- keyboards/handwired/consolekeyboard/30key/30key.c | 16 -- keyboards/handwired/croxsplit44/croxsplit44.c | 17 -- keyboards/handwired/curiosity/curiosity.c | 16 -- keyboards/handwired/cyberstar/cyberstar.c | 16 -- keyboards/handwired/d48/d48.c | 1 - keyboards/handwired/dactyl_left/dactyl_left.c | 16 -- keyboards/handwired/dactyl_manuform/4x5/4x5.c | 1 - keyboards/handwired/dactyl_manuform/4x6/4x6.c | 1 - keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c | 1 - keyboards/handwired/dactyl_manuform/5x6/5x6.c | 1 - .../handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c | 17 -- keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c | 1 - keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c | 18 --- keyboards/handwired/dactyl_manuform/5x7/5x7.c | 1 - keyboards/handwired/dactyl_manuform/6x6/6x6.c | 1 - keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c | 5 - .../dactyl_manuform/6x6_kinesis/6x6_kinesis.c | 5 - keyboards/handwired/dactyl_manuform/6x7/6x7.c | 4 - .../handwired/dactyl_manuform/dmote/62key/62key.c | 1 - .../handwired/dactyl_promicro/dactyl_promicro.c | 1 - keyboards/handwired/dactyl_rah/dactyl_rah.c | 16 -- keyboards/handwired/daishi/daishi.c | 1 - keyboards/handwired/ddg_56/ddg_56.c | 16 -- keyboards/handwired/eagleii/eagleii.c | 1 - keyboards/handwired/elrgo_s/elrgo_s.c | 17 -- keyboards/handwired/ergocheap/ergocheap.c | 16 -- keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c | 17 -- keyboards/handwired/fivethirteen/fivethirteen.c | 1 - keyboards/handwired/floorboard/floorboard.c | 17 -- .../handwired/frankie_macropad/frankie_macropad.c | 17 -- keyboards/handwired/freoduo/freoduo.c | 17 -- keyboards/handwired/fruity60/fruity60.c | 16 -- .../handwired/hacked_motospeed/hacked_motospeed.c | 16 -- keyboards/handwired/heisenberg/heisenberg.c | 16 -- keyboards/handwired/hexon38/hexon38.c | 3 - keyboards/handwired/hnah40/hnah40.c | 16 -- keyboards/handwired/hwpm87/hwpm87.c | 4 - keyboards/handwired/ibm122m/ibm122m.c | 16 -- .../handwired/ibm_wheelwriter/ibm_wheelwriter.c | 20 --- keyboards/handwired/jn68m/jn68m.c | 16 -- keyboards/handwired/jot50/jot50.c | 1 - keyboards/handwired/juliet/juliet.c | 16 -- keyboards/handwired/k8split/k8split.c | 18 --- keyboards/handwired/k_numpad17/k_numpad17.c | 1 - keyboards/handwired/kbod/kbod.c | 1 - keyboards/handwired/ks63/ks63.c | 1 - keyboards/handwired/leftynumpad/leftynumpad.c | 17 -- keyboards/handwired/lovelive9/lovelive9.c | 1 - .../handwired/m40/5x5_macropad/5x5_macropad.c | 4 - keyboards/handwired/macroboard/macroboard.c | 17 -- keyboards/handwired/magicforce61/magicforce61.c | 1 - keyboards/handwired/magicforce68/magicforce68.c | 1 - keyboards/handwired/marauder/marauder.c | 17 -- .../mechboards_micropad/mechboards_micropad.c | 16 -- keyboards/handwired/meck_tkl/meck_tkl.c | 4 - keyboards/handwired/minorca/minorca.c | 1 - keyboards/handwired/misterdeck/misterdeck.c | 18 --- .../handwired/ms_sculpt_mobile/ms_sculpt_mobile.c | 1 - keyboards/handwired/mutepad/mutepad.c | 4 - keyboards/handwired/nicekey/nicekey.c | 1 - .../handwired/not_so_minidox/not_so_minidox.c | 1 - keyboards/handwired/novem/novem.c | 18 --- keyboards/handwired/nozbe_macro/nozbe_macro.c | 17 -- keyboards/handwired/numpad20/numpad20.c | 1 - keyboards/handwired/obuwunkunubi/spaget/spaget.c | 16 -- .../oem_ansi_fullsize/oem_ansi_fullsize.c | 17 -- .../handwired/oem_iso_fullsize/oem_iso_fullsize.c | 20 --- keyboards/handwired/ortho5x13/ortho5x13.c | 1 - keyboards/handwired/ortho5x14/ortho5x14.c | 18 --- keyboards/handwired/owlet60/owlet60.c | 16 -- keyboards/handwired/pilcrow/pilcrow.c | 1 - keyboards/handwired/pill60/pill60.c | 16 -- keyboards/handwired/postageboard/mini/mini.c | 18 --- keyboards/handwired/postageboard/mini/mini.h | 34 ---- keyboards/handwired/postageboard/postageboard.c | 1 - keyboards/handwired/postageboard/r1/r1.c | 18 --- keyboards/handwired/postageboard/r1/r1.h | 34 ---- keyboards/handwired/prime_exl/prime_exl.c | 16 -- keyboards/handwired/prkl30/prkl30.c | 17 -- keyboards/handwired/pteron/pteron.c | 1 - keyboards/handwired/pteron38/pteron38.c | 17 -- keyboards/handwired/pteron44/pteron44.c | 17 -- keyboards/handwired/reclined/reclined.c | 16 -- keyboards/handwired/riblee_f401/riblee_f401.c | 17 -- keyboards/handwired/riblee_f411/riblee_f411.c | 17 -- keyboards/handwired/rs60/rs60.c | 18 --- keyboards/handwired/sick68/sick68.c | 17 -- keyboards/handwired/sick_pad/sick_pad.c | 17 -- .../handwired/skakunm_dactyl/skakunm_dactyl.c | 4 - keyboards/handwired/slash/slash.c | 16 -- keyboards/handwired/space_oddity/space_oddity.c | 1 - keyboards/handwired/splittest/splittest.c | 1 - keyboards/handwired/steamvan/rev1/rev1.c | 17 -- keyboards/handwired/sticc14/sticc14.c | 16 -- keyboards/handwired/swiftrax/astro65/astro65.c | 17 -- keyboards/handwired/swiftrax/bebol/bebol.c | 17 -- keyboards/handwired/swiftrax/beegboy/beegboy.c | 16 -- keyboards/handwired/swiftrax/cowfish/cowfish.c | 1 - .../handwired/swiftrax/digicarpice/digicarpice.c | 17 -- keyboards/handwired/swiftrax/equator/equator.c | 17 -- keyboards/handwired/swiftrax/glacier/glacier.c | 18 --- keyboards/handwired/swiftrax/joypad/joypad.c | 16 -- .../swiftrax/koalafications/koalafications.c | 17 -- keyboards/handwired/swiftrax/nodu/nodu.c | 17 -- keyboards/handwired/swiftrax/pandamic/pandamic.c | 16 -- .../handwired/swiftrax/the_galleon/the_galleon.c | 16 -- keyboards/handwired/swiftrax/unsplit/unsplit.c | 1 - keyboards/handwired/swiftrax/walter/walter.c | 17 -- keyboards/handwired/symmetry60/symmetry60.c | 16 -- keyboards/handwired/t111/t111.c | 17 -- keyboards/handwired/terminus_mini/terminus_mini.c | 16 -- keyboards/handwired/trackpoint/trackpoint.c | 1 - .../handwired/tritium_numpad/tritium_numpad.c | 1 - keyboards/handwired/twadlee/tp69/tp69.c | 18 --- keyboards/handwired/twig/twig50/twig50.c | 4 - .../handwired/unicomp_mini_m/unicomp_mini_m.c | 16 -- keyboards/handwired/unk/rev1/rev1.c | 1 - keyboards/handwired/unk/rev1/rev1.h | 2 - keyboards/handwired/unk/unk.c | 1 - keyboards/handwired/unk/unk.h | 4 - keyboards/handwired/videowriter/videowriter.c | 17 -- keyboards/handwired/wabi/wabi.c | 15 -- keyboards/handwired/wulkan/wulkan.c | 1 - keyboards/handwired/xealous/rev1/rev1.c | 2 - keyboards/handwired/zergo/zergo.c | 17 -- keyboards/hardlineworks/otd_plus/otd_plus.c | 1 - keyboards/hhkb/ansi/ansi.c | 1 - keyboards/hhkb/jp/jp.c | 1 - keyboards/hhkb_lite_2/hhkb_lite_2.c | 1 - keyboards/hidtech/bastyl/bastyl.c | 19 --- keyboards/hillside/48/0_1/0_1.c | 4 - keyboards/hineybush/h08_ocelot/h08_ocelot.c | 17 -- keyboards/hineybush/h65/h65.c | 17 -- keyboards/hineybush/h65_hotswap/h65_hotswap.c | 17 -- keyboards/hineybush/hineyg80/hineyg80.c | 16 -- keyboards/hineybush/sm68/sm68.c | 17 -- keyboards/hnahkb/freyr/freyr.c | 17 -- keyboards/hnahkb/stella/stella.c | 17 -- keyboards/hnahkb/vn66/vn66.c | 17 -- keyboards/holyswitch/southpaw75/southpaw75.c | 17 -- keyboards/horizon/horizon.c | 17 -- .../horrortroll/chinese_pcb/black_e65/black_e65.c | 17 -- keyboards/horrortroll/paws60/paws60.c | 17 -- keyboards/hp69/hp69.c | 16 -- keyboards/hub16/hub16.c | 16 -- keyboards/huytbt/h50/h50.c | 17 -- .../overnumpad_1xb/overnumpad_1xb.c | 24 --- keyboards/ibnuda/alicia_cook/alicia_cook.c | 17 -- keyboards/ibnuda/gurindam/gurindam.c | 16 -- keyboards/idobao/id75/v1/v1.c | 16 -- keyboards/idobao/id87/v1/v1.c | 15 -- keyboards/idobao/id96/id96.c | 19 --- keyboards/idobao/montex/v1/v1.c | 17 -- keyboards/illuminati/is0/is0.c | 16 -- keyboards/illusion/rosa/rosa.c | 18 --- keyboards/ilumkb/primus75/primus75.c | 16 -- keyboards/ingrained/ingrained.c | 4 - keyboards/input_club/infinity60/infinity60.c | 18 --- keyboards/irene/irene.c | 17 -- keyboards/iriskeyboards/iriskeyboards.c | 17 -- keyboards/j80/j80.c | 17 -- keyboards/jacky_studio/s7_elephant/rev1/rev1.c | 17 -- keyboards/jacky_studio/s7_elephant/rev2/rev2.c | 17 -- keyboards/jadookb/jkb2/jkb2.c | 16 -- keyboards/jc65/v32a/v32a.c | 18 --- keyboards/jc65/v32u4/v32u4.c | 1 - keyboards/jd40/jd40.c | 1 - keyboards/jd45/jd45.c | 1 - keyboards/jels/jels60/jels60.c | 21 --- keyboards/jkdlab/binary_monkey/binary_monkey.c | 19 --- keyboards/jones/v03/v03.c | 17 -- keyboards/k34/k34.c | 4 - keyboards/kabedon/kabedon78s/kabedon78s.c | 17 -- keyboards/kagizaraya/chidori/chidori.c | 17 -- keyboards/kagizaraya/halberd/halberd.c | 16 -- keyboards/kagizaraya/scythe/scythe.c | 16 -- keyboards/kakunpc/angel17/alpha/alpha.c | 16 -- keyboards/kakunpc/angel17/rev1/rev1.c | 16 -- keyboards/kakunpc/angel64/alpha/alpha.c | 16 -- keyboards/kakunpc/angel64/rev1/rev1.c | 16 -- keyboards/kakunpc/choc_taro/choc_taro.c | 17 -- .../rabbit_capture_plan/rabbit_capture_plan.c | 17 -- keyboards/kakunpc/suihankey/alpha/alpha.c | 16 -- keyboards/kakunpc/suihankey/rev1/rev1.c | 16 -- keyboards/kakunpc/suihankey/split/alpha/alpha.c | 16 -- keyboards/kakunpc/suihankey/split/rev1/rev1.c | 16 -- keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c | 16 -- keyboards/kapcave/gskt00/gskt00.c | 18 --- keyboards/kapcave/paladin64/paladin64.c | 18 --- keyboards/kapcave/paladinpad/paladinpad.c | 17 -- keyboards/karlb/kbic65/kbic65.c | 4 - keyboards/kb58/kb58.c | 17 -- keyboards/kb_elmo/67mk_e/67mk_e.c | 17 -- keyboards/kb_elmo/aek2_usb/aek2_usb.c | 17 -- keyboards/kb_elmo/elmopad/elmopad.c | 17 -- keyboards/kb_elmo/m0110a_usb/m0110a_usb.c | 17 -- keyboards/kb_elmo/m0116_usb/m0116_usb.c | 17 -- keyboards/kb_elmo/noah_avr/noah_avr.c | 17 -- keyboards/kb_elmo/qez/qez.c | 17 -- keyboards/kb_elmo/sesame/sesame.c | 17 -- keyboards/kb_elmo/twelvekey/twelvekey.c | 17 -- keyboards/kb_elmo/vertex/vertex.c | 17 -- keyboards/kbdclack/kaishi65/kaishi65.c | 17 -- keyboards/kbdfans/baguette66/soldered/soldered.c | 17 -- keyboards/kbdfans/bounce/75/hotswap/hotswap.c | 16 -- keyboards/kbdfans/bounce/75/soldered/soldered.c | 17 -- keyboards/kbdfans/bounce/pad/pad.c | 16 -- keyboards/kbdfans/kbd19x/kbd19x.c | 18 --- keyboards/kbdfans/kbd4x/kbd4x.c | 16 -- keyboards/kbdfans/kbd66/kbd66.c | 16 -- keyboards/kbdfans/kbd67/hotswap/hotswap.c | 16 -- .../kbdfans/kbd67/mkii_soldered/mkii_soldered.c | 16 -- keyboards/kbdfans/kbd67/rev1/rev1.c | 16 -- keyboards/kbdfans/kbd67/rev2/rev2.c | 1 - keyboards/kbdfans/kbd6x/kbd6x.c | 16 -- keyboards/kbdfans/kbd75hs/kbd75hs.c | 17 -- keyboards/kbdfans/kbd8x/kbd8x.c | 17 -- keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c | 16 -- keyboards/kbdfans/kbdpad/mk1/mk1.c | 17 -- keyboards/kbdfans/kbdpad/mk2/mk2.c | 16 -- keyboards/kbdfans/odin/soldered/soldered.c | 16 -- keyboards/kbdfans/odin/v2/v2.c | 17 -- keyboards/kbnordic/nordic60/rev_a/rev_a.c | 17 -- keyboards/keaboard/rev1/config.h | 4 - keyboards/keebformom/keebformom.c | 17 -- keyboards/keebio/bfo9000/bfo9000.c | 1 - keyboards/keebio/bigswitchseat/bigswitchseat.c | 4 - keyboards/keebio/laplace/laplace.c | 1 - keyboards/keebio/tragicforce68/tragicforce68.c | 1 - keyboards/keebio/wtf60/wtf60.c | 1 - keyboards/keebmonkey/kbmg68/kbmg68.c | 20 --- keyboards/keebsforall/freebird60/freebird60.c | 17 -- keyboards/keebsforall/freebirdnp/lite/lite.c | 16 -- keyboards/keebsforall/freebirdtkl/freebirdtkl.c | 17 -- keyboards/keebwerk/nano_slider/nano_slider.c | 18 --- keyboards/keebzdotnet/fme/fme.c | 17 -- keyboards/keebzdotnet/wazowski/wazowski.c | 17 -- keyboards/kegen/gboy/gboy.c | 18 --- keyboards/keybage/radpad/radpad.c | 17 -- keyboards/keyboardio/atreus/atreus.c | 17 -- keyboards/keycapsss/o4l_5x12/o4l_5x12.c | 1 - keyboards/keycapsss/plaid_pad/plaid_pad.c | 17 -- keyboards/keycapsss/plaid_pad/rev1/rev1.c | 17 -- keyboards/keycapsss/plaid_pad/rev1/rev1.h | 19 --- keyboards/keycapsss/plaid_pad/rev2/rev2.c | 17 -- keyboards/keycapsss/plaid_pad/rev2/rev2.h | 19 --- keyboards/keycapsss/plaid_pad/rev3/rev3.c | 17 -- keyboards/keycapsss/plaid_pad/rev3/rev3.h | 20 --- keyboards/keygem/kg60ansi/kg60ansi.c | 14 -- keyboards/keygem/kg65rgbv2/kg65rgbv2.c | 14 -- keyboards/keyhive/absinthe/absinthe.c | 17 -- keyboards/keyhive/ergosaurus/ergosaurus.c | 17 -- keyboards/keyhive/maypad/maypad.c | 16 -- keyboards/keyhive/opus/opus.c | 17 -- keyboards/keyhive/smallice/smallice.c | 17 -- keyboards/keyhive/southpole/southpole.c | 1 - keyboards/keyhive/ut472/ut472.c | 1 - keyboards/keyprez/corgi/corgi.c | 17 -- keyboards/keysofkings/twokey/twokey.c | 17 -- keyboards/keyten/aperture/aperture.c | 17 -- keyboards/keyten/kt3700/kt3700.c | 17 -- keyboards/keyten/kt60_m/kt60_m.c | 18 --- keyboards/kikkou/kikkou.c | 18 --- keyboards/kikoslab/ellora65/ellora65.c | 17 -- keyboards/kikoslab/kl90/kl90.c | 17 -- keyboards/kin80/blackpill103/blackpill103.c | 2 +- keyboards/kin80/blackpill103/blackpill103.h | 19 --- keyboards/kin80/blackpill401/blackpill401.c | 2 +- keyboards/kin80/blackpill401/blackpill401.h | 19 --- keyboards/kin80/blackpill411/blackpill411.c | 2 +- keyboards/kin80/blackpill411/blackpill411.h | 19 --- keyboards/kin80/kin80.c | 17 -- keyboards/kin80/micro/micro.c | 2 +- keyboards/kin80/micro/micro.h | 20 --- keyboards/kindakeyboards/conone65/conone65.c | 17 -- keyboards/kineticlabs/emu/hotswap/hotswap.c | 17 -- keyboards/kineticlabs/emu/soldered/soldered.c | 17 -- keyboards/kingly_keys/ave/ortho/ortho.c | 18 --- keyboards/kingly_keys/ave/staggered/staggered.c | 18 --- keyboards/kingly_keys/little_foot/little_foot.c | 1 - keyboards/kingly_keys/romac/romac.c | 1 - keyboards/kingly_keys/romac_plus/romac_plus.c | 2 - keyboards/kingly_keys/ropro/ropro.c | 1 - keyboards/kingly_keys/smd_milk/smd_milk.c | 16 -- keyboards/kingly_keys/soap/soap.c | 1 - keyboards/kira75/kira75.c | 16 -- keyboards/kira80/kira80.c | 17 -- keyboards/kiwikey/kawii9/kawii9.c | 17 -- keyboards/kiwikey/wanderland/wanderland.c | 17 -- keyboards/kkatano/bakeneko60/bakeneko60.c | 17 -- keyboards/kkatano/bakeneko65/rev2/rev2.c | 17 -- keyboards/kkatano/bakeneko65/rev3/rev3.c | 17 -- keyboards/kkatano/bakeneko80/bakeneko80.c | 17 -- keyboards/knops/mini/mini.c | 16 -- keyboards/kona_classic/kona_classic.c | 16 -- keyboards/kopibeng/mnk65/mnk65.c | 17 -- keyboards/kopibeng/xt60/xt60.c | 17 -- keyboards/kopibeng/xt60_singa/xt60_singa.c | 17 -- keyboards/kopibeng/xt65/xt65.c | 17 -- keyboards/kprepublic/bm43a/bm43a.c | 16 -- keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c | 16 -- keyboards/kprepublic/cospad/cospad.c | 16 -- keyboards/kprepublic/jj40/jj40.c | 19 --- keyboards/kprepublic/jj4x4/jj4x4.c | 19 --- keyboards/kprepublic/jj50/jj50.c | 18 --- keyboards/ktec/daisy/daisy.c | 17 -- keyboards/kwub/bloop/bloop.c | 17 -- keyboards/ky01/ky01.c | 17 -- keyboards/labyrinth75/labyrinth75.c | 17 -- keyboards/latincompass/latin47ble/latin47ble.c | 16 -- keyboards/latincompass/latin64ble/latin64ble.c | 16 -- keyboards/lazydesigners/bolt/bolt.c | 1 - keyboards/lazydesigners/cassette8/cassette8.c | 17 -- keyboards/lazydesigners/dimple/ortho/ortho.c | 15 -- keyboards/lazydesigners/dimpleplus/dimpleplus.c | 1 - keyboards/lazydesigners/the30/the30.c | 16 -- keyboards/lazydesigners/the40/the40.c | 14 -- keyboards/lazydesigners/the60/rev1/rev1.c | 2 - keyboards/lazydesigners/the60/rev2/rev2.c | 1 - keyboards/lefty/rev1/rev1.c | 17 -- keyboards/lefty/rev2/rev2.c | 17 -- keyboards/linworks/dolice/dolice.c | 16 -- keyboards/linworks/fave104/fave104.c | 17 -- keyboards/linworks/fave87/fave87.c | 16 -- .../lizard_trick/tenkey_plusplus/tenkey_plusplus.c | 18 --- keyboards/lm_keyboard/lm60n/lm60n.c | 17 -- keyboards/longnald/corin/corin.c | 19 --- keyboards/lucid/alexa/alexa.c | 14 -- keyboards/lucid/alexa_solder/alexa_solder.c | 14 -- keyboards/lucid/kbd8x_hs/kbx8s_hs.c | 14 -- keyboards/lucid/phantom_hs/phantom_hs.c | 14 -- keyboards/lucid/phantom_solder/phantom_solder.c | 14 -- keyboards/lucid/scarlet/scarlet.c | 14 -- keyboards/lyso1/lefishe/lefishe.c | 17 -- keyboards/lz/erghost/erghost.c | 17 -- keyboards/m10a/m10a.c | 19 --- keyboards/machine_industries/m4_a/m4_a.c | 4 - keyboards/majistic/majistic.c | 17 -- keyboards/makenova/omega/omega4/omega4.c | 4 - keyboards/makrosu/makrosu.c | 16 -- keyboards/manta60/manta60.c | 17 -- keyboards/manyboard/macro/macro.c | 17 -- keyboards/maple_computing/6ball/6ball.c | 1 - keyboards/maple_computing/c39/c39.c | 1 - .../christmas_tree/christmas_tree.c | 1 - .../maple_computing/christmas_tree/v2017/v2017.c | 1 - .../maple_computing/christmas_tree/v2017/v2017.h | 3 - keyboards/maple_computing/jnao/jnao.c | 1 - keyboards/maple_computing/the_ruler/the_ruler.c | 1 - keyboards/marksard/treadstone32/lite/lite.c | 16 -- keyboards/marksard/treadstone32/rev1/rev1.c | 16 -- keyboards/marksard/treadstone48/rev1/rev1.c | 17 -- keyboards/marksard/treadstone48/rev2/rev2.c | 17 -- keyboards/massdrop/thekey/thekey.c | 17 -- keyboards/massdrop/thekey_v2/thekey_v2.c | 17 -- keyboards/matchstickworks/southpad/southpad.c | 16 -- keyboards/matrix/me/me.c | 17 -- keyboards/matthewdias/m3n3van/m3n3van.c | 18 --- keyboards/matthewdias/minim/minim.c | 18 --- keyboards/matthewdias/model_v/model_v.c | 18 --- keyboards/matthewdias/txuu/txuu.c | 18 --- keyboards/mb44/mb44.c | 17 -- keyboards/mechanickeys/miniashen40/miniashen40.c | 17 -- keyboards/mechbrewery/mb65h/mb65h.c | 17 -- keyboards/mechbrewery/mb65s/mb65s.c | 17 -- keyboards/mechkeys/acr60/acr60.c | 17 -- keyboards/mechkeys/alu84/alu84.c | 17 -- keyboards/mechkeys/espectro/espectro.c | 17 -- keyboards/mechkeys/mk60/mk60.c | 16 -- keyboards/mechllama/g35/g35.c | 16 -- keyboards/mechlovin/delphine/delphine.c | 17 -- keyboards/mechlovin/delphine/rgb_led/rgb_led.c | 2 +- keyboards/mechlovin/delphine/rgb_led/rgb_led.h | 19 --- keyboards/mechlovin/foundation/foundation.c | 17 -- keyboards/mechlovin/hex4b/hex4b.c | 17 -- keyboards/mechlovin/hex6c/hex6c.c | 17 -- keyboards/mechlovin/infinity87/infinity87.c | 17 -- keyboards/mechlovin/infinity87/infinity87.h | 18 --- keyboards/mechlovin/infinity87/rev1/rev1.c | 17 -- keyboards/mechlovin/infinity87/rev1/rev1.h | 19 --- keyboards/mechlovin/infinity87/rev2/rev2.c | 17 -- keyboards/mechlovin/infinity87/rev2/rev2.h | 19 --- keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c | 2 +- keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h | 19 --- keyboards/mechlovin/infinity88/infinity88.c | 17 -- keyboards/mechlovin/jay60/jay60.c | 17 -- keyboards/mechlovin/kay60/kay60.c | 17 -- keyboards/mechlovin/mechlovin9/mechlovin9.c | 17 -- keyboards/mechlovin/pisces/pisces.c | 17 -- keyboards/mechlovin/serratus/serratus.c | 17 -- keyboards/mechlovin/th1800/th1800.c | 17 -- keyboards/mechlovin/tmkl/tmkl.c | 17 -- keyboards/mechlovin/zed60/zed60.c | 17 -- keyboards/mechstudio/dawn/dawn.c | 16 -- keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c | 16 -- keyboards/mechwild/bde/rev2/rev2.c | 2 +- keyboards/mechwild/bde/rev2/rev2.h | 18 --- keyboards/mehkee96/mehkee96.c | 18 --- keyboards/meletrix/zoom87/zoom87.c | 17 -- keyboards/melgeek/mach80/mach80.c | 17 -- keyboards/melgeek/mj61/mj61.c | 17 -- keyboards/melgeek/mj63/mj63.c | 17 -- keyboards/melgeek/mj64/mj64.c | 17 -- keyboards/melgeek/mj65/mj65.c | 17 -- keyboards/melgeek/mj6xy/mj6xy.c | 17 -- keyboards/melgeek/mj6xy/rev3/rev3.c | 18 --- keyboards/melgeek/mojo68/mojo68.c | 17 -- keyboards/melgeek/mojo75/mojo75.c | 18 --- keyboards/melgeek/tegic/tegic.c | 18 --- keyboards/melgeek/z70ultra/z70ultra.c | 178 --------------------- keyboards/meme/meme.c | 16 -- keyboards/meow65/meow65.c | 17 -- keyboards/merge/iso_macro/iso_macro.c | 17 -- keyboards/merge/uc1/uc1.c | 17 -- keyboards/mesa/mesa_tkl/mesa_tkl.c | 17 -- keyboards/meson/meson.c | 16 -- keyboards/mexsistor/ludmila/ludmila.c | 17 -- keyboards/mikeneko65/mikeneko65.c | 18 --- keyboards/millipad/millipad.c | 17 -- keyboards/mincedshon/ecila/ecila.c | 4 - keyboards/minimon/index_tab/index_tab.c | 14 -- keyboards/mint60/mint60.c | 16 -- keyboards/misonoworks/karina/karina.c | 18 --- keyboards/misterknife/knife66/knife66.c | 17 -- keyboards/misterknife/knife66_iso/knife66_iso.c | 17 -- keyboards/miuni32/miuni32.c | 1 - keyboards/mlego/m48/m48.c | 17 -- keyboards/mlego/m60/m60.c | 17 -- keyboards/mlego/m60_split/m60_split.c | 17 -- keyboards/mmkzoo65/mmkzoo65.c | 18 --- keyboards/mnk1800s/mnk1800s.c | 16 -- keyboards/mnk50/mnk50.c | 16 -- keyboards/mnk75/mnk75.c | 16 -- keyboards/mode/m75s/m75s.c | 18 --- keyboards/mokey/ginkgo65/ginkgo65.c | 16 -- keyboards/mokey/ginkgo65hot/ginkgo65hot.c | 16 -- keyboards/mokey/ibis80/ibis80.c | 16 -- keyboards/mokey/mokey63/mokey63.c | 15 -- keyboards/mokey/mokey64/mokey64.c | 17 -- keyboards/mokey/xox70/xox70.c | 15 -- keyboards/mokey/xox70hot/xox70hot.c | 15 -- keyboards/molecule/molecule.c | 17 -- keyboards/momoka_ergo/momoka_ergo.c | 17 -- keyboards/monarch/monarch.c | 15 -- keyboards/monoflex60/monoflex60.c | 17 -- keyboards/montsinger/rewind/rewind.c | 1 - keyboards/moon/moon.c | 16 -- keyboards/morizon/morizon.c | 17 -- keyboards/mountainblocks/mb17/mb17.c | 17 -- keyboards/mt/blocked65/blocked65.c | 1 - keyboards/mt/mt40/mt40.c | 17 -- keyboards/mt/mt980/mt980.c | 1 - keyboards/mt/split75/split75.c | 4 - keyboards/mtbkeys/mtb60/hotswap/hotswap.c | 17 -- keyboards/mtbkeys/mtb60/solder/solder.c | 17 -- keyboards/murcielago/murcielago.c | 17 -- keyboards/mysticworks/wyvern/wyvern.c | 17 -- keyboards/nacly/sodium42/sodium42.c | 16 -- keyboards/nacly/sodium50/sodium50.c | 16 -- keyboards/nacly/splitreus62/splitreus62.c | 1 - keyboards/nacly/ua62/ua62.c | 17 -- keyboards/nasu/nasu.c | 16 -- keyboards/ncc1701kb/ncc1701kb.c | 1 - keyboards/neito/neito.c | 17 -- keyboards/nek_type_a/nek_type_a.c | 16 -- keyboards/nemui/nemui.c | 16 -- keyboards/neokeys/g67/element_hs/element_hs.c | 17 -- keyboards/neokeys/g67/hotswap/hotswap.c | 17 -- keyboards/neokeys/g67/soldered/soldered.c | 17 -- keyboards/newgame40/newgame40.c | 1 - keyboards/nibiria/stream15/stream15.c | 19 --- keyboards/nightingale_studios/hailey/hailey.c | 17 -- keyboards/nightly_boards/alter/rev1/rev1.c | 17 -- keyboards/nightly_boards/alter_lite/alter_lite.c | 16 -- keyboards/nightly_boards/conde60/conde60.c | 17 -- keyboards/nightly_boards/daily60/daily60.c | 17 -- keyboards/nightly_boards/jisoo/jisoo.c | 17 -- keyboards/nightly_boards/n2/n2.c | 18 --- keyboards/nightly_boards/n87/n87.c | 17 -- keyboards/nightly_boards/n9/n9.c | 18 --- keyboards/nightly_boards/octopadplus/octopadplus.c | 17 -- keyboards/nightly_boards/paraluman/paraluman.c | 17 -- keyboards/nightly_boards/ph_arisu/ph_arisu.c | 1 - keyboards/nightmare/nightmare.c | 16 -- keyboards/nimrod/nimrod.c | 16 -- keyboards/nix_studio/n60_a/n60_a.c | 16 -- keyboards/nopunin10did/jabberwocky/v1/v1.c | 17 -- keyboards/nopunin10did/jabberwocky/v2/v2.c | 17 -- keyboards/nopunin10did/railroad/rev0/rev0.c | 17 -- keyboards/novelkeys/novelpad/novelpad.c | 18 --- keyboards/noxary/260/260.c | 16 -- keyboards/noxary/268/268.c | 16 -- keyboards/noxary/268_2_rgb/268_2_rgb.c | 16 -- keyboards/noxary/378/378.c | 18 --- keyboards/noxary/valhalla/valhalla.c | 18 --- keyboards/noxary/vulcan/vulcan.c | 17 -- keyboards/numatreus/numatreus.c | 1 - keyboards/nyhxis/nfr_70/nfr_70.c | 17 -- keyboards/obosob/arch_36/arch_36.c | 16 -- keyboards/ocean/addon/addon.c | 15 -- keyboards/ocean/gin_v2/gin_v2.c | 15 -- keyboards/ocean/slamz/slamz.c | 15 -- keyboards/ocean/stealth/stealth.c | 15 -- keyboards/ocean/sus/sus.c | 15 -- keyboards/ocean/wang_ergo/wang_ergo.c | 15 -- keyboards/ocean/wang_v2/wang_v2.c | 15 -- keyboards/ocean/yuri/yuri.c | 15 -- keyboards/oddball/v1/v1.c | 17 -- keyboards/oddball/v1/v1.h | 19 --- keyboards/oddball/v2/v2.c | 17 -- keyboards/oddball/v2/v2.h | 19 --- keyboards/oddball/v2_1/v2_1.c | 17 -- keyboards/oddball/v2_1/v2_1.h | 19 --- keyboards/odelia/odelia.c | 17 -- keyboards/ogre/ergo_single/ergo_single.c | 17 -- keyboards/ogre/ergo_split/ergo_split.c | 17 -- keyboards/ok60/ok60.c | 1 - keyboards/om60/om60.c | 19 --- keyboards/orange75/orange75.c | 1 - keyboards/owlab/jelly_epoch/hotswap/hotswap.c | 18 --- keyboards/owlab/jelly_epoch/soldered/soldered.c | 18 --- keyboards/owlab/suit80/ansi/ansi.c | 17 -- keyboards/owlab/suit80/iso/iso.c | 19 --- keyboards/pabile/p18/p18.c | 1 - keyboards/pabile/p20/ver1/ver1.c | 18 --- keyboards/pabile/p20/ver2/ver2.c | 18 --- keyboards/pabile/p40/p40.c | 1 - keyboards/pabile/p40_ortho/p40_ortho.c | 18 --- keyboards/pabile/p42/p42.c | 1 - keyboards/panc40/panc40.c | 1 - keyboards/panc60/panc60.c | 17 -- keyboards/papercranekeyboards/gerald65/gerald65.c | 4 - keyboards/parallel/parallel_65/hotswap/hotswap.c | 17 -- keyboards/parallel/parallel_65/soldered/soldered.c | 17 -- keyboards/pdxkbc/pdxkbc.c | 16 -- keyboards/pearl/pearl.c | 18 --- keyboards/pearlboards/pearl/pearl.c | 17 -- keyboards/percent/booster/booster.c | 16 -- keyboards/percent/canoe/canoe.c | 18 --- keyboards/percent/skog/skog.c | 20 --- keyboards/percent/skog_lite/skog_lite.c | 17 -- keyboards/phantom/phantom.c | 17 -- keyboards/phase_studio/titan65/soldered/soldered.c | 17 -- keyboards/phrygian/ph100/ph100.c | 19 --- .../frusta_fundamental/frusta_fundamental.c | 17 -- keyboards/pierce/pierce.c | 17 -- keyboards/pimentoso/paddino02/rev1/rev1.c | 16 -- keyboards/pimentoso/paddino02/rev2/left/left.c | 16 -- keyboards/pimentoso/paddino02/rev2/right/right.c | 16 -- keyboards/pimentoso/touhoupad/touhoupad.c | 16 -- keyboards/pixelspace/capsule65i/capsule65i.c | 17 -- keyboards/pizzakeyboards/pizza65/pizza65.c | 17 -- keyboards/pjb/eros/eros.c | 17 -- keyboards/pkb65/pkb65.c | 20 --- keyboards/planck/ez/ez.h | 4 - keyboards/planck/ez/glow/glow.c | 19 --- keyboards/planck/ez/glow/glow.h | 21 --- keyboards/playkbtw/ca66/ca66.c | 1 - keyboards/playkbtw/helen80/helen80.c | 17 -- keyboards/playkbtw/pk60/pk60.c | 1 - keyboards/plume/plume65/plume65.c | 16 -- keyboards/plut0nium/0x3e/0x3e.c | 18 --- keyboards/plx/plx.c | 17 -- keyboards/plywrks/ahgase/ahgase.c | 17 -- keyboards/pohjolaworks/louhi/louhi.c | 17 -- keyboards/poker87c/poker87c.c | 19 --- keyboards/poker87d/poker87d.c | 19 --- keyboards/polilla/polilla.c | 17 -- keyboards/polycarbdiet/s20/s20.c | 17 -- keyboards/portal_66/hotswap/hotswap.c | 17 -- keyboards/portal_66/soldered/soldered.c | 17 -- keyboards/pos78/pos78.c | 17 -- keyboards/primekb/meridian_rgb/meridian_rgb.c | 18 --- keyboards/primekb/prime_e/prime_e.c | 16 -- keyboards/primekb/prime_m/prime_m.c | 17 -- keyboards/primekb/prime_o/prime_o.c | 16 -- keyboards/primekb/prime_r/prime_r.c | 16 -- keyboards/projectkb/signature65/signature65.c | 17 -- keyboards/projectkb/signature87/signature87.c | 1 - keyboards/prototypist/allison/allison.c | 17 -- .../prototypist/allison_numpad/allison_numpad.c | 17 -- keyboards/prototypist/j01/j01.c | 17 -- keyboards/protozoa/p01/p01.c | 16 -- keyboards/psuieee/pluto12/pluto12.c | 4 - keyboards/puck/puck.c | 1 - keyboards/q4z/q4z.c | 16 -- keyboards/qpockets/eggman/eggman.c | 16 -- keyboards/qpockets/space_space/rev1/rev1.c | 17 -- keyboards/qpockets/wanten/wanten.c | 17 -- keyboards/quantrik/kyuu/kyuu.c | 16 -- keyboards/quarkeys/z60/hotswap/hotswap.c | 15 -- keyboards/quarkeys/z60/solder/solder.c | 15 -- keyboards/quarkeys/z67/hotswap/hotswap.c | 15 -- keyboards/quarkeys/z67/solder/solder.c | 15 -- keyboards/qwertlekeys/calice/calice.c | 17 -- keyboards/qwertykeys/qk65/hotswap/hotswap.c | 17 -- keyboards/qwertykeys/qk65/solder/solder.c | 17 -- keyboards/rabbit/rabbit68/rabbit68.c | 16 -- keyboards/rad/rad.c | 15 -- keyboards/rainkeebs/rainkeeb/rainkeeb.c | 16 -- keyboards/rainkeebs/yasui/yasui.c | 16 -- keyboards/rart/rart45/rart45.c | 15 -- keyboards/rart/rart4x4/rart4x4.c | 15 -- keyboards/rart/rart67/rart67.c | 17 -- keyboards/rart/rart67m/rart67m.c | 15 -- keyboards/rart/rart75/rart75.c | 15 -- keyboards/rart/rart80/rart80.c | 15 -- keyboards/rart/rartand/rartand.c | 15 -- keyboards/rart/rartlice/rartlice.c | 16 -- keyboards/rart/rartpad/rartpad.c | 15 -- keyboards/rate/pistachio_mp/pistachio_mp.c | 17 -- keyboards/rate/pistachio_pro/pistachio_pro.c | 17 -- .../rationalist/ratio65_hotswap/rev_a/rev_a.c | 17 -- keyboards/rationalist/ratio65_solder/rev_a/rev_a.c | 17 -- keyboards/recompile_keys/choco60/choco60.c | 17 -- keyboards/recompile_keys/choco60/rev1/rev1.c | 17 -- keyboards/recompile_keys/choco60/rev1/rev1.h | 19 --- keyboards/recompile_keys/choco60/rev2/rev2.c | 17 -- keyboards/recompile_keys/choco60/rev2/rev2.h | 19 --- keyboards/recompile_keys/cocoa40/cocoa40.c | 16 -- keyboards/recompile_keys/mio/mio.c | 17 -- keyboards/rect44/rect44.c | 17 -- keyboards/redscarf_iiplus/verb/verb.c | 16 -- keyboards/redscarf_iiplus/verc/verc.c | 16 -- keyboards/redscarf_iiplus/verd/verd.c | 15 -- keyboards/retro_75/retro_75.c | 1 - keyboards/reversestudio/decadepad/decadepad.c | 1 - keyboards/reviung/reviung33/reviung33.c | 17 -- keyboards/reviung/reviung34/reviung34.c | 16 -- keyboards/reviung/reviung39/reviung39.c | 16 -- keyboards/reviung/reviung41/reviung41.c | 16 -- keyboards/reviung/reviung5/reviung5.c | 17 -- keyboards/reviung/reviung53/reviung53.c | 4 - keyboards/reviung/reviung61/reviung61.c | 17 -- keyboards/rgbkb/zen/rev1/rev1.c | 1 - keyboards/rgbkb/zygomorph/rev1/rev1.c | 2 +- keyboards/rgbkb/zygomorph/rev1/rev1.h | 1 - keyboards/rgbkb/zygomorph/zygomorph.c | 1 - keyboards/rgbkb/zygomorph/zygomorph.h | 4 - keyboards/rmi_kb/aelith/aelith.c | 17 -- keyboards/rmi_kb/chevron/chevron.c | 17 -- keyboards/rmi_kb/herringbone/pro/pro.c | 17 -- keyboards/rmi_kb/herringbone/v1/v1.c | 17 -- keyboards/rmi_kb/mona/v1/v1.c | 17 -- keyboards/rmi_kb/mona/v1_1/v1_1.c | 17 -- keyboards/rmi_kb/mona/v32a/v32a.c | 17 -- keyboards/rmi_kb/squishy65/squishy65.c | 17 -- keyboards/rmi_kb/squishyfrl/squishyfrl.c | 17 -- keyboards/rmi_kb/squishytkl/squishytkl.c | 17 -- keyboards/rmi_kb/tkl_ff/tkl_ff.c | 17 -- keyboards/rmi_kb/tkl_ff/v2/v2.c | 17 -- keyboards/rmi_kb/tkl_ff/v2/v2.h | 18 --- keyboards/rmi_kb/wete/v2/v2.c | 17 -- keyboards/rocketboard_16/rocketboard_16.c | 1 - keyboards/rominronin/katana60/rev1/rev1.c | 16 -- keyboards/rominronin/katana60/rev2/rev2.c | 16 -- keyboards/roseslite/roseslite.c | 16 -- keyboards/rotor/rotor.c | 17 -- keyboards/rpiguy9907/southpaw66/southpaw66.c | 17 -- keyboards/runes/skjoldr/skjoldr.c | 17 -- keyboards/runes/vaengr/vaengr.c | 17 -- keyboards/ryanbaekr/rb18/rb18.c | 17 -- keyboards/ryanbaekr/rb69/rb69.c | 17 -- keyboards/ryanbaekr/rb86/rb86.c | 17 -- keyboards/ryanbaekr/rb87/rb87.c | 17 -- keyboards/ryloo_studio/m0110/m0110.c | 18 --- keyboards/salicylic_acid3/7splus/7splus.c | 17 -- keyboards/salicylic_acid3/ajisai74/ajisai74.c | 18 --- keyboards/salicylic_acid3/ergoarrows/ergoarrows.c | 18 --- keyboards/salicylic_acid3/nafuda/nafuda.c | 1 - keyboards/salicylic_acid3/nknl7en/nknl7en.c | 18 --- keyboards/salicylic_acid3/nknl7jp/nknl7jp.c | 18 --- keyboards/sam/s80/s80.c | 20 --- keyboards/sam/sg81m/sg81m.c | 16 -- keyboards/sanctified/dystopia/dystopia.c | 17 -- keyboards/sandwich/keeb68/keeb68.c | 17 -- keyboards/satt/comet46/comet46.c | 1 - keyboards/satt/vision/vision.c | 17 -- keyboards/sauce/mild/mild.c | 17 -- keyboards/sawnsprojects/amber80/solder/solder.c | 17 -- .../sawnsprojects/krush/krush60/solder/solder.c | 17 -- keyboards/sawnsprojects/vcl65/solder/solder.c | 17 -- keyboards/scatter42/scatter42.c | 17 -- keyboards/sck/gtm/gtm.c | 1 - keyboards/sck/m0116b/m0116b.c | 16 -- keyboards/sck/neiso/neiso.c | 16 -- keyboards/sck/osa/osa.c | 16 -- keyboards/sendyyeah/75pixels/75pixels.c | 17 -- keyboards/sendyyeah/bevi/bevi.c | 17 -- keyboards/senselessclay/ck65/ck65.c | 17 -- keyboards/senselessclay/had60/had60.c | 17 -- keyboards/sentraq/number_pad/number_pad.c | 16 -- keyboards/sentraq/s60_x/default/default.c | 1 - keyboards/sentraq/s60_x/rgb/rgb.c | 1 - keyboards/sentraq/s65_plus/s65_plus.c | 1 - keyboards/sentraq/s65_x/s65_x.c | 1 - keyboards/sets3n/kk980/kk980.c | 17 -- keyboards/shambles/shambles.c | 1 - keyboards/shapeshifter4060/shapeshifter4060.c | 18 --- keyboards/shiro/shiro.c | 16 -- keyboards/shk9/shk9.c | 17 -- keyboards/shoc/shoc.c | 16 -- keyboards/sidderskb/majbritt/rev1/rev1.c | 21 --- keyboards/sidderskb/majbritt/rev2/rev2.c | 17 -- keyboards/signum/3_0/3_0.c | 16 -- keyboards/singa/singa.c | 17 -- keyboards/sirius/unigo66/unigo66.c | 1 - keyboards/skeletn87/hotswap/hotswap.c | 17 -- keyboards/skeletn87/soldered/soldered.c | 17 -- .../skeletonkbd/skeletonnumpad/skeletonnumpad.c | 17 -- keyboards/skergo/skergo.c | 17 -- .../skippys_custom_pcs/rooboard65/rooboard65.c | 14 -- keyboards/skippys_custom_pcs/roopad/roopad.c | 14 -- keyboards/slz40/slz40.c | 17 -- keyboards/smithrune/iron180/iron180.c | 18 --- keyboards/smk60/smk60.c | 5 - keyboards/snampad/snampad.c | 16 -- keyboards/sneakbox/disarray/ortho/ortho.c | 18 --- keyboards/sneakbox/disarray/staggered/staggered.c | 19 --- keyboards/soda/cherish/cherish.c | 18 --- keyboards/soup10/soup10.c | 17 -- keyboards/soy20/soy20.c | 18 --- keyboards/spaceman/pancake/rev1/rev1.c | 16 -- keyboards/spaceman/yun65/yun65.c | 16 -- keyboards/sparrow62/sparrow62.c | 18 --- keyboards/specskeys/specskeys.c | 17 -- keyboards/spiderisland/split78/split78.c | 17 -- keyboards/splitography/splitography.c | 17 -- keyboards/sporewoh/banime40/banime40.c | 18 --- keyboards/star75/star75.c | 4 - keyboards/stello65/hs_rev1/hs_rev1.c | 4 - keyboards/stello65/sl_rev1/sl_rev1.c | 4 - .../stenokeyboards/the_uni/pro_micro/pro_micro.c | 18 --- keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c | 17 -- keyboards/stenokeyboards/the_uni/usb_c/usb_c.c | 18 --- keyboards/stratos/stratos.c | 17 -- keyboards/studiokestra/bourgeau/bourgeau.c | 18 --- keyboards/studiokestra/cascade/cascade.c | 18 --- keyboards/studiokestra/nascent/nascent.c | 17 -- keyboards/studiokestra/nue/nue.c | 17 -- keyboards/suavity/ehan/ehan.c | 3 - keyboards/subatomic/subatomic.c | 1 - keyboards/superuser/ext/ext.c | 16 -- keyboards/superuser/frl/frl.c | 16 -- keyboards/superuser/tkl/tkl.c | 16 -- keyboards/swiftrax/retropad/retropad.c | 16 -- .../switchplate/switchplate910/switchplate910.c | 18 --- keyboards/tada68/tada68.c | 1 - .../takashicompany/center_enter/center_enter.c | 17 -- keyboards/takashicompany/heavy_left/heavy_left.c | 17 -- keyboards/takashicompany/qoolee/qoolee.c | 17 -- keyboards/takashicompany/radialex/radialex.c | 17 -- keyboards/takashiski/hecomi/hecomi.c | 17 -- keyboards/takashiski/namecard2x4/namecard2x4.c | 16 -- keyboards/takashiski/otaku_split/rev0/rev0.c | 16 -- keyboards/takashiski/otaku_split/rev1/rev1.c | 16 -- keyboards/teleport/numpad/numpad.c | 16 -- keyboards/tempo_turtle/bradpad/bradpad.c | 15 -- keyboards/tender/macrowo_pad/macrowo_pad.c | 17 -- keyboards/tenki/tenki.c | 1 - keyboards/tetris/tetris.c | 1 - keyboards/tg4x/tg4x.c | 16 -- keyboards/tgr/910/910.c | 17 -- keyboards/tgr/910ce/910ce.c | 17 -- keyboards/tgr/alice/alice.c | 18 --- keyboards/tgr/jane/v2/v2.c | 17 -- keyboards/tgr/jane/v2ce/v2ce.c | 17 -- keyboards/tgr/tris/tris.c | 17 -- keyboards/the_royal/liminal/liminal.c | 1 - keyboards/the_royal/schwann/schwann.c | 1 - keyboards/themadnoodle/ncc1701kb/v2/v2.c | 1 - keyboards/themadnoodle/noodlepad/noodlepad.c | 1 - .../thevankeyboards/bananasplit/bananasplit.c | 17 -- keyboards/thevankeyboards/caravan/caravan.c | 1 - keyboards/thevankeyboards/jetvan/jetvan.c | 14 -- keyboards/thevankeyboards/minivan/minivan.c | 1 - keyboards/thevankeyboards/roadkit/roadkit.c | 1 - keyboards/tkc/california/california.c | 18 --- keyboards/tkc/candybar/lefty/lefty.c | 17 -- keyboards/tkc/candybar/lefty_r3/lefty_r3.c | 18 --- keyboards/tkc/candybar/righty/righty.c | 17 -- keyboards/tkc/candybar/righty_r3/righty_r3.c | 17 -- keyboards/tkc/godspeed75/godspeed75.c | 17 -- keyboards/tkc/tkl_ab87/tkl_ab87.c | 16 -- keyboards/tkw/grandiceps/grandiceps.c | 16 -- keyboards/tkw/stoutgat/v1/v1.c | 17 -- keyboards/tkw/stoutgat/v2/v2.c | 16 -- keyboards/tokyokeyboard/alix40/alix40.c | 15 -- keyboards/tokyokeyboard/tokyo60/tokyo60.c | 1 - keyboards/tominabox1/adalyn/adalyn.c | 16 -- keyboards/tominabox1/littlefoot_lx/rev1/rev1.c | 18 --- keyboards/tominabox1/littlefoot_lx/rev2/rev2.c | 18 --- keyboards/tominabox1/qaz/qaz.c | 1 - keyboards/tominabox1/underscore33/rev1/rev1.c | 16 -- keyboards/tominabox1/underscore33/rev2/rev2.c | 16 -- keyboards/touchpad/touchpad.c | 1 - keyboards/trashman/ketch/ketch.c | 23 --- keyboards/treasure/type9/type9.c | 16 -- keyboards/treasure/type9s2/type9s2.c | 16 -- keyboards/tronguylabs/m122_3270/m122_3270.c | 17 -- keyboards/tszaboo/ortho4exent/ortho4exent.c | 16 -- keyboards/tunks/ergo33/ergo33.c | 17 -- keyboards/tw40/tw40.c | 17 -- keyboards/tzarc/djinn/rev1/rev1.c | 3 - keyboards/tzarc/djinn/rev1/rev1.h | 3 - keyboards/tzarc/djinn/rev2/rev2.c | 3 - keyboards/tzarc/djinn/rev2/rev2.h | 3 - keyboards/ubest/vn/vn.c | 19 --- keyboards/uk78/uk78.c | 1 - .../overnumpad_1xb/overnumpad_1xb.c | 24 --- .../overnumpad_1xb/overnumpad_1xb.c | 24 --- .../unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c | 24 --- keyboards/unikeyboard/diverge3/diverge3.c | 16 -- keyboards/unikeyboard/divergetm2/divergetm2.c | 17 -- keyboards/unikeyboard/felix/felix.c | 1 - keyboards/unikorn/unikorn.c | 17 -- keyboards/uranuma/uranuma.c | 1 - keyboards/utd80/utd80.c | 16 -- keyboards/v4n4g0rth0n/v4n4g0rth0n.c | 17 -- keyboards/vagrant_10/vagrant_10.c | 25 --- keyboards/vertex/angler2/angler2.c | 17 -- keyboards/vertex/arc60/arc60.c | 18 --- keyboards/vertex/arc60h/arc60h.c | 18 --- keyboards/viktus/at101_bh/at101_bh.c | 1 - keyboards/viktus/omnikey_bh/omnikey_bh.c | 1 - keyboards/viktus/styrka/styrka.c | 16 -- keyboards/viktus/z150_bh/z150_bh.c | 1 - keyboards/waldo/waldo.c | 1 - keyboards/walletburner/cajal/cajal.c | 17 -- keyboards/walletburner/neuron/neuron.c | 1 - keyboards/wavtype/foundation/foundation.c | 4 - keyboards/wavtype/p01_ultra/p01_ultra.c | 17 -- keyboards/weirdo/geminate60/geminate60.c | 16 -- keyboards/weirdo/kelowna/rgb64/rgb64.c | 16 -- keyboards/weirdo/naiping/np64/np64.c | 16 -- keyboards/weirdo/naiping/nphhkb/nphhkb.c | 16 -- keyboards/weirdo/naiping/npminila/npminila.c | 16 -- keyboards/weirdo/tiger910/tiger910.c | 17 -- keyboards/wekey/polaris/polaris.c | 17 -- keyboards/westfoxtrot/aanzee/aanzee.c | 17 -- keyboards/westfoxtrot/cyclops/cyclops.c | 16 -- keyboards/westm/westm68/westm68.c | 17 -- keyboards/westm/westm9/westm9.c | 17 -- keyboards/westm/westmergo/westmergo.c | 17 -- .../wilba_tech/rama_works_m10_b/rama_works_m10_b.c | 17 -- .../rama_works_m50_ax/rama_works_m50_ax.c | 17 -- .../wilba_tech/rama_works_m6_a/rama_works_m6_a.c | 15 -- .../wilba_tech/rama_works_u80_a/rama_works_u80_a.c | 17 -- keyboards/wilba_tech/wt60_a/wt60_a.c | 17 -- keyboards/wilba_tech/wt60_b/wt60_b.c | 1 - keyboards/wilba_tech/wt60_bx/wt60_bx.c | 1 - keyboards/wilba_tech/wt60_c/wt60_c.c | 1 - keyboards/wilba_tech/wt60_g/wt60_g.c | 17 -- keyboards/wilba_tech/wt60_g2/wt60_g2.c | 17 -- keyboards/wilba_tech/wt60_h1/wt60_h1.c | 17 -- keyboards/wilba_tech/wt60_h2/wt60_h2.c | 17 -- keyboards/wilba_tech/wt60_h3/wt60_h3.c | 17 -- keyboards/wilba_tech/wt65_a/wt65_a.c | 17 -- keyboards/wilba_tech/wt65_b/wt65_b.c | 17 -- keyboards/wilba_tech/wt65_d/wt65_d.c | 4 - keyboards/wilba_tech/wt65_f/wt65_f.c | 17 -- keyboards/wilba_tech/wt65_fx/wt65_fx.c | 17 -- keyboards/wilba_tech/wt65_g/wt65_g.c | 17 -- keyboards/wilba_tech/wt65_g2/wt65_g2.c | 17 -- keyboards/wilba_tech/wt65_h1/wt65_h1.c | 17 -- keyboards/wilba_tech/wt65_xt/wt65_xt.c | 17 -- keyboards/wilba_tech/wt65_xtx/wt65_xtx.c | 17 -- keyboards/wilba_tech/wt75_a/wt75_a.c | 17 -- keyboards/wilba_tech/wt75_b/wt75_b.c | 17 -- keyboards/wilba_tech/wt75_c/wt75_c.c | 17 -- keyboards/wilba_tech/wt80_a/wt80_a.c | 17 -- keyboards/wilba_tech/wt80_bc/wt80_bc.c | 17 -- keyboards/wilba_tech/wt80_g/wt80_g.c | 17 -- keyboards/wilba_tech/wt8_a/wt8_a.c | 17 -- keyboards/winkeyless/b87/b87.c | 19 --- keyboards/winkeyless/bface/bface.c | 17 -- keyboards/winkeyless/bmini/bmini.c | 18 --- keyboards/winkeyless/bminiex/bminiex.c | 18 --- keyboards/winry/winry25tc/winry25tc.c | 17 -- keyboards/wolf/kuku65/kuku65.c | 14 -- keyboards/wolf/ryujin/ryujin.c | 14 -- keyboards/wolf/sabre/sabre.c | 14 -- keyboards/wolf/ts60/ts60.c | 14 -- keyboards/woodkeys/bigseries/4key/4key.c | 17 -- keyboards/woodkeys/meira/featherble/featherble.c | 17 -- keyboards/woodkeys/meira/featherble/featherble.h | 19 --- keyboards/woodkeys/meira/promicro/promicro.c | 17 -- keyboards/woodkeys/meira/promicro/promicro.h | 19 --- keyboards/woodkeys/scarletbandana/scarletbandana.c | 22 --- keyboards/wsk/alpha9/alpha9.c | 17 -- keyboards/wsk/gothic50/gothic50.c | 1 - keyboards/wsk/gothic70/gothic70.c | 1 - keyboards/wsk/houndstooth/houndstooth.c | 1 - keyboards/wsk/jerkin/jerkin.c | 1 - keyboards/wsk/kodachi50/kodachi50.c | 1 - keyboards/wsk/pain27/pain27.c | 1 - keyboards/wsk/sl40/sl40.c | 17 -- keyboards/wsk/tkl30/tkl30.c | 1 - keyboards/wuque/creek70/creek70.c | 17 -- keyboards/wuque/ikki68_aurora/ikki68_aurora.c | 17 -- keyboards/wuque/promise87/ansi/ansi.c | 17 -- keyboards/wuque/promise87/wkl/wkl.c | 17 -- keyboards/wuque/tata80/wk/wk.c | 16 -- keyboards/wuque/tata80/wkl/wkl.c | 17 -- keyboards/x16/x16.c | 16 -- keyboards/xelus/dharma/dharma.c | 17 -- keyboards/xelus/pachi/mini_32u4/mini_32u4.c | 18 --- keyboards/xelus/pachi/rev1/rev1.c | 18 --- keyboards/xelus/rs108/rs108.c | 16 -- keyboards/xelus/snap96/snap96.c | 1 - keyboards/xelus/valor/rev1/rev1.c | 19 --- keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c | 19 --- keyboards/xelus/xs108/xs108.c | 17 -- keyboards/xiudi/xd68/xd68.c | 1 - keyboards/xiudi/xd84/xd84.c | 16 -- keyboards/xiudi/xd84pro/xd84pro.c | 16 -- keyboards/xiudi/xd87/xd87.c | 16 -- keyboards/xiudi/xd96/xd96.c | 16 -- keyboards/xmmx/xmmx.c | 1 - keyboards/xw60/xw60.c | 1 - keyboards/yandrstudio/eau87/eau87.c | 16 -- keyboards/yandrstudio/wave75/wave75.c | 16 -- keyboards/yandrstudio/zhou65/zhou65.c | 17 -- keyboards/ydkb/chili/chili.c | 16 -- keyboards/ydkb/grape/grape.c | 16 -- keyboards/ymdk/bface/bface.c | 17 -- keyboards/ymdk/melody96/melody96.c | 1 - keyboards/ymdk/np21/np21.c | 19 --- keyboards/ymdk/np24/u4rgb6/u4rgb6.c | 16 -- keyboards/ymdk/wings/wings.c | 16 -- keyboards/ymdk/wingshs/wingshs.c | 16 -- keyboards/ymdk/ym68/ym68.c | 17 -- keyboards/ymdk/ymd09/ymd09.c | 1 - keyboards/ymdk/ymd21/v2/v2.c | 17 -- keyboards/ymdk/ymd40/v2/v2.c | 17 -- keyboards/ymdk/ymd67/ymd67.c | 1 - keyboards/ymdk/ymd96/ymd96.c | 19 --- keyboards/yoichiro/lunakey_macro/lunakey_macro.c | 17 -- keyboards/yoichiro/lunakey_mini/lunakey_mini.c | 17 -- keyboards/yoichiro/lunakey_pico/lunakey_pico.c | 4 - keyboards/yynmt/dozen0/dozen0.c | 16 -- keyboards/yynmt/kagamidget/kagamidget.c | 16 -- keyboards/zfrontier/big_switch/big_switch.c | 17 -- keyboards/ziggurat/ziggurat.c | 17 -- keyboards/zj68/zj68.c | 16 -- keyboards/zlant/zlant.c | 1 - keyboards/ztboards/after/after.c | 18 --- keyboards/ztboards/noon/noon.c | 19 --- 1418 files changed, 8 insertions(+), 19767 deletions(-) delete mode 100644 keyboards/0_sixty/0_sixty.c delete mode 100644 keyboards/0xc7/61key/61key.c delete mode 100644 keyboards/0xcb/static/static.c delete mode 100644 keyboards/10bleoledhub/10bleoledhub.c delete mode 100644 keyboards/1upkeyboards/1up60hse/1up60hse.c delete mode 100644 keyboards/1upkeyboards/1up60hte/1up60hte.c delete mode 100644 keyboards/1upkeyboards/1up60rgb/1up60rgb.c delete mode 100644 keyboards/1upkeyboards/sweet16/sweet16.c delete mode 100644 keyboards/25keys/aleth42/rev0/rev0.c delete mode 100644 keyboards/25keys/aleth42/rev1/rev1.c delete mode 100644 keyboards/2key2crawl/2key2crawl.c delete mode 100644 keyboards/30wer/30wer.c delete mode 100644 keyboards/3w6/rev1/rev1.c delete mode 100644 keyboards/40percentclub/5x5/5x5.c delete mode 100644 keyboards/40percentclub/gherkin/gherkin.c delete mode 100644 keyboards/40percentclub/half_n_half/half_n_half.c delete mode 100644 keyboards/40percentclub/luddite/luddite.c delete mode 100644 keyboards/40percentclub/mf68/mf68.c delete mode 100644 keyboards/40percentclub/nori/nori.c delete mode 100644 keyboards/40percentclub/tomato/tomato.c delete mode 100644 keyboards/45_ats/45_ats.c delete mode 100644 keyboards/4by3/4by3.c delete mode 100644 keyboards/4pplet/aekiso60/rev_a/rev_a.c delete mode 100644 keyboards/4pplet/aekiso60/rev_b/rev_b.c delete mode 100644 keyboards/4pplet/bootleg/rev_a/rev_a.c delete mode 100644 keyboards/4pplet/steezy60/rev_a/rev_a.c delete mode 100644 keyboards/4pplet/waffling60/rev_a/rev_a.c delete mode 100644 keyboards/7c8/framework/framework.c delete mode 100644 keyboards/9key/9key.c delete mode 100644 keyboards/abacus/abacus.c delete mode 100644 keyboards/abstract/ellipse/rev1/rev1.c delete mode 100644 keyboards/acekeyboard/titan60/titan60.c delete mode 100644 keyboards/acheron/arctic/arctic.c delete mode 100644 keyboards/acheron/keebspcb/keebspcb.c delete mode 100644 keyboards/acheron/lasgweloth/lasgweloth.c delete mode 100644 keyboards/ada/ada1800mini/ada1800mini.c delete mode 100644 keyboards/ada/infinity81/infinity81.c delete mode 100644 keyboards/adelheid/adelheid.c delete mode 100644 keyboards/adm42/adm42.c delete mode 100644 keyboards/adpenrose/obi/obi.c delete mode 100644 keyboards/adpenrose/shisaku/shisaku.c delete mode 100644 keyboards/aeboards/aegis/aegis.c delete mode 100644 keyboards/ai03/andromeda/andromeda.c delete mode 100644 keyboards/ai03/equinox/equinox.c delete mode 100644 keyboards/ai03/jp60/jp60.c delete mode 100644 keyboards/ai03/lunar/lunar.c delete mode 100644 keyboards/ai03/orbit_x/orbit_x.c delete mode 100644 keyboards/ai03/polaris/polaris.c delete mode 100644 keyboards/ai03/quasar/quasar.c delete mode 100644 keyboards/ai03/soyuz/soyuz.c delete mode 100644 keyboards/ai03/voyager60_alps/voyager60_alps.c delete mode 100644 keyboards/akb/eb46/eb46.c delete mode 100644 keyboards/akb/raine/raine.c delete mode 100644 keyboards/akegata_denki/device_one/device_one.c delete mode 100644 keyboards/al1/al1.c delete mode 100644 keyboards/alf/dc60/dc60.c delete mode 100644 keyboards/alf/x11/x11.c delete mode 100644 keyboards/alf/x2/x2.c delete mode 100644 keyboards/alfredslab/swift65/hotswap/hotswap.c delete mode 100644 keyboards/alfredslab/swift65/solder/solder.c delete mode 100644 keyboards/aliceh66/pianoforte/pianoforte.c delete mode 100644 keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c delete mode 100755 keyboards/alpha/alpha.c delete mode 100644 keyboards/alpine65/alpine65.c delete mode 100644 keyboards/alps64/alps64.c delete mode 100644 keyboards/amag23/amag23.c delete mode 100755 keyboards/amjkeyboard/amj40/amj40.c delete mode 100644 keyboards/amjkeyboard/amj60/amj60.c delete mode 100644 keyboards/amjkeyboard/amj66/amj66.c delete mode 100644 keyboards/amjkeyboard/amj84/amj84.c delete mode 100644 keyboards/amjkeyboard/amj96/amj96.c delete mode 100644 keyboards/amjkeyboard/amjpad/amjpad.c delete mode 100644 keyboards/anomalykb/a65i/a65i.c delete mode 100644 keyboards/aos/tkl/tkl.c delete mode 100644 keyboards/aozora/aozora.c delete mode 100644 keyboards/aplyard/aplx6/rev1/rev1.c delete mode 100644 keyboards/aplyard/aplx6/rev2/rev2.c delete mode 100644 keyboards/ares/ares.c delete mode 100644 keyboards/arisu/arisu.c delete mode 100644 keyboards/atlas_65/atlas_65.c delete mode 100644 keyboards/atreus62/atreus62.c delete mode 100644 keyboards/atxkb/1894/1894.c delete mode 100644 keyboards/aurora65/aurora65.c delete mode 100644 keyboards/aves60/aves60.c delete mode 100644 keyboards/aves65/aves65.c delete mode 100644 keyboards/axolstudio/foundation_gamma/foundation_gamma.c delete mode 100644 keyboards/axolstudio/helpo/helpo.c delete mode 100644 keyboards/axolstudio/yeti/soldered/soldered.c delete mode 100644 keyboards/aya/aya.c delete mode 100644 keyboards/b_sides/rev41lp/rev41lp.c delete mode 100644 keyboards/bacca70/bacca70.c delete mode 100644 keyboards/bantam44/bantam44.c delete mode 100644 keyboards/barleycorn_smd/barleycorn_smd.c delete mode 100644 keyboards/barracuda/barracuda.c delete mode 100644 keyboards/basketweave/basketweave.c delete mode 100644 keyboards/bastardkb/tbk/tbk.c delete mode 100644 keyboards/beatervan/beatervan.c delete mode 100644 keyboards/bfake/bfake.c delete mode 100644 keyboards/biacco42/meishi/meishi.c delete mode 100644 keyboards/biacco42/meishi2/meishi2.c delete mode 100644 keyboards/bioi/f60/f60.c delete mode 100644 keyboards/blackplum/blackplum.c delete mode 100644 keyboards/blank/blank01/blank01.c delete mode 100644 keyboards/blank_tehnologii/manibus/manibus.c delete mode 100644 keyboards/blaster75/blaster75.c delete mode 100644 keyboards/bluebell/swoop/swoop.c delete mode 100644 keyboards/boardrun/bizarre/bizarre.c delete mode 100644 keyboards/boardrun/classic/classic.c delete mode 100644 keyboards/bolsa/bolsalice/bolsalice.c delete mode 100644 keyboards/bop/bop.c delete mode 100644 keyboards/box75/box75.c delete mode 100644 keyboards/bpiphany/four_banger/four_banger.c delete mode 100755 keyboards/bpiphany/hid_liber/hid_liber.c delete mode 100644 keyboards/bpiphany/kitten_paw/kitten_paw.c delete mode 100644 keyboards/bpiphany/tiger_lily/tiger_lily.c delete mode 100644 keyboards/bpiphany/unloved_bastard/unloved_bastard.c delete mode 100644 keyboards/bt66tech/bt66tech60/bt66tech60.c delete mode 100644 keyboards/bthlabs/geekpad/geekpad.c delete mode 100644 keyboards/buildakb/potato65/potato65.c delete mode 100644 keyboards/buildakb/potato65hs/potato65hs.c delete mode 100644 keyboards/buildakb/potato65s/potato65s.c delete mode 100644 keyboards/cablecardesigns/cypher/rev6/rev6.c delete mode 100644 keyboards/caffeinated/serpent65/serpent65.c delete mode 100644 keyboards/cannonkeys/adelie/adelie.c delete mode 100644 keyboards/cannonkeys/aella/aella.c delete mode 100644 keyboards/cannonkeys/an_c/an_c.c delete mode 100644 keyboards/cannonkeys/atlas/atlas.c delete mode 100644 keyboards/cannonkeys/atlas_alps/atlas_alps.c delete mode 100644 keyboards/cannonkeys/brutalv2_65/brutalv2_65.c delete mode 100644 keyboards/cannonkeys/chimera65/chimera65.c delete mode 100644 keyboards/cannonkeys/cloudline/cloudline.c delete mode 100644 keyboards/cannonkeys/crin/crin.c delete mode 100644 keyboards/cannonkeys/devastatingtkl/devastatingtkl.c delete mode 100644 keyboards/cannonkeys/gentoo/gentoo.c delete mode 100644 keyboards/cannonkeys/gentoo_hs/gentoo_hs.c delete mode 100644 keyboards/cannonkeys/hoodrowg/hoodrowg.c delete mode 100644 keyboards/cannonkeys/instant60/instant60.c delete mode 100644 keyboards/cannonkeys/instant65/instant65.c delete mode 100644 keyboards/cannonkeys/iron165/iron165.c delete mode 100644 keyboards/cannonkeys/malicious_ergo/malicious_ergo.c delete mode 100755 keyboards/cannonkeys/nearfield/nearfield.c delete mode 100644 keyboards/cannonkeys/obliterated75/obliterated75.c delete mode 100644 keyboards/cannonkeys/onyx/onyx.c delete mode 100644 keyboards/cannonkeys/ortho48/ortho48.c delete mode 100644 keyboards/cannonkeys/ortho60/ortho60.c delete mode 100644 keyboards/cannonkeys/practice60/practice60.c delete mode 100644 keyboards/cannonkeys/practice65/practice65.c delete mode 100644 keyboards/cannonkeys/rekt1800/rekt1800.c delete mode 100644 keyboards/cannonkeys/sagittarius/sagittarius.c delete mode 100644 keyboards/cannonkeys/savage65/savage65.c delete mode 100644 keyboards/cannonkeys/tmov2/tmov2.c delete mode 100644 keyboards/cannonkeys/tsukuyomi/tsukuyomi.c delete mode 100644 keyboards/cannonkeys/vicious40/vicious40.c delete mode 100644 keyboards/capsunlocked/cu24/cu24.c delete mode 100644 keyboards/capsunlocked/cu65/cu65.c delete mode 100644 keyboards/capsunlocked/cu7/cu7.c delete mode 100644 keyboards/capsunlocked/cu80/v1/v1.c delete mode 100644 keyboards/catch22/catch22.c delete mode 100644 keyboards/cest73/tkm/tkm.c delete mode 100644 keyboards/chalice/chalice.c delete mode 100644 keyboards/chaos65/chaos65.c delete mode 100644 keyboards/charue/charon/charon.c delete mode 100644 keyboards/charue/sunsetter/sunsetter.c delete mode 100644 keyboards/charue/sunsetter_r2/sunsetter_r2.c delete mode 100644 keyboards/chavdai40/rev1/rev1.c delete mode 100644 keyboards/chavdai40/rev2/rev2.c delete mode 100644 keyboards/checkerboards/axon40/axon40.c delete mode 100644 keyboards/checkerboards/candybar_ortho/candybar_ortho.c delete mode 100644 keyboards/checkerboards/g_idb60/g_idb60.c delete mode 100644 keyboards/checkerboards/nop60/nop60.c delete mode 100644 keyboards/checkerboards/plexus75_he/plexus75_he.c delete mode 100644 keyboards/checkerboards/pursuit40/pursuit40.c delete mode 100644 keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c delete mode 100644 keyboards/cherrybstudio/cb1800/cb1800.c delete mode 100644 keyboards/cherrybstudio/cb65/cb65.c delete mode 100644 keyboards/cherrybstudio/cb87/cb87.c delete mode 100644 keyboards/cherrybstudio/cb87v2/cb87v2.c delete mode 100644 keyboards/chickenman/ciel/ciel.c delete mode 100644 keyboards/chlx/merro60/merro60.c delete mode 100644 keyboards/chlx/str_merro60/str_merro60.c delete mode 100644 keyboards/chocv/chocv.c delete mode 100644 keyboards/cipulot/kallos/kallos.c delete mode 100644 keyboards/cipulot/kawayo/kawayo.c delete mode 100755 keyboards/ckeys/handwire_101/handwire_101.c delete mode 100644 keyboards/ckeys/nakey/nakey.c delete mode 100644 keyboards/ckeys/washington/washington.c delete mode 100644 keyboards/clawsome/bookerboard/bookerboard.c delete mode 100644 keyboards/clawsome/coupe/coupe.c delete mode 100644 keyboards/clawsome/doodle/doodle.c delete mode 100644 keyboards/clawsome/fightpad/fightpad.c delete mode 100644 keyboards/clawsome/gamebuddy/v1_0/v1_0.c delete mode 100644 keyboards/clawsome/gamebuddy/v1_m/v1_m.c delete mode 100644 keyboards/clawsome/hatchback/hatchback.c delete mode 100644 keyboards/clawsome/luggage_rack/luggage_rack.c delete mode 100644 keyboards/clawsome/numeros/numeros.c delete mode 100644 keyboards/clawsome/roadster/roadster.c delete mode 100644 keyboards/clawsome/sedan/sedan.c delete mode 100644 keyboards/clawsome/sidekick/sidekick.c delete mode 100644 keyboards/clawsome/suv/suv.c delete mode 100644 keyboards/clueboard/2x1800/2018/2018.c delete mode 100644 keyboards/clueboard/2x1800/2018/2018.h delete mode 100644 keyboards/clueboard/60/60.c delete mode 100644 keyboards/clueboard/60/60.h delete mode 100644 keyboards/clueboard/66/rev1/rev1.c delete mode 100644 keyboards/clueboard/66/rev1/rev1.h delete mode 100644 keyboards/cmm_studio/fuji65/fuji65.c delete mode 100644 keyboards/cmm_studio/saka68/hotswap/hotswap.c delete mode 100644 keyboards/cmm_studio/saka68/solder/solder.c delete mode 100644 keyboards/coarse/cordillera/cordillera.c delete mode 100644 keyboards/coarse/ixora/ixora.c delete mode 100644 keyboards/coarse/vinta/vinta.c delete mode 100644 keyboards/compound/compound.c delete mode 100644 keyboards/contender/contender.c delete mode 100644 keyboards/converter/a1200/a1200.c delete mode 100644 keyboards/converter/adb_usb/adb_usb.c delete mode 100644 keyboards/converter/hp_46010a/hp_46010a.c delete mode 100644 keyboards/converter/ibm_terminal/ibm_terminal.c delete mode 100644 keyboards/converter/m0110_usb/m0110_usb.c delete mode 100644 keyboards/converter/modelm101_teensy2/modelm101_teensy2.c delete mode 100644 keyboards/converter/modelm_ssk/modelm_ssk.c delete mode 100644 keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c delete mode 100644 keyboards/converter/periboard_512/periboard_512.c delete mode 100644 keyboards/converter/siemens_tastatur/siemens_tastatur.c delete mode 100644 keyboards/converter/xt_usb/xt_usb.c delete mode 100644 keyboards/cool836a/cool836a.c delete mode 100755 keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c delete mode 100644 keyboards/coseyfannitutti/discipad/discipad.c delete mode 100644 keyboards/coseyfannitutti/discipline/discipline.c delete mode 100644 keyboards/coseyfannitutti/mullet/mullet.c delete mode 100644 keyboards/coseyfannitutti/mulletpad/mulletpad.c delete mode 100644 keyboards/coseyfannitutti/mysterium/mysterium.c delete mode 100644 keyboards/coseyfannitutti/romeo/romeo.c delete mode 100644 keyboards/craftwalk/craftwalk.c delete mode 100755 keyboards/crawlpad/crawlpad.c delete mode 100644 keyboards/crazy_keyboard_68/crazy_keyboard_68.c delete mode 100644 keyboards/creatkeebs/glacier/glacier.c delete mode 100644 keyboards/creatkeebs/thera/thera.c delete mode 100644 keyboards/crimsonkeyboards/resume1800/resume1800.c delete mode 100644 keyboards/crin/crin.c delete mode 100644 keyboards/cutie_club/borsdorf/borsdorf.c delete mode 100755 keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c delete mode 100644 keyboards/cutie_club/keebcats/denis/denis.c delete mode 100644 keyboards/cutie_club/keebcats/dougal/dougal.c delete mode 100644 keyboards/cutie_club/novus/novus.c delete mode 100644 keyboards/cx60/cx60.c delete mode 100644 keyboards/cybergear/macro25/macro25.c delete mode 100644 keyboards/daji/seis_cinco/seis_cinco.c delete mode 100644 keyboards/db/db63/db63.c delete mode 100644 keyboards/dc01/arrow/arrow.c delete mode 100644 keyboards/dc01/left/left.c delete mode 100644 keyboards/dc01/numpad/numpad.c delete mode 100644 keyboards/dc01/right/right.c delete mode 100644 keyboards/delikeeb/flatbread60/flatbread60.c delete mode 100644 keyboards/delikeeb/vaguettelite/vaguettelite.c delete mode 100644 keyboards/delikeeb/vanana/rev1/rev1.c delete mode 100644 keyboards/delikeeb/vanana/rev2/rev2.c delete mode 100644 keyboards/delikeeb/vaneela/vaneela.c delete mode 100644 keyboards/delikeeb/vaneelaex/vaneelaex.c delete mode 100644 keyboards/delikeeb/waaffle/rev3/rev3.c delete mode 100644 keyboards/deltapad/deltapad.c delete mode 100755 keyboards/demiurge/demiurge.c delete mode 100644 keyboards/dm9records/ergoinu/ergoinu.c delete mode 100644 keyboards/dm9records/plaid/plaid.c delete mode 100644 keyboards/dm9records/tartan/tartan.c delete mode 100644 keyboards/dmqdesign/spin/spin.c delete mode 100644 keyboards/donutcables/budget96/budget96.c delete mode 100644 keyboards/donutcables/scrabblepad/scrabblepad.c delete mode 100644 keyboards/doodboard/duckboard/duckboard.c delete mode 100644 keyboards/doodboard/duckboard_r2/duckboard_r2.c delete mode 100644 keyboards/doro67/multi/multi.c delete mode 100644 keyboards/doro67/regular/regular.c delete mode 100644 keyboards/draculad/draculad.c delete mode 100644 keyboards/draytronics/daisy/daisy.c delete mode 100755 keyboards/draytronics/elise/elise.c delete mode 100755 keyboards/draytronics/elise_v2/elise_v2.c delete mode 100644 keyboards/draytronics/scarlet/scarlet.c delete mode 100644 keyboards/drewkeys/iskar/iskar.c delete mode 100644 keyboards/drhigsby/bkf/bkf.c delete mode 100644 keyboards/drhigsby/dubba175/dubba175.c delete mode 100644 keyboards/dtisaac/cg108/cg108.c delete mode 100644 keyboards/dtisaac/dtisaac01/dtisaac01.c delete mode 100644 keyboards/dumbo/dumbo.c delete mode 100644 keyboards/dyz/dyz40/dyz40.c delete mode 100644 keyboards/dyz/dyz60/dyz60.c delete mode 100644 keyboards/dyz/dyz60_hs/dyz60_hs.c delete mode 100644 keyboards/dyz/dyz_tkl/dyz_tkl.c delete mode 100644 keyboards/dyz/selka40/selka40.c delete mode 100644 keyboards/dz60/dz60.c delete mode 100644 keyboards/dztech/duo_s/duo_s.c delete mode 100644 keyboards/dztech/dz96/dz96.c delete mode 100644 keyboards/dztech/endless80/endless80.c delete mode 100644 keyboards/e88/e88.c delete mode 100644 keyboards/earth_rover/earth_rover.c delete mode 100644 keyboards/eason/aeroboard/aeroboard.c delete mode 100644 keyboards/eason/capsule65/capsule65.c delete mode 100644 keyboards/ebastler/isometria_75/rev1/rev1.c delete mode 100644 keyboards/edc40/edc40.c delete mode 100644 keyboards/edi/hardlight/mk1/mk1.c delete mode 100644 keyboards/edi/hardlight/mk2/mk2.c delete mode 100644 keyboards/edi/standaside/standaside.c delete mode 100644 keyboards/edinburgh41/edinburgh41.c delete mode 100644 keyboards/efreet/efreet.c delete mode 100644 keyboards/ekow/akira/akira.c delete mode 100644 keyboards/emajesty/eiri/eiri.c delete mode 100644 keyboards/emi20/emi20.c delete mode 100644 keyboards/emptystring/nqg/nqg.c delete mode 100644 keyboards/eniigmakeyboards/ek60/ek60.c delete mode 100644 keyboards/eniigmakeyboards/ek65/ek65.c delete mode 100644 keyboards/eniigmakeyboards/ek87/ek87.c delete mode 100644 keyboards/ep/40/40.c delete mode 100644 keyboards/ep/96/96.c delete mode 100644 keyboards/ep/comsn/hs68/hs68.c delete mode 100644 keyboards/ep/comsn/mollydooker/mollydooker.c delete mode 100644 keyboards/ep/comsn/tf_longeboye/tf__longeboye.c delete mode 100644 keyboards/epoch80/epoch80.c delete mode 100644 keyboards/ericrlau/numdiscipline/rev1/rev1.c delete mode 100644 keyboards/esca/getawayvan/getawayvan.c delete mode 100644 keyboards/esca/getawayvan_f042/getawayvan_f042.c delete mode 100644 keyboards/eternal_keypad/eternal_keypad.c delete mode 100644 keyboards/eu_isolation/eu_isolation.c delete mode 100644 keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c delete mode 100644 keyboards/evancookaudio/tenpad/tenpad.c delete mode 100644 keyboards/eve/meteor/meteor.c delete mode 100644 keyboards/evil80/evil80.c delete mode 100644 keyboards/evyd13/atom47/rev2/rev2.c delete mode 100644 keyboards/evyd13/atom47/rev3/rev3.c delete mode 100644 keyboards/evyd13/atom47/rev4/rev4.c delete mode 100644 keyboards/evyd13/eon40/eon40.c delete mode 100644 keyboards/evyd13/eon65/eon65.c delete mode 100644 keyboards/evyd13/eon75/eon75.c delete mode 100644 keyboards/evyd13/eon87/eon87.c delete mode 100644 keyboards/evyd13/eon95/eon95.c delete mode 100644 keyboards/evyd13/gh80_1800/gh80_1800.c delete mode 100644 keyboards/evyd13/minitomic/minitomic.c delete mode 100644 keyboards/evyd13/mx5160/mx5160.c delete mode 100644 keyboards/evyd13/nt660/nt660.c delete mode 100644 keyboards/evyd13/nt750/nt750.c delete mode 100644 keyboards/evyd13/nt980/nt980.c delete mode 100644 keyboards/evyd13/omrontkl/omrontkl.c delete mode 100644 keyboards/evyd13/plain60/plain60.c delete mode 100644 keyboards/evyd13/quackfire/quackfire.c delete mode 100644 keyboards/evyd13/solheim68/solheim68.c delete mode 100644 keyboards/evyd13/ta65/ta65.c delete mode 100644 keyboards/evyd13/wasdat/wasdat.c delete mode 100644 keyboards/evyd13/wasdat_code/wasdat_code.c delete mode 100644 keyboards/evyd13/wonderland/wonderland.c delete mode 100644 keyboards/exclusive/e65/e65.c delete mode 100644 keyboards/exclusive/e6v2/le/le.c delete mode 100644 keyboards/exclusive/e6v2/le_bmc/le_bmc.c delete mode 100644 keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c delete mode 100644 keyboards/exclusive/e7v1/e7v1.c delete mode 100644 keyboards/exclusive/e7v1se/e7v1se.c delete mode 100644 keyboards/exent/exent.c delete mode 100644 keyboards/eyeohdesigns/babyv/babyv.c delete mode 100644 keyboards/facew/facew.c delete mode 100644 keyboards/feels/feels65/feels65.c delete mode 100644 keyboards/ferris/0_1/0_1.c delete mode 100644 keyboards/ferris/0_2/0_2.c delete mode 100644 keyboards/ffkeebs/siris/siris.c delete mode 100644 keyboards/fjlabs/7vhotswap/7vhotswap.c delete mode 100644 keyboards/fjlabs/ad65/ad65.c delete mode 100644 keyboards/fjlabs/avalon/avalon.c delete mode 100644 keyboards/fjlabs/bks65/bks65.c delete mode 100644 keyboards/fjlabs/bks65solder/bks65solder.c delete mode 100644 keyboards/fjlabs/kf87/kf87.c delete mode 100644 keyboards/fjlabs/kyuu/kyuu.c delete mode 100644 keyboards/fjlabs/ldk65/ldk65.c delete mode 100644 keyboards/fjlabs/midway60/midway60.c delete mode 100644 keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c delete mode 100644 keyboards/fjlabs/peaker/peaker.c delete mode 100644 keyboards/fjlabs/polaris/polaris.c delete mode 100644 keyboards/fjlabs/ready100/ready100.c delete mode 100644 keyboards/fjlabs/sinanju/sinanju.c delete mode 100644 keyboards/fjlabs/sinanjuwk/sinanjuwk.c delete mode 100644 keyboards/fjlabs/solanis/solanis.c delete mode 100644 keyboards/fjlabs/swordfish/swordfish.c delete mode 100644 keyboards/fjlabs/tf60ansi/tf60ansi.c delete mode 100644 keyboards/fjlabs/tf60v2/tf60v2.c delete mode 100644 keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c delete mode 100644 keyboards/flehrad/downbubble/downbubble.c delete mode 100644 keyboards/flehrad/numbrero/numbrero.c delete mode 100644 keyboards/flehrad/snagpad/snagpad.c delete mode 100644 keyboards/flehrad/tradestation/tradestation.c delete mode 100644 keyboards/fleuron/fleuron.c delete mode 100644 keyboards/fluorite/fluorite.c delete mode 100644 keyboards/flx/lodestone/lodestone.c delete mode 100644 keyboards/flxlb/zplit/zplit.c delete mode 100644 keyboards/flygone60/rev3/rev3.c delete mode 100644 keyboards/foostan/cornelius/cornelius.c delete mode 100644 keyboards/foxlab/key65/hotswap/hotswap.c delete mode 100644 keyboards/foxlab/key65/universal/universal.c delete mode 100644 keyboards/foxlab/leaf60/hotswap/hotswap.c delete mode 100644 keyboards/foxlab/leaf60/universal/universal.c delete mode 100644 keyboards/foxlab/time80/time80.c delete mode 100644 keyboards/foxlab/time_re/hotswap/hotswap.c delete mode 100644 keyboards/foxlab/time_re/universal/universal.c delete mode 100644 keyboards/fr4/southpaw75/southpaw75.c delete mode 100644 keyboards/fr4/unix60/unix60.c delete mode 100755 keyboards/fractal/fractal.c delete mode 100644 keyboards/free_willy/free_willy.c delete mode 100644 keyboards/friedrich/friedrich.c delete mode 100644 keyboards/frooastboard/nano/nano.c delete mode 100644 keyboards/ft/mars65/mars65.c delete mode 100644 keyboards/ft/mars80/mars80.c delete mode 100644 keyboards/function96/v1/v1.c delete mode 100644 keyboards/function96/v2/v2.c delete mode 100644 keyboards/funky40/funky40.c delete mode 100644 keyboards/gami_studio/lex60/lex60.c delete mode 100644 keyboards/generic_panda/panda65_01/panda65_01.c delete mode 100644 keyboards/genone/eclipse_65/eclipse_65.c delete mode 100644 keyboards/genone/g1_65/g1_65.c delete mode 100644 keyboards/geonworks/frogmini/fmh/fmh.c delete mode 100644 keyboards/ggkeyboards/genesis/hotswap/hotswap.c delete mode 100644 keyboards/ggkeyboards/genesis/solder/solder.c delete mode 100644 keyboards/gh60/revc/revc.c delete mode 100644 keyboards/gh60/satan/satan.c delete mode 100644 keyboards/gh60/v1p3/v1p3.c delete mode 100644 keyboards/gh80_3000/gh80_3000.c delete mode 100644 keyboards/gkeyboard/gkb_m16/gkb_m16.c delete mode 100644 keyboards/gl516/a52gl/a52gl.c delete mode 100644 keyboards/gl516/n51gl/n51gl.c delete mode 100644 keyboards/gon/nerd60/nerd60.c delete mode 100644 keyboards/gon/nerdtkl/nerdtkl.c delete mode 100644 keyboards/gowla/gowla.c delete mode 100644 keyboards/gray_studio/aero75/aero75.c delete mode 100644 keyboards/gray_studio/apollo80/apollo80.c delete mode 100644 keyboards/gray_studio/cod67/cod67.c delete mode 100644 keyboards/gray_studio/hb85/hb85.c delete mode 100644 keyboards/gray_studio/space65/space65.c delete mode 100644 keyboards/gray_studio/space65r3/space65r3.c delete mode 100644 keyboards/gray_studio/think65/hotswap/hotswap.c delete mode 100644 keyboards/grid600/press/press.c delete mode 100644 keyboards/gummykey/gummykey.c delete mode 100644 keyboards/gvalchca/ga150/ga150.c delete mode 100644 keyboards/gvalchca/spaccboard/spaccboard.c delete mode 100644 keyboards/h0oni/hotduck/hotduck.c delete mode 100644 keyboards/han60/han60.c delete mode 100644 keyboards/handwired/108key_trackpoint/108key_trackpoint.c delete mode 100644 keyboards/handwired/10k/10k.c delete mode 100644 keyboards/handwired/3dfoxc/3dfoxc.c delete mode 100644 keyboards/handwired/3dortho14u/rev1/rev1.c delete mode 100644 keyboards/handwired/3dortho14u/rev2/rev2.c delete mode 100644 keyboards/handwired/3dp660/3dp660.c delete mode 100644 keyboards/handwired/412_64/412_64.c delete mode 100644 keyboards/handwired/6macro/6macro.c delete mode 100644 keyboards/handwired/acacia/acacia.c delete mode 100644 keyboards/handwired/aim65/aim65.c delete mode 100644 keyboards/handwired/amigopunk/amigopunk.c delete mode 100644 keyboards/handwired/aplx2/aplx2.c delete mode 100644 keyboards/handwired/aranck/aranck.c delete mode 100644 keyboards/handwired/arrow_pad/arrow_pad.c delete mode 100644 keyboards/handwired/axon/axon.c delete mode 100644 keyboards/handwired/baredev/rev1/rev1.c delete mode 100644 keyboards/handwired/bigmac/bigmac.c delete mode 100644 keyboards/handwired/bolek/bolek.c delete mode 100644 keyboards/handwired/boss566y/redragon_vara/redragon_vara.c delete mode 100644 keyboards/handwired/brain/brain.c delete mode 100644 keyboards/handwired/bstk100/bstk100.c delete mode 100644 keyboards/handwired/cans12er/cans12er.c delete mode 100644 keyboards/handwired/carpolly/carpolly.c delete mode 100644 keyboards/handwired/chiron/chiron.c delete mode 100644 keyboards/handwired/ck4x4/ck4x4.c delete mode 100644 keyboards/handwired/cmd60/cmd60.c delete mode 100644 keyboards/handwired/co60/rev1/rev1.c delete mode 100644 keyboards/handwired/co60/rev6/rev6.c delete mode 100644 keyboards/handwired/co60/rev7/rev7.c delete mode 100644 keyboards/handwired/concertina/64key/64key.c delete mode 100644 keyboards/handwired/consolekeyboard/18key/18key.c delete mode 100644 keyboards/handwired/consolekeyboard/20key/20key.c delete mode 100644 keyboards/handwired/consolekeyboard/27key/27key.c delete mode 100644 keyboards/handwired/consolekeyboard/30key/30key.c delete mode 100644 keyboards/handwired/croxsplit44/croxsplit44.c delete mode 100644 keyboards/handwired/curiosity/curiosity.c delete mode 100644 keyboards/handwired/cyberstar/cyberstar.c delete mode 100644 keyboards/handwired/d48/d48.c delete mode 100644 keyboards/handwired/dactyl_left/dactyl_left.c delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/4x5.c delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/4x6.c delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/5x6.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x7/5x7.c delete mode 100644 keyboards/handwired/dactyl_manuform/6x6/6x6.c delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c delete mode 100644 keyboards/handwired/dactyl_manuform/6x7/6x7.c delete mode 100644 keyboards/handwired/dactyl_manuform/dmote/62key/62key.c delete mode 100644 keyboards/handwired/dactyl_promicro/dactyl_promicro.c delete mode 100644 keyboards/handwired/dactyl_rah/dactyl_rah.c delete mode 100644 keyboards/handwired/daishi/daishi.c delete mode 100644 keyboards/handwired/ddg_56/ddg_56.c delete mode 100644 keyboards/handwired/eagleii/eagleii.c delete mode 100644 keyboards/handwired/elrgo_s/elrgo_s.c delete mode 100644 keyboards/handwired/ergocheap/ergocheap.c delete mode 100644 keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c delete mode 100644 keyboards/handwired/fivethirteen/fivethirteen.c delete mode 100644 keyboards/handwired/floorboard/floorboard.c delete mode 100644 keyboards/handwired/frankie_macropad/frankie_macropad.c delete mode 100644 keyboards/handwired/freoduo/freoduo.c delete mode 100644 keyboards/handwired/fruity60/fruity60.c delete mode 100644 keyboards/handwired/hacked_motospeed/hacked_motospeed.c delete mode 100644 keyboards/handwired/heisenberg/heisenberg.c delete mode 100644 keyboards/handwired/hexon38/hexon38.c delete mode 100644 keyboards/handwired/hnah40/hnah40.c delete mode 100644 keyboards/handwired/hwpm87/hwpm87.c delete mode 100644 keyboards/handwired/ibm122m/ibm122m.c delete mode 100644 keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c delete mode 100644 keyboards/handwired/jn68m/jn68m.c delete mode 100644 keyboards/handwired/jot50/jot50.c delete mode 100644 keyboards/handwired/juliet/juliet.c delete mode 100644 keyboards/handwired/k8split/k8split.c delete mode 100644 keyboards/handwired/k_numpad17/k_numpad17.c delete mode 100644 keyboards/handwired/kbod/kbod.c delete mode 100644 keyboards/handwired/ks63/ks63.c delete mode 100644 keyboards/handwired/leftynumpad/leftynumpad.c delete mode 100644 keyboards/handwired/lovelive9/lovelive9.c delete mode 100644 keyboards/handwired/m40/5x5_macropad/5x5_macropad.c delete mode 100644 keyboards/handwired/macroboard/macroboard.c delete mode 100644 keyboards/handwired/magicforce61/magicforce61.c delete mode 100644 keyboards/handwired/magicforce68/magicforce68.c delete mode 100644 keyboards/handwired/marauder/marauder.c delete mode 100644 keyboards/handwired/mechboards_micropad/mechboards_micropad.c delete mode 100644 keyboards/handwired/meck_tkl/meck_tkl.c delete mode 100644 keyboards/handwired/minorca/minorca.c delete mode 100644 keyboards/handwired/misterdeck/misterdeck.c delete mode 100644 keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c delete mode 100644 keyboards/handwired/mutepad/mutepad.c delete mode 100644 keyboards/handwired/nicekey/nicekey.c delete mode 100644 keyboards/handwired/not_so_minidox/not_so_minidox.c delete mode 100644 keyboards/handwired/novem/novem.c delete mode 100644 keyboards/handwired/nozbe_macro/nozbe_macro.c delete mode 100644 keyboards/handwired/numpad20/numpad20.c delete mode 100644 keyboards/handwired/obuwunkunubi/spaget/spaget.c delete mode 100644 keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c delete mode 100644 keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c delete mode 100644 keyboards/handwired/ortho5x13/ortho5x13.c delete mode 100644 keyboards/handwired/ortho5x14/ortho5x14.c delete mode 100644 keyboards/handwired/owlet60/owlet60.c delete mode 100644 keyboards/handwired/pilcrow/pilcrow.c delete mode 100644 keyboards/handwired/pill60/pill60.c delete mode 100644 keyboards/handwired/postageboard/mini/mini.c delete mode 100644 keyboards/handwired/postageboard/mini/mini.h delete mode 100644 keyboards/handwired/postageboard/postageboard.c delete mode 100644 keyboards/handwired/postageboard/r1/r1.c delete mode 100644 keyboards/handwired/postageboard/r1/r1.h delete mode 100644 keyboards/handwired/prime_exl/prime_exl.c delete mode 100644 keyboards/handwired/prkl30/prkl30.c delete mode 100644 keyboards/handwired/pteron/pteron.c delete mode 100644 keyboards/handwired/pteron38/pteron38.c delete mode 100644 keyboards/handwired/pteron44/pteron44.c delete mode 100644 keyboards/handwired/reclined/reclined.c delete mode 100644 keyboards/handwired/riblee_f401/riblee_f401.c delete mode 100644 keyboards/handwired/riblee_f411/riblee_f411.c delete mode 100644 keyboards/handwired/rs60/rs60.c delete mode 100644 keyboards/handwired/sick68/sick68.c delete mode 100644 keyboards/handwired/sick_pad/sick_pad.c delete mode 100644 keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c delete mode 100644 keyboards/handwired/slash/slash.c delete mode 100644 keyboards/handwired/space_oddity/space_oddity.c delete mode 100644 keyboards/handwired/splittest/splittest.c delete mode 100644 keyboards/handwired/steamvan/rev1/rev1.c delete mode 100644 keyboards/handwired/sticc14/sticc14.c delete mode 100644 keyboards/handwired/swiftrax/astro65/astro65.c delete mode 100644 keyboards/handwired/swiftrax/bebol/bebol.c delete mode 100644 keyboards/handwired/swiftrax/beegboy/beegboy.c delete mode 100644 keyboards/handwired/swiftrax/cowfish/cowfish.c delete mode 100644 keyboards/handwired/swiftrax/digicarpice/digicarpice.c delete mode 100644 keyboards/handwired/swiftrax/equator/equator.c delete mode 100644 keyboards/handwired/swiftrax/glacier/glacier.c delete mode 100644 keyboards/handwired/swiftrax/joypad/joypad.c delete mode 100644 keyboards/handwired/swiftrax/koalafications/koalafications.c delete mode 100644 keyboards/handwired/swiftrax/nodu/nodu.c delete mode 100644 keyboards/handwired/swiftrax/pandamic/pandamic.c delete mode 100644 keyboards/handwired/swiftrax/the_galleon/the_galleon.c delete mode 100644 keyboards/handwired/swiftrax/unsplit/unsplit.c delete mode 100644 keyboards/handwired/swiftrax/walter/walter.c delete mode 100644 keyboards/handwired/symmetry60/symmetry60.c delete mode 100644 keyboards/handwired/t111/t111.c delete mode 100644 keyboards/handwired/terminus_mini/terminus_mini.c delete mode 100644 keyboards/handwired/trackpoint/trackpoint.c delete mode 100644 keyboards/handwired/tritium_numpad/tritium_numpad.c delete mode 100644 keyboards/handwired/twadlee/tp69/tp69.c delete mode 100644 keyboards/handwired/twig/twig50/twig50.c delete mode 100644 keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c delete mode 100644 keyboards/handwired/unk/rev1/rev1.c delete mode 100644 keyboards/handwired/unk/unk.c delete mode 100644 keyboards/handwired/unk/unk.h delete mode 100644 keyboards/handwired/videowriter/videowriter.c delete mode 100644 keyboards/handwired/wabi/wabi.c delete mode 100644 keyboards/handwired/wulkan/wulkan.c delete mode 100644 keyboards/handwired/xealous/rev1/rev1.c delete mode 100644 keyboards/handwired/zergo/zergo.c delete mode 100644 keyboards/hardlineworks/otd_plus/otd_plus.c delete mode 100644 keyboards/hhkb/ansi/ansi.c delete mode 100644 keyboards/hhkb/jp/jp.c delete mode 100644 keyboards/hhkb_lite_2/hhkb_lite_2.c delete mode 100644 keyboards/hidtech/bastyl/bastyl.c delete mode 100644 keyboards/hillside/48/0_1/0_1.c delete mode 100644 keyboards/hineybush/h08_ocelot/h08_ocelot.c delete mode 100644 keyboards/hineybush/h65/h65.c delete mode 100644 keyboards/hineybush/h65_hotswap/h65_hotswap.c delete mode 100644 keyboards/hineybush/hineyg80/hineyg80.c delete mode 100644 keyboards/hineybush/sm68/sm68.c delete mode 100644 keyboards/hnahkb/freyr/freyr.c delete mode 100644 keyboards/hnahkb/stella/stella.c delete mode 100644 keyboards/hnahkb/vn66/vn66.c delete mode 100644 keyboards/holyswitch/southpaw75/southpaw75.c delete mode 100644 keyboards/horizon/horizon.c delete mode 100644 keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c delete mode 100644 keyboards/horrortroll/paws60/paws60.c delete mode 100644 keyboards/hp69/hp69.c delete mode 100755 keyboards/hub16/hub16.c delete mode 100644 keyboards/huytbt/h50/h50.c delete mode 100644 keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c delete mode 100644 keyboards/ibnuda/alicia_cook/alicia_cook.c delete mode 100644 keyboards/ibnuda/gurindam/gurindam.c delete mode 100644 keyboards/idobao/id75/v1/v1.c delete mode 100644 keyboards/idobao/id87/v1/v1.c delete mode 100644 keyboards/idobao/id96/id96.c delete mode 100644 keyboards/idobao/montex/v1/v1.c delete mode 100644 keyboards/illuminati/is0/is0.c delete mode 100644 keyboards/illusion/rosa/rosa.c delete mode 100644 keyboards/ilumkb/primus75/primus75.c delete mode 100644 keyboards/ingrained/ingrained.c delete mode 100644 keyboards/input_club/infinity60/infinity60.c delete mode 100644 keyboards/irene/irene.c delete mode 100644 keyboards/iriskeyboards/iriskeyboards.c delete mode 100644 keyboards/j80/j80.c delete mode 100644 keyboards/jacky_studio/s7_elephant/rev1/rev1.c delete mode 100644 keyboards/jacky_studio/s7_elephant/rev2/rev2.c delete mode 100644 keyboards/jadookb/jkb2/jkb2.c delete mode 100644 keyboards/jc65/v32a/v32a.c delete mode 100644 keyboards/jc65/v32u4/v32u4.c delete mode 100644 keyboards/jd40/jd40.c delete mode 100644 keyboards/jd45/jd45.c delete mode 100644 keyboards/jels/jels60/jels60.c delete mode 100644 keyboards/jkdlab/binary_monkey/binary_monkey.c delete mode 100644 keyboards/jones/v03/v03.c delete mode 100644 keyboards/k34/k34.c delete mode 100644 keyboards/kabedon/kabedon78s/kabedon78s.c delete mode 100644 keyboards/kagizaraya/chidori/chidori.c delete mode 100644 keyboards/kagizaraya/halberd/halberd.c delete mode 100644 keyboards/kagizaraya/scythe/scythe.c delete mode 100644 keyboards/kakunpc/angel17/alpha/alpha.c delete mode 100644 keyboards/kakunpc/angel17/rev1/rev1.c delete mode 100644 keyboards/kakunpc/angel64/alpha/alpha.c delete mode 100644 keyboards/kakunpc/angel64/rev1/rev1.c delete mode 100644 keyboards/kakunpc/choc_taro/choc_taro.c delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c delete mode 100644 keyboards/kakunpc/suihankey/alpha/alpha.c delete mode 100644 keyboards/kakunpc/suihankey/rev1/rev1.c delete mode 100644 keyboards/kakunpc/suihankey/split/alpha/alpha.c delete mode 100644 keyboards/kakunpc/suihankey/split/rev1/rev1.c delete mode 100644 keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c delete mode 100755 keyboards/kapcave/gskt00/gskt00.c delete mode 100755 keyboards/kapcave/paladin64/paladin64.c delete mode 100644 keyboards/kapcave/paladinpad/paladinpad.c delete mode 100644 keyboards/karlb/kbic65/kbic65.c delete mode 100644 keyboards/kb58/kb58.c delete mode 100644 keyboards/kb_elmo/67mk_e/67mk_e.c delete mode 100644 keyboards/kb_elmo/aek2_usb/aek2_usb.c delete mode 100644 keyboards/kb_elmo/elmopad/elmopad.c delete mode 100644 keyboards/kb_elmo/m0110a_usb/m0110a_usb.c delete mode 100644 keyboards/kb_elmo/m0116_usb/m0116_usb.c delete mode 100644 keyboards/kb_elmo/noah_avr/noah_avr.c delete mode 100644 keyboards/kb_elmo/qez/qez.c delete mode 100644 keyboards/kb_elmo/sesame/sesame.c delete mode 100644 keyboards/kb_elmo/twelvekey/twelvekey.c delete mode 100644 keyboards/kb_elmo/vertex/vertex.c delete mode 100644 keyboards/kbdclack/kaishi65/kaishi65.c delete mode 100644 keyboards/kbdfans/baguette66/soldered/soldered.c delete mode 100644 keyboards/kbdfans/bounce/75/hotswap/hotswap.c delete mode 100644 keyboards/kbdfans/bounce/75/soldered/soldered.c delete mode 100644 keyboards/kbdfans/bounce/pad/pad.c delete mode 100644 keyboards/kbdfans/kbd19x/kbd19x.c delete mode 100644 keyboards/kbdfans/kbd4x/kbd4x.c delete mode 100644 keyboards/kbdfans/kbd66/kbd66.c delete mode 100644 keyboards/kbdfans/kbd67/hotswap/hotswap.c delete mode 100644 keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c delete mode 100644 keyboards/kbdfans/kbd67/rev1/rev1.c delete mode 100644 keyboards/kbdfans/kbd67/rev2/rev2.c delete mode 100644 keyboards/kbdfans/kbd6x/kbd6x.c delete mode 100644 keyboards/kbdfans/kbd75hs/kbd75hs.c delete mode 100644 keyboards/kbdfans/kbd8x/kbd8x.c delete mode 100644 keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c delete mode 100644 keyboards/kbdfans/kbdpad/mk1/mk1.c delete mode 100644 keyboards/kbdfans/kbdpad/mk2/mk2.c delete mode 100644 keyboards/kbdfans/odin/soldered/soldered.c delete mode 100644 keyboards/kbdfans/odin/v2/v2.c delete mode 100644 keyboards/kbnordic/nordic60/rev_a/rev_a.c delete mode 100644 keyboards/keaboard/rev1/config.h delete mode 100644 keyboards/keebformom/keebformom.c delete mode 100644 keyboards/keebio/bfo9000/bfo9000.c delete mode 100644 keyboards/keebio/bigswitchseat/bigswitchseat.c delete mode 100644 keyboards/keebio/laplace/laplace.c delete mode 100644 keyboards/keebio/tragicforce68/tragicforce68.c delete mode 100644 keyboards/keebio/wtf60/wtf60.c delete mode 100644 keyboards/keebmonkey/kbmg68/kbmg68.c delete mode 100644 keyboards/keebsforall/freebird60/freebird60.c delete mode 100644 keyboards/keebsforall/freebirdnp/lite/lite.c delete mode 100644 keyboards/keebsforall/freebirdtkl/freebirdtkl.c delete mode 100644 keyboards/keebwerk/nano_slider/nano_slider.c delete mode 100644 keyboards/keebzdotnet/fme/fme.c delete mode 100644 keyboards/keebzdotnet/wazowski/wazowski.c delete mode 100644 keyboards/kegen/gboy/gboy.c delete mode 100644 keyboards/keybage/radpad/radpad.c delete mode 100644 keyboards/keyboardio/atreus/atreus.c delete mode 100644 keyboards/keycapsss/o4l_5x12/o4l_5x12.c delete mode 100644 keyboards/keycapsss/plaid_pad/plaid_pad.c delete mode 100644 keyboards/keycapsss/plaid_pad/rev1/rev1.c delete mode 100644 keyboards/keycapsss/plaid_pad/rev1/rev1.h delete mode 100644 keyboards/keycapsss/plaid_pad/rev2/rev2.c delete mode 100644 keyboards/keycapsss/plaid_pad/rev2/rev2.h delete mode 100644 keyboards/keycapsss/plaid_pad/rev3/rev3.c delete mode 100644 keyboards/keycapsss/plaid_pad/rev3/rev3.h delete mode 100644 keyboards/keygem/kg60ansi/kg60ansi.c delete mode 100644 keyboards/keygem/kg65rgbv2/kg65rgbv2.c delete mode 100644 keyboards/keyhive/absinthe/absinthe.c delete mode 100644 keyboards/keyhive/ergosaurus/ergosaurus.c delete mode 100644 keyboards/keyhive/maypad/maypad.c delete mode 100644 keyboards/keyhive/opus/opus.c delete mode 100644 keyboards/keyhive/smallice/smallice.c delete mode 100644 keyboards/keyhive/southpole/southpole.c delete mode 100644 keyboards/keyhive/ut472/ut472.c delete mode 100644 keyboards/keyprez/corgi/corgi.c delete mode 100755 keyboards/keysofkings/twokey/twokey.c delete mode 100644 keyboards/keyten/aperture/aperture.c delete mode 100644 keyboards/keyten/kt3700/kt3700.c delete mode 100644 keyboards/keyten/kt60_m/kt60_m.c delete mode 100644 keyboards/kikkou/kikkou.c delete mode 100644 keyboards/kikoslab/ellora65/ellora65.c delete mode 100644 keyboards/kikoslab/kl90/kl90.c delete mode 100644 keyboards/kin80/blackpill103/blackpill103.h delete mode 100644 keyboards/kin80/blackpill401/blackpill401.h delete mode 100644 keyboards/kin80/blackpill411/blackpill411.h delete mode 100644 keyboards/kin80/kin80.c delete mode 100644 keyboards/kin80/micro/micro.h delete mode 100644 keyboards/kindakeyboards/conone65/conone65.c delete mode 100644 keyboards/kineticlabs/emu/hotswap/hotswap.c delete mode 100644 keyboards/kineticlabs/emu/soldered/soldered.c delete mode 100644 keyboards/kingly_keys/ave/ortho/ortho.c delete mode 100644 keyboards/kingly_keys/ave/staggered/staggered.c delete mode 100644 keyboards/kingly_keys/little_foot/little_foot.c delete mode 100644 keyboards/kingly_keys/romac/romac.c delete mode 100644 keyboards/kingly_keys/romac_plus/romac_plus.c delete mode 100644 keyboards/kingly_keys/ropro/ropro.c delete mode 100644 keyboards/kingly_keys/smd_milk/smd_milk.c delete mode 100644 keyboards/kingly_keys/soap/soap.c delete mode 100644 keyboards/kira75/kira75.c delete mode 100644 keyboards/kira80/kira80.c delete mode 100644 keyboards/kiwikey/kawii9/kawii9.c delete mode 100644 keyboards/kiwikey/wanderland/wanderland.c delete mode 100644 keyboards/kkatano/bakeneko60/bakeneko60.c delete mode 100644 keyboards/kkatano/bakeneko65/rev2/rev2.c delete mode 100644 keyboards/kkatano/bakeneko65/rev3/rev3.c delete mode 100644 keyboards/kkatano/bakeneko80/bakeneko80.c delete mode 100644 keyboards/knops/mini/mini.c delete mode 100644 keyboards/kona_classic/kona_classic.c delete mode 100644 keyboards/kopibeng/mnk65/mnk65.c delete mode 100644 keyboards/kopibeng/xt60/xt60.c delete mode 100644 keyboards/kopibeng/xt60_singa/xt60_singa.c delete mode 100644 keyboards/kopibeng/xt65/xt65.c delete mode 100644 keyboards/kprepublic/bm43a/bm43a.c delete mode 100755 keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c delete mode 100644 keyboards/kprepublic/cospad/cospad.c delete mode 100644 keyboards/kprepublic/jj40/jj40.c delete mode 100644 keyboards/kprepublic/jj4x4/jj4x4.c delete mode 100644 keyboards/kprepublic/jj50/jj50.c delete mode 100644 keyboards/ktec/daisy/daisy.c delete mode 100644 keyboards/kwub/bloop/bloop.c delete mode 100644 keyboards/ky01/ky01.c delete mode 100644 keyboards/labyrinth75/labyrinth75.c delete mode 100644 keyboards/latincompass/latin47ble/latin47ble.c delete mode 100644 keyboards/latincompass/latin64ble/latin64ble.c delete mode 100644 keyboards/lazydesigners/bolt/bolt.c delete mode 100755 keyboards/lazydesigners/cassette8/cassette8.c delete mode 100644 keyboards/lazydesigners/dimple/ortho/ortho.c delete mode 100644 keyboards/lazydesigners/dimpleplus/dimpleplus.c delete mode 100644 keyboards/lazydesigners/the30/the30.c delete mode 100644 keyboards/lazydesigners/the40/the40.c delete mode 100755 keyboards/lazydesigners/the60/rev1/rev1.c delete mode 100755 keyboards/lazydesigners/the60/rev2/rev2.c delete mode 100644 keyboards/lefty/rev1/rev1.c delete mode 100644 keyboards/lefty/rev2/rev2.c delete mode 100644 keyboards/linworks/dolice/dolice.c delete mode 100644 keyboards/linworks/fave104/fave104.c delete mode 100644 keyboards/linworks/fave87/fave87.c delete mode 100644 keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c delete mode 100644 keyboards/lm_keyboard/lm60n/lm60n.c delete mode 100644 keyboards/longnald/corin/corin.c delete mode 100644 keyboards/lucid/alexa/alexa.c delete mode 100644 keyboards/lucid/alexa_solder/alexa_solder.c delete mode 100644 keyboards/lucid/kbd8x_hs/kbx8s_hs.c delete mode 100644 keyboards/lucid/phantom_hs/phantom_hs.c delete mode 100644 keyboards/lucid/phantom_solder/phantom_solder.c delete mode 100644 keyboards/lucid/scarlet/scarlet.c delete mode 100644 keyboards/lyso1/lefishe/lefishe.c delete mode 100644 keyboards/lz/erghost/erghost.c delete mode 100644 keyboards/m10a/m10a.c delete mode 100644 keyboards/machine_industries/m4_a/m4_a.c delete mode 100644 keyboards/majistic/majistic.c delete mode 100644 keyboards/makenova/omega/omega4/omega4.c delete mode 100644 keyboards/makrosu/makrosu.c delete mode 100644 keyboards/manta60/manta60.c delete mode 100644 keyboards/manyboard/macro/macro.c delete mode 100644 keyboards/maple_computing/6ball/6ball.c delete mode 100755 keyboards/maple_computing/c39/c39.c delete mode 100644 keyboards/maple_computing/christmas_tree/christmas_tree.c delete mode 100644 keyboards/maple_computing/christmas_tree/v2017/v2017.c delete mode 100644 keyboards/maple_computing/christmas_tree/v2017/v2017.h delete mode 100644 keyboards/maple_computing/jnao/jnao.c delete mode 100644 keyboards/maple_computing/the_ruler/the_ruler.c delete mode 100644 keyboards/marksard/treadstone32/lite/lite.c delete mode 100644 keyboards/marksard/treadstone32/rev1/rev1.c delete mode 100644 keyboards/marksard/treadstone48/rev1/rev1.c delete mode 100644 keyboards/marksard/treadstone48/rev2/rev2.c delete mode 100644 keyboards/massdrop/thekey/thekey.c delete mode 100644 keyboards/massdrop/thekey_v2/thekey_v2.c delete mode 100644 keyboards/matchstickworks/southpad/southpad.c delete mode 100644 keyboards/matrix/me/me.c delete mode 100644 keyboards/matthewdias/m3n3van/m3n3van.c delete mode 100644 keyboards/matthewdias/minim/minim.c delete mode 100644 keyboards/matthewdias/model_v/model_v.c delete mode 100644 keyboards/matthewdias/txuu/txuu.c delete mode 100644 keyboards/mb44/mb44.c delete mode 100644 keyboards/mechanickeys/miniashen40/miniashen40.c delete mode 100644 keyboards/mechbrewery/mb65h/mb65h.c delete mode 100644 keyboards/mechbrewery/mb65s/mb65s.c delete mode 100644 keyboards/mechkeys/acr60/acr60.c delete mode 100755 keyboards/mechkeys/alu84/alu84.c delete mode 100755 keyboards/mechkeys/espectro/espectro.c delete mode 100644 keyboards/mechkeys/mk60/mk60.c delete mode 100644 keyboards/mechllama/g35/g35.c delete mode 100644 keyboards/mechlovin/delphine/delphine.c delete mode 100644 keyboards/mechlovin/delphine/rgb_led/rgb_led.h delete mode 100644 keyboards/mechlovin/foundation/foundation.c delete mode 100644 keyboards/mechlovin/hex4b/hex4b.c delete mode 100644 keyboards/mechlovin/hex6c/hex6c.c delete mode 100644 keyboards/mechlovin/infinity87/infinity87.c delete mode 100644 keyboards/mechlovin/infinity87/infinity87.h delete mode 100644 keyboards/mechlovin/infinity87/rev1/rev1.c delete mode 100644 keyboards/mechlovin/infinity87/rev1/rev1.h delete mode 100644 keyboards/mechlovin/infinity87/rev2/rev2.c delete mode 100644 keyboards/mechlovin/infinity87/rev2/rev2.h delete mode 100644 keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h delete mode 100644 keyboards/mechlovin/infinity88/infinity88.c delete mode 100644 keyboards/mechlovin/jay60/jay60.c delete mode 100644 keyboards/mechlovin/kay60/kay60.c delete mode 100644 keyboards/mechlovin/mechlovin9/mechlovin9.c delete mode 100644 keyboards/mechlovin/pisces/pisces.c delete mode 100644 keyboards/mechlovin/serratus/serratus.c delete mode 100644 keyboards/mechlovin/th1800/th1800.c delete mode 100644 keyboards/mechlovin/tmkl/tmkl.c delete mode 100644 keyboards/mechlovin/zed60/zed60.c delete mode 100644 keyboards/mechstudio/dawn/dawn.c delete mode 100644 keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c delete mode 100644 keyboards/mechwild/bde/rev2/rev2.h delete mode 100644 keyboards/mehkee96/mehkee96.c delete mode 100644 keyboards/meletrix/zoom87/zoom87.c delete mode 100755 keyboards/melgeek/mach80/mach80.c delete mode 100644 keyboards/melgeek/mj61/mj61.c delete mode 100644 keyboards/melgeek/mj63/mj63.c delete mode 100644 keyboards/melgeek/mj64/mj64.c delete mode 100644 keyboards/melgeek/mj65/mj65.c delete mode 100755 keyboards/melgeek/mj6xy/mj6xy.c delete mode 100644 keyboards/melgeek/mj6xy/rev3/rev3.c delete mode 100755 keyboards/melgeek/mojo68/mojo68.c delete mode 100644 keyboards/melgeek/mojo75/mojo75.c delete mode 100755 keyboards/melgeek/tegic/tegic.c delete mode 100644 keyboards/melgeek/z70ultra/z70ultra.c delete mode 100644 keyboards/meme/meme.c delete mode 100644 keyboards/meow65/meow65.c delete mode 100644 keyboards/merge/iso_macro/iso_macro.c delete mode 100644 keyboards/merge/uc1/uc1.c delete mode 100644 keyboards/mesa/mesa_tkl/mesa_tkl.c delete mode 100644 keyboards/meson/meson.c delete mode 100644 keyboards/mexsistor/ludmila/ludmila.c delete mode 100644 keyboards/mikeneko65/mikeneko65.c delete mode 100644 keyboards/millipad/millipad.c delete mode 100644 keyboards/mincedshon/ecila/ecila.c delete mode 100644 keyboards/minimon/index_tab/index_tab.c delete mode 100644 keyboards/mint60/mint60.c delete mode 100644 keyboards/misonoworks/karina/karina.c delete mode 100644 keyboards/misterknife/knife66/knife66.c delete mode 100644 keyboards/misterknife/knife66_iso/knife66_iso.c delete mode 100644 keyboards/miuni32/miuni32.c delete mode 100644 keyboards/mlego/m48/m48.c delete mode 100644 keyboards/mlego/m60/m60.c delete mode 100644 keyboards/mlego/m60_split/m60_split.c delete mode 100644 keyboards/mmkzoo65/mmkzoo65.c delete mode 100755 keyboards/mnk1800s/mnk1800s.c delete mode 100755 keyboards/mnk50/mnk50.c delete mode 100755 keyboards/mnk75/mnk75.c delete mode 100644 keyboards/mode/m75s/m75s.c delete mode 100644 keyboards/mokey/ginkgo65/ginkgo65.c delete mode 100644 keyboards/mokey/ginkgo65hot/ginkgo65hot.c delete mode 100644 keyboards/mokey/ibis80/ibis80.c delete mode 100644 keyboards/mokey/mokey63/mokey63.c delete mode 100644 keyboards/mokey/mokey64/mokey64.c delete mode 100644 keyboards/mokey/xox70/xox70.c delete mode 100644 keyboards/mokey/xox70hot/xox70hot.c delete mode 100755 keyboards/molecule/molecule.c delete mode 100644 keyboards/momoka_ergo/momoka_ergo.c delete mode 100644 keyboards/monarch/monarch.c delete mode 100644 keyboards/monoflex60/monoflex60.c delete mode 100644 keyboards/montsinger/rewind/rewind.c delete mode 100644 keyboards/moon/moon.c delete mode 100644 keyboards/morizon/morizon.c delete mode 100644 keyboards/mountainblocks/mb17/mb17.c delete mode 100644 keyboards/mt/blocked65/blocked65.c delete mode 100644 keyboards/mt/mt40/mt40.c delete mode 100644 keyboards/mt/mt980/mt980.c delete mode 100644 keyboards/mt/split75/split75.c delete mode 100644 keyboards/mtbkeys/mtb60/hotswap/hotswap.c delete mode 100644 keyboards/mtbkeys/mtb60/solder/solder.c delete mode 100644 keyboards/murcielago/murcielago.c delete mode 100644 keyboards/mysticworks/wyvern/wyvern.c delete mode 100644 keyboards/nacly/sodium42/sodium42.c delete mode 100644 keyboards/nacly/sodium50/sodium50.c delete mode 100644 keyboards/nacly/splitreus62/splitreus62.c delete mode 100644 keyboards/nacly/ua62/ua62.c delete mode 100644 keyboards/nasu/nasu.c delete mode 100644 keyboards/ncc1701kb/ncc1701kb.c delete mode 100644 keyboards/neito/neito.c delete mode 100644 keyboards/nek_type_a/nek_type_a.c delete mode 100644 keyboards/nemui/nemui.c delete mode 100644 keyboards/neokeys/g67/element_hs/element_hs.c delete mode 100644 keyboards/neokeys/g67/hotswap/hotswap.c delete mode 100644 keyboards/neokeys/g67/soldered/soldered.c delete mode 100644 keyboards/newgame40/newgame40.c delete mode 100644 keyboards/nibiria/stream15/stream15.c delete mode 100644 keyboards/nightingale_studios/hailey/hailey.c delete mode 100644 keyboards/nightly_boards/alter/rev1/rev1.c delete mode 100644 keyboards/nightly_boards/alter_lite/alter_lite.c delete mode 100644 keyboards/nightly_boards/conde60/conde60.c delete mode 100644 keyboards/nightly_boards/daily60/daily60.c delete mode 100644 keyboards/nightly_boards/jisoo/jisoo.c delete mode 100644 keyboards/nightly_boards/n2/n2.c delete mode 100644 keyboards/nightly_boards/n87/n87.c delete mode 100644 keyboards/nightly_boards/n9/n9.c delete mode 100644 keyboards/nightly_boards/octopadplus/octopadplus.c delete mode 100644 keyboards/nightly_boards/paraluman/paraluman.c delete mode 100644 keyboards/nightly_boards/ph_arisu/ph_arisu.c delete mode 100644 keyboards/nightmare/nightmare.c delete mode 100644 keyboards/nimrod/nimrod.c delete mode 100644 keyboards/nix_studio/n60_a/n60_a.c delete mode 100644 keyboards/nopunin10did/jabberwocky/v1/v1.c delete mode 100644 keyboards/nopunin10did/jabberwocky/v2/v2.c delete mode 100644 keyboards/nopunin10did/railroad/rev0/rev0.c delete mode 100755 keyboards/novelkeys/novelpad/novelpad.c delete mode 100644 keyboards/noxary/260/260.c delete mode 100644 keyboards/noxary/268/268.c delete mode 100644 keyboards/noxary/268_2_rgb/268_2_rgb.c delete mode 100644 keyboards/noxary/378/378.c delete mode 100644 keyboards/noxary/valhalla/valhalla.c delete mode 100644 keyboards/noxary/vulcan/vulcan.c delete mode 100644 keyboards/numatreus/numatreus.c delete mode 100644 keyboards/nyhxis/nfr_70/nfr_70.c delete mode 100644 keyboards/obosob/arch_36/arch_36.c delete mode 100644 keyboards/ocean/addon/addon.c delete mode 100644 keyboards/ocean/gin_v2/gin_v2.c delete mode 100644 keyboards/ocean/slamz/slamz.c delete mode 100644 keyboards/ocean/stealth/stealth.c delete mode 100644 keyboards/ocean/sus/sus.c delete mode 100644 keyboards/ocean/wang_ergo/wang_ergo.c delete mode 100644 keyboards/ocean/wang_v2/wang_v2.c delete mode 100644 keyboards/ocean/yuri/yuri.c delete mode 100644 keyboards/oddball/v1/v1.c delete mode 100644 keyboards/oddball/v1/v1.h delete mode 100644 keyboards/oddball/v2/v2.c delete mode 100644 keyboards/oddball/v2/v2.h delete mode 100644 keyboards/oddball/v2_1/v2_1.c delete mode 100644 keyboards/oddball/v2_1/v2_1.h delete mode 100644 keyboards/odelia/odelia.c delete mode 100644 keyboards/ogre/ergo_single/ergo_single.c delete mode 100644 keyboards/ogre/ergo_split/ergo_split.c delete mode 100644 keyboards/ok60/ok60.c delete mode 100644 keyboards/om60/om60.c delete mode 100644 keyboards/orange75/orange75.c delete mode 100644 keyboards/owlab/jelly_epoch/hotswap/hotswap.c delete mode 100644 keyboards/owlab/jelly_epoch/soldered/soldered.c delete mode 100644 keyboards/owlab/suit80/ansi/ansi.c delete mode 100644 keyboards/owlab/suit80/iso/iso.c delete mode 100644 keyboards/pabile/p18/p18.c delete mode 100644 keyboards/pabile/p20/ver1/ver1.c delete mode 100644 keyboards/pabile/p20/ver2/ver2.c delete mode 100644 keyboards/pabile/p40/p40.c delete mode 100644 keyboards/pabile/p40_ortho/p40_ortho.c delete mode 100644 keyboards/pabile/p42/p42.c delete mode 100644 keyboards/panc40/panc40.c delete mode 100644 keyboards/panc60/panc60.c delete mode 100644 keyboards/papercranekeyboards/gerald65/gerald65.c delete mode 100644 keyboards/parallel/parallel_65/hotswap/hotswap.c delete mode 100644 keyboards/parallel/parallel_65/soldered/soldered.c delete mode 100644 keyboards/pdxkbc/pdxkbc.c delete mode 100644 keyboards/pearl/pearl.c delete mode 100644 keyboards/pearlboards/pearl/pearl.c delete mode 100644 keyboards/percent/booster/booster.c delete mode 100644 keyboards/percent/canoe/canoe.c delete mode 100644 keyboards/percent/skog/skog.c delete mode 100644 keyboards/percent/skog_lite/skog_lite.c delete mode 100644 keyboards/phantom/phantom.c delete mode 100644 keyboards/phase_studio/titan65/soldered/soldered.c delete mode 100644 keyboards/phrygian/ph100/ph100.c delete mode 100644 keyboards/picolab/frusta_fundamental/frusta_fundamental.c delete mode 100644 keyboards/pierce/pierce.c delete mode 100644 keyboards/pimentoso/paddino02/rev1/rev1.c delete mode 100644 keyboards/pimentoso/paddino02/rev2/left/left.c delete mode 100644 keyboards/pimentoso/paddino02/rev2/right/right.c delete mode 100644 keyboards/pimentoso/touhoupad/touhoupad.c delete mode 100644 keyboards/pixelspace/capsule65i/capsule65i.c delete mode 100644 keyboards/pizzakeyboards/pizza65/pizza65.c delete mode 100644 keyboards/pjb/eros/eros.c delete mode 100644 keyboards/pkb65/pkb65.c delete mode 100644 keyboards/planck/ez/glow/glow.c delete mode 100644 keyboards/planck/ez/glow/glow.h delete mode 100644 keyboards/playkbtw/ca66/ca66.c delete mode 100644 keyboards/playkbtw/helen80/helen80.c delete mode 100644 keyboards/playkbtw/pk60/pk60.c delete mode 100644 keyboards/plume/plume65/plume65.c delete mode 100644 keyboards/plut0nium/0x3e/0x3e.c delete mode 100644 keyboards/plx/plx.c delete mode 100644 keyboards/plywrks/ahgase/ahgase.c delete mode 100644 keyboards/pohjolaworks/louhi/louhi.c delete mode 100644 keyboards/poker87c/poker87c.c delete mode 100644 keyboards/poker87d/poker87d.c delete mode 100644 keyboards/polilla/polilla.c delete mode 100644 keyboards/polycarbdiet/s20/s20.c delete mode 100644 keyboards/portal_66/hotswap/hotswap.c delete mode 100644 keyboards/portal_66/soldered/soldered.c delete mode 100644 keyboards/pos78/pos78.c delete mode 100644 keyboards/primekb/meridian_rgb/meridian_rgb.c delete mode 100644 keyboards/primekb/prime_e/prime_e.c delete mode 100644 keyboards/primekb/prime_m/prime_m.c delete mode 100644 keyboards/primekb/prime_o/prime_o.c delete mode 100644 keyboards/primekb/prime_r/prime_r.c delete mode 100644 keyboards/projectkb/signature65/signature65.c delete mode 100644 keyboards/projectkb/signature87/signature87.c delete mode 100644 keyboards/prototypist/allison/allison.c delete mode 100644 keyboards/prototypist/allison_numpad/allison_numpad.c delete mode 100644 keyboards/prototypist/j01/j01.c delete mode 100644 keyboards/protozoa/p01/p01.c delete mode 100644 keyboards/psuieee/pluto12/pluto12.c delete mode 100644 keyboards/puck/puck.c delete mode 100644 keyboards/q4z/q4z.c delete mode 100644 keyboards/qpockets/eggman/eggman.c delete mode 100644 keyboards/qpockets/space_space/rev1/rev1.c delete mode 100644 keyboards/qpockets/wanten/wanten.c delete mode 100644 keyboards/quantrik/kyuu/kyuu.c delete mode 100644 keyboards/quarkeys/z60/hotswap/hotswap.c delete mode 100644 keyboards/quarkeys/z60/solder/solder.c delete mode 100644 keyboards/quarkeys/z67/hotswap/hotswap.c delete mode 100644 keyboards/quarkeys/z67/solder/solder.c delete mode 100644 keyboards/qwertlekeys/calice/calice.c delete mode 100644 keyboards/qwertykeys/qk65/hotswap/hotswap.c delete mode 100644 keyboards/qwertykeys/qk65/solder/solder.c delete mode 100644 keyboards/rabbit/rabbit68/rabbit68.c delete mode 100644 keyboards/rad/rad.c delete mode 100644 keyboards/rainkeebs/rainkeeb/rainkeeb.c delete mode 100644 keyboards/rainkeebs/yasui/yasui.c delete mode 100644 keyboards/rart/rart45/rart45.c delete mode 100644 keyboards/rart/rart4x4/rart4x4.c delete mode 100644 keyboards/rart/rart67/rart67.c delete mode 100644 keyboards/rart/rart67m/rart67m.c delete mode 100644 keyboards/rart/rart75/rart75.c delete mode 100644 keyboards/rart/rart80/rart80.c delete mode 100644 keyboards/rart/rartand/rartand.c delete mode 100644 keyboards/rart/rartlice/rartlice.c delete mode 100644 keyboards/rart/rartpad/rartpad.c delete mode 100644 keyboards/rate/pistachio_mp/pistachio_mp.c delete mode 100644 keyboards/rate/pistachio_pro/pistachio_pro.c delete mode 100644 keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c delete mode 100644 keyboards/rationalist/ratio65_solder/rev_a/rev_a.c delete mode 100644 keyboards/recompile_keys/choco60/choco60.c delete mode 100644 keyboards/recompile_keys/choco60/rev1/rev1.c delete mode 100644 keyboards/recompile_keys/choco60/rev1/rev1.h delete mode 100644 keyboards/recompile_keys/choco60/rev2/rev2.c delete mode 100644 keyboards/recompile_keys/choco60/rev2/rev2.h delete mode 100644 keyboards/recompile_keys/cocoa40/cocoa40.c delete mode 100644 keyboards/recompile_keys/mio/mio.c delete mode 100644 keyboards/rect44/rect44.c delete mode 100755 keyboards/redscarf_iiplus/verb/verb.c delete mode 100755 keyboards/redscarf_iiplus/verc/verc.c delete mode 100644 keyboards/redscarf_iiplus/verd/verd.c delete mode 100644 keyboards/retro_75/retro_75.c delete mode 100644 keyboards/reversestudio/decadepad/decadepad.c delete mode 100644 keyboards/reviung/reviung33/reviung33.c delete mode 100755 keyboards/reviung/reviung34/reviung34.c delete mode 100644 keyboards/reviung/reviung39/reviung39.c delete mode 100644 keyboards/reviung/reviung41/reviung41.c delete mode 100644 keyboards/reviung/reviung5/reviung5.c delete mode 100644 keyboards/reviung/reviung53/reviung53.c delete mode 100644 keyboards/reviung/reviung61/reviung61.c delete mode 100644 keyboards/rgbkb/zen/rev1/rev1.c delete mode 100644 keyboards/rgbkb/zygomorph/zygomorph.c delete mode 100644 keyboards/rgbkb/zygomorph/zygomorph.h delete mode 100644 keyboards/rmi_kb/aelith/aelith.c delete mode 100644 keyboards/rmi_kb/chevron/chevron.c delete mode 100644 keyboards/rmi_kb/herringbone/pro/pro.c delete mode 100644 keyboards/rmi_kb/herringbone/v1/v1.c delete mode 100644 keyboards/rmi_kb/mona/v1/v1.c delete mode 100644 keyboards/rmi_kb/mona/v1_1/v1_1.c delete mode 100644 keyboards/rmi_kb/mona/v32a/v32a.c delete mode 100644 keyboards/rmi_kb/squishy65/squishy65.c delete mode 100644 keyboards/rmi_kb/squishyfrl/squishyfrl.c delete mode 100644 keyboards/rmi_kb/squishytkl/squishytkl.c delete mode 100644 keyboards/rmi_kb/tkl_ff/tkl_ff.c delete mode 100644 keyboards/rmi_kb/tkl_ff/v2/v2.c delete mode 100644 keyboards/rmi_kb/tkl_ff/v2/v2.h delete mode 100644 keyboards/rmi_kb/wete/v2/v2.c delete mode 100644 keyboards/rocketboard_16/rocketboard_16.c delete mode 100644 keyboards/rominronin/katana60/rev1/rev1.c delete mode 100644 keyboards/rominronin/katana60/rev2/rev2.c delete mode 100644 keyboards/roseslite/roseslite.c delete mode 100644 keyboards/rotor/rotor.c delete mode 100644 keyboards/rpiguy9907/southpaw66/southpaw66.c delete mode 100644 keyboards/runes/skjoldr/skjoldr.c delete mode 100644 keyboards/runes/vaengr/vaengr.c delete mode 100644 keyboards/ryanbaekr/rb18/rb18.c delete mode 100644 keyboards/ryanbaekr/rb69/rb69.c delete mode 100644 keyboards/ryanbaekr/rb86/rb86.c delete mode 100644 keyboards/ryanbaekr/rb87/rb87.c delete mode 100755 keyboards/ryloo_studio/m0110/m0110.c delete mode 100644 keyboards/salicylic_acid3/7splus/7splus.c delete mode 100644 keyboards/salicylic_acid3/ajisai74/ajisai74.c delete mode 100644 keyboards/salicylic_acid3/ergoarrows/ergoarrows.c delete mode 100644 keyboards/salicylic_acid3/nafuda/nafuda.c delete mode 100644 keyboards/salicylic_acid3/nknl7en/nknl7en.c delete mode 100644 keyboards/salicylic_acid3/nknl7jp/nknl7jp.c delete mode 100644 keyboards/sam/s80/s80.c delete mode 100644 keyboards/sam/sg81m/sg81m.c delete mode 100644 keyboards/sanctified/dystopia/dystopia.c delete mode 100644 keyboards/sandwich/keeb68/keeb68.c delete mode 100644 keyboards/satt/comet46/comet46.c delete mode 100644 keyboards/satt/vision/vision.c delete mode 100644 keyboards/sauce/mild/mild.c delete mode 100644 keyboards/sawnsprojects/amber80/solder/solder.c delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/solder.c delete mode 100644 keyboards/sawnsprojects/vcl65/solder/solder.c delete mode 100644 keyboards/scatter42/scatter42.c delete mode 100644 keyboards/sck/gtm/gtm.c delete mode 100644 keyboards/sck/m0116b/m0116b.c delete mode 100644 keyboards/sck/neiso/neiso.c delete mode 100644 keyboards/sck/osa/osa.c delete mode 100644 keyboards/sendyyeah/75pixels/75pixels.c delete mode 100644 keyboards/sendyyeah/bevi/bevi.c delete mode 100644 keyboards/senselessclay/ck65/ck65.c delete mode 100644 keyboards/senselessclay/had60/had60.c delete mode 100644 keyboards/sentraq/number_pad/number_pad.c delete mode 100644 keyboards/sentraq/s60_x/default/default.c delete mode 100644 keyboards/sentraq/s60_x/rgb/rgb.c delete mode 100644 keyboards/sentraq/s65_plus/s65_plus.c delete mode 100644 keyboards/sentraq/s65_x/s65_x.c delete mode 100644 keyboards/sets3n/kk980/kk980.c delete mode 100644 keyboards/shambles/shambles.c delete mode 100644 keyboards/shapeshifter4060/shapeshifter4060.c delete mode 100644 keyboards/shiro/shiro.c delete mode 100644 keyboards/shk9/shk9.c delete mode 100644 keyboards/shoc/shoc.c delete mode 100644 keyboards/sidderskb/majbritt/rev1/rev1.c delete mode 100644 keyboards/sidderskb/majbritt/rev2/rev2.c delete mode 100644 keyboards/signum/3_0/3_0.c delete mode 100644 keyboards/singa/singa.c delete mode 100644 keyboards/sirius/unigo66/unigo66.c delete mode 100644 keyboards/skeletn87/hotswap/hotswap.c delete mode 100644 keyboards/skeletn87/soldered/soldered.c delete mode 100644 keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c delete mode 100644 keyboards/skergo/skergo.c delete mode 100644 keyboards/skippys_custom_pcs/rooboard65/rooboard65.c delete mode 100644 keyboards/skippys_custom_pcs/roopad/roopad.c delete mode 100644 keyboards/slz40/slz40.c delete mode 100644 keyboards/smithrune/iron180/iron180.c delete mode 100644 keyboards/smk60/smk60.c delete mode 100644 keyboards/snampad/snampad.c delete mode 100644 keyboards/sneakbox/disarray/ortho/ortho.c delete mode 100644 keyboards/sneakbox/disarray/staggered/staggered.c delete mode 100644 keyboards/soda/cherish/cherish.c delete mode 100644 keyboards/soup10/soup10.c delete mode 100644 keyboards/soy20/soy20.c delete mode 100644 keyboards/spaceman/pancake/rev1/rev1.c delete mode 100644 keyboards/spaceman/yun65/yun65.c delete mode 100644 keyboards/sparrow62/sparrow62.c delete mode 100644 keyboards/specskeys/specskeys.c delete mode 100644 keyboards/spiderisland/split78/split78.c delete mode 100644 keyboards/splitography/splitography.c delete mode 100644 keyboards/sporewoh/banime40/banime40.c delete mode 100644 keyboards/star75/star75.c delete mode 100644 keyboards/stello65/hs_rev1/hs_rev1.c delete mode 100644 keyboards/stello65/sl_rev1/sl_rev1.c delete mode 100644 keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c delete mode 100644 keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c delete mode 100644 keyboards/stenokeyboards/the_uni/usb_c/usb_c.c delete mode 100644 keyboards/stratos/stratos.c delete mode 100644 keyboards/studiokestra/bourgeau/bourgeau.c delete mode 100644 keyboards/studiokestra/cascade/cascade.c delete mode 100644 keyboards/studiokestra/nascent/nascent.c delete mode 100644 keyboards/studiokestra/nue/nue.c delete mode 100644 keyboards/suavity/ehan/ehan.c delete mode 100644 keyboards/subatomic/subatomic.c delete mode 100644 keyboards/superuser/ext/ext.c delete mode 100644 keyboards/superuser/frl/frl.c delete mode 100644 keyboards/superuser/tkl/tkl.c delete mode 100644 keyboards/swiftrax/retropad/retropad.c delete mode 100644 keyboards/switchplate/switchplate910/switchplate910.c delete mode 100755 keyboards/tada68/tada68.c delete mode 100644 keyboards/takashicompany/center_enter/center_enter.c delete mode 100644 keyboards/takashicompany/heavy_left/heavy_left.c delete mode 100644 keyboards/takashicompany/qoolee/qoolee.c delete mode 100644 keyboards/takashicompany/radialex/radialex.c delete mode 100644 keyboards/takashiski/hecomi/hecomi.c delete mode 100644 keyboards/takashiski/namecard2x4/namecard2x4.c delete mode 100644 keyboards/takashiski/otaku_split/rev0/rev0.c delete mode 100644 keyboards/takashiski/otaku_split/rev1/rev1.c delete mode 100644 keyboards/teleport/numpad/numpad.c delete mode 100644 keyboards/tempo_turtle/bradpad/bradpad.c delete mode 100644 keyboards/tender/macrowo_pad/macrowo_pad.c delete mode 100644 keyboards/tenki/tenki.c delete mode 100755 keyboards/tetris/tetris.c delete mode 100644 keyboards/tg4x/tg4x.c delete mode 100644 keyboards/tgr/910/910.c delete mode 100644 keyboards/tgr/910ce/910ce.c delete mode 100644 keyboards/tgr/alice/alice.c delete mode 100644 keyboards/tgr/jane/v2/v2.c delete mode 100644 keyboards/tgr/jane/v2ce/v2ce.c delete mode 100644 keyboards/tgr/tris/tris.c delete mode 100644 keyboards/the_royal/liminal/liminal.c delete mode 100644 keyboards/the_royal/schwann/schwann.c delete mode 100644 keyboards/themadnoodle/ncc1701kb/v2/v2.c delete mode 100644 keyboards/themadnoodle/noodlepad/noodlepad.c delete mode 100644 keyboards/thevankeyboards/bananasplit/bananasplit.c delete mode 100644 keyboards/thevankeyboards/caravan/caravan.c delete mode 100644 keyboards/thevankeyboards/jetvan/jetvan.c delete mode 100644 keyboards/thevankeyboards/minivan/minivan.c delete mode 100644 keyboards/thevankeyboards/roadkit/roadkit.c delete mode 100644 keyboards/tkc/california/california.c delete mode 100644 keyboards/tkc/candybar/lefty/lefty.c delete mode 100644 keyboards/tkc/candybar/lefty_r3/lefty_r3.c delete mode 100644 keyboards/tkc/candybar/righty/righty.c delete mode 100644 keyboards/tkc/candybar/righty_r3/righty_r3.c delete mode 100644 keyboards/tkc/godspeed75/godspeed75.c delete mode 100644 keyboards/tkc/tkl_ab87/tkl_ab87.c delete mode 100644 keyboards/tkw/grandiceps/grandiceps.c delete mode 100644 keyboards/tkw/stoutgat/v1/v1.c delete mode 100644 keyboards/tkw/stoutgat/v2/v2.c delete mode 100644 keyboards/tokyokeyboard/alix40/alix40.c delete mode 100644 keyboards/tokyokeyboard/tokyo60/tokyo60.c delete mode 100644 keyboards/tominabox1/adalyn/adalyn.c delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev1/rev1.c delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev2/rev2.c delete mode 100644 keyboards/tominabox1/qaz/qaz.c delete mode 100644 keyboards/tominabox1/underscore33/rev1/rev1.c delete mode 100644 keyboards/tominabox1/underscore33/rev2/rev2.c delete mode 100644 keyboards/touchpad/touchpad.c delete mode 100644 keyboards/trashman/ketch/ketch.c delete mode 100644 keyboards/treasure/type9/type9.c delete mode 100644 keyboards/treasure/type9s2/type9s2.c delete mode 100644 keyboards/tronguylabs/m122_3270/m122_3270.c delete mode 100644 keyboards/tszaboo/ortho4exent/ortho4exent.c delete mode 100644 keyboards/tunks/ergo33/ergo33.c delete mode 100644 keyboards/tw40/tw40.c delete mode 100644 keyboards/tzarc/djinn/rev1/rev1.c delete mode 100644 keyboards/tzarc/djinn/rev1/rev1.h delete mode 100644 keyboards/tzarc/djinn/rev2/rev2.c delete mode 100644 keyboards/tzarc/djinn/rev2/rev2.h delete mode 100644 keyboards/ubest/vn/vn.c delete mode 100644 keyboards/uk78/uk78.c delete mode 100644 keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c delete mode 100644 keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c delete mode 100644 keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c delete mode 100644 keyboards/unikeyboard/diverge3/diverge3.c delete mode 100644 keyboards/unikeyboard/divergetm2/divergetm2.c delete mode 100644 keyboards/unikeyboard/felix/felix.c delete mode 100644 keyboards/unikorn/unikorn.c delete mode 100644 keyboards/uranuma/uranuma.c delete mode 100644 keyboards/utd80/utd80.c delete mode 100644 keyboards/v4n4g0rth0n/v4n4g0rth0n.c delete mode 100755 keyboards/vagrant_10/vagrant_10.c delete mode 100644 keyboards/vertex/angler2/angler2.c delete mode 100644 keyboards/vertex/arc60/arc60.c delete mode 100644 keyboards/vertex/arc60h/arc60h.c delete mode 100644 keyboards/viktus/at101_bh/at101_bh.c delete mode 100644 keyboards/viktus/omnikey_bh/omnikey_bh.c delete mode 100644 keyboards/viktus/styrka/styrka.c delete mode 100644 keyboards/viktus/z150_bh/z150_bh.c delete mode 100644 keyboards/waldo/waldo.c delete mode 100644 keyboards/walletburner/cajal/cajal.c delete mode 100644 keyboards/walletburner/neuron/neuron.c delete mode 100644 keyboards/wavtype/foundation/foundation.c delete mode 100644 keyboards/wavtype/p01_ultra/p01_ultra.c delete mode 100644 keyboards/weirdo/geminate60/geminate60.c delete mode 100644 keyboards/weirdo/kelowna/rgb64/rgb64.c delete mode 100644 keyboards/weirdo/naiping/np64/np64.c delete mode 100644 keyboards/weirdo/naiping/nphhkb/nphhkb.c delete mode 100644 keyboards/weirdo/naiping/npminila/npminila.c delete mode 100644 keyboards/weirdo/tiger910/tiger910.c delete mode 100644 keyboards/wekey/polaris/polaris.c delete mode 100644 keyboards/westfoxtrot/aanzee/aanzee.c delete mode 100644 keyboards/westfoxtrot/cyclops/cyclops.c delete mode 100644 keyboards/westm/westm68/westm68.c delete mode 100644 keyboards/westm/westm9/westm9.c delete mode 100644 keyboards/westm/westmergo/westmergo.c delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c delete mode 100644 keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c delete mode 100644 keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c delete mode 100644 keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c delete mode 100644 keyboards/wilba_tech/wt60_a/wt60_a.c delete mode 100644 keyboards/wilba_tech/wt60_b/wt60_b.c delete mode 100644 keyboards/wilba_tech/wt60_bx/wt60_bx.c delete mode 100644 keyboards/wilba_tech/wt60_c/wt60_c.c delete mode 100644 keyboards/wilba_tech/wt60_g/wt60_g.c delete mode 100644 keyboards/wilba_tech/wt60_g2/wt60_g2.c delete mode 100644 keyboards/wilba_tech/wt60_h1/wt60_h1.c delete mode 100644 keyboards/wilba_tech/wt60_h2/wt60_h2.c delete mode 100644 keyboards/wilba_tech/wt60_h3/wt60_h3.c delete mode 100644 keyboards/wilba_tech/wt65_a/wt65_a.c delete mode 100644 keyboards/wilba_tech/wt65_b/wt65_b.c delete mode 100644 keyboards/wilba_tech/wt65_d/wt65_d.c delete mode 100644 keyboards/wilba_tech/wt65_f/wt65_f.c delete mode 100644 keyboards/wilba_tech/wt65_fx/wt65_fx.c delete mode 100644 keyboards/wilba_tech/wt65_g/wt65_g.c delete mode 100644 keyboards/wilba_tech/wt65_g2/wt65_g2.c delete mode 100644 keyboards/wilba_tech/wt65_h1/wt65_h1.c delete mode 100644 keyboards/wilba_tech/wt65_xt/wt65_xt.c delete mode 100644 keyboards/wilba_tech/wt65_xtx/wt65_xtx.c delete mode 100644 keyboards/wilba_tech/wt75_a/wt75_a.c delete mode 100644 keyboards/wilba_tech/wt75_b/wt75_b.c delete mode 100644 keyboards/wilba_tech/wt75_c/wt75_c.c delete mode 100644 keyboards/wilba_tech/wt80_a/wt80_a.c delete mode 100644 keyboards/wilba_tech/wt80_bc/wt80_bc.c delete mode 100644 keyboards/wilba_tech/wt80_g/wt80_g.c delete mode 100644 keyboards/wilba_tech/wt8_a/wt8_a.c delete mode 100644 keyboards/winkeyless/b87/b87.c delete mode 100644 keyboards/winkeyless/bface/bface.c delete mode 100644 keyboards/winkeyless/bmini/bmini.c delete mode 100644 keyboards/winkeyless/bminiex/bminiex.c delete mode 100644 keyboards/winry/winry25tc/winry25tc.c delete mode 100644 keyboards/wolf/kuku65/kuku65.c delete mode 100644 keyboards/wolf/ryujin/ryujin.c delete mode 100644 keyboards/wolf/sabre/sabre.c delete mode 100644 keyboards/wolf/ts60/ts60.c delete mode 100755 keyboards/woodkeys/bigseries/4key/4key.c delete mode 100644 keyboards/woodkeys/meira/featherble/featherble.c delete mode 100644 keyboards/woodkeys/meira/featherble/featherble.h delete mode 100644 keyboards/woodkeys/meira/promicro/promicro.c delete mode 100644 keyboards/woodkeys/meira/promicro/promicro.h delete mode 100644 keyboards/woodkeys/scarletbandana/scarletbandana.c delete mode 100644 keyboards/wsk/alpha9/alpha9.c delete mode 100644 keyboards/wsk/gothic50/gothic50.c delete mode 100644 keyboards/wsk/gothic70/gothic70.c delete mode 100644 keyboards/wsk/houndstooth/houndstooth.c delete mode 100644 keyboards/wsk/jerkin/jerkin.c delete mode 100644 keyboards/wsk/kodachi50/kodachi50.c delete mode 100644 keyboards/wsk/pain27/pain27.c delete mode 100644 keyboards/wsk/sl40/sl40.c delete mode 100644 keyboards/wsk/tkl30/tkl30.c delete mode 100644 keyboards/wuque/creek70/creek70.c delete mode 100644 keyboards/wuque/ikki68_aurora/ikki68_aurora.c delete mode 100644 keyboards/wuque/promise87/ansi/ansi.c delete mode 100644 keyboards/wuque/promise87/wkl/wkl.c delete mode 100644 keyboards/wuque/tata80/wk/wk.c delete mode 100644 keyboards/wuque/tata80/wkl/wkl.c delete mode 100644 keyboards/x16/x16.c delete mode 100644 keyboards/xelus/dharma/dharma.c delete mode 100644 keyboards/xelus/pachi/mini_32u4/mini_32u4.c delete mode 100644 keyboards/xelus/pachi/rev1/rev1.c delete mode 100644 keyboards/xelus/rs108/rs108.c delete mode 100644 keyboards/xelus/snap96/snap96.c delete mode 100644 keyboards/xelus/valor/rev1/rev1.c delete mode 100644 keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c delete mode 100644 keyboards/xelus/xs108/xs108.c delete mode 100755 keyboards/xiudi/xd68/xd68.c delete mode 100644 keyboards/xiudi/xd84/xd84.c delete mode 100644 keyboards/xiudi/xd84pro/xd84pro.c delete mode 100644 keyboards/xiudi/xd87/xd87.c delete mode 100644 keyboards/xiudi/xd96/xd96.c delete mode 100644 keyboards/xmmx/xmmx.c delete mode 100644 keyboards/xw60/xw60.c delete mode 100644 keyboards/yandrstudio/eau87/eau87.c delete mode 100644 keyboards/yandrstudio/wave75/wave75.c delete mode 100644 keyboards/yandrstudio/zhou65/zhou65.c delete mode 100644 keyboards/ydkb/chili/chili.c delete mode 100644 keyboards/ydkb/grape/grape.c delete mode 100644 keyboards/ymdk/bface/bface.c delete mode 100644 keyboards/ymdk/melody96/melody96.c delete mode 100644 keyboards/ymdk/np21/np21.c delete mode 100644 keyboards/ymdk/np24/u4rgb6/u4rgb6.c delete mode 100644 keyboards/ymdk/wings/wings.c delete mode 100644 keyboards/ymdk/wingshs/wingshs.c delete mode 100644 keyboards/ymdk/ym68/ym68.c delete mode 100644 keyboards/ymdk/ymd09/ymd09.c delete mode 100644 keyboards/ymdk/ymd21/v2/v2.c delete mode 100644 keyboards/ymdk/ymd40/v2/v2.c delete mode 100644 keyboards/ymdk/ymd67/ymd67.c delete mode 100644 keyboards/ymdk/ymd96/ymd96.c delete mode 100644 keyboards/yoichiro/lunakey_macro/lunakey_macro.c delete mode 100644 keyboards/yoichiro/lunakey_mini/lunakey_mini.c delete mode 100644 keyboards/yoichiro/lunakey_pico/lunakey_pico.c delete mode 100644 keyboards/yynmt/dozen0/dozen0.c delete mode 100644 keyboards/yynmt/kagamidget/kagamidget.c delete mode 100644 keyboards/zfrontier/big_switch/big_switch.c delete mode 100644 keyboards/ziggurat/ziggurat.c delete mode 100644 keyboards/zj68/zj68.c delete mode 100755 keyboards/zlant/zlant.c delete mode 100644 keyboards/ztboards/after/after.c delete mode 100644 keyboards/ztboards/noon/noon.c (limited to 'keyboards/maple_computing') diff --git a/keyboards/0_sixty/0_sixty.c b/keyboards/0_sixty/0_sixty.c deleted file mode 100644 index 40f1362d0c..0000000000 --- a/keyboards/0_sixty/0_sixty.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Vinam Arora - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "0_sixty.h" diff --git a/keyboards/0xc7/61key/61key.c b/keyboards/0xc7/61key/61key.c deleted file mode 100644 index 2db485796c..0000000000 --- a/keyboards/0xc7/61key/61key.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 0xC7 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "61key.h" diff --git a/keyboards/0xcb/static/static.c b/keyboards/0xcb/static/static.c deleted file mode 100644 index c6f5601f29..0000000000 --- a/keyboards/0xcb/static/static.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 0xCB - Conor Burns - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "static.h" diff --git a/keyboards/10bleoledhub/10bleoledhub.c b/keyboards/10bleoledhub/10bleoledhub.c deleted file mode 100644 index 095d49d388..0000000000 --- a/keyboards/10bleoledhub/10bleoledhub.c +++ /dev/null @@ -1,17 +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 . - */ -#include "10bleoledhub.h" - diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c deleted file mode 100644 index fa62f52e64..0000000000 --- a/keyboards/1upkeyboards/1up60hse/1up60hse.c +++ /dev/null @@ -1,16 +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 . - */ -#include "1up60hse.h" diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.c b/keyboards/1upkeyboards/1up60hte/1up60hte.c deleted file mode 100644 index 460e42a0e5..0000000000 --- a/keyboards/1upkeyboards/1up60hte/1up60hte.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2019 Bubnick - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "1up60hte.h" diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c deleted file mode 100644 index 4ba631c797..0000000000 --- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c +++ /dev/null @@ -1 +0,0 @@ -#include "1up60rgb.h" diff --git a/keyboards/1upkeyboards/sweet16/sweet16.c b/keyboards/1upkeyboards/sweet16/sweet16.c deleted file mode 100644 index 2f116c2a37..0000000000 --- a/keyboards/1upkeyboards/sweet16/sweet16.c +++ /dev/null @@ -1 +0,0 @@ -#include "sweet16.h" \ No newline at end of file diff --git a/keyboards/25keys/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c deleted file mode 100644 index ce91e83804..0000000000 --- a/keyboards/25keys/aleth42/rev0/rev0.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev0.h" \ No newline at end of file diff --git a/keyboards/25keys/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c deleted file mode 100644 index 360cf8e7f1..0000000000 --- a/keyboards/25keys/aleth42/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" \ No newline at end of file diff --git a/keyboards/2key2crawl/2key2crawl.c b/keyboards/2key2crawl/2key2crawl.c deleted file mode 100644 index fe2161bef4..0000000000 --- a/keyboards/2key2crawl/2key2crawl.c +++ /dev/null @@ -1 +0,0 @@ -#include "2key2crawl.h" diff --git a/keyboards/30wer/30wer.c b/keyboards/30wer/30wer.c deleted file mode 100644 index a46c543196..0000000000 --- a/keyboards/30wer/30wer.c +++ /dev/null @@ -1 +0,0 @@ -#include "30wer.h" diff --git a/keyboards/3w6/rev1/rev1.c b/keyboards/3w6/rev1/rev1.c deleted file mode 100644 index 3944ec3b13..0000000000 --- a/keyboards/3w6/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c deleted file mode 100644 index b31fcd7814..0000000000 --- a/keyboards/40percentclub/5x5/5x5.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x5.h" diff --git a/keyboards/40percentclub/gherkin/gherkin.c b/keyboards/40percentclub/gherkin/gherkin.c deleted file mode 100644 index 2952d842cf..0000000000 --- a/keyboards/40percentclub/gherkin/gherkin.c +++ /dev/null @@ -1 +0,0 @@ -#include "gherkin.h" diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c deleted file mode 100644 index e49e545798..0000000000 --- a/keyboards/40percentclub/half_n_half/half_n_half.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Boy_314 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "half_n_half.h" diff --git a/keyboards/40percentclub/luddite/luddite.c b/keyboards/40percentclub/luddite/luddite.c deleted file mode 100644 index 3e720ad571..0000000000 --- a/keyboards/40percentclub/luddite/luddite.c +++ /dev/null @@ -1 +0,0 @@ -#include "luddite.h" diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c deleted file mode 100644 index 4abee8e0c3..0000000000 --- a/keyboards/40percentclub/mf68/mf68.c +++ /dev/null @@ -1 +0,0 @@ -#include "mf68.h" diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c deleted file mode 100644 index f60cf98d86..0000000000 --- a/keyboards/40percentclub/nori/nori.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nori.h" diff --git a/keyboards/40percentclub/tomato/tomato.c b/keyboards/40percentclub/tomato/tomato.c deleted file mode 100644 index dbf8bfe12b..0000000000 --- a/keyboards/40percentclub/tomato/tomato.c +++ /dev/null @@ -1 +0,0 @@ -#include "tomato.h" diff --git a/keyboards/45_ats/45_ats.c b/keyboards/45_ats/45_ats.c deleted file mode 100644 index 0a2c069abd..0000000000 --- a/keyboards/45_ats/45_ats.c +++ /dev/null @@ -1,19 +0,0 @@ - /* - Copyright 2020 Alec Penland - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "45_ats.h" diff --git a/keyboards/4by3/4by3.c b/keyboards/4by3/4by3.c deleted file mode 100644 index 3ae27260d4..0000000000 --- a/keyboards/4by3/4by3.c +++ /dev/null @@ -1 +0,0 @@ -#include "4by3.h" \ No newline at end of file diff --git a/keyboards/4pplet/aekiso60/rev_a/rev_a.c b/keyboards/4pplet/aekiso60/rev_a/rev_a.c deleted file mode 100644 index d3db08ad19..0000000000 --- a/keyboards/4pplet/aekiso60/rev_a/rev_a.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev_a.h" diff --git a/keyboards/4pplet/aekiso60/rev_b/rev_b.c b/keyboards/4pplet/aekiso60/rev_b/rev_b.c deleted file mode 100644 index 4928bbc23a..0000000000 --- a/keyboards/4pplet/aekiso60/rev_b/rev_b.c +++ /dev/null @@ -1,19 +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_b.h" - - diff --git a/keyboards/4pplet/bootleg/rev_a/rev_a.c b/keyboards/4pplet/bootleg/rev_a/rev_a.c deleted file mode 100644 index b4f233d379..0000000000 --- a/keyboards/4pplet/bootleg/rev_a/rev_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 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_a.h" diff --git a/keyboards/4pplet/steezy60/rev_a/rev_a.c b/keyboards/4pplet/steezy60/rev_a/rev_a.c deleted file mode 100644 index d3db08ad19..0000000000 --- a/keyboards/4pplet/steezy60/rev_a/rev_a.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev_a.h" diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c deleted file mode 100644 index dc6c727fb7..0000000000 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.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_a.h" diff --git a/keyboards/7c8/framework/framework.c b/keyboards/7c8/framework/framework.c deleted file mode 100644 index 6ce105be97..0000000000 --- a/keyboards/7c8/framework/framework.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Steven 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 . - */ - -#include "framework.h" diff --git a/keyboards/9key/9key.c b/keyboards/9key/9key.c deleted file mode 100644 index bbbabb81c4..0000000000 --- a/keyboards/9key/9key.c +++ /dev/null @@ -1 +0,0 @@ -#include "9key.h" diff --git a/keyboards/abacus/abacus.c b/keyboards/abacus/abacus.c deleted file mode 100644 index aef62aa921..0000000000 --- a/keyboards/abacus/abacus.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "abacus.h" diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c deleted file mode 100644 index f2a7e484cd..0000000000 --- a/keyboards/abstract/ellipse/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/acekeyboard/titan60/titan60.c b/keyboards/acekeyboard/titan60/titan60.c deleted file mode 100644 index 64479f31c8..0000000000 --- a/keyboards/acekeyboard/titan60/titan60.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "titan60.h" diff --git a/keyboards/acheron/arctic/arctic.c b/keyboards/acheron/arctic/arctic.c deleted file mode 100644 index 716150a107..0000000000 --- a/keyboards/acheron/arctic/arctic.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "arctic.h" diff --git a/keyboards/acheron/keebspcb/keebspcb.c b/keyboards/acheron/keebspcb/keebspcb.c deleted file mode 100644 index 56109507cd..0000000000 --- a/keyboards/acheron/keebspcb/keebspcb.c +++ /dev/null @@ -1 +0,0 @@ -#include "keebspcb.h" diff --git a/keyboards/acheron/lasgweloth/lasgweloth.c b/keyboards/acheron/lasgweloth/lasgweloth.c deleted file mode 100644 index be2052a399..0000000000 --- a/keyboards/acheron/lasgweloth/lasgweloth.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 "lasgweloth.h" diff --git a/keyboards/ada/ada1800mini/ada1800mini.c b/keyboards/ada/ada1800mini/ada1800mini.c deleted file mode 100644 index a7d8ead5df..0000000000 --- a/keyboards/ada/ada1800mini/ada1800mini.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "ada1800mini.h" diff --git a/keyboards/ada/infinity81/infinity81.c b/keyboards/ada/infinity81/infinity81.c deleted file mode 100644 index 7e20a1d705..0000000000 --- a/keyboards/ada/infinity81/infinity81.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "infinity81.h" diff --git a/keyboards/adelheid/adelheid.c b/keyboards/adelheid/adelheid.c deleted file mode 100644 index 35fd2cd1e5..0000000000 --- a/keyboards/adelheid/adelheid.c +++ /dev/null @@ -1,16 +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 . - */ -#include "adelheid.h" diff --git a/keyboards/adm42/adm42.c b/keyboards/adm42/adm42.c deleted file mode 100644 index 0cae6c9ab5..0000000000 --- a/keyboards/adm42/adm42.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "adm42.h" diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c deleted file mode 100644 index 2efd4eba47..0000000000 --- a/keyboards/adpenrose/obi/obi.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "obi.h" - diff --git a/keyboards/adpenrose/shisaku/shisaku.c b/keyboards/adpenrose/shisaku/shisaku.c deleted file mode 100644 index a1ab356ac6..0000000000 --- a/keyboards/adpenrose/shisaku/shisaku.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "shisaku.h" diff --git a/keyboards/aeboards/aegis/aegis.c b/keyboards/aeboards/aegis/aegis.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/aeboards/aegis/aegis.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/ai03/andromeda/andromeda.c b/keyboards/ai03/andromeda/andromeda.c deleted file mode 100644 index 5dd580effd..0000000000 --- a/keyboards/ai03/andromeda/andromeda.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#include "andromeda.h" diff --git a/keyboards/ai03/equinox/equinox.c b/keyboards/ai03/equinox/equinox.c deleted file mode 100644 index a8ea38ecd1..0000000000 --- a/keyboards/ai03/equinox/equinox.c +++ /dev/null @@ -1,17 +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 . - */ -#include "equinox.h" - diff --git a/keyboards/ai03/jp60/jp60.c b/keyboards/ai03/jp60/jp60.c deleted file mode 100644 index c18a99c6a6..0000000000 --- a/keyboards/ai03/jp60/jp60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "jp60.h" diff --git a/keyboards/ai03/lunar/lunar.c b/keyboards/ai03/lunar/lunar.c deleted file mode 100644 index 9c7bf23a62..0000000000 --- a/keyboards/ai03/lunar/lunar.c +++ /dev/null @@ -1,16 +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 . - */ -#include "lunar.h" diff --git a/keyboards/ai03/orbit_x/orbit_x.c b/keyboards/ai03/orbit_x/orbit_x.c deleted file mode 100644 index 3327261add..0000000000 --- a/keyboards/ai03/orbit_x/orbit_x.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "orbit_x.h" - diff --git a/keyboards/ai03/polaris/polaris.c b/keyboards/ai03/polaris/polaris.c deleted file mode 100644 index 256dcb930a..0000000000 --- a/keyboards/ai03/polaris/polaris.c +++ /dev/null @@ -1,16 +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 . - */ -#include "polaris.h" diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c deleted file mode 100644 index 75d77e355c..0000000000 --- a/keyboards/ai03/quasar/quasar.c +++ /dev/null @@ -1,16 +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 . - */ -#include "quasar.h" diff --git a/keyboards/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c deleted file mode 100644 index e643d14ec1..0000000000 --- a/keyboards/ai03/soyuz/soyuz.c +++ /dev/null @@ -1,16 +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 . - */ -#include "soyuz.h" diff --git a/keyboards/ai03/voyager60_alps/voyager60_alps.c b/keyboards/ai03/voyager60_alps/voyager60_alps.c deleted file mode 100644 index 251198c445..0000000000 --- a/keyboards/ai03/voyager60_alps/voyager60_alps.c +++ /dev/null @@ -1,15 +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 . -*/ - -#include "voyager60_alps.h" diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c deleted file mode 100644 index a2113d0fe9..0000000000 --- a/keyboards/akb/eb46/eb46.c +++ /dev/null @@ -1,16 +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 . - */ -#include "eb46.h" diff --git a/keyboards/akb/raine/raine.c b/keyboards/akb/raine/raine.c deleted file mode 100644 index d73db4409b..0000000000 --- a/keyboards/akb/raine/raine.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "raine.h" diff --git a/keyboards/akegata_denki/device_one/device_one.c b/keyboards/akegata_denki/device_one/device_one.c deleted file mode 100644 index 06e03ee893..0000000000 --- a/keyboards/akegata_denki/device_one/device_one.c +++ /dev/null @@ -1 +0,0 @@ -#include "device_one.h" diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c deleted file mode 100644 index a7d3980ece..0000000000 --- a/keyboards/al1/al1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "al1.h" diff --git a/keyboards/alf/dc60/dc60.c b/keyboards/alf/dc60/dc60.c deleted file mode 100644 index 4096d10a64..0000000000 --- a/keyboards/alf/dc60/dc60.c +++ /dev/null @@ -1,16 +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 . - */ -#include "dc60.h" diff --git a/keyboards/alf/x11/x11.c b/keyboards/alf/x11/x11.c deleted file mode 100644 index 28e77ecd3f..0000000000 --- a/keyboards/alf/x11/x11.c +++ /dev/null @@ -1,16 +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 . - */ -#include "x11.h" diff --git a/keyboards/alf/x2/x2.c b/keyboards/alf/x2/x2.c deleted file mode 100644 index e4352296b9..0000000000 --- a/keyboards/alf/x2/x2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 @fixed - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "x2.h" diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.c b/keyboards/alfredslab/swift65/hotswap/hotswap.c deleted file mode 100644 index 83546fff4e..0000000000 --- a/keyboards/alfredslab/swift65/hotswap/hotswap.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Steven Phillips (spooknik) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" - diff --git a/keyboards/alfredslab/swift65/solder/solder.c b/keyboards/alfredslab/swift65/solder/solder.c deleted file mode 100644 index 4dd021ba7c..0000000000 --- a/keyboards/alfredslab/swift65/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Steven Phillips (spooknik) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" diff --git a/keyboards/aliceh66/pianoforte/pianoforte.c b/keyboards/aliceh66/pianoforte/pianoforte.c deleted file mode 100644 index 3531744aef..0000000000 --- a/keyboards/aliceh66/pianoforte/pianoforte.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 AliceH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "pianoforte.h" diff --git a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c b/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c deleted file mode 100644 index 4617663fd3..0000000000 --- a/keyboards/aliceh66/pianoforte_hs/pianoforte_hs.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 AliceH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "pianoforte_hs.h" diff --git a/keyboards/alpha/alpha.c b/keyboards/alpha/alpha.c deleted file mode 100755 index 3029ba50a8..0000000000 --- a/keyboards/alpha/alpha.c +++ /dev/null @@ -1 +0,0 @@ -#include "alpha.h" diff --git a/keyboards/alpine65/alpine65.c b/keyboards/alpine65/alpine65.c deleted file mode 100644 index 318862f659..0000000000 --- a/keyboards/alpine65/alpine65.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 "alpine65.h" diff --git a/keyboards/alps64/alps64.c b/keyboards/alps64/alps64.c deleted file mode 100644 index 61270aaced..0000000000 --- a/keyboards/alps64/alps64.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2012,2013 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 . -*/ -#include "alps64.h" diff --git a/keyboards/amag23/amag23.c b/keyboards/amag23/amag23.c deleted file mode 100644 index 5fda69e999..0000000000 --- a/keyboards/amag23/amag23.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "amag23.h" - diff --git a/keyboards/amjkeyboard/amj40/amj40.c b/keyboards/amjkeyboard/amj40/amj40.c deleted file mode 100755 index f0f3121c6a..0000000000 --- a/keyboards/amjkeyboard/amj40/amj40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Fabian Topfstedt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "amj40.h" diff --git a/keyboards/amjkeyboard/amj60/amj60.c b/keyboards/amjkeyboard/amj60/amj60.c deleted file mode 100644 index af0539a679..0000000000 --- a/keyboards/amjkeyboard/amj60/amj60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2016 Toni (@toneman77) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "amj60.h" diff --git a/keyboards/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c deleted file mode 100644 index 6d77e43a0a..0000000000 --- a/keyboards/amjkeyboard/amj66/amj66.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Alex Peters - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "amj66.h" diff --git a/keyboards/amjkeyboard/amj84/amj84.c b/keyboards/amjkeyboard/amj84/amj84.c deleted file mode 100644 index 49116c48c3..0000000000 --- a/keyboards/amjkeyboard/amj84/amj84.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "amj84.h" diff --git a/keyboards/amjkeyboard/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c deleted file mode 100644 index 65fca6f12a..0000000000 --- a/keyboards/amjkeyboard/amj96/amj96.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 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 . - */ -#include "amj96.h" diff --git a/keyboards/amjkeyboard/amjpad/amjpad.c b/keyboards/amjkeyboard/amjpad/amjpad.c deleted file mode 100644 index 83cdedf688..0000000000 --- a/keyboards/amjkeyboard/amjpad/amjpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "amjpad.h" diff --git a/keyboards/anomalykb/a65i/a65i.c b/keyboards/anomalykb/a65i/a65i.c deleted file mode 100644 index ed9a82938c..0000000000 --- a/keyboards/anomalykb/a65i/a65i.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Lfgberg - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "a65i.h" diff --git a/keyboards/aos/tkl/tkl.c b/keyboards/aos/tkl/tkl.c deleted file mode 100644 index b4ff32d8f4..0000000000 --- a/keyboards/aos/tkl/tkl.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 aholland909 - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "tkl.h" diff --git a/keyboards/aozora/aozora.c b/keyboards/aozora/aozora.c deleted file mode 100644 index 4466858348..0000000000 --- a/keyboards/aozora/aozora.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Salmon Cat 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 . - */ - -#include "aozora.h" diff --git a/keyboards/aplyard/aplx6/rev1/rev1.c b/keyboards/aplyard/aplx6/rev1/rev1.c deleted file mode 100644 index 7f6f8a3224..0000000000 --- a/keyboards/aplyard/aplx6/rev1/rev1.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 April 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 . -*/ - -#include "rev1.h" - diff --git a/keyboards/aplyard/aplx6/rev2/rev2.c b/keyboards/aplyard/aplx6/rev2/rev2.c deleted file mode 100644 index 1a97f50058..0000000000 --- a/keyboards/aplyard/aplx6/rev2/rev2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev2.h" diff --git a/keyboards/ares/ares.c b/keyboards/ares/ares.c deleted file mode 100644 index 80d4455179..0000000000 --- a/keyboards/ares/ares.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ares.h" diff --git a/keyboards/arisu/arisu.c b/keyboards/arisu/arisu.c deleted file mode 100644 index 443b67e9bf..0000000000 --- a/keyboards/arisu/arisu.c +++ /dev/null @@ -1,16 +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 . - */ -#include "arisu.h" diff --git a/keyboards/atlas_65/atlas_65.c b/keyboards/atlas_65/atlas_65.c deleted file mode 100644 index 536d8edf71..0000000000 --- a/keyboards/atlas_65/atlas_65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "atlas_65.h" diff --git a/keyboards/atreus62/atreus62.c b/keyboards/atreus62/atreus62.c deleted file mode 100644 index ba5bce9899..0000000000 --- a/keyboards/atreus62/atreus62.c +++ /dev/null @@ -1 +0,0 @@ -#include "atreus62.h" \ No newline at end of file diff --git a/keyboards/atxkb/1894/1894.c b/keyboards/atxkb/1894/1894.c deleted file mode 100644 index 9ac75b91e4..0000000000 --- a/keyboards/atxkb/1894/1894.c +++ /dev/null @@ -1,16 +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 . - */ -#include "1894.h" diff --git a/keyboards/aurora65/aurora65.c b/keyboards/aurora65/aurora65.c deleted file mode 100644 index 0c51c51c5f..0000000000 --- a/keyboards/aurora65/aurora65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 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 . - */ -#include "aurora65.h" diff --git a/keyboards/aves60/aves60.c b/keyboards/aves60/aves60.c deleted file mode 100644 index 4931deb7c9..0000000000 --- a/keyboards/aves60/aves60.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Evelien Dekkers (@evyd13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "aves60.h" diff --git a/keyboards/aves65/aves65.c b/keyboards/aves65/aves65.c deleted file mode 100644 index f495edf737..0000000000 --- a/keyboards/aves65/aves65.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2019 I/O Keyboards - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "aves65.h" diff --git a/keyboards/axolstudio/foundation_gamma/foundation_gamma.c b/keyboards/axolstudio/foundation_gamma/foundation_gamma.c deleted file mode 100644 index e686d8f321..0000000000 --- a/keyboards/axolstudio/foundation_gamma/foundation_gamma.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "foundation_gamma.h" diff --git a/keyboards/axolstudio/helpo/helpo.c b/keyboards/axolstudio/helpo/helpo.c deleted file mode 100644 index 04c7b4f1a0..0000000000 --- a/keyboards/axolstudio/helpo/helpo.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "helpo.h" diff --git a/keyboards/axolstudio/yeti/soldered/soldered.c b/keyboards/axolstudio/yeti/soldered/soldered.c deleted file mode 100644 index 5041fabed0..0000000000 --- a/keyboards/axolstudio/yeti/soldered/soldered.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "soldered.h" diff --git a/keyboards/aya/aya.c b/keyboards/aya/aya.c deleted file mode 100644 index 95bc5794d8..0000000000 --- a/keyboards/aya/aya.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "aya.h" diff --git a/keyboards/b_sides/rev41lp/rev41lp.c b/keyboards/b_sides/rev41lp/rev41lp.c deleted file mode 100644 index d9ab1ed21e..0000000000 --- a/keyboards/b_sides/rev41lp/rev41lp.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "rev41lp.h" diff --git a/keyboards/bacca70/bacca70.c b/keyboards/bacca70/bacca70.c deleted file mode 100644 index 174b4d97e7..0000000000 --- a/keyboards/bacca70/bacca70.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 keebnewb - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bacca70.h" diff --git a/keyboards/bantam44/bantam44.c b/keyboards/bantam44/bantam44.c deleted file mode 100644 index f995308ae7..0000000000 --- a/keyboards/bantam44/bantam44.c +++ /dev/null @@ -1 +0,0 @@ -#include "bantam44.h" \ No newline at end of file diff --git a/keyboards/barleycorn_smd/barleycorn_smd.c b/keyboards/barleycorn_smd/barleycorn_smd.c deleted file mode 100644 index d70689d8fe..0000000000 --- a/keyboards/barleycorn_smd/barleycorn_smd.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "barleycorn_smd.h" diff --git a/keyboards/barracuda/barracuda.c b/keyboards/barracuda/barracuda.c deleted file mode 100644 index f863b1917e..0000000000 --- a/keyboards/barracuda/barracuda.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 knaruo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "barracuda.h" diff --git a/keyboards/basketweave/basketweave.c b/keyboards/basketweave/basketweave.c deleted file mode 100644 index 388810c9c8..0000000000 --- a/keyboards/basketweave/basketweave.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 null-ll - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "basketweave.h" diff --git a/keyboards/bastardkb/tbk/tbk.c b/keyboards/bastardkb/tbk/tbk.c deleted file mode 100644 index 4cebec2a54..0000000000 --- a/keyboards/bastardkb/tbk/tbk.c +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright 2021 Quentin LEBASTARD - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "tbk.h" diff --git a/keyboards/beatervan/beatervan.c b/keyboards/beatervan/beatervan.c deleted file mode 100644 index 0730af001b..0000000000 --- a/keyboards/beatervan/beatervan.c +++ /dev/null @@ -1,16 +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 . - */ -#include "beatervan.h" diff --git a/keyboards/bfake/bfake.c b/keyboards/bfake/bfake.c deleted file mode 100644 index 5eedcc1946..0000000000 --- a/keyboards/bfake/bfake.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "bfake.h" diff --git a/keyboards/biacco42/meishi/meishi.c b/keyboards/biacco42/meishi/meishi.c deleted file mode 100644 index 85ede859d3..0000000000 --- a/keyboards/biacco42/meishi/meishi.c +++ /dev/null @@ -1,16 +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 . - */ -#include "meishi.h" diff --git a/keyboards/biacco42/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c deleted file mode 100644 index 14525ae175..0000000000 --- a/keyboards/biacco42/meishi2/meishi2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "meishi2.h" diff --git a/keyboards/bioi/f60/f60.c b/keyboards/bioi/f60/f60.c deleted file mode 100644 index 2af81d7ba9..0000000000 --- a/keyboards/bioi/f60/f60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "f60.h" diff --git a/keyboards/blackplum/blackplum.c b/keyboards/blackplum/blackplum.c deleted file mode 100644 index ea8d34e9d9..0000000000 --- a/keyboards/blackplum/blackplum.c +++ /dev/null @@ -1 +0,0 @@ -#include "blackplum.h" diff --git a/keyboards/blank/blank01/blank01.c b/keyboards/blank/blank01/blank01.c deleted file mode 100644 index 7b74a1ae34..0000000000 --- a/keyboards/blank/blank01/blank01.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 gkeyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "blank01.h" diff --git a/keyboards/blank_tehnologii/manibus/manibus.c b/keyboards/blank_tehnologii/manibus/manibus.c deleted file mode 100644 index 77ef2602d5..0000000000 --- a/keyboards/blank_tehnologii/manibus/manibus.c +++ /dev/null @@ -1,16 +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 . - */ -#include "manibus.h" diff --git a/keyboards/blaster75/blaster75.c b/keyboards/blaster75/blaster75.c deleted file mode 100644 index 2b5f60a566..0000000000 --- a/keyboards/blaster75/blaster75.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Altain - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "blaster75.h" \ No newline at end of file diff --git a/keyboards/bluebell/swoop/swoop.c b/keyboards/bluebell/swoop/swoop.c deleted file mode 100644 index a373b48c47..0000000000 --- a/keyboards/bluebell/swoop/swoop.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 James White - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "swoop.h" diff --git a/keyboards/boardrun/bizarre/bizarre.c b/keyboards/boardrun/bizarre/bizarre.c deleted file mode 100644 index 10125f57b8..0000000000 --- a/keyboards/boardrun/bizarre/bizarre.c +++ /dev/null @@ -1,16 +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 . - */ - -#include "bizarre.h" diff --git a/keyboards/boardrun/classic/classic.c b/keyboards/boardrun/classic/classic.c deleted file mode 100644 index 49eea39329..0000000000 --- a/keyboards/boardrun/classic/classic.c +++ /dev/null @@ -1,16 +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 . - */ - -#include "classic.h" diff --git a/keyboards/bolsa/bolsalice/bolsalice.c b/keyboards/bolsa/bolsalice/bolsalice.c deleted file mode 100644 index 8fc60ce213..0000000000 --- a/keyboards/bolsa/bolsalice/bolsalice.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 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 . -*/ - -#include "bolsalice.h" diff --git a/keyboards/bop/bop.c b/keyboards/bop/bop.c deleted file mode 100644 index 492d7cfe37..0000000000 --- a/keyboards/bop/bop.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bop.h" diff --git a/keyboards/box75/box75.c b/keyboards/box75/box75.c deleted file mode 100644 index 43d3030907..0000000000 --- a/keyboards/box75/box75.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 "box75.h" diff --git a/keyboards/bpiphany/four_banger/four_banger.c b/keyboards/bpiphany/four_banger/four_banger.c deleted file mode 100644 index 20aefb61d9..0000000000 --- a/keyboards/bpiphany/four_banger/four_banger.c +++ /dev/null @@ -1 +0,0 @@ -#include "four_banger.h" \ No newline at end of file diff --git a/keyboards/bpiphany/hid_liber/hid_liber.c b/keyboards/bpiphany/hid_liber/hid_liber.c deleted file mode 100755 index 2e4ddb3293..0000000000 --- a/keyboards/bpiphany/hid_liber/hid_liber.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2012 Jun Wako : LED init - * Copyright 2017 Mathias Andersson : Phantom config - * 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 . - */ -#include "hid_liber.h" diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c deleted file mode 100644 index e71b3c8011..0000000000 --- a/keyboards/bpiphany/kitten_paw/kitten_paw.c +++ /dev/null @@ -1 +0,0 @@ -#include "kitten_paw.h" diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c deleted file mode 100644 index f57f8b5f50..0000000000 --- a/keyboards/bpiphany/tiger_lily/tiger_lily.c +++ /dev/null @@ -1 +0,0 @@ -#include "tiger_lily.h" diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c deleted file mode 100644 index f4b8032a01..0000000000 --- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Alexander Fougner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "unloved_bastard.h" diff --git a/keyboards/bt66tech/bt66tech60/bt66tech60.c b/keyboards/bt66tech/bt66tech60/bt66tech60.c deleted file mode 100644 index e7218b9e93..0000000000 --- a/keyboards/bt66tech/bt66tech60/bt66tech60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bt66tech - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bt66tech60.h" diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c deleted file mode 100644 index 6b8edd31c3..0000000000 --- a/keyboards/bthlabs/geekpad/geekpad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019-present Tomek Wójcik - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "geekpad.h" diff --git a/keyboards/buildakb/potato65/potato65.c b/keyboards/buildakb/potato65/potato65.c deleted file mode 100644 index 6070a7c115..0000000000 --- a/keyboards/buildakb/potato65/potato65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Maelkk - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "potato65.h" diff --git a/keyboards/buildakb/potato65hs/potato65hs.c b/keyboards/buildakb/potato65hs/potato65hs.c deleted file mode 100644 index 2b5ca899b3..0000000000 --- a/keyboards/buildakb/potato65hs/potato65hs.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Maelkk - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "potato65hs.h" diff --git a/keyboards/buildakb/potato65s/potato65s.c b/keyboards/buildakb/potato65s/potato65s.c deleted file mode 100644 index 0d86564128..0000000000 --- a/keyboards/buildakb/potato65s/potato65s.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Maelkk - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "potato65s.h" diff --git a/keyboards/cablecardesigns/cypher/rev6/rev6.c b/keyboards/cablecardesigns/cypher/rev6/rev6.c deleted file mode 100644 index 56e615122a..0000000000 --- a/keyboards/cablecardesigns/cypher/rev6/rev6.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 Cable Car Designs (@westfoxtrot) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev6.h" \ No newline at end of file diff --git a/keyboards/caffeinated/serpent65/serpent65.c b/keyboards/caffeinated/serpent65/serpent65.c deleted file mode 100644 index ad812ee44c..0000000000 --- a/keyboards/caffeinated/serpent65/serpent65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "serpent65.h" diff --git a/keyboards/cannonkeys/adelie/adelie.c b/keyboards/cannonkeys/adelie/adelie.c deleted file mode 100644 index 04764169ee..0000000000 --- a/keyboards/cannonkeys/adelie/adelie.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "adelie.h" diff --git a/keyboards/cannonkeys/aella/aella.c b/keyboards/cannonkeys/aella/aella.c deleted file mode 100644 index 862bf41451..0000000000 --- a/keyboards/cannonkeys/aella/aella.c +++ /dev/null @@ -1 +0,0 @@ -#include "aella.h" diff --git a/keyboards/cannonkeys/an_c/an_c.c b/keyboards/cannonkeys/an_c/an_c.c deleted file mode 100644 index 9dfb80e9e2..0000000000 --- a/keyboards/cannonkeys/an_c/an_c.c +++ /dev/null @@ -1 +0,0 @@ -#include "an_c.h" diff --git a/keyboards/cannonkeys/atlas/atlas.c b/keyboards/cannonkeys/atlas/atlas.c deleted file mode 100644 index 8b0b236fe9..0000000000 --- a/keyboards/cannonkeys/atlas/atlas.c +++ /dev/null @@ -1 +0,0 @@ -#include "atlas.h" diff --git a/keyboards/cannonkeys/atlas_alps/atlas_alps.c b/keyboards/cannonkeys/atlas_alps/atlas_alps.c deleted file mode 100644 index b1cdb84517..0000000000 --- a/keyboards/cannonkeys/atlas_alps/atlas_alps.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "atlas_alps.h" diff --git a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c b/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c deleted file mode 100644 index e7102c47f2..0000000000 --- a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "brutalv2_65.h" diff --git a/keyboards/cannonkeys/chimera65/chimera65.c b/keyboards/cannonkeys/chimera65/chimera65.c deleted file mode 100644 index 14f170d9c2..0000000000 --- a/keyboards/cannonkeys/chimera65/chimera65.c +++ /dev/null @@ -1 +0,0 @@ -#include "chimera65.h" diff --git a/keyboards/cannonkeys/cloudline/cloudline.c b/keyboards/cannonkeys/cloudline/cloudline.c deleted file mode 100644 index d2b347a455..0000000000 --- a/keyboards/cannonkeys/cloudline/cloudline.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Andrew Kannan (@awkannan) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "cloudline.h" diff --git a/keyboards/cannonkeys/crin/crin.c b/keyboards/cannonkeys/crin/crin.c deleted file mode 100644 index 9f6039ff09..0000000000 --- a/keyboards/cannonkeys/crin/crin.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "crin.h" diff --git a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c b/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c deleted file mode 100644 index 46072b4090..0000000000 --- a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c +++ /dev/null @@ -1 +0,0 @@ -#include "devastatingtkl.h" diff --git a/keyboards/cannonkeys/gentoo/gentoo.c b/keyboards/cannonkeys/gentoo/gentoo.c deleted file mode 100644 index a535e9b44c..0000000000 --- a/keyboards/cannonkeys/gentoo/gentoo.c +++ /dev/null @@ -1,16 +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 . - */ -#include "gentoo.h" diff --git a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c b/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c deleted file mode 100644 index 8ecaa655f8..0000000000 --- a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c +++ /dev/null @@ -1,16 +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 . - */ -#include "gentoo_hs.h" diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.c b/keyboards/cannonkeys/hoodrowg/hoodrowg.c deleted file mode 100644 index f3aff6a32b..0000000000 --- a/keyboards/cannonkeys/hoodrowg/hoodrowg.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 CannonKeys 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 . -*/ -#include "hoodrowg.h" diff --git a/keyboards/cannonkeys/instant60/instant60.c b/keyboards/cannonkeys/instant60/instant60.c deleted file mode 100644 index 25b7099b0b..0000000000 --- a/keyboards/cannonkeys/instant60/instant60.c +++ /dev/null @@ -1 +0,0 @@ -#include "instant60.h" diff --git a/keyboards/cannonkeys/instant65/instant65.c b/keyboards/cannonkeys/instant65/instant65.c deleted file mode 100644 index 5efbf8226c..0000000000 --- a/keyboards/cannonkeys/instant65/instant65.c +++ /dev/null @@ -1 +0,0 @@ -#include "instant65.h" diff --git a/keyboards/cannonkeys/iron165/iron165.c b/keyboards/cannonkeys/iron165/iron165.c deleted file mode 100644 index da21712fb2..0000000000 --- a/keyboards/cannonkeys/iron165/iron165.c +++ /dev/null @@ -1 +0,0 @@ -#include "iron165.h" diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c deleted file mode 100644 index 58e33a3889..0000000000 --- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c +++ /dev/null @@ -1,16 +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 . - */ -#include "malicious_ergo.h" diff --git a/keyboards/cannonkeys/nearfield/nearfield.c b/keyboards/cannonkeys/nearfield/nearfield.c deleted file mode 100755 index 7a635209de..0000000000 --- a/keyboards/cannonkeys/nearfield/nearfield.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Dr.Doof - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "nearfield.h" diff --git a/keyboards/cannonkeys/obliterated75/obliterated75.c b/keyboards/cannonkeys/obliterated75/obliterated75.c deleted file mode 100644 index 347a643836..0000000000 --- a/keyboards/cannonkeys/obliterated75/obliterated75.c +++ /dev/null @@ -1 +0,0 @@ -#include "obliterated75.h" diff --git a/keyboards/cannonkeys/onyx/onyx.c b/keyboards/cannonkeys/onyx/onyx.c deleted file mode 100644 index fee271c9ee..0000000000 --- a/keyboards/cannonkeys/onyx/onyx.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2020 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 . - */ - -#include "onyx.h" diff --git a/keyboards/cannonkeys/ortho48/ortho48.c b/keyboards/cannonkeys/ortho48/ortho48.c deleted file mode 100644 index fe38f02007..0000000000 --- a/keyboards/cannonkeys/ortho48/ortho48.c +++ /dev/null @@ -1,3 +0,0 @@ - -#include "ortho48.h" - diff --git a/keyboards/cannonkeys/ortho60/ortho60.c b/keyboards/cannonkeys/ortho60/ortho60.c deleted file mode 100644 index f917ef96f9..0000000000 --- a/keyboards/cannonkeys/ortho60/ortho60.c +++ /dev/null @@ -1,3 +0,0 @@ - -#include "ortho60.h" - diff --git a/keyboards/cannonkeys/practice60/practice60.c b/keyboards/cannonkeys/practice60/practice60.c deleted file mode 100644 index d2cf47deb8..0000000000 --- a/keyboards/cannonkeys/practice60/practice60.c +++ /dev/null @@ -1,2 +0,0 @@ - -#include "practice60.h" diff --git a/keyboards/cannonkeys/practice65/practice65.c b/keyboards/cannonkeys/practice65/practice65.c deleted file mode 100644 index 10f60460fa..0000000000 --- a/keyboards/cannonkeys/practice65/practice65.c +++ /dev/null @@ -1,2 +0,0 @@ - -#include "practice65.h" diff --git a/keyboards/cannonkeys/rekt1800/rekt1800.c b/keyboards/cannonkeys/rekt1800/rekt1800.c deleted file mode 100644 index 3a8673b955..0000000000 --- a/keyboards/cannonkeys/rekt1800/rekt1800.c +++ /dev/null @@ -1 +0,0 @@ -#include "rekt1800.h" diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.c b/keyboards/cannonkeys/sagittarius/sagittarius.c deleted file mode 100644 index ea1b979c49..0000000000 --- a/keyboards/cannonkeys/sagittarius/sagittarius.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2020 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 . - */ - -#include "sagittarius.h" diff --git a/keyboards/cannonkeys/savage65/savage65.c b/keyboards/cannonkeys/savage65/savage65.c deleted file mode 100644 index d8e610c8b9..0000000000 --- a/keyboards/cannonkeys/savage65/savage65.c +++ /dev/null @@ -1 +0,0 @@ -#include "savage65.h" diff --git a/keyboards/cannonkeys/tmov2/tmov2.c b/keyboards/cannonkeys/tmov2/tmov2.c deleted file mode 100644 index 47295ac270..0000000000 --- a/keyboards/cannonkeys/tmov2/tmov2.c +++ /dev/null @@ -1 +0,0 @@ -#include "tmov2.h" diff --git a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c b/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c deleted file mode 100644 index aca92f07db..0000000000 --- a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2020 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 . - */ - -#include "tsukuyomi.h" diff --git a/keyboards/cannonkeys/vicious40/vicious40.c b/keyboards/cannonkeys/vicious40/vicious40.c deleted file mode 100644 index ae8ca5082b..0000000000 --- a/keyboards/cannonkeys/vicious40/vicious40.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 Andrew Kannan - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "vicious40.h" diff --git a/keyboards/capsunlocked/cu24/cu24.c b/keyboards/capsunlocked/cu24/cu24.c deleted file mode 100644 index 0c976f076f..0000000000 --- a/keyboards/capsunlocked/cu24/cu24.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 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 . - */ -#include "cu24.h" diff --git a/keyboards/capsunlocked/cu65/cu65.c b/keyboards/capsunlocked/cu65/cu65.c deleted file mode 100644 index 2b7f720e13..0000000000 --- a/keyboards/capsunlocked/cu65/cu65.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2020 CapsUnlocked -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "cu65.h" diff --git a/keyboards/capsunlocked/cu7/cu7.c b/keyboards/capsunlocked/cu7/cu7.c deleted file mode 100644 index 815ac53c94..0000000000 --- a/keyboards/capsunlocked/cu7/cu7.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 CapsUnlocked -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "cu7.h" diff --git a/keyboards/capsunlocked/cu80/v1/v1.c b/keyboards/capsunlocked/cu80/v1/v1.c deleted file mode 100644 index 96161175b2..0000000000 --- a/keyboards/capsunlocked/cu80/v1/v1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Andy Holland - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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.h" diff --git a/keyboards/catch22/catch22.c b/keyboards/catch22/catch22.c deleted file mode 100644 index 11a983936e..0000000000 --- a/keyboards/catch22/catch22.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 QMK Community - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "catch22.h" diff --git a/keyboards/cest73/tkm/tkm.c b/keyboards/cest73/tkm/tkm.c deleted file mode 100644 index b127e9eb53..0000000000 --- a/keyboards/cest73/tkm/tkm.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 cest73 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "tkm.h" diff --git a/keyboards/chalice/chalice.c b/keyboards/chalice/chalice.c deleted file mode 100644 index 1d7cc12228..0000000000 --- a/keyboards/chalice/chalice.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 null-ll - * Copyright 2021 Jels, Josh Johnson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "chalice.h" diff --git a/keyboards/chaos65/chaos65.c b/keyboards/chaos65/chaos65.c deleted file mode 100644 index 4a56f8a2ae..0000000000 --- a/keyboards/chaos65/chaos65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "chaos65.h" diff --git a/keyboards/charue/charon/charon.c b/keyboards/charue/charon/charon.c deleted file mode 100644 index 2c4a518a31..0000000000 --- a/keyboards/charue/charon/charon.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Charue 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 . - */ - -#include "charon.h" diff --git a/keyboards/charue/sunsetter/sunsetter.c b/keyboards/charue/sunsetter/sunsetter.c deleted file mode 100644 index 4d1cdf4e80..0000000000 --- a/keyboards/charue/sunsetter/sunsetter.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Michael Pio "Coarse" Mayol - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "sunsetter.h" diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.c b/keyboards/charue/sunsetter_r2/sunsetter_r2.c deleted file mode 100644 index 86b75fdd18..0000000000 --- a/keyboards/charue/sunsetter_r2/sunsetter_r2.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Charue Design -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "sunsetter_r2.h" diff --git a/keyboards/chavdai40/rev1/rev1.c b/keyboards/chavdai40/rev1/rev1.c deleted file mode 100644 index 116c301c2b..0000000000 --- a/keyboards/chavdai40/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 t-miyajima - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/chavdai40/rev2/rev2.c b/keyboards/chavdai40/rev2/rev2.c deleted file mode 100644 index 6bd488c299..0000000000 --- a/keyboards/chavdai40/rev2/rev2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 t-miyajima - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/checkerboards/axon40/axon40.c b/keyboards/checkerboards/axon40/axon40.c deleted file mode 100644 index a18e99cfab..0000000000 --- a/keyboards/checkerboards/axon40/axon40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Nathan Spears -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "axon40.h" diff --git a/keyboards/checkerboards/candybar_ortho/candybar_ortho.c b/keyboards/checkerboards/candybar_ortho/candybar_ortho.c deleted file mode 100644 index 8f127cd36e..0000000000 --- a/keyboards/checkerboards/candybar_ortho/candybar_ortho.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Nathan Spears -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "candybar_ortho.h" diff --git a/keyboards/checkerboards/g_idb60/g_idb60.c b/keyboards/checkerboards/g_idb60/g_idb60.c deleted file mode 100644 index d09f2dbb20..0000000000 --- a/keyboards/checkerboards/g_idb60/g_idb60.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2021 Nathan Spears - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "g_idb60.h" diff --git a/keyboards/checkerboards/nop60/nop60.c b/keyboards/checkerboards/nop60/nop60.c deleted file mode 100644 index b8a67e87df..0000000000 --- a/keyboards/checkerboards/nop60/nop60.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2021 Nathan Spears - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "nop60.h" diff --git a/keyboards/checkerboards/plexus75_he/plexus75_he.c b/keyboards/checkerboards/plexus75_he/plexus75_he.c deleted file mode 100644 index 1c7dad7ab7..0000000000 --- a/keyboards/checkerboards/plexus75_he/plexus75_he.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "plexus75_he.h" diff --git a/keyboards/checkerboards/pursuit40/pursuit40.c b/keyboards/checkerboards/pursuit40/pursuit40.c deleted file mode 100644 index 4fed33c34a..0000000000 --- a/keyboards/checkerboards/pursuit40/pursuit40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pursuit40.h" diff --git a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c b/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c deleted file mode 100644 index 7000732a13..0000000000 --- a/keyboards/checkerboards/ud40_ortho_alt/ud40_ortho_alt.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ud40_ortho_alt.h" diff --git a/keyboards/cherrybstudio/cb1800/cb1800.c b/keyboards/cherrybstudio/cb1800/cb1800.c deleted file mode 100644 index 6a42e65db5..0000000000 --- a/keyboards/cherrybstudio/cb1800/cb1800.c +++ /dev/null @@ -1,14 +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 . -*/ - -#include "cb1800.h" diff --git a/keyboards/cherrybstudio/cb65/cb65.c b/keyboards/cherrybstudio/cb65/cb65.c deleted file mode 100644 index 4ff1006adf..0000000000 --- a/keyboards/cherrybstudio/cb65/cb65.c +++ /dev/null @@ -1,14 +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 . -*/ - -#include "cb65.h" diff --git a/keyboards/cherrybstudio/cb87/cb87.c b/keyboards/cherrybstudio/cb87/cb87.c deleted file mode 100644 index 4dcdd898eb..0000000000 --- a/keyboards/cherrybstudio/cb87/cb87.c +++ /dev/null @@ -1,14 +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 . -*/ - -#include "cb87.h" \ No newline at end of file diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.c b/keyboards/cherrybstudio/cb87v2/cb87v2.c deleted file mode 100644 index 8d2fbba409..0000000000 --- a/keyboards/cherrybstudio/cb87v2/cb87v2.c +++ /dev/null @@ -1,14 +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 . -*/ - -#include "cb87v2.h" diff --git a/keyboards/chickenman/ciel/ciel.c b/keyboards/chickenman/ciel/ciel.c deleted file mode 100644 index de8302bfb4..0000000000 --- a/keyboards/chickenman/ciel/ciel.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ciel.h" diff --git a/keyboards/chlx/merro60/merro60.c b/keyboards/chlx/merro60/merro60.c deleted file mode 100644 index 4182c65c76..0000000000 --- a/keyboards/chlx/merro60/merro60.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2021 Alexander Lee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "merro60.h" - diff --git a/keyboards/chlx/str_merro60/str_merro60.c b/keyboards/chlx/str_merro60/str_merro60.c deleted file mode 100644 index fd4f843d74..0000000000 --- a/keyboards/chlx/str_merro60/str_merro60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Alexander Lee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "str_merro60.h" diff --git a/keyboards/chocv/chocv.c b/keyboards/chocv/chocv.c deleted file mode 100644 index c79f8a1b75..0000000000 --- a/keyboards/chocv/chocv.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 BrickBots 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 . - */ - -#include "chocv.h" diff --git a/keyboards/cipulot/kallos/kallos.c b/keyboards/cipulot/kallos/kallos.c deleted file mode 100644 index 77f41f9075..0000000000 --- a/keyboards/cipulot/kallos/kallos.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Cipulot - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kallos.h" diff --git a/keyboards/cipulot/kawayo/kawayo.c b/keyboards/cipulot/kawayo/kawayo.c deleted file mode 100644 index 1dee38696e..0000000000 --- a/keyboards/cipulot/kawayo/kawayo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Cipulot - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kawayo.h" \ No newline at end of file diff --git a/keyboards/ckeys/handwire_101/handwire_101.c b/keyboards/ckeys/handwire_101/handwire_101.c deleted file mode 100755 index 7d251ddce6..0000000000 --- a/keyboards/ckeys/handwire_101/handwire_101.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Branden Byers - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "handwire_101.h" diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c deleted file mode 100644 index 84c0b03ff6..0000000000 --- a/keyboards/ckeys/nakey/nakey.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2018 James Underwood - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nakey.h" diff --git a/keyboards/ckeys/washington/washington.c b/keyboards/ckeys/washington/washington.c deleted file mode 100644 index 58089caac4..0000000000 --- a/keyboards/ckeys/washington/washington.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 merlin04 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "washington.h" diff --git a/keyboards/clawsome/bookerboard/bookerboard.c b/keyboards/clawsome/bookerboard/bookerboard.c deleted file mode 100644 index 2cf132de59..0000000000 --- a/keyboards/clawsome/bookerboard/bookerboard.c +++ /dev/null @@ -1,16 +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 . - */ -#include "bookerboard.h" \ No newline at end of file diff --git a/keyboards/clawsome/coupe/coupe.c b/keyboards/clawsome/coupe/coupe.c deleted file mode 100644 index 80aca53943..0000000000 --- a/keyboards/clawsome/coupe/coupe.c +++ /dev/null @@ -1,16 +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 . - */ -#include "coupe.h" \ No newline at end of file diff --git a/keyboards/clawsome/doodle/doodle.c b/keyboards/clawsome/doodle/doodle.c deleted file mode 100644 index 4f1b773512..0000000000 --- a/keyboards/clawsome/doodle/doodle.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "doodle.h" \ No newline at end of file diff --git a/keyboards/clawsome/fightpad/fightpad.c b/keyboards/clawsome/fightpad/fightpad.c deleted file mode 100644 index f0dae8eaf3..0000000000 --- a/keyboards/clawsome/fightpad/fightpad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "fightpad.h" \ No newline at end of file diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.c b/keyboards/clawsome/gamebuddy/v1_0/v1_0.c deleted file mode 100644 index b63474c28a..0000000000 --- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.c +++ /dev/null @@ -1,16 +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 . - */ -#include "v1_0.h" diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.c b/keyboards/clawsome/gamebuddy/v1_m/v1_m.c deleted file mode 100644 index 88db72d27b..0000000000 --- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.c +++ /dev/null @@ -1,16 +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 . - */ -#include "v1_m.h" diff --git a/keyboards/clawsome/hatchback/hatchback.c b/keyboards/clawsome/hatchback/hatchback.c deleted file mode 100644 index 117593a688..0000000000 --- a/keyboards/clawsome/hatchback/hatchback.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hatchback.h" diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.c b/keyboards/clawsome/luggage_rack/luggage_rack.c deleted file mode 100644 index 3a49c797d0..0000000000 --- a/keyboards/clawsome/luggage_rack/luggage_rack.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "luggage_rack.h" diff --git a/keyboards/clawsome/numeros/numeros.c b/keyboards/clawsome/numeros/numeros.c deleted file mode 100644 index daa7fb1b8d..0000000000 --- a/keyboards/clawsome/numeros/numeros.c +++ /dev/null @@ -1,16 +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 . - */ -#include "numeros.h" diff --git a/keyboards/clawsome/roadster/roadster.c b/keyboards/clawsome/roadster/roadster.c deleted file mode 100644 index be57d7c2f4..0000000000 --- a/keyboards/clawsome/roadster/roadster.c +++ /dev/null @@ -1,16 +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 . - */ -#include "roadster.h" \ No newline at end of file diff --git a/keyboards/clawsome/sedan/sedan.c b/keyboards/clawsome/sedan/sedan.c deleted file mode 100644 index 4977bf6978..0000000000 --- a/keyboards/clawsome/sedan/sedan.c +++ /dev/null @@ -1,16 +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 . - */ -#include "sedan.h" \ No newline at end of file diff --git a/keyboards/clawsome/sidekick/sidekick.c b/keyboards/clawsome/sidekick/sidekick.c deleted file mode 100644 index 4f52b1ba12..0000000000 --- a/keyboards/clawsome/sidekick/sidekick.c +++ /dev/null @@ -1,16 +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 . - */ -#include "sidekick.h" diff --git a/keyboards/clawsome/suv/suv.c b/keyboards/clawsome/suv/suv.c deleted file mode 100644 index d456be8850..0000000000 --- a/keyboards/clawsome/suv/suv.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "suv.h" \ No newline at end of file diff --git a/keyboards/clueboard/2x1800/2018/2018.c b/keyboards/clueboard/2x1800/2018/2018.c deleted file mode 100644 index dee0c01b5b..0000000000 --- a/keyboards/clueboard/2x1800/2018/2018.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 Zach White - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "2018.h" diff --git a/keyboards/clueboard/2x1800/2018/2018.h b/keyboards/clueboard/2x1800/2018/2018.h deleted file mode 100644 index 6e2d3b3831..0000000000 --- a/keyboards/clueboard/2x1800/2018/2018.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Zach White - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" diff --git a/keyboards/clueboard/60/60.c b/keyboards/clueboard/60/60.c deleted file mode 100644 index 90d1661394..0000000000 --- a/keyboards/clueboard/60/60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 skully - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "60.h" diff --git a/keyboards/clueboard/60/60.h b/keyboards/clueboard/60/60.h deleted file mode 100644 index 9a019ccf6d..0000000000 --- a/keyboards/clueboard/60/60.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 skully - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" diff --git a/keyboards/clueboard/66/rev1/rev1.c b/keyboards/clueboard/66/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/clueboard/66/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/clueboard/66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h deleted file mode 100644 index ef5b3f3e04..0000000000 --- a/keyboards/clueboard/66/rev1/rev1.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "quantum.h" diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c deleted file mode 100644 index 46695a0d21..0000000000 --- a/keyboards/cmm_studio/fuji65/fuji65.c +++ /dev/null @@ -1,20 +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 . - */ - -#include "fuji65.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/cmm_studio/saka68/hotswap/hotswap.c b/keyboards/cmm_studio/saka68/hotswap/hotswap.c deleted file mode 100644 index 14454b58ba..0000000000 --- a/keyboards/cmm_studio/saka68/hotswap/hotswap.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hotswap.h" diff --git a/keyboards/cmm_studio/saka68/solder/solder.c b/keyboards/cmm_studio/saka68/solder/solder.c deleted file mode 100644 index 195c14023b..0000000000 --- a/keyboards/cmm_studio/saka68/solder/solder.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "solder.h" diff --git a/keyboards/coarse/cordillera/cordillera.c b/keyboards/coarse/cordillera/cordillera.c deleted file mode 100644 index 437547ff28..0000000000 --- a/keyboards/coarse/cordillera/cordillera.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 coarse - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "cordillera.h" diff --git a/keyboards/coarse/ixora/ixora.c b/keyboards/coarse/ixora/ixora.c deleted file mode 100644 index f2dcd864aa..0000000000 --- a/keyboards/coarse/ixora/ixora.c +++ /dev/null @@ -1 +0,0 @@ -#include "ixora.h" diff --git a/keyboards/coarse/vinta/vinta.c b/keyboards/coarse/vinta/vinta.c deleted file mode 100644 index edd45511b4..0000000000 --- a/keyboards/coarse/vinta/vinta.c +++ /dev/null @@ -1 +0,0 @@ -#include "vinta.h" diff --git a/keyboards/compound/compound.c b/keyboards/compound/compound.c deleted file mode 100644 index 046eae950f..0000000000 --- a/keyboards/compound/compound.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "compound.h" diff --git a/keyboards/contender/contender.c b/keyboards/contender/contender.c deleted file mode 100644 index 5e00516206..0000000000 --- a/keyboards/contender/contender.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 sotoba - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "contender.h" diff --git a/keyboards/converter/a1200/a1200.c b/keyboards/converter/a1200/a1200.c deleted file mode 100644 index 5e7e404287..0000000000 --- a/keyboards/converter/a1200/a1200.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 8bits4ever - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "a1200.h" diff --git a/keyboards/converter/adb_usb/adb_usb.c b/keyboards/converter/adb_usb/adb_usb.c deleted file mode 100644 index 7026d62751..0000000000 --- a/keyboards/converter/adb_usb/adb_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "adb_usb.h" -#include -#include "quantum.h" diff --git a/keyboards/converter/hp_46010a/hp_46010a.c b/keyboards/converter/hp_46010a/hp_46010a.c deleted file mode 100644 index 915a220f91..0000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "hp_46010a.h" -#include -#include "quantum.h" \ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c deleted file mode 100644 index fd64a21ace..0000000000 --- a/keyboards/converter/ibm_terminal/ibm_terminal.c +++ /dev/null @@ -1 +0,0 @@ -#include "ibm_terminal.h" diff --git a/keyboards/converter/m0110_usb/m0110_usb.c b/keyboards/converter/m0110_usb/m0110_usb.c deleted file mode 100644 index a2f98cced6..0000000000 --- a/keyboards/converter/m0110_usb/m0110_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "m0110_usb.h" -#include -#include "quantum.h" diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c deleted file mode 100644 index 8283d91eda..0000000000 --- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "modelm101_teensy2.h" diff --git a/keyboards/converter/modelm_ssk/modelm_ssk.c b/keyboards/converter/modelm_ssk/modelm_ssk.c deleted file mode 100644 index 1b01115e5d..0000000000 --- a/keyboards/converter/modelm_ssk/modelm_ssk.c +++ /dev/null @@ -1,19 +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 . - */ -#include "modelm_ssk.h" - - - diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c deleted file mode 100644 index 341af05b31..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Adam Newbold - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "numeric_keypad_iie.h" diff --git a/keyboards/converter/periboard_512/periboard_512.c b/keyboards/converter/periboard_512/periboard_512.c deleted file mode 100644 index 11c65e923a..0000000000 --- a/keyboards/converter/periboard_512/periboard_512.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "periboard_512.h" diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c deleted file mode 100644 index 21d00c8c30..0000000000 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "siemens_tastatur.h" diff --git a/keyboards/converter/xt_usb/xt_usb.c b/keyboards/converter/xt_usb/xt_usb.c deleted file mode 100644 index 88acee0b0f..0000000000 --- a/keyboards/converter/xt_usb/xt_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "xt_usb.h" diff --git a/keyboards/cool836a/cool836a.c b/keyboards/cool836a/cool836a.c deleted file mode 100644 index 5795bf9546..0000000000 --- a/keyboards/cool836a/cool836a.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "cool836a.h" diff --git a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c b/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c deleted file mode 100755 index aab96c9388..0000000000 --- a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 mini-ninja-64 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "click_pad_v1.h" diff --git a/keyboards/coseyfannitutti/discipad/discipad.c b/keyboards/coseyfannitutti/discipad/discipad.c deleted file mode 100644 index 4bdb1c6c20..0000000000 --- a/keyboards/coseyfannitutti/discipad/discipad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "discipad.h" diff --git a/keyboards/coseyfannitutti/discipline/discipline.c b/keyboards/coseyfannitutti/discipline/discipline.c deleted file mode 100644 index 50ba0bae54..0000000000 --- a/keyboards/coseyfannitutti/discipline/discipline.c +++ /dev/null @@ -1,16 +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 . - */ -#include "discipline.h" diff --git a/keyboards/coseyfannitutti/mullet/mullet.c b/keyboards/coseyfannitutti/mullet/mullet.c deleted file mode 100644 index 18445a6c93..0000000000 --- a/keyboards/coseyfannitutti/mullet/mullet.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mullet.h" diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.c b/keyboards/coseyfannitutti/mulletpad/mulletpad.c deleted file mode 100644 index 72bb19c303..0000000000 --- a/keyboards/coseyfannitutti/mulletpad/mulletpad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mulletpad.h" diff --git a/keyboards/coseyfannitutti/mysterium/mysterium.c b/keyboards/coseyfannitutti/mysterium/mysterium.c deleted file mode 100644 index 4bfbd844c1..0000000000 --- a/keyboards/coseyfannitutti/mysterium/mysterium.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mysterium.h" \ No newline at end of file diff --git a/keyboards/coseyfannitutti/romeo/romeo.c b/keyboards/coseyfannitutti/romeo/romeo.c deleted file mode 100644 index 696a764070..0000000000 --- a/keyboards/coseyfannitutti/romeo/romeo.c +++ /dev/null @@ -1,16 +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 . - */ -#include "romeo.h" diff --git a/keyboards/craftwalk/craftwalk.c b/keyboards/craftwalk/craftwalk.c deleted file mode 100644 index 9b1ea8e2e4..0000000000 --- a/keyboards/craftwalk/craftwalk.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 sotoba - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "craftwalk.h" diff --git a/keyboards/crawlpad/crawlpad.c b/keyboards/crawlpad/crawlpad.c deleted file mode 100755 index d48f0a409f..0000000000 --- a/keyboards/crawlpad/crawlpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "crawlpad.h" diff --git a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c b/keyboards/crazy_keyboard_68/crazy_keyboard_68.c deleted file mode 100644 index cbea93fb85..0000000000 --- a/keyboards/crazy_keyboard_68/crazy_keyboard_68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 chent7 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "crazy_keyboard_68.h" diff --git a/keyboards/creatkeebs/glacier/glacier.c b/keyboards/creatkeebs/glacier/glacier.c deleted file mode 100644 index 27ff4d02c7..0000000000 --- a/keyboards/creatkeebs/glacier/glacier.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Tim (https://github.com/Timliuzhaolu) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "glacier.h" diff --git a/keyboards/creatkeebs/thera/thera.c b/keyboards/creatkeebs/thera/thera.c deleted file mode 100644 index db4f27d908..0000000000 --- a/keyboards/creatkeebs/thera/thera.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Tim (https://github.com/Timliuzhaolu) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "thera.h" diff --git a/keyboards/crimsonkeyboards/resume1800/resume1800.c b/keyboards/crimsonkeyboards/resume1800/resume1800.c deleted file mode 100644 index 63194c6605..0000000000 --- a/keyboards/crimsonkeyboards/resume1800/resume1800.c +++ /dev/null @@ -1,16 +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 . - */ -#include "resume1800.h" \ No newline at end of file diff --git a/keyboards/crin/crin.c b/keyboards/crin/crin.c deleted file mode 100644 index dd7d938308..0000000000 --- a/keyboards/crin/crin.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "crin.h" diff --git a/keyboards/cutie_club/borsdorf/borsdorf.c b/keyboards/cutie_club/borsdorf/borsdorf.c deleted file mode 100644 index 94ca279864..0000000000 --- a/keyboards/cutie_club/borsdorf/borsdorf.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "borsdorf.h" diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c deleted file mode 100755 index 934817aca2..0000000000 --- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "giant_macro_pad.h" diff --git a/keyboards/cutie_club/keebcats/denis/denis.c b/keyboards/cutie_club/keebcats/denis/denis.c deleted file mode 100644 index c661e8cbb5..0000000000 --- a/keyboards/cutie_club/keebcats/denis/denis.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "denis.h" diff --git a/keyboards/cutie_club/keebcats/dougal/dougal.c b/keyboards/cutie_club/keebcats/dougal/dougal.c deleted file mode 100644 index 8f247bd287..0000000000 --- a/keyboards/cutie_club/keebcats/dougal/dougal.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dougal.h" diff --git a/keyboards/cutie_club/novus/novus.c b/keyboards/cutie_club/novus/novus.c deleted file mode 100644 index 2fe5fbfc8f..0000000000 --- a/keyboards/cutie_club/novus/novus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "novus.h" diff --git a/keyboards/cx60/cx60.c b/keyboards/cx60/cx60.c deleted file mode 100644 index 2277d14638..0000000000 --- a/keyboards/cx60/cx60.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2021 Horns Lyn - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "cx60.h" diff --git a/keyboards/cybergear/macro25/macro25.c b/keyboards/cybergear/macro25/macro25.c deleted file mode 100644 index 662c5c1fe3..0000000000 --- a/keyboards/cybergear/macro25/macro25.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 CyberGear Marius Kavoliunas - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "macro25.h" diff --git a/keyboards/daji/seis_cinco/seis_cinco.c b/keyboards/daji/seis_cinco/seis_cinco.c deleted file mode 100644 index e1417232c0..0000000000 --- a/keyboards/daji/seis_cinco/seis_cinco.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 B. Fletcher - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "seis_cinco.h" diff --git a/keyboards/db/db63/db63.c b/keyboards/db/db63/db63.c deleted file mode 100644 index 62ebb2cc69..0000000000 --- a/keyboards/db/db63/db63.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "db63.h" diff --git a/keyboards/dc01/arrow/arrow.c b/keyboards/dc01/arrow/arrow.c deleted file mode 100644 index b3ed4ede76..0000000000 --- a/keyboards/dc01/arrow/arrow.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 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 . - */ -#include "arrow.h" diff --git a/keyboards/dc01/left/left.c b/keyboards/dc01/left/left.c deleted file mode 100644 index b10121705d..0000000000 --- a/keyboards/dc01/left/left.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 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 . - */ -#include "left.h" diff --git a/keyboards/dc01/numpad/numpad.c b/keyboards/dc01/numpad/numpad.c deleted file mode 100644 index 2599f6320a..0000000000 --- a/keyboards/dc01/numpad/numpad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "numpad.h" diff --git a/keyboards/dc01/right/right.c b/keyboards/dc01/right/right.c deleted file mode 100644 index bbb1d568cd..0000000000 --- a/keyboards/dc01/right/right.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 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 . - */ -#include "right.h" diff --git a/keyboards/delikeeb/flatbread60/flatbread60.c b/keyboards/delikeeb/flatbread60/flatbread60.c deleted file mode 100644 index 0cbc265530..0000000000 --- a/keyboards/delikeeb/flatbread60/flatbread60.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "flatbread60.h" - diff --git a/keyboards/delikeeb/vaguettelite/vaguettelite.c b/keyboards/delikeeb/vaguettelite/vaguettelite.c deleted file mode 100644 index a91dae9a3f..0000000000 --- a/keyboards/delikeeb/vaguettelite/vaguettelite.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "vaguettelite.h" diff --git a/keyboards/delikeeb/vanana/rev1/rev1.c b/keyboards/delikeeb/vanana/rev1/rev1.c deleted file mode 100644 index 73b5039eb8..0000000000 --- a/keyboards/delikeeb/vanana/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/delikeeb/vanana/rev2/rev2.c b/keyboards/delikeeb/vanana/rev2/rev2.c deleted file mode 100644 index 8f2a259921..0000000000 --- a/keyboards/delikeeb/vanana/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" diff --git a/keyboards/delikeeb/vaneela/vaneela.c b/keyboards/delikeeb/vaneela/vaneela.c deleted file mode 100644 index ca5d513a00..0000000000 --- a/keyboards/delikeeb/vaneela/vaneela.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "vaneela.h" - diff --git a/keyboards/delikeeb/vaneelaex/vaneelaex.c b/keyboards/delikeeb/vaneelaex/vaneelaex.c deleted file mode 100644 index e82cd5487b..0000000000 --- a/keyboards/delikeeb/vaneelaex/vaneelaex.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "vaneelaex.h" - diff --git a/keyboards/delikeeb/waaffle/rev3/rev3.c b/keyboards/delikeeb/waaffle/rev3/rev3.c deleted file mode 100644 index bf7f5a1099..0000000000 --- a/keyboards/delikeeb/waaffle/rev3/rev3.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev3.h" diff --git a/keyboards/deltapad/deltapad.c b/keyboards/deltapad/deltapad.c deleted file mode 100644 index ee9ac17c4a..0000000000 --- a/keyboards/deltapad/deltapad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Richard Snijder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "deltapad.h" diff --git a/keyboards/demiurge/demiurge.c b/keyboards/demiurge/demiurge.c deleted file mode 100755 index 4bd588d6e9..0000000000 --- a/keyboards/demiurge/demiurge.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 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 . -*/ - -#include "demiurge.h" \ No newline at end of file diff --git a/keyboards/dm9records/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c deleted file mode 100644 index a01ac0a25c..0000000000 --- a/keyboards/dm9records/ergoinu/ergoinu.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ergoinu.h" diff --git a/keyboards/dm9records/plaid/plaid.c b/keyboards/dm9records/plaid/plaid.c deleted file mode 100644 index 50da81950e..0000000000 --- a/keyboards/dm9records/plaid/plaid.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Takuya Urakawa (dm9records.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 "plaid.h" diff --git a/keyboards/dm9records/tartan/tartan.c b/keyboards/dm9records/tartan/tartan.c deleted file mode 100644 index b702633cc9..0000000000 --- a/keyboards/dm9records/tartan/tartan.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Takuya Urakawa (dm9records.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 "tartan.h" diff --git a/keyboards/dmqdesign/spin/spin.c b/keyboards/dmqdesign/spin/spin.c deleted file mode 100644 index fe3f267d1a..0000000000 --- a/keyboards/dmqdesign/spin/spin.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019-2020 DMQ 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 . - */ -#include "spin.h" diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c deleted file mode 100644 index 8c7b894bc4..0000000000 --- a/keyboards/donutcables/budget96/budget96.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "budget96.h" diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.c b/keyboards/donutcables/scrabblepad/scrabblepad.c deleted file mode 100644 index 88e60fea26..0000000000 --- a/keyboards/donutcables/scrabblepad/scrabblepad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 DonutCables - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "scrabblepad.h" diff --git a/keyboards/doodboard/duckboard/duckboard.c b/keyboards/doodboard/duckboard/duckboard.c deleted file mode 100644 index 853e105ceb..0000000000 --- a/keyboards/doodboard/duckboard/duckboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020-2021 doodboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "duckboard.h" diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.c b/keyboards/doodboard/duckboard_r2/duckboard_r2.c deleted file mode 100644 index 095544b9e3..0000000000 --- a/keyboards/doodboard/duckboard_r2/duckboard_r2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020-2021 doodboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "duckboard_r2.h" diff --git a/keyboards/doro67/multi/multi.c b/keyboards/doro67/multi/multi.c deleted file mode 100644 index 3ab1f53653..0000000000 --- a/keyboards/doro67/multi/multi.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 ShadeDream - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "multi.h" diff --git a/keyboards/doro67/regular/regular.c b/keyboards/doro67/regular/regular.c deleted file mode 100644 index c9b0a25b59..0000000000 --- a/keyboards/doro67/regular/regular.c +++ /dev/null @@ -1,16 +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 . - */ -#include "regular.h" diff --git a/keyboards/draculad/draculad.c b/keyboards/draculad/draculad.c deleted file mode 100644 index 04a83ef2e3..0000000000 --- a/keyboards/draculad/draculad.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "draculad.h" \ No newline at end of file diff --git a/keyboards/draytronics/daisy/daisy.c b/keyboards/draytronics/daisy/daisy.c deleted file mode 100644 index 149cb3d0c7..0000000000 --- a/keyboards/draytronics/daisy/daisy.c +++ /dev/null @@ -1,19 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "daisy.h" diff --git a/keyboards/draytronics/elise/elise.c b/keyboards/draytronics/elise/elise.c deleted file mode 100755 index 731202ab6d..0000000000 --- a/keyboards/draytronics/elise/elise.c +++ /dev/null @@ -1,18 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "elise.h" diff --git a/keyboards/draytronics/elise_v2/elise_v2.c b/keyboards/draytronics/elise_v2/elise_v2.c deleted file mode 100755 index f153d7a341..0000000000 --- a/keyboards/draytronics/elise_v2/elise_v2.c +++ /dev/null @@ -1,18 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "elise_v2.h" diff --git a/keyboards/draytronics/scarlet/scarlet.c b/keyboards/draytronics/scarlet/scarlet.c deleted file mode 100644 index fdcc811d52..0000000000 --- a/keyboards/draytronics/scarlet/scarlet.c +++ /dev/null @@ -1,19 +0,0 @@ -/*Copyright 2020 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "scarlet.h" diff --git a/keyboards/drewkeys/iskar/iskar.c b/keyboards/drewkeys/iskar/iskar.c deleted file mode 100644 index 32ea7aa2e4..0000000000 --- a/keyboards/drewkeys/iskar/iskar.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Drewkeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "iskar.h" diff --git a/keyboards/drhigsby/bkf/bkf.c b/keyboards/drhigsby/bkf/bkf.c deleted file mode 100644 index 6df3ed56f6..0000000000 --- a/keyboards/drhigsby/bkf/bkf.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "bkf.h" diff --git a/keyboards/drhigsby/dubba175/dubba175.c b/keyboards/drhigsby/dubba175/dubba175.c deleted file mode 100644 index 066e772fa2..0000000000 --- a/keyboards/drhigsby/dubba175/dubba175.c +++ /dev/null @@ -1,16 +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 . - */ -#include "dubba175.h" \ No newline at end of file diff --git a/keyboards/dtisaac/cg108/cg108.c b/keyboards/dtisaac/cg108/cg108.c deleted file mode 100644 index c2a7254aa8..0000000000 --- a/keyboards/dtisaac/cg108/cg108.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "cg108.h" diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.c b/keyboards/dtisaac/dtisaac01/dtisaac01.c deleted file mode 100644 index b11920280f..0000000000 --- a/keyboards/dtisaac/dtisaac01/dtisaac01.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "dtisaac01.h" diff --git a/keyboards/dumbo/dumbo.c b/keyboards/dumbo/dumbo.c deleted file mode 100644 index a8c34c1c9e..0000000000 --- a/keyboards/dumbo/dumbo.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Adam Naldal - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dumbo.h" diff --git a/keyboards/dyz/dyz40/dyz40.c b/keyboards/dyz/dyz40/dyz40.c deleted file mode 100644 index 1ca2cf1082..0000000000 --- a/keyboards/dyz/dyz40/dyz40.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 dayatz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dyz40.h" diff --git a/keyboards/dyz/dyz60/dyz60.c b/keyboards/dyz/dyz60/dyz60.c deleted file mode 100644 index b5a2606210..0000000000 --- a/keyboards/dyz/dyz60/dyz60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 dayatz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dyz60.h" diff --git a/keyboards/dyz/dyz60_hs/dyz60_hs.c b/keyboards/dyz/dyz60_hs/dyz60_hs.c deleted file mode 100644 index c6ec0f20d8..0000000000 --- a/keyboards/dyz/dyz60_hs/dyz60_hs.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 dayatz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dyz60_hs.h" diff --git a/keyboards/dyz/dyz_tkl/dyz_tkl.c b/keyboards/dyz/dyz_tkl/dyz_tkl.c deleted file mode 100644 index cdc23b8664..0000000000 --- a/keyboards/dyz/dyz_tkl/dyz_tkl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 dayatz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dyz_tkl.h" diff --git a/keyboards/dyz/selka40/selka40.c b/keyboards/dyz/selka40/selka40.c deleted file mode 100644 index f46aac4b2b..0000000000 --- a/keyboards/dyz/selka40/selka40.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 dayatz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "selka40.h" diff --git a/keyboards/dz60/dz60.c b/keyboards/dz60/dz60.c deleted file mode 100644 index 23db2e4d75..0000000000 --- a/keyboards/dz60/dz60.c +++ /dev/null @@ -1 +0,0 @@ -#include "dz60.h" diff --git a/keyboards/dztech/duo_s/duo_s.c b/keyboards/dztech/duo_s/duo_s.c deleted file mode 100644 index ca64b1ff56..0000000000 --- a/keyboards/dztech/duo_s/duo_s.c +++ /dev/null @@ -1,16 +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 . - */ -#include "duo_s.h" diff --git a/keyboards/dztech/dz96/dz96.c b/keyboards/dztech/dz96/dz96.c deleted file mode 100644 index c83c0a2c4d..0000000000 --- a/keyboards/dztech/dz96/dz96.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "dz96.h" diff --git a/keyboards/dztech/endless80/endless80.c b/keyboards/dztech/endless80/endless80.c deleted file mode 100644 index 27135b54d4..0000000000 --- a/keyboards/dztech/endless80/endless80.c +++ /dev/null @@ -1,16 +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 . - */ -#include "endless80.h" \ No newline at end of file diff --git a/keyboards/e88/e88.c b/keyboards/e88/e88.c deleted file mode 100644 index 336660a0d3..0000000000 --- a/keyboards/e88/e88.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "e88.h" diff --git a/keyboards/earth_rover/earth_rover.c b/keyboards/earth_rover/earth_rover.c deleted file mode 100644 index c12eaa8c0e..0000000000 --- a/keyboards/earth_rover/earth_rover.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 k.bigwheel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "earth_rover.h" diff --git a/keyboards/eason/aeroboard/aeroboard.c b/keyboards/eason/aeroboard/aeroboard.c deleted file mode 100644 index 091fcf2fac..0000000000 --- a/keyboards/eason/aeroboard/aeroboard.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Eason -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "aeroboard.h" diff --git a/keyboards/eason/capsule65/capsule65.c b/keyboards/eason/capsule65/capsule65.c deleted file mode 100644 index c04abea9e4..0000000000 --- a/keyboards/eason/capsule65/capsule65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 EASON - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "capsule65.h" diff --git a/keyboards/ebastler/isometria_75/rev1/rev1.c b/keyboards/ebastler/isometria_75/rev1/rev1.c deleted file mode 100644 index 8b703dfbd1..0000000000 --- a/keyboards/ebastler/isometria_75/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/edc40/edc40.c b/keyboards/edc40/edc40.c deleted file mode 100644 index 96746d4f35..0000000000 --- a/keyboards/edc40/edc40.c +++ /dev/null @@ -1,16 +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 . - */ -#include "edc40.h" diff --git a/keyboards/edi/hardlight/mk1/mk1.c b/keyboards/edi/hardlight/mk1/mk1.c deleted file mode 100644 index 5a1e0bbb19..0000000000 --- a/keyboards/edi/hardlight/mk1/mk1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -This program is free software: you can 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 . -*/ - -#include "mk1.h" diff --git a/keyboards/edi/hardlight/mk2/mk2.c b/keyboards/edi/hardlight/mk2/mk2.c deleted file mode 100644 index ab4414e4d2..0000000000 --- a/keyboards/edi/hardlight/mk2/mk2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -This program is free software: you can 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 . -*/ - -#include "mk2.h" diff --git a/keyboards/edi/standaside/standaside.c b/keyboards/edi/standaside/standaside.c deleted file mode 100644 index 9f445ec044..0000000000 --- a/keyboards/edi/standaside/standaside.c +++ /dev/null @@ -1 +0,0 @@ -#include "standaside.h" diff --git a/keyboards/edinburgh41/edinburgh41.c b/keyboards/edinburgh41/edinburgh41.c deleted file mode 100644 index 28c07d51bb..0000000000 --- a/keyboards/edinburgh41/edinburgh41.c +++ /dev/null @@ -1,16 +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 . - */ -#include "edinburgh41.h" diff --git a/keyboards/efreet/efreet.c b/keyboards/efreet/efreet.c deleted file mode 100644 index 3c52e1cd1a..0000000000 --- a/keyboards/efreet/efreet.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Amber Holly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "efreet.h" diff --git a/keyboards/ekow/akira/akira.c b/keyboards/ekow/akira/akira.c deleted file mode 100644 index 420a05e04a..0000000000 --- a/keyboards/ekow/akira/akira.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 eugenepy - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "akira.h" diff --git a/keyboards/emajesty/eiri/eiri.c b/keyboards/emajesty/eiri/eiri.c deleted file mode 100644 index 161fc9a967..0000000000 --- a/keyboards/emajesty/eiri/eiri.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "eiri.h" diff --git a/keyboards/emi20/emi20.c b/keyboards/emi20/emi20.c deleted file mode 100644 index a5bcc89d49..0000000000 --- a/keyboards/emi20/emi20.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "emi20.h" diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c deleted file mode 100644 index 8001a3a11b..0000000000 --- a/keyboards/emptystring/nqg/nqg.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#include "nqg.h" diff --git a/keyboards/eniigmakeyboards/ek60/ek60.c b/keyboards/eniigmakeyboards/ek60/ek60.c deleted file mode 100644 index 2ce369ec82..0000000000 --- a/keyboards/eniigmakeyboards/ek60/ek60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 adamws - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ek60.h" - diff --git a/keyboards/eniigmakeyboards/ek65/ek65.c b/keyboards/eniigmakeyboards/ek65/ek65.c deleted file mode 100644 index 5fbb75dc82..0000000000 --- a/keyboards/eniigmakeyboards/ek65/ek65.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 adamws - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ek65.h" - diff --git a/keyboards/eniigmakeyboards/ek87/ek87.c b/keyboards/eniigmakeyboards/ek87/ek87.c deleted file mode 100644 index 0101d679d9..0000000000 --- a/keyboards/eniigmakeyboards/ek87/ek87.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 adamws - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ek87.h" diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c deleted file mode 100644 index fad78a7941..0000000000 --- a/keyboards/ep/40/40.c +++ /dev/null @@ -1,16 +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 . - */ -#include "40.h" diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c deleted file mode 100644 index 70b48aa411..0000000000 --- a/keyboards/ep/96/96.c +++ /dev/null @@ -1,16 +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 . - */ -#include "96.h" diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c deleted file mode 100644 index 16595739c0..0000000000 --- a/keyboards/ep/comsn/hs68/hs68.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hs68.h" diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c deleted file mode 100644 index 3657ac9642..0000000000 --- a/keyboards/ep/comsn/mollydooker/mollydooker.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mollydooker.h" diff --git a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c deleted file mode 100644 index ee8db1e523..0000000000 --- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c +++ /dev/null @@ -1,16 +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 . - */ -#include "tf_longeboye.h" diff --git a/keyboards/epoch80/epoch80.c b/keyboards/epoch80/epoch80.c deleted file mode 100644 index 43aa6ee8c9..0000000000 --- a/keyboards/epoch80/epoch80.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "epoch80.h" diff --git a/keyboards/ericrlau/numdiscipline/rev1/rev1.c b/keyboards/ericrlau/numdiscipline/rev1/rev1.c deleted file mode 100644 index 9f3a0ba4a4..0000000000 --- a/keyboards/ericrlau/numdiscipline/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Eric Lau - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/esca/getawayvan/getawayvan.c b/keyboards/esca/getawayvan/getawayvan.c deleted file mode 100644 index ecd2bcf487..0000000000 --- a/keyboards/esca/getawayvan/getawayvan.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "getawayvan.h" diff --git a/keyboards/esca/getawayvan_f042/getawayvan_f042.c b/keyboards/esca/getawayvan_f042/getawayvan_f042.c deleted file mode 100644 index 6ee36ae432..0000000000 --- a/keyboards/esca/getawayvan_f042/getawayvan_f042.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Enrique Cabrer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "getawayvan_f042.h" diff --git a/keyboards/eternal_keypad/eternal_keypad.c b/keyboards/eternal_keypad/eternal_keypad.c deleted file mode 100644 index abaa94a288..0000000000 --- a/keyboards/eternal_keypad/eternal_keypad.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "eternal_keypad.h" diff --git a/keyboards/eu_isolation/eu_isolation.c b/keyboards/eu_isolation/eu_isolation.c deleted file mode 100644 index 9794e34e5c..0000000000 --- a/keyboards/eu_isolation/eu_isolation.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Austin "TuckTuckFloof" Ashmore -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "eu_isolation.h" diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c deleted file mode 100644 index 814275e3f0..0000000000 --- a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c +++ /dev/null @@ -1,17 +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 . - * -*/ -#include "sleepingdinosaur.h" diff --git a/keyboards/evancookaudio/tenpad/tenpad.c b/keyboards/evancookaudio/tenpad/tenpad.c deleted file mode 100644 index abd852baf2..0000000000 --- a/keyboards/evancookaudio/tenpad/tenpad.c +++ /dev/null @@ -1,17 +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 . - * -*/ -#include "tenpad.h" diff --git a/keyboards/eve/meteor/meteor.c b/keyboards/eve/meteor/meteor.c deleted file mode 100644 index 6bdb117f3a..0000000000 --- a/keyboards/eve/meteor/meteor.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "meteor.h" diff --git a/keyboards/evil80/evil80.c b/keyboards/evil80/evil80.c deleted file mode 100644 index 471580fd80..0000000000 --- a/keyboards/evil80/evil80.c +++ /dev/null @@ -1 +0,0 @@ -#include "evil80.h" diff --git a/keyboards/evyd13/atom47/rev2/rev2.c b/keyboards/evyd13/atom47/rev2/rev2.c deleted file mode 100644 index adb21be368..0000000000 --- a/keyboards/evyd13/atom47/rev2/rev2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien 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 . -*/ - -#include "rev2.h" diff --git a/keyboards/evyd13/atom47/rev3/rev3.c b/keyboards/evyd13/atom47/rev3/rev3.c deleted file mode 100644 index 52fa91fbc4..0000000000 --- a/keyboards/evyd13/atom47/rev3/rev3.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien 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 . -*/ - -#include "rev3.h" diff --git a/keyboards/evyd13/atom47/rev4/rev4.c b/keyboards/evyd13/atom47/rev4/rev4.c deleted file mode 100644 index 0ac2a41acc..0000000000 --- a/keyboards/evyd13/atom47/rev4/rev4.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien 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 . -*/ - -#include "rev4.h" diff --git a/keyboards/evyd13/eon40/eon40.c b/keyboards/evyd13/eon40/eon40.c deleted file mode 100644 index 014fca9d40..0000000000 --- a/keyboards/evyd13/eon40/eon40.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "eon40.h" diff --git a/keyboards/evyd13/eon65/eon65.c b/keyboards/evyd13/eon65/eon65.c deleted file mode 100644 index cdbe987ebb..0000000000 --- a/keyboards/evyd13/eon65/eon65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "eon65.h" diff --git a/keyboards/evyd13/eon75/eon75.c b/keyboards/evyd13/eon75/eon75.c deleted file mode 100644 index 38620a6362..0000000000 --- a/keyboards/evyd13/eon75/eon75.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "eon75.h" diff --git a/keyboards/evyd13/eon87/eon87.c b/keyboards/evyd13/eon87/eon87.c deleted file mode 100644 index 83a005225d..0000000000 --- a/keyboards/evyd13/eon87/eon87.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "eon87.h" diff --git a/keyboards/evyd13/eon95/eon95.c b/keyboards/evyd13/eon95/eon95.c deleted file mode 100644 index 603d84a139..0000000000 --- a/keyboards/evyd13/eon95/eon95.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "eon95.h" diff --git a/keyboards/evyd13/gh80_1800/gh80_1800.c b/keyboards/evyd13/gh80_1800/gh80_1800.c deleted file mode 100644 index 1691b3949e..0000000000 --- a/keyboards/evyd13/gh80_1800/gh80_1800.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "gh80_1800.h" diff --git a/keyboards/evyd13/minitomic/minitomic.c b/keyboards/evyd13/minitomic/minitomic.c deleted file mode 100644 index 15f2829648..0000000000 --- a/keyboards/evyd13/minitomic/minitomic.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "minitomic.h" diff --git a/keyboards/evyd13/mx5160/mx5160.c b/keyboards/evyd13/mx5160/mx5160.c deleted file mode 100644 index 298c44fd49..0000000000 --- a/keyboards/evyd13/mx5160/mx5160.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "mx5160.h" diff --git a/keyboards/evyd13/nt660/nt660.c b/keyboards/evyd13/nt660/nt660.c deleted file mode 100644 index f89fa579c3..0000000000 --- a/keyboards/evyd13/nt660/nt660.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "nt660.h" diff --git a/keyboards/evyd13/nt750/nt750.c b/keyboards/evyd13/nt750/nt750.c deleted file mode 100644 index 6ae67cc368..0000000000 --- a/keyboards/evyd13/nt750/nt750.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "nt750.h" diff --git a/keyboards/evyd13/nt980/nt980.c b/keyboards/evyd13/nt980/nt980.c deleted file mode 100644 index e0113f1249..0000000000 --- a/keyboards/evyd13/nt980/nt980.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "nt980.h" diff --git a/keyboards/evyd13/omrontkl/omrontkl.c b/keyboards/evyd13/omrontkl/omrontkl.c deleted file mode 100644 index 26d0344d33..0000000000 --- a/keyboards/evyd13/omrontkl/omrontkl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "omrontkl.h" diff --git a/keyboards/evyd13/plain60/plain60.c b/keyboards/evyd13/plain60/plain60.c deleted file mode 100644 index d816064104..0000000000 --- a/keyboards/evyd13/plain60/plain60.c +++ /dev/null @@ -1 +0,0 @@ -#include "plain60.h" diff --git a/keyboards/evyd13/quackfire/quackfire.c b/keyboards/evyd13/quackfire/quackfire.c deleted file mode 100644 index 634d4187c6..0000000000 --- a/keyboards/evyd13/quackfire/quackfire.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "quackfire.h" diff --git a/keyboards/evyd13/solheim68/solheim68.c b/keyboards/evyd13/solheim68/solheim68.c deleted file mode 100644 index 27f90f4e87..0000000000 --- a/keyboards/evyd13/solheim68/solheim68.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "solheim68.h" diff --git a/keyboards/evyd13/ta65/ta65.c b/keyboards/evyd13/ta65/ta65.c deleted file mode 100644 index ca9aafb1b7..0000000000 --- a/keyboards/evyd13/ta65/ta65.c +++ /dev/null @@ -1 +0,0 @@ -#include "ta65.h" diff --git a/keyboards/evyd13/wasdat/wasdat.c b/keyboards/evyd13/wasdat/wasdat.c deleted file mode 100644 index 6aaa1b8427..0000000000 --- a/keyboards/evyd13/wasdat/wasdat.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "wasdat.h" diff --git a/keyboards/evyd13/wasdat_code/wasdat_code.c b/keyboards/evyd13/wasdat_code/wasdat_code.c deleted file mode 100644 index c1cdadea9e..0000000000 --- a/keyboards/evyd13/wasdat_code/wasdat_code.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "wasdat_code.h" diff --git a/keyboards/evyd13/wonderland/wonderland.c b/keyboards/evyd13/wonderland/wonderland.c deleted file mode 100644 index f2a53a17a4..0000000000 --- a/keyboards/evyd13/wonderland/wonderland.c +++ /dev/null @@ -1 +0,0 @@ -#include "wonderland.h" diff --git a/keyboards/exclusive/e65/e65.c b/keyboards/exclusive/e65/e65.c deleted file mode 100644 index feb0e65438..0000000000 --- a/keyboards/exclusive/e65/e65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Brice Figureau - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "e65.h" diff --git a/keyboards/exclusive/e6v2/le/le.c b/keyboards/exclusive/e6v2/le/le.c deleted file mode 100644 index dd973feec5..0000000000 --- a/keyboards/exclusive/e6v2/le/le.c +++ /dev/null @@ -1 +0,0 @@ -#include "le.h" diff --git a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c b/keyboards/exclusive/e6v2/le_bmc/le_bmc.c deleted file mode 100644 index e36cfd645d..0000000000 --- a/keyboards/exclusive/e6v2/le_bmc/le_bmc.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 amnesia0287 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "le_bmc.h" diff --git a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c deleted file mode 100644 index 10dd1a26ed..0000000000 --- a/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "oe_bmc.h" diff --git a/keyboards/exclusive/e7v1/e7v1.c b/keyboards/exclusive/e7v1/e7v1.c deleted file mode 100644 index 880121f4f0..0000000000 --- a/keyboards/exclusive/e7v1/e7v1.c +++ /dev/null @@ -1 +0,0 @@ -#include "e7v1.h" diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c deleted file mode 100644 index 69248f01d4..0000000000 --- a/keyboards/exclusive/e7v1se/e7v1se.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "e7v1se.h" diff --git a/keyboards/exent/exent.c b/keyboards/exent/exent.c deleted file mode 100644 index 82066f7e85..0000000000 --- a/keyboards/exent/exent.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "exent.h" diff --git a/keyboards/eyeohdesigns/babyv/babyv.c b/keyboards/eyeohdesigns/babyv/babyv.c deleted file mode 100644 index 5a01ea2c91..0000000000 --- a/keyboards/eyeohdesigns/babyv/babyv.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Eye Oh! 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 . - */ - -#include "babyv.h" diff --git a/keyboards/facew/facew.c b/keyboards/facew/facew.c deleted file mode 100644 index 373dbc6cd6..0000000000 --- a/keyboards/facew/facew.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "facew.h" diff --git a/keyboards/feels/feels65/feels65.c b/keyboards/feels/feels65/feels65.c deleted file mode 100644 index dc8b7664ab..0000000000 --- a/keyboards/feels/feels65/feels65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "feels65.h" diff --git a/keyboards/ferris/0_1/0_1.c b/keyboards/ferris/0_1/0_1.c deleted file mode 100644 index dbdb0b4bdc..0000000000 --- a/keyboards/ferris/0_1/0_1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "0_1.h" diff --git a/keyboards/ferris/0_2/0_2.c b/keyboards/ferris/0_2/0_2.c deleted file mode 100644 index 519961dd38..0000000000 --- a/keyboards/ferris/0_2/0_2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "0_2.h" diff --git a/keyboards/ffkeebs/siris/siris.c b/keyboards/ffkeebs/siris/siris.c deleted file mode 100644 index cfd505773a..0000000000 --- a/keyboards/ffkeebs/siris/siris.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "siris.h" diff --git a/keyboards/fjlabs/7vhotswap/7vhotswap.c b/keyboards/fjlabs/7vhotswap/7vhotswap.c deleted file mode 100644 index 60a9dffc43..0000000000 --- a/keyboards/fjlabs/7vhotswap/7vhotswap.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "7vhotswap.h" diff --git a/keyboards/fjlabs/ad65/ad65.c b/keyboards/fjlabs/ad65/ad65.c deleted file mode 100644 index 5714fa8b3c..0000000000 --- a/keyboards/fjlabs/ad65/ad65.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "ad65.h" diff --git a/keyboards/fjlabs/avalon/avalon.c b/keyboards/fjlabs/avalon/avalon.c deleted file mode 100644 index 9f6b63e4c8..0000000000 --- a/keyboards/fjlabs/avalon/avalon.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "avalon.h" diff --git a/keyboards/fjlabs/bks65/bks65.c b/keyboards/fjlabs/bks65/bks65.c deleted file mode 100644 index 4a8637462b..0000000000 --- a/keyboards/fjlabs/bks65/bks65.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "bks65.h" diff --git a/keyboards/fjlabs/bks65solder/bks65solder.c b/keyboards/fjlabs/bks65solder/bks65solder.c deleted file mode 100644 index 0ebf9000df..0000000000 --- a/keyboards/fjlabs/bks65solder/bks65solder.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "bks65solder.h" diff --git a/keyboards/fjlabs/kf87/kf87.c b/keyboards/fjlabs/kf87/kf87.c deleted file mode 100644 index 77ddbfe7d5..0000000000 --- a/keyboards/fjlabs/kf87/kf87.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "kf87.h" diff --git a/keyboards/fjlabs/kyuu/kyuu.c b/keyboards/fjlabs/kyuu/kyuu.c deleted file mode 100644 index 9de177c600..0000000000 --- a/keyboards/fjlabs/kyuu/kyuu.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "kyuu.h" diff --git a/keyboards/fjlabs/ldk65/ldk65.c b/keyboards/fjlabs/ldk65/ldk65.c deleted file mode 100644 index ed4e5bc681..0000000000 --- a/keyboards/fjlabs/ldk65/ldk65.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "ldk65.h" diff --git a/keyboards/fjlabs/midway60/midway60.c b/keyboards/fjlabs/midway60/midway60.c deleted file mode 100644 index 10d8088a29..0000000000 --- a/keyboards/fjlabs/midway60/midway60.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "midway60.h" diff --git a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c deleted file mode 100644 index 5bf82ad443..0000000000 --- a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.c +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "mk61rgbansi.h" diff --git a/keyboards/fjlabs/peaker/peaker.c b/keyboards/fjlabs/peaker/peaker.c deleted file mode 100644 index 2c8830a731..0000000000 --- a/keyboards/fjlabs/peaker/peaker.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "peaker.h" diff --git a/keyboards/fjlabs/polaris/polaris.c b/keyboards/fjlabs/polaris/polaris.c deleted file mode 100644 index ff9357769c..0000000000 --- a/keyboards/fjlabs/polaris/polaris.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "polaris.h" diff --git a/keyboards/fjlabs/ready100/ready100.c b/keyboards/fjlabs/ready100/ready100.c deleted file mode 100644 index 6791a75697..0000000000 --- a/keyboards/fjlabs/ready100/ready100.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "ready100.h" diff --git a/keyboards/fjlabs/sinanju/sinanju.c b/keyboards/fjlabs/sinanju/sinanju.c deleted file mode 100644 index 2c84310ea5..0000000000 --- a/keyboards/fjlabs/sinanju/sinanju.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "sinanju.h" diff --git a/keyboards/fjlabs/sinanjuwk/sinanjuwk.c b/keyboards/fjlabs/sinanjuwk/sinanjuwk.c deleted file mode 100644 index e6af5203ad..0000000000 --- a/keyboards/fjlabs/sinanjuwk/sinanjuwk.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "sinanjuwk.h" diff --git a/keyboards/fjlabs/solanis/solanis.c b/keyboards/fjlabs/solanis/solanis.c deleted file mode 100644 index 3104ff485e..0000000000 --- a/keyboards/fjlabs/solanis/solanis.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "solanis.h" diff --git a/keyboards/fjlabs/swordfish/swordfish.c b/keyboards/fjlabs/swordfish/swordfish.c deleted file mode 100644 index a8689fefe8..0000000000 --- a/keyboards/fjlabs/swordfish/swordfish.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "swordfish.h" diff --git a/keyboards/fjlabs/tf60ansi/tf60ansi.c b/keyboards/fjlabs/tf60ansi/tf60ansi.c deleted file mode 100644 index da31f8eaff..0000000000 --- a/keyboards/fjlabs/tf60ansi/tf60ansi.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "tf60ansi.h" diff --git a/keyboards/fjlabs/tf60v2/tf60v2.c b/keyboards/fjlabs/tf60v2/tf60v2.c deleted file mode 100644 index 7a73d63901..0000000000 --- a/keyboards/fjlabs/tf60v2/tf60v2.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "tf60v2.h" diff --git a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c b/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c deleted file mode 100644 index 637b6d05e8..0000000000 --- a/keyboards/fjlabs/tf65rgbv2/tf65rgbv2.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "tf65rgbv2.h" diff --git a/keyboards/flehrad/downbubble/downbubble.c b/keyboards/flehrad/downbubble/downbubble.c deleted file mode 100644 index 48be8e4998..0000000000 --- a/keyboards/flehrad/downbubble/downbubble.c +++ /dev/null @@ -1,16 +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 . - */ -#include "downbubble.h" diff --git a/keyboards/flehrad/numbrero/numbrero.c b/keyboards/flehrad/numbrero/numbrero.c deleted file mode 100644 index d3ec36904a..0000000000 --- a/keyboards/flehrad/numbrero/numbrero.c +++ /dev/null @@ -1 +0,0 @@ -#include "numbrero.h" diff --git a/keyboards/flehrad/snagpad/snagpad.c b/keyboards/flehrad/snagpad/snagpad.c deleted file mode 100644 index ce7e50b387..0000000000 --- a/keyboards/flehrad/snagpad/snagpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "snagpad.h" diff --git a/keyboards/flehrad/tradestation/tradestation.c b/keyboards/flehrad/tradestation/tradestation.c deleted file mode 100644 index bd572db83f..0000000000 --- a/keyboards/flehrad/tradestation/tradestation.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 flehrad - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "tradestation.h" diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c deleted file mode 100644 index babdb23c5d..0000000000 --- a/keyboards/fleuron/fleuron.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 James Underwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "fleuron.h" diff --git a/keyboards/fluorite/fluorite.c b/keyboards/fluorite/fluorite.c deleted file mode 100644 index 7c864fbe7f..0000000000 --- a/keyboards/fluorite/fluorite.c +++ /dev/null @@ -1,16 +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 . - */ -#include "fluorite.h" diff --git a/keyboards/flx/lodestone/lodestone.c b/keyboards/flx/lodestone/lodestone.c deleted file mode 100644 index bb0df70cc7..0000000000 --- a/keyboards/flx/lodestone/lodestone.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "lodestone.h" diff --git a/keyboards/flxlb/zplit/zplit.c b/keyboards/flxlb/zplit/zplit.c deleted file mode 100644 index 25956640a7..0000000000 --- a/keyboards/flxlb/zplit/zplit.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "zplit.h" diff --git a/keyboards/flygone60/rev3/rev3.c b/keyboards/flygone60/rev3/rev3.c deleted file mode 100644 index 0de52610ae..0000000000 --- a/keyboards/flygone60/rev3/rev3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 ShandonCodes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev3.h" diff --git a/keyboards/foostan/cornelius/cornelius.c b/keyboards/foostan/cornelius/cornelius.c deleted file mode 100644 index 6ff9555d37..0000000000 --- a/keyboards/foostan/cornelius/cornelius.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "cornelius.h" diff --git a/keyboards/foxlab/key65/hotswap/hotswap.c b/keyboards/foxlab/key65/hotswap/hotswap.c deleted file mode 100644 index 31fb011ad5..0000000000 --- a/keyboards/foxlab/key65/hotswap/hotswap.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hotswap.h" diff --git a/keyboards/foxlab/key65/universal/universal.c b/keyboards/foxlab/key65/universal/universal.c deleted file mode 100644 index 5fa9e8f171..0000000000 --- a/keyboards/foxlab/key65/universal/universal.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "universal.h" diff --git a/keyboards/foxlab/leaf60/hotswap/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c deleted file mode 100644 index e2de4a7e31..0000000000 --- a/keyboards/foxlab/leaf60/hotswap/hotswap.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Fox Lab - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c deleted file mode 100644 index 197e411d70..0000000000 --- a/keyboards/foxlab/leaf60/universal/universal.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Fox Lab - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "universal.h" diff --git a/keyboards/foxlab/time80/time80.c b/keyboards/foxlab/time80/time80.c deleted file mode 100644 index d2cf8cef2c..0000000000 --- a/keyboards/foxlab/time80/time80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Lukas Alexander - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "time80.h" diff --git a/keyboards/foxlab/time_re/hotswap/hotswap.c b/keyboards/foxlab/time_re/hotswap/hotswap.c deleted file mode 100644 index b3acfe7b4e..0000000000 --- a/keyboards/foxlab/time_re/hotswap/hotswap.c +++ /dev/null @@ -1,17 +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 . - */ -#include "hotswap.h" - diff --git a/keyboards/foxlab/time_re/universal/universal.c b/keyboards/foxlab/time_re/universal/universal.c deleted file mode 100644 index 286104854b..0000000000 --- a/keyboards/foxlab/time_re/universal/universal.c +++ /dev/null @@ -1,17 +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 . - */ -#include "universal.h" - diff --git a/keyboards/fr4/southpaw75/southpaw75.c b/keyboards/fr4/southpaw75/southpaw75.c deleted file mode 100644 index c9c6f2d366..0000000000 --- a/keyboards/fr4/southpaw75/southpaw75.c +++ /dev/null @@ -1,17 +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 . - */ -#include "southpaw75.h" diff --git a/keyboards/fr4/unix60/unix60.c b/keyboards/fr4/unix60/unix60.c deleted file mode 100644 index 80fd383316..0000000000 --- a/keyboards/fr4/unix60/unix60.c +++ /dev/null @@ -1,17 +0,0 @@ - /* - Copyright 2020 Lasse Küchenmeister - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "unix60.h" diff --git a/keyboards/fractal/fractal.c b/keyboards/fractal/fractal.c deleted file mode 100755 index e315c7ab4b..0000000000 --- a/keyboards/fractal/fractal.c +++ /dev/null @@ -1 +0,0 @@ -#include "fractal.h" diff --git a/keyboards/free_willy/free_willy.c b/keyboards/free_willy/free_willy.c deleted file mode 100644 index 71a912fdc5..0000000000 --- a/keyboards/free_willy/free_willy.c +++ /dev/null @@ -1,16 +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 . - */ -#include "free_willy.h" diff --git a/keyboards/friedrich/friedrich.c b/keyboards/friedrich/friedrich.c deleted file mode 100644 index 5c6995202d..0000000000 --- a/keyboards/friedrich/friedrich.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "friedrich.h" diff --git a/keyboards/frooastboard/nano/nano.c b/keyboards/frooastboard/nano/nano.c deleted file mode 100644 index 584176a4e9..0000000000 --- a/keyboards/frooastboard/nano/nano.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021-2022 frooastside - * - * This program is free software: you can 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 . - */ - -#include "nano.h" diff --git a/keyboards/ft/mars65/mars65.c b/keyboards/ft/mars65/mars65.c deleted file mode 100644 index d4fbf86d5a..0000000000 --- a/keyboards/ft/mars65/mars65.c +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2022 wonderbeel (https://github.com/wonderbeel) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "mars65.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ - diff --git a/keyboards/ft/mars80/mars80.c b/keyboards/ft/mars80/mars80.c deleted file mode 100644 index 5c95d04e35..0000000000 --- a/keyboards/ft/mars80/mars80.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mars80.h" diff --git a/keyboards/function96/v1/v1.c b/keyboards/function96/v1/v1.c deleted file mode 100644 index 03cade9261..0000000000 --- a/keyboards/function96/v1/v1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "v1.h" diff --git a/keyboards/function96/v2/v2.c b/keyboards/function96/v2/v2.c deleted file mode 100644 index 0e1ae134d8..0000000000 --- a/keyboards/function96/v2/v2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "v2.h" diff --git a/keyboards/funky40/funky40.c b/keyboards/funky40/funky40.c deleted file mode 100644 index 1ecc25143d..0000000000 --- a/keyboards/funky40/funky40.c +++ /dev/null @@ -1 +0,0 @@ -#include "funky40.h" diff --git a/keyboards/gami_studio/lex60/lex60.c b/keyboards/gami_studio/lex60/lex60.c deleted file mode 100644 index 939d6c5589..0000000000 --- a/keyboards/gami_studio/lex60/lex60.c +++ /dev/null @@ -1 +0,0 @@ -#include "lex60.h" diff --git a/keyboards/generic_panda/panda65_01/panda65_01.c b/keyboards/generic_panda/panda65_01/panda65_01.c deleted file mode 100644 index 15bf577426..0000000000 --- a/keyboards/generic_panda/panda65_01/panda65_01.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 generic_panda - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "panda65_01.h" diff --git a/keyboards/genone/eclipse_65/eclipse_65.c b/keyboards/genone/eclipse_65/eclipse_65.c deleted file mode 100644 index eab6d20d2e..0000000000 --- a/keyboards/genone/eclipse_65/eclipse_65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 GEN ONE 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 . - */ - - #include "eclipse_65.h" diff --git a/keyboards/genone/g1_65/g1_65.c b/keyboards/genone/g1_65/g1_65.c deleted file mode 100644 index af2da3de9a..0000000000 --- a/keyboards/genone/g1_65/g1_65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 GEN ONE 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 . - */ - -#include "g1_65.h" diff --git a/keyboards/geonworks/frogmini/fmh/fmh.c b/keyboards/geonworks/frogmini/fmh/fmh.c deleted file mode 100644 index f642a86f44..0000000000 --- a/keyboards/geonworks/frogmini/fmh/fmh.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "fmh.h" diff --git a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c b/keyboards/ggkeyboards/genesis/hotswap/hotswap.c deleted file mode 100644 index e27d117d9a..0000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" diff --git a/keyboards/ggkeyboards/genesis/solder/solder.c b/keyboards/ggkeyboards/genesis/solder/solder.c deleted file mode 100644 index 6474550515..0000000000 --- a/keyboards/ggkeyboards/genesis/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" diff --git a/keyboards/gh60/revc/revc.c b/keyboards/gh60/revc/revc.c deleted file mode 100644 index 47dd5410f0..0000000000 --- a/keyboards/gh60/revc/revc.c +++ /dev/null @@ -1 +0,0 @@ -#include "revc.h" diff --git a/keyboards/gh60/satan/satan.c b/keyboards/gh60/satan/satan.c deleted file mode 100644 index cd65084455..0000000000 --- a/keyboards/gh60/satan/satan.c +++ /dev/null @@ -1 +0,0 @@ -#include "satan.h" diff --git a/keyboards/gh60/v1p3/v1p3.c b/keyboards/gh60/v1p3/v1p3.c deleted file mode 100644 index bf41fb2174..0000000000 --- a/keyboards/gh60/v1p3/v1p3.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 noroadsleft - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v1p3.h" diff --git a/keyboards/gh80_3000/gh80_3000.c b/keyboards/gh80_3000/gh80_3000.c deleted file mode 100644 index 0aa785c22d..0000000000 --- a/keyboards/gh80_3000/gh80_3000.c +++ /dev/null @@ -1 +0,0 @@ -#include "gh80_3000.h" diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.c b/keyboards/gkeyboard/gkb_m16/gkb_m16.c deleted file mode 100644 index 5a1f7f13e3..0000000000 --- a/keyboards/gkeyboard/gkb_m16/gkb_m16.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 gkeyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "gkb_m16.h" diff --git a/keyboards/gl516/a52gl/a52gl.c b/keyboards/gl516/a52gl/a52gl.c deleted file mode 100644 index 67c27d2d7d..0000000000 --- a/keyboards/gl516/a52gl/a52gl.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "a52gl.h" diff --git a/keyboards/gl516/n51gl/n51gl.c b/keyboards/gl516/n51gl/n51gl.c deleted file mode 100644 index f13d0cd78e..0000000000 --- a/keyboards/gl516/n51gl/n51gl.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "n51gl.h" diff --git a/keyboards/gon/nerd60/nerd60.c b/keyboards/gon/nerd60/nerd60.c deleted file mode 100644 index 5022732b80..0000000000 --- a/keyboards/gon/nerd60/nerd60.c +++ /dev/null @@ -1 +0,0 @@ -#include "nerd60.h" diff --git a/keyboards/gon/nerdtkl/nerdtkl.c b/keyboards/gon/nerdtkl/nerdtkl.c deleted file mode 100644 index e221e9e78e..0000000000 --- a/keyboards/gon/nerdtkl/nerdtkl.c +++ /dev/null @@ -1 +0,0 @@ -#include "nerdtkl.h" diff --git a/keyboards/gowla/gowla.c b/keyboards/gowla/gowla.c deleted file mode 100644 index 13781bce3c..0000000000 --- a/keyboards/gowla/gowla.c +++ /dev/null @@ -1 +0,0 @@ -#include "gowla.h" diff --git a/keyboards/gray_studio/aero75/aero75.c b/keyboards/gray_studio/aero75/aero75.c deleted file mode 100644 index f026786c90..0000000000 --- a/keyboards/gray_studio/aero75/aero75.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 Yizhen Liu (@edwardslau) -// SPDX-License-Identifier: GPL-2.0 -#include "aero75.h" diff --git a/keyboards/gray_studio/apollo80/apollo80.c b/keyboards/gray_studio/apollo80/apollo80.c deleted file mode 100644 index 842a63f318..0000000000 --- a/keyboards/gray_studio/apollo80/apollo80.c +++ /dev/null @@ -1,18 +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 . - */ -#include "apollo80.h" - - diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c deleted file mode 100644 index 494e06da74..0000000000 --- a/keyboards/gray_studio/cod67/cod67.c +++ /dev/null @@ -1,16 +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 . - */ -#include "cod67.h" diff --git a/keyboards/gray_studio/hb85/hb85.c b/keyboards/gray_studio/hb85/hb85.c deleted file mode 100644 index 964234d6b4..0000000000 --- a/keyboards/gray_studio/hb85/hb85.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro , - 2019 fcoury - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "hb85.h" diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c deleted file mode 100644 index d27a1f38c3..0000000000 --- a/keyboards/gray_studio/space65/space65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "space65.h" diff --git a/keyboards/gray_studio/space65r3/space65r3.c b/keyboards/gray_studio/space65r3/space65r3.c deleted file mode 100644 index 8cc0c7ad3e..0000000000 --- a/keyboards/gray_studio/space65r3/space65r3.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 Yizhen Liu (@edwardslau) -// SPDX-License-Identifier: GPL-2.0 -#include "space65r3.h" diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.c b/keyboards/gray_studio/think65/hotswap/hotswap.c deleted file mode 100644 index 60808979c9..0000000000 --- a/keyboards/gray_studio/think65/hotswap/hotswap.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hotswap.h" diff --git a/keyboards/grid600/press/press.c b/keyboards/grid600/press/press.c deleted file mode 100644 index 33935deca4..0000000000 --- a/keyboards/grid600/press/press.c +++ /dev/null @@ -1,16 +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 . - */ -#include "press.h" \ No newline at end of file diff --git a/keyboards/gummykey/gummykey.c b/keyboards/gummykey/gummykey.c deleted file mode 100644 index 3669d08057..0000000000 --- a/keyboards/gummykey/gummykey.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Gummor (@gumorr) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "gummykey.h" diff --git a/keyboards/gvalchca/ga150/ga150.c b/keyboards/gvalchca/ga150/ga150.c deleted file mode 100644 index 3f098c4c53..0000000000 --- a/keyboards/gvalchca/ga150/ga150.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ga150.h" \ No newline at end of file diff --git a/keyboards/gvalchca/spaccboard/spaccboard.c b/keyboards/gvalchca/spaccboard/spaccboard.c deleted file mode 100644 index 57d512cc2b..0000000000 --- a/keyboards/gvalchca/spaccboard/spaccboard.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "spaccboard.h" \ No newline at end of file diff --git a/keyboards/h0oni/hotduck/hotduck.c b/keyboards/h0oni/hotduck/hotduck.c deleted file mode 100644 index a251fb8987..0000000000 --- a/keyboards/h0oni/hotduck/hotduck.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Md Mashur Shalehin, aka h0oni - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotduck.h" - diff --git a/keyboards/han60/han60.c b/keyboards/han60/han60.c deleted file mode 100644 index 4ba3a50e72..0000000000 --- a/keyboards/han60/han60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 farhandsome - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "han60.h" diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c b/keyboards/handwired/108key_trackpoint/108key_trackpoint.c deleted file mode 100644 index 3834f89613..0000000000 --- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c +++ /dev/null @@ -1 +0,0 @@ -#include "108key_trackpoint.h" diff --git a/keyboards/handwired/10k/10k.c b/keyboards/handwired/10k/10k.c deleted file mode 100644 index bd0babd956..0000000000 --- a/keyboards/handwired/10k/10k.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Nabos - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "10k.h" - diff --git a/keyboards/handwired/3dfoxc/3dfoxc.c b/keyboards/handwired/3dfoxc/3dfoxc.c deleted file mode 100644 index e83a32d295..0000000000 --- a/keyboards/handwired/3dfoxc/3dfoxc.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "3dfoxc.h" diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.c b/keyboards/handwired/3dortho14u/rev1/rev1.c deleted file mode 100644 index 220fd71cfe..0000000000 --- a/keyboards/handwired/3dortho14u/rev1/rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev1.h" diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.c b/keyboards/handwired/3dortho14u/rev2/rev2.c deleted file mode 100644 index 545fea9fad..0000000000 --- a/keyboards/handwired/3dortho14u/rev2/rev2.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev2.h" diff --git a/keyboards/handwired/3dp660/3dp660.c b/keyboards/handwired/3dp660/3dp660.c deleted file mode 100644 index 3f655d359f..0000000000 --- a/keyboards/handwired/3dp660/3dp660.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "3dp660.h" diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c deleted file mode 100644 index 4a8cc00694..0000000000 --- a/keyboards/handwired/412_64/412_64.c +++ /dev/null @@ -1 +0,0 @@ -#include "412_64.h" diff --git a/keyboards/handwired/6macro/6macro.c b/keyboards/handwired/6macro/6macro.c deleted file mode 100644 index 0a62bedf16..0000000000 --- a/keyboards/handwired/6macro/6macro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 joaofbmaia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "6macro.h" diff --git a/keyboards/handwired/acacia/acacia.c b/keyboards/handwired/acacia/acacia.c deleted file mode 100644 index 276b23552a..0000000000 --- a/keyboards/handwired/acacia/acacia.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "acacia.h" diff --git a/keyboards/handwired/aim65/aim65.c b/keyboards/handwired/aim65/aim65.c deleted file mode 100644 index 6f8ea6ecda..0000000000 --- a/keyboards/handwired/aim65/aim65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "aim65.h" diff --git a/keyboards/handwired/amigopunk/amigopunk.c b/keyboards/handwired/amigopunk/amigopunk.c deleted file mode 100644 index dbb70415ac..0000000000 --- a/keyboards/handwired/amigopunk/amigopunk.c +++ /dev/null @@ -1,17 +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. - */ - -#include "amigopunk.h" diff --git a/keyboards/handwired/aplx2/aplx2.c b/keyboards/handwired/aplx2/aplx2.c deleted file mode 100644 index e3dd174542..0000000000 --- a/keyboards/handwired/aplx2/aplx2.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 April 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 . -*/ - -#include "aplx2.h" - diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c deleted file mode 100644 index 62e36bdb46..0000000000 --- a/keyboards/handwired/aranck/aranck.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "aranck.h" diff --git a/keyboards/handwired/arrow_pad/arrow_pad.c b/keyboards/handwired/arrow_pad/arrow_pad.c deleted file mode 100644 index 381934aa88..0000000000 --- a/keyboards/handwired/arrow_pad/arrow_pad.c +++ /dev/null @@ -1 +0,0 @@ -#include "arrow_pad.h" \ No newline at end of file diff --git a/keyboards/handwired/axon/axon.c b/keyboards/handwired/axon/axon.c deleted file mode 100644 index e5d7122138..0000000000 --- a/keyboards/handwired/axon/axon.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Robin Liu - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "axon.h" diff --git a/keyboards/handwired/baredev/rev1/rev1.c b/keyboards/handwired/baredev/rev1/rev1.c deleted file mode 100644 index 809138c9b2..0000000000 --- a/keyboards/handwired/baredev/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Fernando "ManoShu" Rodrigues - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/handwired/bigmac/bigmac.c b/keyboards/handwired/bigmac/bigmac.c deleted file mode 100644 index ef2867377d..0000000000 --- a/keyboards/handwired/bigmac/bigmac.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bigmac.h" diff --git a/keyboards/handwired/bolek/bolek.c b/keyboards/handwired/bolek/bolek.c deleted file mode 100644 index 413f7166c6..0000000000 --- a/keyboards/handwired/bolek/bolek.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bolek.h" diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c deleted file mode 100644 index 18cfcfaa17..0000000000 --- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 boss566y - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "redragon_vara.h" diff --git a/keyboards/handwired/brain/brain.c b/keyboards/handwired/brain/brain.c deleted file mode 100644 index 2f792f04cf..0000000000 --- a/keyboards/handwired/brain/brain.c +++ /dev/null @@ -1 +0,0 @@ -#include "brain.h" diff --git a/keyboards/handwired/bstk100/bstk100.c b/keyboards/handwired/bstk100/bstk100.c deleted file mode 100644 index 004b97004b..0000000000 --- a/keyboards/handwired/bstk100/bstk100.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 FREE WING,Y.Sakamoto - * http://www.neko.ne.jp/~freewing/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bstk100.h" diff --git a/keyboards/handwired/cans12er/cans12er.c b/keyboards/handwired/cans12er/cans12er.c deleted file mode 100644 index e74b6a3026..0000000000 --- a/keyboards/handwired/cans12er/cans12er.c +++ /dev/null @@ -1 +0,0 @@ -#include "cans12er.h" diff --git a/keyboards/handwired/carpolly/carpolly.c b/keyboards/handwired/carpolly/carpolly.c deleted file mode 100644 index 119dfa962b..0000000000 --- a/keyboards/handwired/carpolly/carpolly.c +++ /dev/null @@ -1,20 +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 . - */ - -#include "carpolly.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/chiron/chiron.c b/keyboards/handwired/chiron/chiron.c deleted file mode 100644 index 997cda6a4d..0000000000 --- a/keyboards/handwired/chiron/chiron.c +++ /dev/null @@ -1,16 +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 . - */ -#include "chiron.h" diff --git a/keyboards/handwired/ck4x4/ck4x4.c b/keyboards/handwired/ck4x4/ck4x4.c deleted file mode 100644 index 3091ce9c01..0000000000 --- a/keyboards/handwired/ck4x4/ck4x4.c +++ /dev/null @@ -1 +0,0 @@ -#include "ck4x4.h" diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c deleted file mode 100644 index 20c359e5e9..0000000000 --- a/keyboards/handwired/cmd60/cmd60.c +++ /dev/null @@ -1 +0,0 @@ -#include "cmd60.h" diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c deleted file mode 100644 index 6c68c515f4..0000000000 --- a/keyboards/handwired/co60/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 John M Daly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/handwired/co60/rev6/rev6.c b/keyboards/handwired/co60/rev6/rev6.c deleted file mode 100644 index e2645871a0..0000000000 --- a/keyboards/handwired/co60/rev6/rev6.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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" - diff --git a/keyboards/handwired/co60/rev7/rev7.c b/keyboards/handwired/co60/rev7/rev7.c deleted file mode 100644 index 40fd7e6649..0000000000 --- a/keyboards/handwired/co60/rev7/rev7.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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" - diff --git a/keyboards/handwired/concertina/64key/64key.c b/keyboards/handwired/concertina/64key/64key.c deleted file mode 100644 index 31211b0a9a..0000000000 --- a/keyboards/handwired/concertina/64key/64key.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020-2021 Viktor Eikman - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "64key.h" diff --git a/keyboards/handwired/consolekeyboard/18key/18key.c b/keyboards/handwired/consolekeyboard/18key/18key.c deleted file mode 100644 index 911aaa642d..0000000000 --- a/keyboards/handwired/consolekeyboard/18key/18key.c +++ /dev/null @@ -1,16 +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 . - */ -#include "18key.h" diff --git a/keyboards/handwired/consolekeyboard/20key/20key.c b/keyboards/handwired/consolekeyboard/20key/20key.c deleted file mode 100644 index 409d1c16b5..0000000000 --- a/keyboards/handwired/consolekeyboard/20key/20key.c +++ /dev/null @@ -1,16 +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 . - */ -#include "20key.h" diff --git a/keyboards/handwired/consolekeyboard/27key/27key.c b/keyboards/handwired/consolekeyboard/27key/27key.c deleted file mode 100644 index 06f0bb9a62..0000000000 --- a/keyboards/handwired/consolekeyboard/27key/27key.c +++ /dev/null @@ -1,16 +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 . - */ -#include "27key.h" diff --git a/keyboards/handwired/consolekeyboard/30key/30key.c b/keyboards/handwired/consolekeyboard/30key/30key.c deleted file mode 100644 index 4500206dd3..0000000000 --- a/keyboards/handwired/consolekeyboard/30key/30key.c +++ /dev/null @@ -1,16 +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 . - */ -#include "30key.h" diff --git a/keyboards/handwired/croxsplit44/croxsplit44.c b/keyboards/handwired/croxsplit44/croxsplit44.c deleted file mode 100644 index 4dbc7d4cb5..0000000000 --- a/keyboards/handwired/croxsplit44/croxsplit44.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "croxsplit44.h" diff --git a/keyboards/handwired/curiosity/curiosity.c b/keyboards/handwired/curiosity/curiosity.c deleted file mode 100644 index e0a6e130e7..0000000000 --- a/keyboards/handwired/curiosity/curiosity.c +++ /dev/null @@ -1,16 +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 . - */ -#include "curiosity.h" \ No newline at end of file diff --git a/keyboards/handwired/cyberstar/cyberstar.c b/keyboards/handwired/cyberstar/cyberstar.c deleted file mode 100644 index 1ddabcab0f..0000000000 --- a/keyboards/handwired/cyberstar/cyberstar.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 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 . - */ -#include "cyberstar.h" diff --git a/keyboards/handwired/d48/d48.c b/keyboards/handwired/d48/d48.c deleted file mode 100644 index 3cc2097bf8..0000000000 --- a/keyboards/handwired/d48/d48.c +++ /dev/null @@ -1 +0,0 @@ -#include "d48.h" diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c deleted file mode 100644 index 51a31afbdb..0000000000 --- a/keyboards/handwired/dactyl_left/dactyl_left.c +++ /dev/null @@ -1,16 +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 . - */ -#include "dactyl_left.h" diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c deleted file mode 100644 index 3170eb9399..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x5.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c deleted file mode 100644 index 5e68c1a9fa..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c deleted file mode 100644 index a770f5ac40..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6_5.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c deleted file mode 100644 index 0e9d5481c4..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c deleted file mode 100644 index 0d1ffd84df..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Jan Christoph Ebersbach - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "5x6_2_5.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c deleted file mode 100644 index e4ad432ccc..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6_5.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c deleted file mode 100644 index dbfb96ce40..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 fgoodwin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "5x6_6.h" diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c deleted file mode 100644 index aae28e450c..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x7/5x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x7.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.c b/keyboards/handwired/dactyl_manuform/6x6/6x6.c deleted file mode 100644 index 7d3524a571..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "6x6.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c deleted file mode 100644 index ad213e2b75..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2012 Jun Wako -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x6_4.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c deleted file mode 100644 index a564360b48..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2012 Jun Wako -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x6_kinesis.h" diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.c b/keyboards/handwired/dactyl_manuform/6x7/6x7.c deleted file mode 100644 index eea518da09..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x7/6x7.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x7.h" diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c deleted file mode 100644 index 8d0d95e166..0000000000 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c +++ /dev/null @@ -1 +0,0 @@ -#include "62key.h" diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c deleted file mode 100644 index 23f4b13f44..0000000000 --- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c +++ /dev/null @@ -1 +0,0 @@ -#include "dactyl_promicro.h" diff --git a/keyboards/handwired/dactyl_rah/dactyl_rah.c b/keyboards/handwired/dactyl_rah/dactyl_rah.c deleted file mode 100644 index 0058d87992..0000000000 --- a/keyboards/handwired/dactyl_rah/dactyl_rah.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2020 Ralph Azucena - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dactyl_rah.h" diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c deleted file mode 100644 index 0442fc0dc5..0000000000 --- a/keyboards/handwired/daishi/daishi.c +++ /dev/null @@ -1 +0,0 @@ -#include "daishi.h" diff --git a/keyboards/handwired/ddg_56/ddg_56.c b/keyboards/handwired/ddg_56/ddg_56.c deleted file mode 100644 index 5d24bc74b5..0000000000 --- a/keyboards/handwired/ddg_56/ddg_56.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "ddg_56.h" \ No newline at end of file diff --git a/keyboards/handwired/eagleii/eagleii.c b/keyboards/handwired/eagleii/eagleii.c deleted file mode 100644 index 5abd5b92f9..0000000000 --- a/keyboards/handwired/eagleii/eagleii.c +++ /dev/null @@ -1 +0,0 @@ -#include "eagleii.h" diff --git a/keyboards/handwired/elrgo_s/elrgo_s.c b/keyboards/handwired/elrgo_s/elrgo_s.c deleted file mode 100644 index 32640da061..0000000000 --- a/keyboards/handwired/elrgo_s/elrgo_s.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Yaroslav Smirnov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "elrgo_s.h" diff --git a/keyboards/handwired/ergocheap/ergocheap.c b/keyboards/handwired/ergocheap/ergocheap.c deleted file mode 100644 index ab5cf8a0a7..0000000000 --- a/keyboards/handwired/ergocheap/ergocheap.c +++ /dev/null @@ -1,16 +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 . - */ -#include "ergocheap.h" \ No newline at end of file diff --git a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c deleted file mode 100644 index 3e38e5e2fd..0000000000 --- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "fc200rt_qmk.h" diff --git a/keyboards/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c deleted file mode 100644 index 2d71560bf6..0000000000 --- a/keyboards/handwired/fivethirteen/fivethirteen.c +++ /dev/null @@ -1 +0,0 @@ -#include "fivethirteen.h" diff --git a/keyboards/handwired/floorboard/floorboard.c b/keyboards/handwired/floorboard/floorboard.c deleted file mode 100644 index 6317f66acc..0000000000 --- a/keyboards/handwired/floorboard/floorboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Kevin Lockwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "floorboard.h" diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.c b/keyboards/handwired/frankie_macropad/frankie_macropad.c deleted file mode 100644 index 5f89811e7a..0000000000 --- a/keyboards/handwired/frankie_macropad/frankie_macropad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Eric Wood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "frankie_macropad.h" diff --git a/keyboards/handwired/freoduo/freoduo.c b/keyboards/handwired/freoduo/freoduo.c deleted file mode 100644 index f60e78f43a..0000000000 --- a/keyboards/handwired/freoduo/freoduo.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "freoduo.h" diff --git a/keyboards/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c deleted file mode 100644 index 0640382676..0000000000 --- a/keyboards/handwired/fruity60/fruity60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "fruity60.h" diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c deleted file mode 100644 index f6a394b731..0000000000 --- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hacked_motospeed.h" diff --git a/keyboards/handwired/heisenberg/heisenberg.c b/keyboards/handwired/heisenberg/heisenberg.c deleted file mode 100644 index 54c8bdae95..0000000000 --- a/keyboards/handwired/heisenberg/heisenberg.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "heisenberg.h" \ No newline at end of file diff --git a/keyboards/handwired/hexon38/hexon38.c b/keyboards/handwired/hexon38/hexon38.c deleted file mode 100644 index d830adef3c..0000000000 --- a/keyboards/handwired/hexon38/hexon38.c +++ /dev/null @@ -1,3 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#include "hexon38.h" diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c deleted file mode 100644 index 88c81b7d49..0000000000 --- a/keyboards/handwired/hnah40/hnah40.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hnah40.h" diff --git a/keyboards/handwired/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c deleted file mode 100644 index 9edc09c971..0000000000 --- a/keyboards/handwired/hwpm87/hwpm87.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "hwpm87.h" diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c deleted file mode 100644 index 7ee099d250..0000000000 --- a/keyboards/handwired/ibm122m/ibm122m.c +++ /dev/null @@ -1,16 +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 . - */ -#include "ibm122m.h" diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c deleted file mode 100644 index eb8e446905..0000000000 --- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c +++ /dev/null @@ -1,20 +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 . - */ - -#include "ibm_wheelwriter.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c deleted file mode 100644 index 415645f1b4..0000000000 --- a/keyboards/handwired/jn68m/jn68m.c +++ /dev/null @@ -1,16 +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 . - */ -#include "jn68m.h" diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c deleted file mode 100644 index da04e862e1..0000000000 --- a/keyboards/handwired/jot50/jot50.c +++ /dev/null @@ -1 +0,0 @@ -#include "jot50.h" diff --git a/keyboards/handwired/juliet/juliet.c b/keyboards/handwired/juliet/juliet.c deleted file mode 100644 index fd8a9bf868..0000000000 --- a/keyboards/handwired/juliet/juliet.c +++ /dev/null @@ -1,16 +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 . - */ -#include "juliet.h" diff --git a/keyboards/handwired/k8split/k8split.c b/keyboards/handwired/k8split/k8split.c deleted file mode 100644 index 300a075ae4..0000000000 --- a/keyboards/handwired/k8split/k8split.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "k8split.h" diff --git a/keyboards/handwired/k_numpad17/k_numpad17.c b/keyboards/handwired/k_numpad17/k_numpad17.c deleted file mode 100644 index 290a86aac5..0000000000 --- a/keyboards/handwired/k_numpad17/k_numpad17.c +++ /dev/null @@ -1 +0,0 @@ -#include "k_numpad17.h" \ No newline at end of file diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c deleted file mode 100644 index c229d267b1..0000000000 --- a/keyboards/handwired/kbod/kbod.c +++ /dev/null @@ -1 +0,0 @@ -#include "kbod.h" diff --git a/keyboards/handwired/ks63/ks63.c b/keyboards/handwired/ks63/ks63.c deleted file mode 100644 index bd48359a81..0000000000 --- a/keyboards/handwired/ks63/ks63.c +++ /dev/null @@ -1 +0,0 @@ -#include "ks63.h" diff --git a/keyboards/handwired/leftynumpad/leftynumpad.c b/keyboards/handwired/leftynumpad/leftynumpad.c deleted file mode 100644 index 195ec78289..0000000000 --- a/keyboards/handwired/leftynumpad/leftynumpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Tom Swartz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "leftynumpad.h" diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c deleted file mode 100644 index c0198a8eaf..0000000000 --- a/keyboards/handwired/lovelive9/lovelive9.c +++ /dev/null @@ -1 +0,0 @@ -#include "lovelive9.h" diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c deleted file mode 100644 index d99d41a49b..0000000000 --- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Tomek (@m40-dev) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "5x5_macropad.h" \ No newline at end of file diff --git a/keyboards/handwired/macroboard/macroboard.c b/keyboards/handwired/macroboard/macroboard.c deleted file mode 100644 index f9d41ff162..0000000000 --- a/keyboards/handwired/macroboard/macroboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Michał Szczepaniak - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "macroboard.h" diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c deleted file mode 100644 index 420bbb80f5..0000000000 --- a/keyboards/handwired/magicforce61/magicforce61.c +++ /dev/null @@ -1 +0,0 @@ -#include "magicforce61.h" diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c deleted file mode 100644 index 8d74f1438b..0000000000 --- a/keyboards/handwired/magicforce68/magicforce68.c +++ /dev/null @@ -1 +0,0 @@ -#include "magicforce68.h" diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c deleted file mode 100644 index c8f8781211..0000000000 --- a/keyboards/handwired/marauder/marauder.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "marauder.h" diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c deleted file mode 100644 index 662af8815e..0000000000 --- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mechboards_micropad.h" diff --git a/keyboards/handwired/meck_tkl/meck_tkl.c b/keyboards/handwired/meck_tkl/meck_tkl.c deleted file mode 100644 index 2668b440ec..0000000000 --- a/keyboards/handwired/meck_tkl/meck_tkl.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "meck_tkl.h" diff --git a/keyboards/handwired/minorca/minorca.c b/keyboards/handwired/minorca/minorca.c deleted file mode 100644 index dbae0b0f90..0000000000 --- a/keyboards/handwired/minorca/minorca.c +++ /dev/null @@ -1 +0,0 @@ -#include "minorca.h" diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c deleted file mode 100644 index ee9cc93b3a..0000000000 --- a/keyboards/handwired/misterdeck/misterdeck.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2021 Chris Broekema (broekema@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 . - */ - -#include "misterdeck.h" diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c deleted file mode 100644 index 53773e5d85..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c +++ /dev/null @@ -1 +0,0 @@ -#include "ms_sculpt_mobile.h" diff --git a/keyboards/handwired/mutepad/mutepad.c b/keyboards/handwired/mutepad/mutepad.c deleted file mode 100644 index 09210c3f4f..0000000000 --- a/keyboards/handwired/mutepad/mutepad.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 JoshwJB (@JoshwJB) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "mutepad.h" diff --git a/keyboards/handwired/nicekey/nicekey.c b/keyboards/handwired/nicekey/nicekey.c deleted file mode 100644 index 9720b0d0cb..0000000000 --- a/keyboards/handwired/nicekey/nicekey.c +++ /dev/null @@ -1 +0,0 @@ -#include "nicekey.h" diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.c b/keyboards/handwired/not_so_minidox/not_so_minidox.c deleted file mode 100644 index 898c9eaca8..0000000000 --- a/keyboards/handwired/not_so_minidox/not_so_minidox.c +++ /dev/null @@ -1 +0,0 @@ -#include "not_so_minidox.h" \ No newline at end of file diff --git a/keyboards/handwired/novem/novem.c b/keyboards/handwired/novem/novem.c deleted file mode 100644 index 967ec828f0..0000000000 --- a/keyboards/handwired/novem/novem.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Jose I. Martinez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "novem.h" - diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.c b/keyboards/handwired/nozbe_macro/nozbe_macro.c deleted file mode 100644 index b6d38fec83..0000000000 --- a/keyboards/handwired/nozbe_macro/nozbe_macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Marcin Leon Omelan (@rozPierog) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nozbe_macro.h" diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c deleted file mode 100644 index 50766b7857..0000000000 --- a/keyboards/handwired/numpad20/numpad20.c +++ /dev/null @@ -1 +0,0 @@ -#include "numpad20.h" diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.c b/keyboards/handwired/obuwunkunubi/spaget/spaget.c deleted file mode 100644 index aeb0dc5436..0000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/spaget.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 obuwunkunubi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "spaget.h" diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c deleted file mode 100644 index 14004599aa..0000000000 --- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Cian Johnston - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "oem_ansi_fullsize.h" diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c deleted file mode 100644 index 62690ef673..0000000000 --- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c +++ /dev/null @@ -1,20 +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 . - */ - -#include "oem_iso_fullsize.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c deleted file mode 100644 index 525e1ba112..0000000000 --- a/keyboards/handwired/ortho5x13/ortho5x13.c +++ /dev/null @@ -1 +0,0 @@ -#include "ortho5x13.h" diff --git a/keyboards/handwired/ortho5x14/ortho5x14.c b/keyboards/handwired/ortho5x14/ortho5x14.c deleted file mode 100644 index 0379ab75bd..0000000000 --- a/keyboards/handwired/ortho5x14/ortho5x14.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "ortho5x14.h" - diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c deleted file mode 100644 index 079beb8e40..0000000000 --- a/keyboards/handwired/owlet60/owlet60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 worthlessowl - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "owlet60.h" diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c deleted file mode 100644 index 03db58bb2c..0000000000 --- a/keyboards/handwired/pilcrow/pilcrow.c +++ /dev/null @@ -1 +0,0 @@ -#include "pilcrow.h" diff --git a/keyboards/handwired/pill60/pill60.c b/keyboards/handwired/pill60/pill60.c deleted file mode 100644 index 928685a92c..0000000000 --- a/keyboards/handwired/pill60/pill60.c +++ /dev/null @@ -1,16 +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 . - */ -#include "pill60.h" \ No newline at end of file diff --git a/keyboards/handwired/postageboard/mini/mini.c b/keyboards/handwired/postageboard/mini/mini.c deleted file mode 100644 index 381ad975f0..0000000000 --- a/keyboards/handwired/postageboard/mini/mini.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mini.h" - diff --git a/keyboards/handwired/postageboard/mini/mini.h b/keyboards/handwired/postageboard/mini/mini.h deleted file mode 100644 index 28ee58ef13..0000000000 --- a/keyboards/handwired/postageboard/mini/mini.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/postageboard/postageboard.c b/keyboards/handwired/postageboard/postageboard.c deleted file mode 100644 index 005ce313df..0000000000 --- a/keyboards/handwired/postageboard/postageboard.c +++ /dev/null @@ -1 +0,0 @@ -#include "postageboard.h" diff --git a/keyboards/handwired/postageboard/r1/r1.c b/keyboards/handwired/postageboard/r1/r1.c deleted file mode 100644 index e87edc145b..0000000000 --- a/keyboards/handwired/postageboard/r1/r1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "r1.h" - diff --git a/keyboards/handwired/postageboard/r1/r1.h b/keyboards/handwired/postageboard/r1/r1.h deleted file mode 100644 index 28ee58ef13..0000000000 --- a/keyboards/handwired/postageboard/r1/r1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c deleted file mode 100644 index e85991c537..0000000000 --- a/keyboards/handwired/prime_exl/prime_exl.c +++ /dev/null @@ -1,16 +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 . - */ -#include "prime_exl.h" diff --git a/keyboards/handwired/prkl30/prkl30.c b/keyboards/handwired/prkl30/prkl30.c deleted file mode 100644 index efec8a3aaa..0000000000 --- a/keyboards/handwired/prkl30/prkl30.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 ErkHal - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "prkl30.h" diff --git a/keyboards/handwired/pteron/pteron.c b/keyboards/handwired/pteron/pteron.c deleted file mode 100644 index 972b45aa20..0000000000 --- a/keyboards/handwired/pteron/pteron.c +++ /dev/null @@ -1 +0,0 @@ -#include "pteron.h" diff --git a/keyboards/handwired/pteron38/pteron38.c b/keyboards/handwired/pteron38/pteron38.c deleted file mode 100644 index 62d09ffa55..0000000000 --- a/keyboards/handwired/pteron38/pteron38.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "pteron38.h" diff --git a/keyboards/handwired/pteron44/pteron44.c b/keyboards/handwired/pteron44/pteron44.c deleted file mode 100644 index e6c2ad50b6..0000000000 --- a/keyboards/handwired/pteron44/pteron44.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "pteron44.h" diff --git a/keyboards/handwired/reclined/reclined.c b/keyboards/handwired/reclined/reclined.c deleted file mode 100644 index ca6da9de6d..0000000000 --- a/keyboards/handwired/reclined/reclined.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Daniel Perrett - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "reclined.h" \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/riblee_f401.c b/keyboards/handwired/riblee_f401/riblee_f401.c deleted file mode 100644 index 65155b373c..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Daniel Reibl - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "riblee_f401.h" \ No newline at end of file diff --git a/keyboards/handwired/riblee_f411/riblee_f411.c b/keyboards/handwired/riblee_f411/riblee_f411.c deleted file mode 100644 index 20d3735e88..0000000000 --- a/keyboards/handwired/riblee_f411/riblee_f411.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Janos Daniel Reibl @riblee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "riblee_f411.h" \ No newline at end of file diff --git a/keyboards/handwired/rs60/rs60.c b/keyboards/handwired/rs60/rs60.c deleted file mode 100644 index f748740cbe..0000000000 --- a/keyboards/handwired/rs60/rs60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 QMK Community - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "rs60.h" diff --git a/keyboards/handwired/sick68/sick68.c b/keyboards/handwired/sick68/sick68.c deleted file mode 100644 index c1f37824ca..0000000000 --- a/keyboards/handwired/sick68/sick68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 umbynos - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "sick68.h" diff --git a/keyboards/handwired/sick_pad/sick_pad.c b/keyboards/handwired/sick_pad/sick_pad.c deleted file mode 100644 index 3464545fef..0000000000 --- a/keyboards/handwired/sick_pad/sick_pad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "sick_pad.h" diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c deleted file mode 100644 index 4105eea751..0000000000 --- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Marko Skakun -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "skakunm_dactyl.h" \ No newline at end of file diff --git a/keyboards/handwired/slash/slash.c b/keyboards/handwired/slash/slash.c deleted file mode 100644 index 59902b5074..0000000000 --- a/keyboards/handwired/slash/slash.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 4sdftemp - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "slash.h" diff --git a/keyboards/handwired/space_oddity/space_oddity.c b/keyboards/handwired/space_oddity/space_oddity.c deleted file mode 100644 index 9a9a270a43..0000000000 --- a/keyboards/handwired/space_oddity/space_oddity.c +++ /dev/null @@ -1 +0,0 @@ -#include "space_oddity.h" diff --git a/keyboards/handwired/splittest/splittest.c b/keyboards/handwired/splittest/splittest.c deleted file mode 100644 index 3c919a565d..0000000000 --- a/keyboards/handwired/splittest/splittest.c +++ /dev/null @@ -1 +0,0 @@ -#include "splittest.h" diff --git a/keyboards/handwired/steamvan/rev1/rev1.c b/keyboards/handwired/steamvan/rev1/rev1.c deleted file mode 100644 index 53f9a400f4..0000000000 --- a/keyboards/handwired/steamvan/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" - diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c deleted file mode 100644 index 50c3a4a4b7..0000000000 --- a/keyboards/handwired/sticc14/sticc14.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 ErkHal - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "sticc14.h" diff --git a/keyboards/handwired/swiftrax/astro65/astro65.c b/keyboards/handwired/swiftrax/astro65/astro65.c deleted file mode 100644 index 57586550bb..0000000000 --- a/keyboards/handwired/swiftrax/astro65/astro65.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "astro65.h" diff --git a/keyboards/handwired/swiftrax/bebol/bebol.c b/keyboards/handwired/swiftrax/bebol/bebol.c deleted file mode 100644 index 9894f84cb7..0000000000 --- a/keyboards/handwired/swiftrax/bebol/bebol.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "bebol.h" diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.c b/keyboards/handwired/swiftrax/beegboy/beegboy.c deleted file mode 100644 index 6923d50283..0000000000 --- a/keyboards/handwired/swiftrax/beegboy/beegboy.c +++ /dev/null @@ -1,16 +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 . - */ -#include "beegboy.h" diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.c b/keyboards/handwired/swiftrax/cowfish/cowfish.c deleted file mode 100644 index 7debc62782..0000000000 --- a/keyboards/handwired/swiftrax/cowfish/cowfish.c +++ /dev/null @@ -1 +0,0 @@ -#include "cowfish.h" diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c b/keyboards/handwired/swiftrax/digicarpice/digicarpice.c deleted file mode 100644 index c40a20a1f0..0000000000 --- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 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 . -*/ -#include "digicarpice.h" diff --git a/keyboards/handwired/swiftrax/equator/equator.c b/keyboards/handwired/swiftrax/equator/equator.c deleted file mode 100644 index b2981689b9..0000000000 --- a/keyboards/handwired/swiftrax/equator/equator.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "equator.h" diff --git a/keyboards/handwired/swiftrax/glacier/glacier.c b/keyboards/handwired/swiftrax/glacier/glacier.c deleted file mode 100644 index a30c69ba87..0000000000 --- a/keyboards/handwired/swiftrax/glacier/glacier.c +++ /dev/null @@ -1,18 +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 . -*/ -#include "glacier.h" - diff --git a/keyboards/handwired/swiftrax/joypad/joypad.c b/keyboards/handwired/swiftrax/joypad/joypad.c deleted file mode 100644 index 60ef822462..0000000000 --- a/keyboards/handwired/swiftrax/joypad/joypad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "joypad.h" \ No newline at end of file diff --git a/keyboards/handwired/swiftrax/koalafications/koalafications.c b/keyboards/handwired/swiftrax/koalafications/koalafications.c deleted file mode 100644 index 51a1fdf866..0000000000 --- a/keyboards/handwired/swiftrax/koalafications/koalafications.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "koalafications.h" diff --git a/keyboards/handwired/swiftrax/nodu/nodu.c b/keyboards/handwired/swiftrax/nodu/nodu.c deleted file mode 100644 index d56df1ead9..0000000000 --- a/keyboards/handwired/swiftrax/nodu/nodu.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "nodu.h" diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.c b/keyboards/handwired/swiftrax/pandamic/pandamic.c deleted file mode 100644 index c718a33734..0000000000 --- a/keyboards/handwired/swiftrax/pandamic/pandamic.c +++ /dev/null @@ -1,16 +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 . - */ -#include "pandamic.h" diff --git a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c b/keyboards/handwired/swiftrax/the_galleon/the_galleon.c deleted file mode 100644 index c7545cea83..0000000000 --- a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c +++ /dev/null @@ -1,16 +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 . - */ -#include "the_galleon.h" diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.c b/keyboards/handwired/swiftrax/unsplit/unsplit.c deleted file mode 100644 index 41d548c098..0000000000 --- a/keyboards/handwired/swiftrax/unsplit/unsplit.c +++ /dev/null @@ -1 +0,0 @@ -#include "unsplit.h" diff --git a/keyboards/handwired/swiftrax/walter/walter.c b/keyboards/handwired/swiftrax/walter/walter.c deleted file mode 100644 index 43d328fa11..0000000000 --- a/keyboards/handwired/swiftrax/walter/walter.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "walter.h" diff --git a/keyboards/handwired/symmetry60/symmetry60.c b/keyboards/handwired/symmetry60/symmetry60.c deleted file mode 100644 index 70828297c7..0000000000 --- a/keyboards/handwired/symmetry60/symmetry60.c +++ /dev/null @@ -1,16 +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 . - */ -#include "symmetry60.h" diff --git a/keyboards/handwired/t111/t111.c b/keyboards/handwired/t111/t111.c deleted file mode 100644 index f61e34240e..0000000000 --- a/keyboards/handwired/t111/t111.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "t111.h" diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c deleted file mode 100644 index 295fa4c5a7..0000000000 --- a/keyboards/handwired/terminus_mini/terminus_mini.c +++ /dev/null @@ -1,16 +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 . - */ -#include "terminus_mini.h" diff --git a/keyboards/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c deleted file mode 100644 index e1b144241c..0000000000 --- a/keyboards/handwired/trackpoint/trackpoint.c +++ /dev/null @@ -1 +0,0 @@ -#include "trackpoint.h" diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.c b/keyboards/handwired/tritium_numpad/tritium_numpad.c deleted file mode 100644 index c9f86eda7e..0000000000 --- a/keyboards/handwired/tritium_numpad/tritium_numpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "tritium_numpad.h" diff --git a/keyboards/handwired/twadlee/tp69/tp69.c b/keyboards/handwired/twadlee/tp69/tp69.c deleted file mode 100644 index f4454c3bda..0000000000 --- a/keyboards/handwired/twadlee/tp69/tp69.c +++ /dev/null @@ -1,18 +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 . - * - */ - -#include "tp69.h" diff --git a/keyboards/handwired/twig/twig50/twig50.c b/keyboards/handwired/twig/twig50/twig50.c deleted file mode 100644 index 7c4c8572f8..0000000000 --- a/keyboards/handwired/twig/twig50/twig50.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Takeshi Noda (nodatk@gmail.com) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "twig50.h" diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c deleted file mode 100644 index e8249df251..0000000000 --- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c +++ /dev/null @@ -1,16 +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 . - */ -#include "unicomp_mini_m.h" diff --git a/keyboards/handwired/unk/rev1/rev1.c b/keyboards/handwired/unk/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/handwired/unk/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h index 3d20e3e9fc..7f3992eebc 100644 --- a/keyboards/handwired/unk/rev1/rev1.h +++ b/keyboards/handwired/unk/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "unk.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/handwired/unk/unk.c b/keyboards/handwired/unk/unk.c deleted file mode 100644 index 5764d560b6..0000000000 --- a/keyboards/handwired/unk/unk.c +++ /dev/null @@ -1 +0,0 @@ -#include "unk.h" diff --git a/keyboards/handwired/unk/unk.h b/keyboards/handwired/unk/unk.h deleted file mode 100644 index baad77573c..0000000000 --- a/keyboards/handwired/unk/unk.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "quantum.h" -#include "rev1.h" diff --git a/keyboards/handwired/videowriter/videowriter.c b/keyboards/handwired/videowriter/videowriter.c deleted file mode 100644 index 5f0f3d7122..0000000000 --- a/keyboards/handwired/videowriter/videowriter.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "videowriter.h" diff --git a/keyboards/handwired/wabi/wabi.c b/keyboards/handwired/wabi/wabi.c deleted file mode 100644 index a0d0ccbf7b..0000000000 --- a/keyboards/handwired/wabi/wabi.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "wabi.h" diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c deleted file mode 100644 index 72024175d2..0000000000 --- a/keyboards/handwired/wulkan/wulkan.c +++ /dev/null @@ -1 +0,0 @@ -#include "wulkan.h" diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c deleted file mode 100644 index ad9f298c19..0000000000 --- a/keyboards/handwired/xealous/rev1/rev1.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "quantum.h" -#include "rev1.h" diff --git a/keyboards/handwired/zergo/zergo.c b/keyboards/handwired/zergo/zergo.c deleted file mode 100644 index 8b283d126c..0000000000 --- a/keyboards/handwired/zergo/zergo.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "zergo.h" diff --git a/keyboards/hardlineworks/otd_plus/otd_plus.c b/keyboards/hardlineworks/otd_plus/otd_plus.c deleted file mode 100644 index 29d395d287..0000000000 --- a/keyboards/hardlineworks/otd_plus/otd_plus.c +++ /dev/null @@ -1 +0,0 @@ -#include "otd_plus.h" diff --git a/keyboards/hhkb/ansi/ansi.c b/keyboards/hhkb/ansi/ansi.c deleted file mode 100644 index cefc4e0690..0000000000 --- a/keyboards/hhkb/ansi/ansi.c +++ /dev/null @@ -1 +0,0 @@ -#include "ansi.h" \ No newline at end of file diff --git a/keyboards/hhkb/jp/jp.c b/keyboards/hhkb/jp/jp.c deleted file mode 100644 index f1f1388c77..0000000000 --- a/keyboards/hhkb/jp/jp.c +++ /dev/null @@ -1 +0,0 @@ -#include "jp.h" \ No newline at end of file diff --git a/keyboards/hhkb_lite_2/hhkb_lite_2.c b/keyboards/hhkb_lite_2/hhkb_lite_2.c deleted file mode 100644 index d0eaf250d6..0000000000 --- a/keyboards/hhkb_lite_2/hhkb_lite_2.c +++ /dev/null @@ -1 +0,0 @@ -#include "hhkb_lite_2.h" diff --git a/keyboards/hidtech/bastyl/bastyl.c b/keyboards/hidtech/bastyl/bastyl.c deleted file mode 100644 index 637af1ffed..0000000000 --- a/keyboards/hidtech/bastyl/bastyl.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "bastyl.h" diff --git a/keyboards/hillside/48/0_1/0_1.c b/keyboards/hillside/48/0_1/0_1.c deleted file mode 100644 index 34659eb424..0000000000 --- a/keyboards/hillside/48/0_1/0_1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Michael McCoyd (@mmccoyd) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "0_1.h" diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.c b/keyboards/hineybush/h08_ocelot/h08_ocelot.c deleted file mode 100644 index e00bd9ecb5..0000000000 --- a/keyboards/hineybush/h08_ocelot/h08_ocelot.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "h08_ocelot.h" diff --git a/keyboards/hineybush/h65/h65.c b/keyboards/hineybush/h65/h65.c deleted file mode 100644 index 76467ef91b..0000000000 --- a/keyboards/hineybush/h65/h65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "h65.h" diff --git a/keyboards/hineybush/h65_hotswap/h65_hotswap.c b/keyboards/hineybush/h65_hotswap/h65_hotswap.c deleted file mode 100644 index df5e56bf0b..0000000000 --- a/keyboards/hineybush/h65_hotswap/h65_hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "h65_hotswap.h" diff --git a/keyboards/hineybush/hineyg80/hineyg80.c b/keyboards/hineybush/hineyg80/hineyg80.c deleted file mode 100644 index a56e46e9de..0000000000 --- a/keyboards/hineybush/hineyg80/hineyg80.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Josh Hinnebusch - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hineyg80.h" diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c deleted file mode 100644 index 54fd8ab0a3..0000000000 --- a/keyboards/hineybush/sm68/sm68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "sm68.h" diff --git a/keyboards/hnahkb/freyr/freyr.c b/keyboards/hnahkb/freyr/freyr.c deleted file mode 100644 index a856521e7f..0000000000 --- a/keyboards/hnahkb/freyr/freyr.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "freyr.h" diff --git a/keyboards/hnahkb/stella/stella.c b/keyboards/hnahkb/stella/stella.c deleted file mode 100644 index 5eb55b3668..0000000000 --- a/keyboards/hnahkb/stella/stella.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "stella.h" diff --git a/keyboards/hnahkb/vn66/vn66.c b/keyboards/hnahkb/vn66/vn66.c deleted file mode 100644 index 5631359040..0000000000 --- a/keyboards/hnahkb/vn66/vn66.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "vn66.h" diff --git a/keyboards/holyswitch/southpaw75/southpaw75.c b/keyboards/holyswitch/southpaw75/southpaw75.c deleted file mode 100644 index 9024602277..0000000000 --- a/keyboards/holyswitch/southpaw75/southpaw75.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "southpaw75.h" diff --git a/keyboards/horizon/horizon.c b/keyboards/horizon/horizon.c deleted file mode 100644 index 08360325ec..0000000000 --- a/keyboards/horizon/horizon.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "horizon.h" diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c b/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c deleted file mode 100644 index 968d0da903..0000000000 --- a/keyboards/horrortroll/chinese_pcb/black_e65/black_e65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "black_e65.h" diff --git a/keyboards/horrortroll/paws60/paws60.c b/keyboards/horrortroll/paws60/paws60.c deleted file mode 100644 index 8734d75070..0000000000 --- a/keyboards/horrortroll/paws60/paws60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "paws60.h" diff --git a/keyboards/hp69/hp69.c b/keyboards/hp69/hp69.c deleted file mode 100644 index d9a78e3d83..0000000000 --- a/keyboards/hp69/hp69.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hp69.h" diff --git a/keyboards/hub16/hub16.c b/keyboards/hub16/hub16.c deleted file mode 100755 index e18ba55269..0000000000 --- a/keyboards/hub16/hub16.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Josh Johnson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hub16.h" \ No newline at end of file diff --git a/keyboards/huytbt/h50/h50.c b/keyboards/huytbt/h50/h50.c deleted file mode 100644 index bb80f14583..0000000000 --- a/keyboards/huytbt/h50/h50.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "h50.h" diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c deleted file mode 100644 index cb5ec3dc12..0000000000 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Purdea Andrei - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "overnumpad_1xb.h" - -void keyboard_post_init_kb(void) -{ - //debug_enable=true; - //debug_matrix=true; -} - diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c deleted file mode 100644 index 39f17e4a7d..0000000000 --- a/keyboards/ibnuda/alicia_cook/alicia_cook.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "alicia_cook.h" diff --git a/keyboards/ibnuda/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c deleted file mode 100644 index bdca0269c2..0000000000 --- a/keyboards/ibnuda/gurindam/gurindam.c +++ /dev/null @@ -1,16 +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 . - */ -#include "gurindam.h" diff --git a/keyboards/idobao/id75/v1/v1.c b/keyboards/idobao/id75/v1/v1.c deleted file mode 100644 index 992a292616..0000000000 --- a/keyboards/idobao/id75/v1/v1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "v1.h" diff --git a/keyboards/idobao/id87/v1/v1.c b/keyboards/idobao/id87/v1/v1.c deleted file mode 100644 index 59dc3daab4..0000000000 --- a/keyboards/idobao/id87/v1/v1.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2020 Tybera -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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.h" diff --git a/keyboards/idobao/id96/id96.c b/keyboards/idobao/id96/id96.c deleted file mode 100644 index 1bb863f1ff..0000000000 --- a/keyboards/idobao/id96/id96.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "id96.h" diff --git a/keyboards/idobao/montex/v1/v1.c b/keyboards/idobao/montex/v1/v1.c deleted file mode 100644 index e927383097..0000000000 --- a/keyboards/idobao/montex/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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/>. -*/ - -#include "v1.h" diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c deleted file mode 100644 index 770a47f0ed..0000000000 --- a/keyboards/illuminati/is0/is0.c +++ /dev/null @@ -1,16 +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 . - */ -#include "is0.h" diff --git a/keyboards/illusion/rosa/rosa.c b/keyboards/illusion/rosa/rosa.c deleted file mode 100644 index 54619e1ce7..0000000000 --- a/keyboards/illusion/rosa/rosa.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Brandon Lee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "rosa.h" diff --git a/keyboards/ilumkb/primus75/primus75.c b/keyboards/ilumkb/primus75/primus75.c deleted file mode 100644 index 49d76a0a88..0000000000 --- a/keyboards/ilumkb/primus75/primus75.c +++ /dev/null @@ -1,16 +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 . - */ -#include "primus75.h" diff --git a/keyboards/ingrained/ingrained.c b/keyboards/ingrained/ingrained.c deleted file mode 100644 index 80aa82f840..0000000000 --- a/keyboards/ingrained/ingrained.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 s8erdude (@jpuerto96) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "ingrained.h" diff --git a/keyboards/input_club/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c deleted file mode 100644 index 73751140ea..0000000000 --- a/keyboards/input_club/infinity60/infinity60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2012,2013 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 . -*/ - -#include "infinity60.h" diff --git a/keyboards/irene/irene.c b/keyboards/irene/irene.c deleted file mode 100644 index f0f4751c52..0000000000 --- a/keyboards/irene/irene.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "irene.h" diff --git a/keyboards/iriskeyboards/iriskeyboards.c b/keyboards/iriskeyboards/iriskeyboards.c deleted file mode 100644 index bee4488664..0000000000 --- a/keyboards/iriskeyboards/iriskeyboards.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 SonOfAres - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "iriskeyboards.h" diff --git a/keyboards/j80/j80.c b/keyboards/j80/j80.c deleted file mode 100644 index fd49e913e0..0000000000 --- a/keyboards/j80/j80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 JER - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "j80.h" diff --git a/keyboards/jacky_studio/s7_elephant/rev1/rev1.c b/keyboards/jacky_studio/s7_elephant/rev1/rev1.c deleted file mode 100644 index 0477a9ef5f..0000000000 --- a/keyboards/jacky_studio/s7_elephant/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/jacky_studio/s7_elephant/rev2/rev2.c b/keyboards/jacky_studio/s7_elephant/rev2/rev2.c deleted file mode 100644 index 1cc3fd53f0..0000000000 --- a/keyboards/jacky_studio/s7_elephant/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/jadookb/jkb2/jkb2.c b/keyboards/jadookb/jkb2/jkb2.c deleted file mode 100644 index 3ac90e97eb..0000000000 --- a/keyboards/jadookb/jkb2/jkb2.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 Wizard-GG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "jkb2.h" diff --git a/keyboards/jc65/v32a/v32a.c b/keyboards/jc65/v32a/v32a.c deleted file mode 100644 index aa7233ba2a..0000000000 --- a/keyboards/jc65/v32a/v32a.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "v32a.h" diff --git a/keyboards/jc65/v32u4/v32u4.c b/keyboards/jc65/v32u4/v32u4.c deleted file mode 100644 index a6837268e1..0000000000 --- a/keyboards/jc65/v32u4/v32u4.c +++ /dev/null @@ -1 +0,0 @@ -#include "v32u4.h" diff --git a/keyboards/jd40/jd40.c b/keyboards/jd40/jd40.c deleted file mode 100644 index 1b68ddd4f3..0000000000 --- a/keyboards/jd40/jd40.c +++ /dev/null @@ -1 +0,0 @@ -#include "jd40.h" diff --git a/keyboards/jd45/jd45.c b/keyboards/jd45/jd45.c deleted file mode 100644 index 00c5810479..0000000000 --- a/keyboards/jd45/jd45.c +++ /dev/null @@ -1 +0,0 @@ -#include "jd45.h" \ No newline at end of file diff --git a/keyboards/jels/jels60/jels60.c b/keyboards/jels/jels60/jels60.c deleted file mode 100644 index 6e8fd58da8..0000000000 --- a/keyboards/jels/jels60/jels60.c +++ /dev/null @@ -1,21 +0,0 @@ - /* Copyright 2022 Joah Nelson (Jels) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "jels60.h" - - - - diff --git a/keyboards/jkdlab/binary_monkey/binary_monkey.c b/keyboards/jkdlab/binary_monkey/binary_monkey.c deleted file mode 100644 index bdbcac18ee..0000000000 --- a/keyboards/jkdlab/binary_monkey/binary_monkey.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2021 JKDLAB. - * Copyright 2021 Jaehee - * - * This program is free software: you can 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 https://www.gnu.org/licenses/. - */ - -#include "binary_monkey.h" diff --git a/keyboards/jones/v03/v03.c b/keyboards/jones/v03/v03.c deleted file mode 100644 index 9bc63fe961..0000000000 --- a/keyboards/jones/v03/v03.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "v03.h" diff --git a/keyboards/k34/k34.c b/keyboards/k34/k34.c deleted file mode 100644 index 0dffa61ffd..0000000000 --- a/keyboards/k34/k34.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 jp_smasher (@jp_smasher) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "k34.h" diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.c b/keyboards/kabedon/kabedon78s/kabedon78s.c deleted file mode 100644 index dc60ea752e..0000000000 --- a/keyboards/kabedon/kabedon78s/kabedon78s.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "kabedon78s.h" diff --git a/keyboards/kagizaraya/chidori/chidori.c b/keyboards/kagizaraya/chidori/chidori.c deleted file mode 100644 index 229982724e..0000000000 --- a/keyboards/kagizaraya/chidori/chidori.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "chidori.h" diff --git a/keyboards/kagizaraya/halberd/halberd.c b/keyboards/kagizaraya/halberd/halberd.c deleted file mode 100644 index 8ce55ca3e5..0000000000 --- a/keyboards/kagizaraya/halberd/halberd.c +++ /dev/null @@ -1,16 +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 . - */ -#include "halberd.h" diff --git a/keyboards/kagizaraya/scythe/scythe.c b/keyboards/kagizaraya/scythe/scythe.c deleted file mode 100644 index c1f95e2f70..0000000000 --- a/keyboards/kagizaraya/scythe/scythe.c +++ /dev/null @@ -1,16 +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 . - */ -#include "scythe.h" diff --git a/keyboards/kakunpc/angel17/alpha/alpha.c b/keyboards/kakunpc/angel17/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/angel17/alpha/alpha.c +++ /dev/null @@ -1,16 +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 . - */ -#include "alpha.h" diff --git a/keyboards/kakunpc/angel17/rev1/rev1.c b/keyboards/kakunpc/angel17/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/angel17/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/kakunpc/angel64/alpha/alpha.c b/keyboards/kakunpc/angel64/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/angel64/alpha/alpha.c +++ /dev/null @@ -1,16 +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 . - */ -#include "alpha.h" diff --git a/keyboards/kakunpc/angel64/rev1/rev1.c b/keyboards/kakunpc/angel64/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/angel64/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/kakunpc/choc_taro/choc_taro.c b/keyboards/kakunpc/choc_taro/choc_taro.c deleted file mode 100644 index 2a835b2bd8..0000000000 --- a/keyboards/kakunpc/choc_taro/choc_taro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "choc_taro.h" diff --git a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c deleted file mode 100644 index 7a45e61f35..0000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rabbit_capture_plan.h" diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/suihankey/alpha/alpha.c +++ /dev/null @@ -1,16 +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 . - */ -#include "alpha.h" diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/suihankey/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/alpha.c +++ /dev/null @@ -1,16 +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 . - */ -#include "alpha.h" diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c deleted file mode 100644 index a1808324c8..0000000000 --- a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c +++ /dev/null @@ -1,16 +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 . - */ -#include "thedogkeyboard.h" diff --git a/keyboards/kapcave/gskt00/gskt00.c b/keyboards/kapcave/gskt00/gskt00.c deleted file mode 100755 index c2c2d823f9..0000000000 --- a/keyboards/kapcave/gskt00/gskt00.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "gskt00.h" - diff --git a/keyboards/kapcave/paladin64/paladin64.c b/keyboards/kapcave/paladin64/paladin64.c deleted file mode 100755 index 88dd1fdff2..0000000000 --- a/keyboards/kapcave/paladin64/paladin64.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "paladin64.h" - diff --git a/keyboards/kapcave/paladinpad/paladinpad.c b/keyboards/kapcave/paladinpad/paladinpad.c deleted file mode 100644 index 063e49c872..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "paladinpad.h" diff --git a/keyboards/karlb/kbic65/kbic65.c b/keyboards/karlb/kbic65/kbic65.c deleted file mode 100644 index 910c2a6c72..0000000000 --- a/keyboards/karlb/kbic65/kbic65.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Karl Berggren <@bkarl> -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "kbic65.h" diff --git a/keyboards/kb58/kb58.c b/keyboards/kb58/kb58.c deleted file mode 100644 index 5d189fa321..0000000000 --- a/keyboards/kb58/kb58.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "kb58.h" diff --git a/keyboards/kb_elmo/67mk_e/67mk_e.c b/keyboards/kb_elmo/67mk_e/67mk_e.c deleted file mode 100644 index 31254fe962..0000000000 --- a/keyboards/kb_elmo/67mk_e/67mk_e.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "67mk_e.h" diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.c b/keyboards/kb_elmo/aek2_usb/aek2_usb.c deleted file mode 100644 index 6ce5d21df7..0000000000 --- a/keyboards/kb_elmo/aek2_usb/aek2_usb.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "aek2_usb.h" diff --git a/keyboards/kb_elmo/elmopad/elmopad.c b/keyboards/kb_elmo/elmopad/elmopad.c deleted file mode 100644 index bb905ed7e1..0000000000 --- a/keyboards/kb_elmo/elmopad/elmopad.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "elmopad.h" diff --git a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c b/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c deleted file mode 100644 index 9711eca53e..0000000000 --- a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "m0110a_usb.h" diff --git a/keyboards/kb_elmo/m0116_usb/m0116_usb.c b/keyboards/kb_elmo/m0116_usb/m0116_usb.c deleted file mode 100644 index 823e2abd0a..0000000000 --- a/keyboards/kb_elmo/m0116_usb/m0116_usb.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "m0116_usb.h" diff --git a/keyboards/kb_elmo/noah_avr/noah_avr.c b/keyboards/kb_elmo/noah_avr/noah_avr.c deleted file mode 100644 index 6245bb6358..0000000000 --- a/keyboards/kb_elmo/noah_avr/noah_avr.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "noah_avr.h" diff --git a/keyboards/kb_elmo/qez/qez.c b/keyboards/kb_elmo/qez/qez.c deleted file mode 100644 index 68808fad8e..0000000000 --- a/keyboards/kb_elmo/qez/qez.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "qez.h" diff --git a/keyboards/kb_elmo/sesame/sesame.c b/keyboards/kb_elmo/sesame/sesame.c deleted file mode 100644 index 4ca3d08f04..0000000000 --- a/keyboards/kb_elmo/sesame/sesame.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "sesame.h" diff --git a/keyboards/kb_elmo/twelvekey/twelvekey.c b/keyboards/kb_elmo/twelvekey/twelvekey.c deleted file mode 100644 index 2a33acd92e..0000000000 --- a/keyboards/kb_elmo/twelvekey/twelvekey.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "twelvekey.h" diff --git a/keyboards/kb_elmo/vertex/vertex.c b/keyboards/kb_elmo/vertex/vertex.c deleted file mode 100644 index 26467196f1..0000000000 --- a/keyboards/kb_elmo/vertex/vertex.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "vertex.h" diff --git a/keyboards/kbdclack/kaishi65/kaishi65.c b/keyboards/kbdclack/kaishi65/kaishi65.c deleted file mode 100644 index 97f608f468..0000000000 --- a/keyboards/kbdclack/kaishi65/kaishi65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 KBDClack - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kaishi65.h" diff --git a/keyboards/kbdfans/baguette66/soldered/soldered.c b/keyboards/kbdfans/baguette66/soldered/soldered.c deleted file mode 100644 index f2848c1b32..0000000000 --- a/keyboards/kbdfans/baguette66/soldered/soldered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "soldered.h" diff --git a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c b/keyboards/kbdfans/bounce/75/hotswap/hotswap.c deleted file mode 100644 index 702a9b096d..0000000000 --- a/keyboards/kbdfans/bounce/75/hotswap/hotswap.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 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 . - */ -#include "hotswap.h" \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/soldered.c b/keyboards/kbdfans/bounce/75/soldered/soldered.c deleted file mode 100644 index a24bc9a36c..0000000000 --- a/keyboards/kbdfans/bounce/75/soldered/soldered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "soldered.h" \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/pad/pad.c b/keyboards/kbdfans/bounce/pad/pad.c deleted file mode 100644 index 18c18838ca..0000000000 --- a/keyboards/kbdfans/bounce/pad/pad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 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 . - */ -#include "pad.h" \ No newline at end of file diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c deleted file mode 100644 index bdaf1a507a..0000000000 --- a/keyboards/kbdfans/kbd19x/kbd19x.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 Jeff Shufelt @jshuf - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "kbd19x.h" diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c deleted file mode 100644 index c7e5797932..0000000000 --- a/keyboards/kbdfans/kbd4x/kbd4x.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 sevenseacat - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kbd4x.h" diff --git a/keyboards/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c deleted file mode 100644 index c4f56c1717..0000000000 --- a/keyboards/kbdfans/kbd66/kbd66.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Alex Peters - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kbd66.h" diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c deleted file mode 100644 index 60808979c9..0000000000 --- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c +++ /dev/null @@ -1,16 +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 . - */ -#include "hotswap.h" diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c deleted file mode 100644 index b685fa824a..0000000000 --- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mkii_soldered.h" diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c deleted file mode 100644 index 489e856837..0000000000 --- a/keyboards/kbdfans/kbd67/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c deleted file mode 100644 index 803d923b92..0000000000 --- a/keyboards/kbdfans/kbd67/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev2.h" \ No newline at end of file diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c deleted file mode 100644 index 3797822d4a..0000000000 --- a/keyboards/kbdfans/kbd6x/kbd6x.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kbd6x.h" diff --git a/keyboards/kbdfans/kbd75hs/kbd75hs.c b/keyboards/kbdfans/kbd75hs/kbd75hs.c deleted file mode 100644 index e22c267575..0000000000 --- a/keyboards/kbdfans/kbd75hs/kbd75hs.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "kbd75hs.h" diff --git a/keyboards/kbdfans/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c deleted file mode 100644 index c19981dbc4..0000000000 --- a/keyboards/kbdfans/kbd8x/kbd8x.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 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 . - */ - -#include "kbd8x.h" diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c deleted file mode 100644 index 0a36e3109d..0000000000 --- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kbd8x_mk2.h" diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c deleted file mode 100644 index 5635b0a589..0000000000 --- a/keyboards/kbdfans/kbdpad/mk1/mk1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mk1.h" diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c deleted file mode 100644 index 2449724126..0000000000 --- a/keyboards/kbdfans/kbdpad/mk2/mk2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mk2.h" diff --git a/keyboards/kbdfans/odin/soldered/soldered.c b/keyboards/kbdfans/odin/soldered/soldered.c deleted file mode 100644 index ddf024efd3..0000000000 --- a/keyboards/kbdfans/odin/soldered/soldered.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "soldered.h" \ No newline at end of file diff --git a/keyboards/kbdfans/odin/v2/v2.c b/keyboards/kbdfans/odin/v2/v2.c deleted file mode 100644 index 42cbbc301a..0000000000 --- a/keyboards/kbdfans/odin/v2/v2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "v2.h" diff --git a/keyboards/kbnordic/nordic60/rev_a/rev_a.c b/keyboards/kbnordic/nordic60/rev_a/rev_a.c deleted file mode 100644 index 7c92220811..0000000000 --- a/keyboards/kbnordic/nordic60/rev_a/rev_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 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_a.h" diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h deleted file mode 100644 index 941b25a2d7..0000000000 --- a/keyboards/keaboard/rev1/config.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Keith Wade -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once diff --git a/keyboards/keebformom/keebformom.c b/keyboards/keebformom/keebformom.c deleted file mode 100644 index 18de3af9ef..0000000000 --- a/keyboards/keebformom/keebformom.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Sandipratama - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "keebformom.h" \ No newline at end of file diff --git a/keyboards/keebio/bfo9000/bfo9000.c b/keyboards/keebio/bfo9000/bfo9000.c deleted file mode 100644 index 2ae778e32b..0000000000 --- a/keyboards/keebio/bfo9000/bfo9000.c +++ /dev/null @@ -1 +0,0 @@ -#include "bfo9000.h" diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.c b/keyboards/keebio/bigswitchseat/bigswitchseat.c deleted file mode 100644 index a322fdad62..0000000000 --- a/keyboards/keebio/bigswitchseat/bigswitchseat.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "bigswitchseat.h" diff --git a/keyboards/keebio/laplace/laplace.c b/keyboards/keebio/laplace/laplace.c deleted file mode 100644 index dcf32aee69..0000000000 --- a/keyboards/keebio/laplace/laplace.c +++ /dev/null @@ -1 +0,0 @@ -#include "laplace.h" diff --git a/keyboards/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c deleted file mode 100644 index 42df8ec295..0000000000 --- a/keyboards/keebio/tragicforce68/tragicforce68.c +++ /dev/null @@ -1 +0,0 @@ -#include "tragicforce68.h" diff --git a/keyboards/keebio/wtf60/wtf60.c b/keyboards/keebio/wtf60/wtf60.c deleted file mode 100644 index 631af10615..0000000000 --- a/keyboards/keebio/wtf60/wtf60.c +++ /dev/null @@ -1 +0,0 @@ -#include "wtf60.h" diff --git a/keyboards/keebmonkey/kbmg68/kbmg68.c b/keyboards/keebmonkey/kbmg68/kbmg68.c deleted file mode 100644 index 452624d771..0000000000 --- a/keyboards/keebmonkey/kbmg68/kbmg68.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 Your Mom Loves My Keyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kbmg68.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/keebsforall/freebird60/freebird60.c b/keyboards/keebsforall/freebird60/freebird60.c deleted file mode 100644 index abbb209dfd..0000000000 --- a/keyboards/keebsforall/freebird60/freebird60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "freebird60.h" diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.c b/keyboards/keebsforall/freebirdnp/lite/lite.c deleted file mode 100644 index 4d424c17da..0000000000 --- a/keyboards/keebsforall/freebirdnp/lite/lite.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "lite.h" diff --git a/keyboards/keebsforall/freebirdtkl/freebirdtkl.c b/keyboards/keebsforall/freebirdtkl/freebirdtkl.c deleted file mode 100644 index f996c90e7b..0000000000 --- a/keyboards/keebsforall/freebirdtkl/freebirdtkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "freebirdtkl.h" diff --git a/keyboards/keebwerk/nano_slider/nano_slider.c b/keyboards/keebwerk/nano_slider/nano_slider.c deleted file mode 100644 index f5730779ac..0000000000 --- a/keyboards/keebwerk/nano_slider/nano_slider.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Duckle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nano_slider.h" - diff --git a/keyboards/keebzdotnet/fme/fme.c b/keyboards/keebzdotnet/fme/fme.c deleted file mode 100644 index e4b37fa4a9..0000000000 --- a/keyboards/keebzdotnet/fme/fme.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 keebnewb - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "fme.h" diff --git a/keyboards/keebzdotnet/wazowski/wazowski.c b/keyboards/keebzdotnet/wazowski/wazowski.c deleted file mode 100644 index d4d6119ae5..0000000000 --- a/keyboards/keebzdotnet/wazowski/wazowski.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 keebzdotnet - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wazowski.h" diff --git a/keyboards/kegen/gboy/gboy.c b/keyboards/kegen/gboy/gboy.c deleted file mode 100644 index cd6869748d..0000000000 --- a/keyboards/kegen/gboy/gboy.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2022 Matt Chan - * - * This program is free software: you can 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 . - */ - -#include "gboy.h" diff --git a/keyboards/keybage/radpad/radpad.c b/keyboards/keybage/radpad/radpad.c deleted file mode 100644 index 4a31d8f573..0000000000 --- a/keyboards/keybage/radpad/radpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "radpad.h" diff --git a/keyboards/keyboardio/atreus/atreus.c b/keyboards/keyboardio/atreus/atreus.c deleted file mode 100644 index 0ad7156581..0000000000 --- a/keyboards/keyboardio/atreus/atreus.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "atreus.h" diff --git a/keyboards/keycapsss/o4l_5x12/o4l_5x12.c b/keyboards/keycapsss/o4l_5x12/o4l_5x12.c deleted file mode 100644 index 78267062c3..0000000000 --- a/keyboards/keycapsss/o4l_5x12/o4l_5x12.c +++ /dev/null @@ -1 +0,0 @@ -#include "o4l_5x12.h" diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.c b/keyboards/keycapsss/plaid_pad/plaid_pad.c deleted file mode 100644 index 127b80a5f9..0000000000 --- a/keyboards/keycapsss/plaid_pad/plaid_pad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ben Roesner (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 . - */ - -#include "plaid_pad.h" diff --git a/keyboards/keycapsss/plaid_pad/rev1/rev1.c b/keyboards/keycapsss/plaid_pad/rev1/rev1.c deleted file mode 100644 index 7d21ede286..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ben Roesner (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 . - */ - -#include "rev1.h" diff --git a/keyboards/keycapsss/plaid_pad/rev1/rev1.h b/keyboards/keycapsss/plaid_pad/rev1/rev1.h deleted file mode 100644 index 4a42622ba5..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Ben Roesner (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 "plaid_pad.h" diff --git a/keyboards/keycapsss/plaid_pad/rev2/rev2.c b/keyboards/keycapsss/plaid_pad/rev2/rev2.c deleted file mode 100644 index 7a830676be..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ben Roesner (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 . - */ - -#include "rev2.h" diff --git a/keyboards/keycapsss/plaid_pad/rev2/rev2.h b/keyboards/keycapsss/plaid_pad/rev2/rev2.h deleted file mode 100644 index 4a42622ba5..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev2/rev2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Ben Roesner (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 "plaid_pad.h" diff --git a/keyboards/keycapsss/plaid_pad/rev3/rev3.c b/keyboards/keycapsss/plaid_pad/rev3/rev3.c deleted file mode 100644 index bfe1934b3f..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev3/rev3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ben Roesner (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 . - */ - -#include "rev3.h" diff --git a/keyboards/keycapsss/plaid_pad/rev3/rev3.h b/keyboards/keycapsss/plaid_pad/rev3/rev3.h deleted file mode 100644 index d38fe6a5bb..0000000000 --- a/keyboards/keycapsss/plaid_pad/rev3/rev3.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 Ben Roesner (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 "plaid_pad.h" - diff --git a/keyboards/keygem/kg60ansi/kg60ansi.c b/keyboards/keygem/kg60ansi/kg60ansi.c deleted file mode 100644 index 15a1f4ee31..0000000000 --- a/keyboards/keygem/kg60ansi/kg60ansi.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "kg60ansi.h" diff --git a/keyboards/keygem/kg65rgbv2/kg65rgbv2.c b/keyboards/keygem/kg65rgbv2/kg65rgbv2.c deleted file mode 100644 index f714accbf4..0000000000 --- a/keyboards/keygem/kg65rgbv2/kg65rgbv2.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "kg65rgbv2.h" diff --git a/keyboards/keyhive/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c deleted file mode 100644 index 502139ed0c..0000000000 --- a/keyboards/keyhive/absinthe/absinthe.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 cfbender - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "absinthe.h" diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c deleted file mode 100644 index 4c31455128..0000000000 --- a/keyboards/keyhive/ergosaurus/ergosaurus.c +++ /dev/null @@ -1,17 +0,0 @@ - -/* Copyright 2019 cfbender - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ergosaurus.h" diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c deleted file mode 100644 index 426575b3d2..0000000000 --- a/keyboards/keyhive/maypad/maypad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 codybender - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "maypad.h" diff --git a/keyboards/keyhive/opus/opus.c b/keyboards/keyhive/opus/opus.c deleted file mode 100644 index 5a188cf8a0..0000000000 --- a/keyboards/keyhive/opus/opus.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "opus.h" diff --git a/keyboards/keyhive/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c deleted file mode 100644 index c7d65e27ab..0000000000 --- a/keyboards/keyhive/smallice/smallice.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "smallice.h" diff --git a/keyboards/keyhive/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c deleted file mode 100644 index f345893fb5..0000000000 --- a/keyboards/keyhive/southpole/southpole.c +++ /dev/null @@ -1 +0,0 @@ -#include "southpole.h" diff --git a/keyboards/keyhive/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c deleted file mode 100644 index 637922171a..0000000000 --- a/keyboards/keyhive/ut472/ut472.c +++ /dev/null @@ -1 +0,0 @@ -#include "ut472.h" diff --git a/keyboards/keyprez/corgi/corgi.c b/keyboards/keyprez/corgi/corgi.c deleted file mode 100644 index ba64134de9..0000000000 --- a/keyboards/keyprez/corgi/corgi.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "corgi.h" diff --git a/keyboards/keysofkings/twokey/twokey.c b/keyboards/keysofkings/twokey/twokey.c deleted file mode 100755 index 1668092bf4..0000000000 --- a/keyboards/keysofkings/twokey/twokey.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2020 Keys of Kings - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "twokey.h" diff --git a/keyboards/keyten/aperture/aperture.c b/keyboards/keyten/aperture/aperture.c deleted file mode 100644 index 38415add5a..0000000000 --- a/keyboards/keyten/aperture/aperture.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "aperture.h" diff --git a/keyboards/keyten/kt3700/kt3700.c b/keyboards/keyten/kt3700/kt3700.c deleted file mode 100644 index 63596e1d21..0000000000 --- a/keyboards/keyten/kt3700/kt3700.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Ivan Gromov (@key10iq) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kt3700.h" diff --git a/keyboards/keyten/kt60_m/kt60_m.c b/keyboards/keyten/kt60_m/kt60_m.c deleted file mode 100644 index 7d4f7614c8..0000000000 --- a/keyboards/keyten/kt60_m/kt60_m.c +++ /dev/null @@ -1,18 +0,0 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kt60_m.h" \ No newline at end of file diff --git a/keyboards/kikkou/kikkou.c b/keyboards/kikkou/kikkou.c deleted file mode 100644 index 704934ace2..0000000000 --- a/keyboards/kikkou/kikkou.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 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 . -*/ - -#include "kikkou.h" diff --git a/keyboards/kikoslab/ellora65/ellora65.c b/keyboards/kikoslab/ellora65/ellora65.c deleted file mode 100644 index 8ef707c2d8..0000000000 --- a/keyboards/kikoslab/ellora65/ellora65.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "ellora65.h" diff --git a/keyboards/kikoslab/kl90/kl90.c b/keyboards/kikoslab/kl90/kl90.c deleted file mode 100644 index d592f90255..0000000000 --- a/keyboards/kikoslab/kl90/kl90.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "kl90.h" diff --git a/keyboards/kin80/blackpill103/blackpill103.c b/keyboards/kin80/blackpill103/blackpill103.c index c8fd4e5822..e06ad44748 100644 --- a/keyboards/kin80/blackpill103/blackpill103.c +++ b/keyboards/kin80/blackpill103/blackpill103.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "blackpill103.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill103/blackpill103.h b/keyboards/kin80/blackpill103/blackpill103.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill103/blackpill103.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 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 "kin80.h" diff --git a/keyboards/kin80/blackpill401/blackpill401.c b/keyboards/kin80/blackpill401/blackpill401.c index 26f32d85e0..e06ad44748 100644 --- a/keyboards/kin80/blackpill401/blackpill401.c +++ b/keyboards/kin80/blackpill401/blackpill401.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "blackpill401.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill401/blackpill401.h b/keyboards/kin80/blackpill401/blackpill401.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill401/blackpill401.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 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 "kin80.h" diff --git a/keyboards/kin80/blackpill411/blackpill411.c b/keyboards/kin80/blackpill411/blackpill411.c index 1b68dfc2d3..012a434e41 100644 --- a/keyboards/kin80/blackpill411/blackpill411.c +++ b/keyboards/kin80/blackpill411/blackpill411.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "blackpill411.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill411/blackpill411.h b/keyboards/kin80/blackpill411/blackpill411.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill411/blackpill411.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 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 "kin80.h" diff --git a/keyboards/kin80/kin80.c b/keyboards/kin80/kin80.c deleted file mode 100644 index 89b46c340e..0000000000 --- a/keyboards/kin80/kin80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "kin80.h" diff --git a/keyboards/kin80/micro/micro.c b/keyboards/kin80/micro/micro.c index 264d1a8577..e06ad44748 100644 --- a/keyboards/kin80/micro/micro.c +++ b/keyboards/kin80/micro/micro.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "micro.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/micro/micro.h b/keyboards/kin80/micro/micro.h deleted file mode 100644 index 6efe88e663..0000000000 --- a/keyboards/kin80/micro/micro.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 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 "kin80.h" - diff --git a/keyboards/kindakeyboards/conone65/conone65.c b/keyboards/kindakeyboards/conone65/conone65.c deleted file mode 100644 index 950786542b..0000000000 --- a/keyboards/kindakeyboards/conone65/conone65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Kindakeyboards - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "conone65.h" diff --git a/keyboards/kineticlabs/emu/hotswap/hotswap.c b/keyboards/kineticlabs/emu/hotswap/hotswap.c deleted file mode 100644 index 8b26d5cd84..0000000000 --- a/keyboards/kineticlabs/emu/hotswap/hotswap.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hotswap.h" diff --git a/keyboards/kineticlabs/emu/soldered/soldered.c b/keyboards/kineticlabs/emu/soldered/soldered.c deleted file mode 100644 index b99b94e08a..0000000000 --- a/keyboards/kineticlabs/emu/soldered/soldered.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "soldered.h" diff --git a/keyboards/kingly_keys/ave/ortho/ortho.c b/keyboards/kingly_keys/ave/ortho/ortho.c deleted file mode 100644 index 4fb95e7684..0000000000 --- a/keyboards/kingly_keys/ave/ortho/ortho.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "ortho.h" diff --git a/keyboards/kingly_keys/ave/staggered/staggered.c b/keyboards/kingly_keys/ave/staggered/staggered.c deleted file mode 100644 index 4aa0d45ea3..0000000000 --- a/keyboards/kingly_keys/ave/staggered/staggered.c +++ /dev/null @@ -1,18 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "staggered.h" diff --git a/keyboards/kingly_keys/little_foot/little_foot.c b/keyboards/kingly_keys/little_foot/little_foot.c deleted file mode 100644 index 5513b113a0..0000000000 --- a/keyboards/kingly_keys/little_foot/little_foot.c +++ /dev/null @@ -1 +0,0 @@ -#include "little_foot.h" diff --git a/keyboards/kingly_keys/romac/romac.c b/keyboards/kingly_keys/romac/romac.c deleted file mode 100644 index 24f4c16333..0000000000 --- a/keyboards/kingly_keys/romac/romac.c +++ /dev/null @@ -1 +0,0 @@ -#include "romac.h" diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.c b/keyboards/kingly_keys/romac_plus/romac_plus.c deleted file mode 100644 index 1e95f36c78..0000000000 --- a/keyboards/kingly_keys/romac_plus/romac_plus.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "romac_plus.h" - \ No newline at end of file diff --git a/keyboards/kingly_keys/ropro/ropro.c b/keyboards/kingly_keys/ropro/ropro.c deleted file mode 100644 index ccb1ed0dff..0000000000 --- a/keyboards/kingly_keys/ropro/ropro.c +++ /dev/null @@ -1 +0,0 @@ -#include "ropro.h" diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.c b/keyboards/kingly_keys/smd_milk/smd_milk.c deleted file mode 100644 index 95fa50e029..0000000000 --- a/keyboards/kingly_keys/smd_milk/smd_milk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Sebastian Williams - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "smd_milk.h" diff --git a/keyboards/kingly_keys/soap/soap.c b/keyboards/kingly_keys/soap/soap.c deleted file mode 100644 index a467c54b74..0000000000 --- a/keyboards/kingly_keys/soap/soap.c +++ /dev/null @@ -1 +0,0 @@ -#include "soap.h" diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c deleted file mode 100644 index bf9afcc8f1..0000000000 --- a/keyboards/kira75/kira75.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kira75.h" diff --git a/keyboards/kira80/kira80.c b/keyboards/kira80/kira80.c deleted file mode 100644 index 0f79316fba..0000000000 --- a/keyboards/kira80/kira80.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "kira80.h" diff --git a/keyboards/kiwikey/kawii9/kawii9.c b/keyboards/kiwikey/kawii9/kawii9.c deleted file mode 100644 index 0e317ca726..0000000000 --- a/keyboards/kiwikey/kawii9/kawii9.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 KiwiKey - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "kawii9.h" diff --git a/keyboards/kiwikey/wanderland/wanderland.c b/keyboards/kiwikey/wanderland/wanderland.c deleted file mode 100644 index 33575e17a6..0000000000 --- a/keyboards/kiwikey/wanderland/wanderland.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 KiwiKey - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wanderland.h" diff --git a/keyboards/kkatano/bakeneko60/bakeneko60.c b/keyboards/kkatano/bakeneko60/bakeneko60.c deleted file mode 100644 index 809c1ccf18..0000000000 --- a/keyboards/kkatano/bakeneko60/bakeneko60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bakeneko60.h" diff --git a/keyboards/kkatano/bakeneko65/rev2/rev2.c b/keyboards/kkatano/bakeneko65/rev2/rev2.c deleted file mode 100644 index a486650790..0000000000 --- a/keyboards/kkatano/bakeneko65/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/kkatano/bakeneko65/rev3/rev3.c b/keyboards/kkatano/bakeneko65/rev3/rev3.c deleted file mode 100644 index cf1084d495..0000000000 --- a/keyboards/kkatano/bakeneko65/rev3/rev3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev3.h" diff --git a/keyboards/kkatano/bakeneko80/bakeneko80.c b/keyboards/kkatano/bakeneko80/bakeneko80.c deleted file mode 100644 index 264979f550..0000000000 --- a/keyboards/kkatano/bakeneko80/bakeneko80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bakeneko80.h" \ No newline at end of file diff --git a/keyboards/knops/mini/mini.c b/keyboards/knops/mini/mini.c deleted file mode 100644 index f378cc5d5f..0000000000 --- a/keyboards/knops/mini/mini.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 Kayle Knops - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mini.h" diff --git a/keyboards/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c deleted file mode 100644 index af4ea06e6d..0000000000 --- a/keyboards/kona_classic/kona_classic.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kona_classic.h" diff --git a/keyboards/kopibeng/mnk65/mnk65.c b/keyboards/kopibeng/mnk65/mnk65.c deleted file mode 100644 index 2ae4eec194..0000000000 --- a/keyboards/kopibeng/mnk65/mnk65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mnk65.h" \ No newline at end of file diff --git a/keyboards/kopibeng/xt60/xt60.c b/keyboards/kopibeng/xt60/xt60.c deleted file mode 100644 index db8993d58b..0000000000 --- a/keyboards/kopibeng/xt60/xt60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "xt60.h" \ No newline at end of file diff --git a/keyboards/kopibeng/xt60_singa/xt60_singa.c b/keyboards/kopibeng/xt60_singa/xt60_singa.c deleted file mode 100644 index 1a3a2b613f..0000000000 --- a/keyboards/kopibeng/xt60_singa/xt60_singa.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "xt60_singa.h" \ No newline at end of file diff --git a/keyboards/kopibeng/xt65/xt65.c b/keyboards/kopibeng/xt65/xt65.c deleted file mode 100644 index bd1622bfa2..0000000000 --- a/keyboards/kopibeng/xt65/xt65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "xt65.h" diff --git a/keyboards/kprepublic/bm43a/bm43a.c b/keyboards/kprepublic/bm43a/bm43a.c deleted file mode 100644 index 47e42864e0..0000000000 --- a/keyboards/kprepublic/bm43a/bm43a.c +++ /dev/null @@ -1,16 +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 . - */ -#include "bm43a.h" diff --git a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c b/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c deleted file mode 100755 index 8a0e8faab3..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.c +++ /dev/null @@ -1,16 +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 . - */ -#include "bm43hsrgb.h" diff --git a/keyboards/kprepublic/cospad/cospad.c b/keyboards/kprepublic/cospad/cospad.c deleted file mode 100644 index e7772f2908..0000000000 --- a/keyboards/kprepublic/cospad/cospad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "cospad.h" diff --git a/keyboards/kprepublic/jj40/jj40.c b/keyboards/kprepublic/jj40/jj40.c deleted file mode 100644 index 894ed49078..0000000000 --- a/keyboards/kprepublic/jj40/jj40.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro -Modified 2018 Kenneth A. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "jj40.h" diff --git a/keyboards/kprepublic/jj4x4/jj4x4.c b/keyboards/kprepublic/jj4x4/jj4x4.c deleted file mode 100644 index 6330c89de5..0000000000 --- a/keyboards/kprepublic/jj4x4/jj4x4.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro -Modified 2018 Kenneth A. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "jj4x4.h" diff --git a/keyboards/kprepublic/jj50/jj50.c b/keyboards/kprepublic/jj50/jj50.c deleted file mode 100644 index 91b10aebee..0000000000 --- a/keyboards/kprepublic/jj50/jj50.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "jj50.h" diff --git a/keyboards/ktec/daisy/daisy.c b/keyboards/ktec/daisy/daisy.c deleted file mode 100644 index 98b7ac84b3..0000000000 --- a/keyboards/ktec/daisy/daisy.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "daisy.h" diff --git a/keyboards/kwub/bloop/bloop.c b/keyboards/kwub/bloop/bloop.c deleted file mode 100644 index bbd2980b53..0000000000 --- a/keyboards/kwub/bloop/bloop.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Kwabena Aduse-Poku (Kwub) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "bloop.h" diff --git a/keyboards/ky01/ky01.c b/keyboards/ky01/ky01.c deleted file mode 100644 index 7ddffc01d9..0000000000 --- a/keyboards/ky01/ky01.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ky01.h" diff --git a/keyboards/labyrinth75/labyrinth75.c b/keyboards/labyrinth75/labyrinth75.c deleted file mode 100644 index 1bfe209587..0000000000 --- a/keyboards/labyrinth75/labyrinth75.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "labyrinth75.h" diff --git a/keyboards/latincompass/latin47ble/latin47ble.c b/keyboards/latincompass/latin47ble/latin47ble.c deleted file mode 100644 index c207b42297..0000000000 --- a/keyboards/latincompass/latin47ble/latin47ble.c +++ /dev/null @@ -1,16 +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 . - */ -#include "latin47ble.h" diff --git a/keyboards/latincompass/latin64ble/latin64ble.c b/keyboards/latincompass/latin64ble/latin64ble.c deleted file mode 100644 index 580f4da426..0000000000 --- a/keyboards/latincompass/latin64ble/latin64ble.c +++ /dev/null @@ -1,16 +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 . - */ -#include "latin64ble.h" diff --git a/keyboards/lazydesigners/bolt/bolt.c b/keyboards/lazydesigners/bolt/bolt.c deleted file mode 100644 index 074d6bfd5a..0000000000 --- a/keyboards/lazydesigners/bolt/bolt.c +++ /dev/null @@ -1 +0,0 @@ -#include "bolt.h" diff --git a/keyboards/lazydesigners/cassette8/cassette8.c b/keyboards/lazydesigners/cassette8/cassette8.c deleted file mode 100755 index a36de6d7a6..0000000000 --- a/keyboards/lazydesigners/cassette8/cassette8.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "cassette8.h" diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.c b/keyboards/lazydesigners/dimple/ortho/ortho.c deleted file mode 100644 index da76fde176..0000000000 --- a/keyboards/lazydesigners/dimple/ortho/ortho.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright 2021 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 . -*/ - -#include "ortho.h" diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.c b/keyboards/lazydesigners/dimpleplus/dimpleplus.c deleted file mode 100644 index 36eed8cc13..0000000000 --- a/keyboards/lazydesigners/dimpleplus/dimpleplus.c +++ /dev/null @@ -1 +0,0 @@ -#include "dimpleplus.h" diff --git a/keyboards/lazydesigners/the30/the30.c b/keyboards/lazydesigners/the30/the30.c deleted file mode 100644 index c41e16dc08..0000000000 --- a/keyboards/lazydesigners/the30/the30.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Erovia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "the30.h" diff --git a/keyboards/lazydesigners/the40/the40.c b/keyboards/lazydesigners/the40/the40.c deleted file mode 100644 index cd1a22a9c3..0000000000 --- a/keyboards/lazydesigners/the40/the40.c +++ /dev/null @@ -1,14 +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 . - */ -#include "the40.h" diff --git a/keyboards/lazydesigners/the60/rev1/rev1.c b/keyboards/lazydesigners/the60/rev1/rev1.c deleted file mode 100755 index 1b6fbd7c2d..0000000000 --- a/keyboards/lazydesigners/the60/rev1/rev1.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "rev1.h" - diff --git a/keyboards/lazydesigners/the60/rev2/rev2.c b/keyboards/lazydesigners/the60/rev2/rev2.c deleted file mode 100755 index b1af81707d..0000000000 --- a/keyboards/lazydesigners/the60/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev2.h" diff --git a/keyboards/lefty/rev1/rev1.c b/keyboards/lefty/rev1/rev1.c deleted file mode 100644 index 81734fd7fc..0000000000 --- a/keyboards/lefty/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Smoll Chungus (@smollchungus) -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "lefty.h" diff --git a/keyboards/lefty/rev2/rev2.c b/keyboards/lefty/rev2/rev2.c deleted file mode 100644 index 81734fd7fc..0000000000 --- a/keyboards/lefty/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Smoll Chungus (@smollchungus) -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "lefty.h" diff --git a/keyboards/linworks/dolice/dolice.c b/keyboards/linworks/dolice/dolice.c deleted file mode 100644 index febac2099f..0000000000 --- a/keyboards/linworks/dolice/dolice.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dolice.h" diff --git a/keyboards/linworks/fave104/fave104.c b/keyboards/linworks/fave104/fave104.c deleted file mode 100644 index f6b1e8d11b..0000000000 --- a/keyboards/linworks/fave104/fave104.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "fave104.h" diff --git a/keyboards/linworks/fave87/fave87.c b/keyboards/linworks/fave87/fave87.c deleted file mode 100644 index 49272baf5a..0000000000 --- a/keyboards/linworks/fave87/fave87.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "fave87.h" diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c deleted file mode 100644 index 96c0b92dff..0000000000 --- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Jonathon Carstens jonathon@lizardtrick.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 "tenkey_plusplus.h" diff --git a/keyboards/lm_keyboard/lm60n/lm60n.c b/keyboards/lm_keyboard/lm60n/lm60n.c deleted file mode 100644 index 91b010c6bd..0000000000 --- a/keyboards/lm_keyboard/lm60n/lm60n.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 gkeyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "lm60n.h" diff --git a/keyboards/longnald/corin/corin.c b/keyboards/longnald/corin/corin.c deleted file mode 100644 index fabe3686d8..0000000000 --- a/keyboards/longnald/corin/corin.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2020 Longnald - * Copyright (C) 2020 Seaton Jiang - * - * This program is free software: you can 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 . - */ - -#include "corin.h" \ No newline at end of file diff --git a/keyboards/lucid/alexa/alexa.c b/keyboards/lucid/alexa/alexa.c deleted file mode 100644 index c8bbfcdc77..0000000000 --- a/keyboards/lucid/alexa/alexa.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "alexa.h" diff --git a/keyboards/lucid/alexa_solder/alexa_solder.c b/keyboards/lucid/alexa_solder/alexa_solder.c deleted file mode 100644 index 446e4f063a..0000000000 --- a/keyboards/lucid/alexa_solder/alexa_solder.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2022 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "alexa_solder.h" diff --git a/keyboards/lucid/kbd8x_hs/kbx8s_hs.c b/keyboards/lucid/kbd8x_hs/kbx8s_hs.c deleted file mode 100644 index 52e4ed5394..0000000000 --- a/keyboards/lucid/kbd8x_hs/kbx8s_hs.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "kbd8x_hs.h" diff --git a/keyboards/lucid/phantom_hs/phantom_hs.c b/keyboards/lucid/phantom_hs/phantom_hs.c deleted file mode 100644 index 4d10b67bd6..0000000000 --- a/keyboards/lucid/phantom_hs/phantom_hs.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "phantom_hs.h" diff --git a/keyboards/lucid/phantom_solder/phantom_solder.c b/keyboards/lucid/phantom_solder/phantom_solder.c deleted file mode 100644 index bd036146f4..0000000000 --- a/keyboards/lucid/phantom_solder/phantom_solder.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "phantom_solder.h" diff --git a/keyboards/lucid/scarlet/scarlet.c b/keyboards/lucid/scarlet/scarlet.c deleted file mode 100644 index aa26a78c43..0000000000 --- a/keyboards/lucid/scarlet/scarlet.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "scarlet.h" diff --git a/keyboards/lyso1/lefishe/lefishe.c b/keyboards/lyso1/lefishe/lefishe.c deleted file mode 100644 index c557a59c2d..0000000000 --- a/keyboards/lyso1/lefishe/lefishe.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Lyso1 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "lefishe.h" diff --git a/keyboards/lz/erghost/erghost.c b/keyboards/lz/erghost/erghost.c deleted file mode 100644 index 7ea321e12e..0000000000 --- a/keyboards/lz/erghost/erghost.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "erghost.h" diff --git a/keyboards/m10a/m10a.c b/keyboards/m10a/m10a.c deleted file mode 100644 index d9e7503a48..0000000000 --- a/keyboards/m10a/m10a.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright - * 2017 Josh Black (@consolenaut) - * 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 . - */ - -#include "m10a.h" diff --git a/keyboards/machine_industries/m4_a/m4_a.c b/keyboards/machine_industries/m4_a/m4_a.c deleted file mode 100644 index a1598688a8..0000000000 --- a/keyboards/machine_industries/m4_a/m4_a.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 naut -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "m4_a.h" diff --git a/keyboards/majistic/majistic.c b/keyboards/majistic/majistic.c deleted file mode 100644 index 7ceba7cf28..0000000000 --- a/keyboards/majistic/majistic.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "majistic.h" diff --git a/keyboards/makenova/omega/omega4/omega4.c b/keyboards/makenova/omega/omega4/omega4.c deleted file mode 100644 index b64ae638bd..0000000000 --- a/keyboards/makenova/omega/omega4/omega4.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 makenova (@makenova) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "omega4.h" diff --git a/keyboards/makrosu/makrosu.c b/keyboards/makrosu/makrosu.c deleted file mode 100644 index 8a9a222789..0000000000 --- a/keyboards/makrosu/makrosu.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 Valdydesu_ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "makrosu.h" diff --git a/keyboards/manta60/manta60.c b/keyboards/manta60/manta60.c deleted file mode 100644 index 1013fce72d..0000000000 --- a/keyboards/manta60/manta60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "manta60.h" diff --git a/keyboards/manyboard/macro/macro.c b/keyboards/manyboard/macro/macro.c deleted file mode 100644 index eb8a188f3c..0000000000 --- a/keyboards/manyboard/macro/macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 WillEhman - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "macro.h" diff --git a/keyboards/maple_computing/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c deleted file mode 100644 index 1eddde9ba5..0000000000 --- a/keyboards/maple_computing/6ball/6ball.c +++ /dev/null @@ -1 +0,0 @@ -#include "6ball.h" diff --git a/keyboards/maple_computing/c39/c39.c b/keyboards/maple_computing/c39/c39.c deleted file mode 100755 index 78ecae5a32..0000000000 --- a/keyboards/maple_computing/c39/c39.c +++ /dev/null @@ -1 +0,0 @@ -#include "c39.h" diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.c b/keyboards/maple_computing/christmas_tree/christmas_tree.c deleted file mode 100644 index c03670a3a5..0000000000 --- a/keyboards/maple_computing/christmas_tree/christmas_tree.c +++ /dev/null @@ -1 +0,0 @@ -#include "christmas_tree.h" diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.c b/keyboards/maple_computing/christmas_tree/v2017/v2017.c deleted file mode 100644 index 22067e5367..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/v2017.c +++ /dev/null @@ -1 +0,0 @@ -#include "v2017.h" \ No newline at end of file diff --git a/keyboards/maple_computing/christmas_tree/v2017/v2017.h b/keyboards/maple_computing/christmas_tree/v2017/v2017.h deleted file mode 100644 index f779c0ed47..0000000000 --- a/keyboards/maple_computing/christmas_tree/v2017/v2017.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "christmas_tree.h" diff --git a/keyboards/maple_computing/jnao/jnao.c b/keyboards/maple_computing/jnao/jnao.c deleted file mode 100644 index 8a49c747a1..0000000000 --- a/keyboards/maple_computing/jnao/jnao.c +++ /dev/null @@ -1 +0,0 @@ -#include "jnao.h" diff --git a/keyboards/maple_computing/the_ruler/the_ruler.c b/keyboards/maple_computing/the_ruler/the_ruler.c deleted file mode 100644 index 29a8248924..0000000000 --- a/keyboards/maple_computing/the_ruler/the_ruler.c +++ /dev/null @@ -1 +0,0 @@ -#include "the_ruler.h" diff --git a/keyboards/marksard/treadstone32/lite/lite.c b/keyboards/marksard/treadstone32/lite/lite.c deleted file mode 100644 index a1997feff0..0000000000 --- a/keyboards/marksard/treadstone32/lite/lite.c +++ /dev/null @@ -1,16 +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 . - */ -#include "lite.h" diff --git a/keyboards/marksard/treadstone32/rev1/rev1.c b/keyboards/marksard/treadstone32/rev1/rev1.c deleted file mode 100644 index bf41abddbe..0000000000 --- a/keyboards/marksard/treadstone32/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/marksard/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c deleted file mode 100644 index 3daa3e8e81..0000000000 --- a/keyboards/marksard/treadstone48/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rev1.h" diff --git a/keyboards/marksard/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c deleted file mode 100644 index f7e7bc7702..0000000000 --- a/keyboards/marksard/treadstone48/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rev2.h" diff --git a/keyboards/massdrop/thekey/thekey.c b/keyboards/massdrop/thekey/thekey.c deleted file mode 100644 index b32c302cd0..0000000000 --- a/keyboards/massdrop/thekey/thekey.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Joe Maples - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "thekey.h" diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.c b/keyboards/massdrop/thekey_v2/thekey_v2.c deleted file mode 100644 index b1a824d9d4..0000000000 --- a/keyboards/massdrop/thekey_v2/thekey_v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Jason Wihardja - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "thekey_v2.h" diff --git a/keyboards/matchstickworks/southpad/southpad.c b/keyboards/matchstickworks/southpad/southpad.c deleted file mode 100644 index 52c9c1e6b1..0000000000 --- a/keyboards/matchstickworks/southpad/southpad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Logan Butler - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "southpad.h" diff --git a/keyboards/matrix/me/me.c b/keyboards/matrix/me/me.c deleted file mode 100644 index c99f26e623..0000000000 --- a/keyboards/matrix/me/me.c +++ /dev/null @@ -1,17 +0,0 @@ -/** - * me.c - * - Copyright 2021 astro - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 "me.h" diff --git a/keyboards/matthewdias/m3n3van/m3n3van.c b/keyboards/matthewdias/m3n3van/m3n3van.c deleted file mode 100644 index 5032a02c3c..0000000000 --- a/keyboards/matthewdias/m3n3van/m3n3van.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 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 . -*/ - -#include "m3n3van.h" diff --git a/keyboards/matthewdias/minim/minim.c b/keyboards/matthewdias/minim/minim.c deleted file mode 100644 index aadb26fee2..0000000000 --- a/keyboards/matthewdias/minim/minim.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "minim.h" diff --git a/keyboards/matthewdias/model_v/model_v.c b/keyboards/matthewdias/model_v/model_v.c deleted file mode 100644 index a65738d97b..0000000000 --- a/keyboards/matthewdias/model_v/model_v.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 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 . -*/ - -#include "model_v.h" diff --git a/keyboards/matthewdias/txuu/txuu.c b/keyboards/matthewdias/txuu/txuu.c deleted file mode 100644 index 81c4b440ad..0000000000 --- a/keyboards/matthewdias/txuu/txuu.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 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 . -*/ - -#include "txuu.h" diff --git a/keyboards/mb44/mb44.c b/keyboards/mb44/mb44.c deleted file mode 100644 index 16f68705f8..0000000000 --- a/keyboards/mb44/mb44.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 melonbred - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mb44.h" \ No newline at end of file diff --git a/keyboards/mechanickeys/miniashen40/miniashen40.c b/keyboards/mechanickeys/miniashen40/miniashen40.c deleted file mode 100644 index 9c740e117e..0000000000 --- a/keyboards/mechanickeys/miniashen40/miniashen40.c +++ /dev/null @@ -1,17 +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 . -*/ - -#include "miniashen40.h" diff --git a/keyboards/mechbrewery/mb65h/mb65h.c b/keyboards/mechbrewery/mb65h/mb65h.c deleted file mode 100644 index 040ef8ce44..0000000000 --- a/keyboards/mechbrewery/mb65h/mb65h.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 MechBrewery - * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@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 . - */ -#include "mb65h.h" \ No newline at end of file diff --git a/keyboards/mechbrewery/mb65s/mb65s.c b/keyboards/mechbrewery/mb65s/mb65s.c deleted file mode 100644 index 4d8e2cf759..0000000000 --- a/keyboards/mechbrewery/mb65s/mb65s.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 MechBrewery - * Author: tuananhnguyen204 (https://github.com/AnthonyNguyen168) (tuananhnguyen204@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 . - */ -#include "mb65s.h" \ No newline at end of file diff --git a/keyboards/mechkeys/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c deleted file mode 100644 index 7cba669b84..0000000000 --- a/keyboards/mechkeys/acr60/acr60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Ryan Mitchell (@newtmitch) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "acr60.h" diff --git a/keyboards/mechkeys/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c deleted file mode 100755 index 3e058d3ed5..0000000000 --- a/keyboards/mechkeys/alu84/alu84.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 @TurboMech /u/TurboMech @A9entOran9e#6134 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "alu84.h" diff --git a/keyboards/mechkeys/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c deleted file mode 100755 index 64494c49c1..0000000000 --- a/keyboards/mechkeys/espectro/espectro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 @TurboMech /u/TurboMech @A9entOran9e#6134 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "espectro.h" diff --git a/keyboards/mechkeys/mk60/mk60.c b/keyboards/mechkeys/mk60/mk60.c deleted file mode 100644 index 7ec8bff22b..0000000000 --- a/keyboards/mechkeys/mk60/mk60.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mk60.h" diff --git a/keyboards/mechllama/g35/g35.c b/keyboards/mechllama/g35/g35.c deleted file mode 100644 index e3925674fe..0000000000 --- a/keyboards/mechllama/g35/g35.c +++ /dev/null @@ -1,16 +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 . - */ -#include "g35.h" diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c deleted file mode 100644 index 8e33b6603c..0000000000 --- a/keyboards/mechlovin/delphine/delphine.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "delphine.h" diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c index 3e02735cdf..02a011ba4b 100644 --- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.c +++ b/keyboards/mechlovin/delphine/rgb_led/rgb_led.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rgb_led.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h b/keyboards/mechlovin/delphine/rgb_led/rgb_led.h deleted file mode 100644 index 60d5817344..0000000000 --- a/keyboards/mechlovin/delphine/rgb_led/rgb_led.h +++ /dev/null @@ -1,19 +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" diff --git a/keyboards/mechlovin/foundation/foundation.c b/keyboards/mechlovin/foundation/foundation.c deleted file mode 100644 index 12d3e848d7..0000000000 --- a/keyboards/mechlovin/foundation/foundation.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Mechlovin' 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 . - */ - -#include "foundation.h" diff --git a/keyboards/mechlovin/hex4b/hex4b.c b/keyboards/mechlovin/hex4b/hex4b.c deleted file mode 100644 index fb8c4aef16..0000000000 --- a/keyboards/mechlovin/hex4b/hex4b.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hex4b.h" diff --git a/keyboards/mechlovin/hex6c/hex6c.c b/keyboards/mechlovin/hex6c/hex6c.c deleted file mode 100644 index 255121dc19..0000000000 --- a/keyboards/mechlovin/hex6c/hex6c.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' 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 . - */ - -#include "hex6c.h" diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c deleted file mode 100644 index 434e796091..0000000000 --- a/keyboards/mechlovin/infinity87/infinity87.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "infinity87.h" diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h deleted file mode 100644 index b7b00bef40..0000000000 --- a/keyboards/mechlovin/infinity87/infinity87.h +++ /dev/null @@ -1,18 +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" diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.c b/keyboards/mechlovin/infinity87/rev1/rev1.c deleted file mode 100644 index c65ff19838..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h deleted file mode 100644 index 167ed6940a..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Mechlovin' 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" diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.c b/keyboards/mechlovin/infinity87/rev2/rev2.c deleted file mode 100644 index ab9ecbf6fc..0000000000 --- a/keyboards/mechlovin/infinity87/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" \ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.h b/keyboards/mechlovin/infinity87/rev2/rev2.h deleted file mode 100644 index 16cdf9ed85..0000000000 --- a/keyboards/mechlovin/infinity87/rev2/rev2.h +++ /dev/null @@ -1,19 +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" diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c index 210fb843b3..c10d47d191 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c +++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rgb_rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h deleted file mode 100644 index 16cdf9ed85..0000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h +++ /dev/null @@ -1,19 +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" diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c deleted file mode 100644 index 4d352358a7..0000000000 --- a/keyboards/mechlovin/infinity88/infinity88.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "infinity88.h" diff --git a/keyboards/mechlovin/jay60/jay60.c b/keyboards/mechlovin/jay60/jay60.c deleted file mode 100644 index 9571c1375a..0000000000 --- a/keyboards/mechlovin/jay60/jay60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "jay60.h" diff --git a/keyboards/mechlovin/kay60/kay60.c b/keyboards/mechlovin/kay60/kay60.c deleted file mode 100644 index 61d968e48c..0000000000 --- a/keyboards/mechlovin/kay60/kay60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "kay60.h" diff --git a/keyboards/mechlovin/mechlovin9/mechlovin9.c b/keyboards/mechlovin/mechlovin9/mechlovin9.c deleted file mode 100644 index a5a8b6c0fe..0000000000 --- a/keyboards/mechlovin/mechlovin9/mechlovin9.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mechlovin' 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 . - */ - -#include "mechlovin9.h" diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c deleted file mode 100644 index b43bf2aaa4..0000000000 --- a/keyboards/mechlovin/pisces/pisces.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "pisces.h" diff --git a/keyboards/mechlovin/serratus/serratus.c b/keyboards/mechlovin/serratus/serratus.c deleted file mode 100644 index b396e57bf5..0000000000 --- a/keyboards/mechlovin/serratus/serratus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "serratus.h" diff --git a/keyboards/mechlovin/th1800/th1800.c b/keyboards/mechlovin/th1800/th1800.c deleted file mode 100644 index f27b244c41..0000000000 --- a/keyboards/mechlovin/th1800/th1800.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "th1800.h" diff --git a/keyboards/mechlovin/tmkl/tmkl.c b/keyboards/mechlovin/tmkl/tmkl.c deleted file mode 100644 index 22c4d3f0b8..0000000000 --- a/keyboards/mechlovin/tmkl/tmkl.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "tmkl.h" \ No newline at end of file diff --git a/keyboards/mechlovin/zed60/zed60.c b/keyboards/mechlovin/zed60/zed60.c deleted file mode 100644 index fb0c44ec3d..0000000000 --- a/keyboards/mechlovin/zed60/zed60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Mechlovin' 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 . - */ - -#include "zed60.h" diff --git a/keyboards/mechstudio/dawn/dawn.c b/keyboards/mechstudio/dawn/dawn.c deleted file mode 100644 index 43edc785ad..0000000000 --- a/keyboards/mechstudio/dawn/dawn.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 David 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 . - */ -#include "dawn.h" diff --git a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c b/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c deleted file mode 100644 index 054684e7bd..0000000000 --- a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 David 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 . - */ -#include "ud_40_ortho.h" diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c index 3dae312e2b..d89f2f1938 100644 --- a/keyboards/mechwild/bde/rev2/rev2.c +++ b/keyboards/mechwild/bde/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/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h deleted file mode 100644 index bb37c7ef69..0000000000 --- a/keyboards/mechwild/bde/rev2/rev2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 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" diff --git a/keyboards/mehkee96/mehkee96.c b/keyboards/mehkee96/mehkee96.c deleted file mode 100644 index d9e2bac7a5..0000000000 --- a/keyboards/mehkee96/mehkee96.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "mehkee96.h" diff --git a/keyboards/meletrix/zoom87/zoom87.c b/keyboards/meletrix/zoom87/zoom87.c deleted file mode 100644 index 59fc2ba3c8..0000000000 --- a/keyboards/meletrix/zoom87/zoom87.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 meletrix - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "zoom87.h" diff --git a/keyboards/melgeek/mach80/mach80.c b/keyboards/melgeek/mach80/mach80.c deleted file mode 100755 index 28d21b22b1..0000000000 --- a/keyboards/melgeek/mach80/mach80.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mach80.h" diff --git a/keyboards/melgeek/mj61/mj61.c b/keyboards/melgeek/mj61/mj61.c deleted file mode 100644 index a3aa29676a..0000000000 --- a/keyboards/melgeek/mj61/mj61.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mj61.h" diff --git a/keyboards/melgeek/mj63/mj63.c b/keyboards/melgeek/mj63/mj63.c deleted file mode 100644 index 8b1ff38651..0000000000 --- a/keyboards/melgeek/mj63/mj63.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mj63.h" diff --git a/keyboards/melgeek/mj64/mj64.c b/keyboards/melgeek/mj64/mj64.c deleted file mode 100644 index 8e57f68232..0000000000 --- a/keyboards/melgeek/mj64/mj64.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mj64.h" diff --git a/keyboards/melgeek/mj65/mj65.c b/keyboards/melgeek/mj65/mj65.c deleted file mode 100644 index 3686798dab..0000000000 --- a/keyboards/melgeek/mj65/mj65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mj65.h" diff --git a/keyboards/melgeek/mj6xy/mj6xy.c b/keyboards/melgeek/mj6xy/mj6xy.c deleted file mode 100755 index 78297ab7c4..0000000000 --- a/keyboards/melgeek/mj6xy/mj6xy.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mj6xy.h" diff --git a/keyboards/melgeek/mj6xy/rev3/rev3.c b/keyboards/melgeek/mj6xy/rev3/rev3.c deleted file mode 100644 index 7982316513..0000000000 --- a/keyboards/melgeek/mj6xy/rev3/rev3.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "mj6xy.h" - diff --git a/keyboards/melgeek/mojo68/mojo68.c b/keyboards/melgeek/mojo68/mojo68.c deleted file mode 100755 index d217daf0ac..0000000000 --- a/keyboards/melgeek/mojo68/mojo68.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mojo68.h" diff --git a/keyboards/melgeek/mojo75/mojo75.c b/keyboards/melgeek/mojo75/mojo75.c deleted file mode 100644 index 53db19d104..0000000000 --- a/keyboards/melgeek/mojo75/mojo75.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "mojo75.h" - diff --git a/keyboards/melgeek/tegic/tegic.c b/keyboards/melgeek/tegic/tegic.c deleted file mode 100755 index e2f5b49f5e..0000000000 --- a/keyboards/melgeek/tegic/tegic.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "tegic.h" - diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c deleted file mode 100644 index 9ade47d43e..0000000000 --- a/keyboards/melgeek/z70ultra/z70ultra.c +++ /dev/null @@ -1,178 +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 . - */ - -#include "z70ultra.h" - - -#ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { - {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */ - {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */ - {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */ - {0, CS28_SW4, CS30_SW4, CS29_SW4}, /* RGB13 */ - {0, CS28_SW5, CS30_SW5, CS29_SW5}, /* RGB14 */ - {0, CS28_SW6, CS30_SW6, CS29_SW6}, /* RGB15 */ - {0, CS28_SW7, CS30_SW7, CS29_SW7}, /* RGB16 */ - {0, CS28_SW8, CS30_SW8, CS29_SW8}, /* RGB17 */ - {0, CS28_SW9, CS30_SW9, CS29_SW9}, /* RGB18 */ - {0, CS31_SW1, CS33_SW1, CS32_SW1}, /* RGB28 */ - {0, CS31_SW2, CS33_SW2, CS32_SW2}, /* RGB29 */ - {0, CS31_SW3, CS33_SW3, CS32_SW3}, /* RGB30 */ - {0, CS31_SW4, CS33_SW4, CS32_SW4}, /* RGB31 */ - {0, CS31_SW5, CS33_SW5, CS32_SW5}, /* RGB32 */ - {0, CS31_SW6, CS33_SW6, CS32_SW6}, /* RGB33 */ - {0, CS25_SW1, CS27_SW1, CS26_SW1}, /* RGB1 */ - {0, CS25_SW2, CS27_SW2, CS26_SW2}, /* RGB2 */ - {0, CS25_SW3, CS27_SW3, CS26_SW3}, /* RGB3 */ - {0, CS25_SW4, CS27_SW4, CS26_SW4}, /* RGB4 */ - {0, CS25_SW5, CS27_SW5, CS26_SW5}, /* RGB5 */ - {0, CS25_SW6, CS27_SW6, CS26_SW6}, /* RGB6 */ - {0, CS25_SW7, CS27_SW7, CS26_SW7}, /* RGB7 */ - {0, CS25_SW8, CS27_SW8, CS26_SW8}, /* RGB8 */ - {0, CS25_SW9, CS27_SW9, CS26_SW9}, /* RGB9 */ - {0, CS34_SW1, CS36_SW1, CS35_SW1}, /* RGB46 */ - {0, CS34_SW2, CS36_SW2, CS35_SW2}, /* RGB47 */ - {0, CS34_SW3, CS36_SW3, CS35_SW3}, /* RGB48 */ - {0, CS34_SW4, CS36_SW4, CS35_SW4}, /* RGB49 */ - {0, CS34_SW5, CS36_SW5, CS35_SW5}, /* RGB50 */ - {0, CS31_SW7, CS33_SW7, CS32_SW7}, /* RGB34 */ - {0, CS22_SW1, CS24_SW1, CS23_SW1}, /* RGB37 */ - {0, CS22_SW2, CS24_SW2, CS23_SW2}, /* RGB38 */ - {0, CS22_SW3, CS24_SW3, CS23_SW3}, /* RGB39 */ - {0, CS22_SW4, CS24_SW4, CS23_SW4}, /* RGB40 */ - {0, CS22_SW5, CS24_SW5, CS23_SW5}, /* RGB41 */ - {0, CS22_SW6, CS24_SW6, CS23_SW6}, /* RGB42 */ - {0, CS22_SW7, CS24_SW7, CS23_SW7}, /* RGB43 */ - {0, CS22_SW8, CS24_SW8, CS23_SW8}, /* RGB44 */ - {0, CS22_SW9, CS24_SW9, CS23_SW9}, /* RGB45 */ - {0, CS34_SW9, CS36_SW9, CS35_SW9}, /* RGB54 */ - {0, CS34_SW8, CS36_SW8, CS35_SW8}, /* RGB53 */ - {0, CS34_SW7, CS36_SW7, CS35_SW7}, /* RGB52 */ - {0, CS34_SW6, CS36_SW6, CS35_SW6}, /* RGB51 */ - {0, CS31_SW8, CS33_SW8, CS32_SW8}, /* RGB35 */ - {0, CS19_SW2, CS21_SW2, CS20_SW2}, /* RGB56 */ - {0, CS19_SW4, CS21_SW4, CS20_SW4}, /* RGB60 */ - {0, CS19_SW5, CS21_SW5, CS20_SW5}, /* RGB59 */ - {0, CS19_SW6, CS21_SW6, CS20_SW6}, /* RGB60 */ - {0, CS19_SW7, CS21_SW7, CS20_SW7}, /* RGB61 */ - {0, CS19_SW8, CS21_SW8, CS20_SW8}, /* RGB62 */ - {0, CS19_SW9, CS21_SW9, CS20_SW9}, /* RGB63 */ - {0, CS19_SW3, CS21_SW3, CS20_SW3}, /* RGB57 */ - {0, CS19_SW1, CS21_SW1, CS20_SW1}, /* RGB55 */ - {0, CS37_SW5, CS39_SW5, CS38_SW5}, /* RGB23 */ - {0, CS37_SW6, CS39_SW6, CS38_SW6}, /* RGB24 */ - {0, CS37_SW7, CS39_SW7, CS38_SW7}, /* RGB25 */ - {0, CS37_SW8, CS39_SW8, CS38_SW8}, /* RGB26 */ - {0, CS31_SW9, CS33_SW9, CS32_SW9}, /* RGB36 */ - - {0, CS6_SW1, CS8_SW1, CS7_SW1}, /* RGB64 */ - {0, CS6_SW3, CS8_SW3, CS7_SW3}, /* RGB66 */ - {0, CS6_SW4, CS8_SW4, CS7_SW4}, /* RGB67 */ - {0, CS6_SW5, CS8_SW5, CS7_SW5}, /* RGB69 */ - {0, CS6_SW6, CS8_SW6, CS7_SW6}, /* RGB70 */ - {0, CS6_SW2, CS8_SW2, CS7_SW2}, /* RGB65 */ - - {0, CS37_SW1, CS39_SW1, CS38_SW1}, /* RGB19 */ - {0, CS37_SW2, CS39_SW2, CS38_SW2}, /* RGB20 */ - {0, CS37_SW3, CS39_SW3, CS38_SW3}, /* RGB21 */ - {0, CS37_SW4, CS39_SW4, CS38_SW4}, /* RGB22 */ - {0, CS37_SW9, CS39_SW9, CS38_SW9}, /* RGB27 */ -}; -led_config_t g_led_config = { - { - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, }, /* R0 */ - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, }, /* R1 */ - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, }, /* R2 */ - { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, }, /* R3 */ - { 58, 59, 60, NO_LED, 61, 62, 63, NO_LED, NO_LED, 64, 65, NO_LED, NO_LED, NO_LED, }, /* R4 */ - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 14, 29, 56, 43, 57, 66, 67, 68, }, /* R5 */ - }, { - {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, - {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, - {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, - {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, - {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, - }, { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - } -}; - -const is31_led g_is31_indicator_leds[6] = { - {0, CS5_SW1, CS3_SW1, CS4_SW1}, /* RGB71 */ - {0, CS5_SW2, CS3_SW2, CS4_SW2}, /* RGB72 */ - {0, CS5_SW3, CS3_SW3, CS4_SW3}, /* RGB73 */ - {0, CS5_SW4, CS3_SW4, CS4_SW4}, /* RGB74 */ - {0, CS5_SW5, CS3_SW5, CS4_SW5}, /* RGB75 */ - {0, CS5_SW6, CS3_SW6, CS4_SW6}, /* RGB76 */ -}; - -bool led_update_kb(led_t led_state) { - if (led_update_user(led_state)) { - if (led_state.caps_lock) { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0xff, 0x00, 0x00); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0xff, 0x00, 0x00); - } else { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[3], 0x00, 0x00, 0x00); - } - - if (led_state.num_lock) { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0xff, 0x00); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0xff, 0x00); - } else { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[4], 0x00, 0x00, 0x00); - } - - if (led_state.scroll_lock) { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0xff); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0xff); - } else { - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00); - IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00); - } - } - return true; -} - -void matrix_init_kb(void) { - for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) { - is31_led led = g_is31_indicator_leds[i]; - IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF); - } - - IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0); - - matrix_init_user(); -} - -void suspend_power_down_kb(void) { - rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); -} - -void suspend_wakeup_init_kb(void) { - rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); -} -#endif diff --git a/keyboards/meme/meme.c b/keyboards/meme/meme.c deleted file mode 100644 index 928f121fe9..0000000000 --- a/keyboards/meme/meme.c +++ /dev/null @@ -1,16 +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 . - */ -#include "meme.h" diff --git a/keyboards/meow65/meow65.c b/keyboards/meow65/meow65.c deleted file mode 100644 index 4d03f6a460..0000000000 --- a/keyboards/meow65/meow65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 mrninhvn - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "meow65.h" diff --git a/keyboards/merge/iso_macro/iso_macro.c b/keyboards/merge/iso_macro/iso_macro.c deleted file mode 100644 index 6052f9cce9..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "iso_macro.h" diff --git a/keyboards/merge/uc1/uc1.c b/keyboards/merge/uc1/uc1.c deleted file mode 100644 index d23e7426d8..0000000000 --- a/keyboards/merge/uc1/uc1.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "uc1.h" diff --git a/keyboards/mesa/mesa_tkl/mesa_tkl.c b/keyboards/mesa/mesa_tkl/mesa_tkl.c deleted file mode 100644 index f75153b321..0000000000 --- a/keyboards/mesa/mesa_tkl/mesa_tkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Mesa Keyboards - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mesa_tkl.h" diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c deleted file mode 100644 index 4b777633b1..0000000000 --- a/keyboards/meson/meson.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Luciano M - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "meson.h" diff --git a/keyboards/mexsistor/ludmila/ludmila.c b/keyboards/mexsistor/ludmila/ludmila.c deleted file mode 100644 index 4125d19671..0000000000 --- a/keyboards/mexsistor/ludmila/ludmila.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Kevin M. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ludmila.h" diff --git a/keyboards/mikeneko65/mikeneko65.c b/keyboards/mikeneko65/mikeneko65.c deleted file mode 100644 index c968026a50..0000000000 --- a/keyboards/mikeneko65/mikeneko65.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 kkatano - * Copyright 2022 takishim - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mikeneko65.h" diff --git a/keyboards/millipad/millipad.c b/keyboards/millipad/millipad.c deleted file mode 100644 index 5b6b668289..0000000000 --- a/keyboards/millipad/millipad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Jirou - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "millipad.h" diff --git a/keyboards/mincedshon/ecila/ecila.c b/keyboards/mincedshon/ecila/ecila.c deleted file mode 100644 index 909de998c9..0000000000 --- a/keyboards/mincedshon/ecila/ecila.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 mincedshon (@mincedshon) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "ecila.h" diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c deleted file mode 100644 index a0d8377e97..0000000000 --- a/keyboards/minimon/index_tab/index_tab.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "index_tab.h" diff --git a/keyboards/mint60/mint60.c b/keyboards/mint60/mint60.c deleted file mode 100644 index 8905392eff..0000000000 --- a/keyboards/mint60/mint60.c +++ /dev/null @@ -1,16 +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 . - */ -#include "mint60.h" diff --git a/keyboards/misonoworks/karina/karina.c b/keyboards/misonoworks/karina/karina.c deleted file mode 100644 index f621e3f452..0000000000 --- a/keyboards/misonoworks/karina/karina.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "karina.h" diff --git a/keyboards/misterknife/knife66/knife66.c b/keyboards/misterknife/knife66/knife66.c deleted file mode 100644 index 0e261b3a81..0000000000 --- a/keyboards/misterknife/knife66/knife66.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Thierry Kleist - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "knife66.h" diff --git a/keyboards/misterknife/knife66_iso/knife66_iso.c b/keyboards/misterknife/knife66_iso/knife66_iso.c deleted file mode 100644 index fe966b0ee7..0000000000 --- a/keyboards/misterknife/knife66_iso/knife66_iso.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Thierry Kleist - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "knife66_iso.h" diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c deleted file mode 100644 index 7defbe891b..0000000000 --- a/keyboards/miuni32/miuni32.c +++ /dev/null @@ -1 +0,0 @@ -#include "miuni32.h" diff --git a/keyboards/mlego/m48/m48.c b/keyboards/mlego/m48/m48.c deleted file mode 100644 index 887521075b..0000000000 --- a/keyboards/mlego/m48/m48.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021-2022 alin elena - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "m48.h" - diff --git a/keyboards/mlego/m60/m60.c b/keyboards/mlego/m60/m60.c deleted file mode 100644 index e5dba32cdf..0000000000 --- a/keyboards/mlego/m60/m60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021-2022 alin elena - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "m60.h" - diff --git a/keyboards/mlego/m60_split/m60_split.c b/keyboards/mlego/m60_split/m60_split.c deleted file mode 100644 index 49fa10457a..0000000000 --- a/keyboards/mlego/m60_split/m60_split.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021-2022 alin elena - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "m60_split.h" - diff --git a/keyboards/mmkzoo65/mmkzoo65.c b/keyboards/mmkzoo65/mmkzoo65.c deleted file mode 100644 index 09da82dd89..0000000000 --- a/keyboards/mmkzoo65/mmkzoo65.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "mmkzoo65.h" - diff --git a/keyboards/mnk1800s/mnk1800s.c b/keyboards/mnk1800s/mnk1800s.c deleted file mode 100755 index f7fcd20c2b..0000000000 --- a/keyboards/mnk1800s/mnk1800s.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "mnk1800s.h" diff --git a/keyboards/mnk50/mnk50.c b/keyboards/mnk50/mnk50.c deleted file mode 100755 index 0e833dc7b3..0000000000 --- a/keyboards/mnk50/mnk50.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "mnk50.h" diff --git a/keyboards/mnk75/mnk75.c b/keyboards/mnk75/mnk75.c deleted file mode 100755 index 357bb07823..0000000000 --- a/keyboards/mnk75/mnk75.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ - #include "mnk75.h" diff --git a/keyboards/mode/m75s/m75s.c b/keyboards/mode/m75s/m75s.c deleted file mode 100644 index 87e643653c..0000000000 --- a/keyboards/mode/m75s/m75s.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright 2022 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 . -*/ - -#include "m75s.h" diff --git a/keyboards/mokey/ginkgo65/ginkgo65.c b/keyboards/mokey/ginkgo65/ginkgo65.c deleted file mode 100644 index 4ab3aae51f..0000000000 --- a/keyboards/mokey/ginkgo65/ginkgo65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "ginkgo65.h" - diff --git a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c b/keyboards/mokey/ginkgo65hot/ginkgo65hot.c deleted file mode 100644 index 1db0f9c22d..0000000000 --- a/keyboards/mokey/ginkgo65hot/ginkgo65hot.c +++ /dev/null @@ -1,16 +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 . - */ -#include "ginkgo65hot.h" - diff --git a/keyboards/mokey/ibis80/ibis80.c b/keyboards/mokey/ibis80/ibis80.c deleted file mode 100644 index faddc99eb5..0000000000 --- a/keyboards/mokey/ibis80/ibis80.c +++ /dev/null @@ -1,16 +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 . - */ - -#include "ibis80.h" \ No newline at end of file diff --git a/keyboards/mokey/mokey63/mokey63.c b/keyboards/mokey/mokey63/mokey63.c deleted file mode 100644 index ea30335a84..0000000000 --- a/keyboards/mokey/mokey63/mokey63.c +++ /dev/null @@ -1,15 +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 . - */ -#include "mokey63.h" diff --git a/keyboards/mokey/mokey64/mokey64.c b/keyboards/mokey/mokey64/mokey64.c deleted file mode 100644 index 5ba764b6b2..0000000000 --- a/keyboards/mokey/mokey64/mokey64.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 "mokey64.h" \ No newline at end of file diff --git a/keyboards/mokey/xox70/xox70.c b/keyboards/mokey/xox70/xox70.c deleted file mode 100644 index 7c46b6a54a..0000000000 --- a/keyboards/mokey/xox70/xox70.c +++ /dev/null @@ -1,15 +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 . - */ -#include "xox70.h" \ No newline at end of file diff --git a/keyboards/mokey/xox70hot/xox70hot.c b/keyboards/mokey/xox70hot/xox70hot.c deleted file mode 100644 index 728b5e4e39..0000000000 --- a/keyboards/mokey/xox70hot/xox70hot.c +++ /dev/null @@ -1,15 +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 . - */ -#include "xox70hot.h" \ No newline at end of file diff --git a/keyboards/molecule/molecule.c b/keyboards/molecule/molecule.c deleted file mode 100755 index c5f035289e..0000000000 --- a/keyboards/molecule/molecule.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "molecule.h" diff --git a/keyboards/momoka_ergo/momoka_ergo.c b/keyboards/momoka_ergo/momoka_ergo.c deleted file mode 100644 index 8069d7f512..0000000000 --- a/keyboards/momoka_ergo/momoka_ergo.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "momoka_ergo.h" diff --git a/keyboards/monarch/monarch.c b/keyboards/monarch/monarch.c deleted file mode 100644 index a054e2caef..0000000000 --- a/keyboards/monarch/monarch.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2021 King Keyboards www.kingkbs.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 "monarch.h" diff --git a/keyboards/monoflex60/monoflex60.c b/keyboards/monoflex60/monoflex60.c deleted file mode 100644 index 075a79125e..0000000000 --- a/keyboards/monoflex60/monoflex60.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "monoflex60.h" diff --git a/keyboards/montsinger/rewind/rewind.c b/keyboards/montsinger/rewind/rewind.c deleted file mode 100644 index 6796ef8d2e..0000000000 --- a/keyboards/montsinger/rewind/rewind.c +++ /dev/null @@ -1 +0,0 @@ -#include "rewind.h" diff --git a/keyboards/moon/moon.c b/keyboards/moon/moon.c deleted file mode 100644 index 95ce007e2b..0000000000 --- a/keyboards/moon/moon.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "moon.h" diff --git a/keyboards/morizon/morizon.c b/keyboards/morizon/morizon.c deleted file mode 100644 index 1196375cd0..0000000000 --- a/keyboards/morizon/morizon.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "morizon.h" diff --git a/keyboards/mountainblocks/mb17/mb17.c b/keyboards/mountainblocks/mb17/mb17.c deleted file mode 100644 index abc6183cbf..0000000000 --- a/keyboards/mountainblocks/mb17/mb17.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mb17.h" diff --git a/keyboards/mt/blocked65/blocked65.c b/keyboards/mt/blocked65/blocked65.c deleted file mode 100644 index 81da8005b0..0000000000 --- a/keyboards/mt/blocked65/blocked65.c +++ /dev/null @@ -1 +0,0 @@ -#include "blocked65.h" diff --git a/keyboards/mt/mt40/mt40.c b/keyboards/mt/mt40/mt40.c deleted file mode 100644 index dd079e7d81..0000000000 --- a/keyboards/mt/mt40/mt40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 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 . - */ - -#include "mt40.h" diff --git a/keyboards/mt/mt980/mt980.c b/keyboards/mt/mt980/mt980.c deleted file mode 100644 index 69f7cc491a..0000000000 --- a/keyboards/mt/mt980/mt980.c +++ /dev/null @@ -1 +0,0 @@ -#include "mt980.h" diff --git a/keyboards/mt/split75/split75.c b/keyboards/mt/split75/split75.c deleted file mode 100644 index 890c9d1de3..0000000000 --- a/keyboards/mt/split75/split75.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Artjoms Rizihs (@artjomsR) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "split75.h" diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.c b/keyboards/mtbkeys/mtb60/hotswap/hotswap.c deleted file mode 100644 index f23de6af54..0000000000 --- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 MTBKeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" diff --git a/keyboards/mtbkeys/mtb60/solder/solder.c b/keyboards/mtbkeys/mtb60/solder/solder.c deleted file mode 100644 index 9bb7f2b98e..0000000000 --- a/keyboards/mtbkeys/mtb60/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 MTBKeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" diff --git a/keyboards/murcielago/murcielago.c b/keyboards/murcielago/murcielago.c deleted file mode 100644 index 30215c69cd..0000000000 --- a/keyboards/murcielago/murcielago.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "murcielago.h" \ No newline at end of file diff --git a/keyboards/mysticworks/wyvern/wyvern.c b/keyboards/mysticworks/wyvern/wyvern.c deleted file mode 100644 index 015fb5ff05..0000000000 --- a/keyboards/mysticworks/wyvern/wyvern.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Albert Dong - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wyvern.h" - diff --git a/keyboards/nacly/sodium42/sodium42.c b/keyboards/nacly/sodium42/sodium42.c deleted file mode 100644 index 980b123bac..0000000000 --- a/keyboards/nacly/sodium42/sodium42.c +++ /dev/null @@ -1,16 +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 . - */ -#include "sodium42.h" diff --git a/keyboards/nacly/sodium50/sodium50.c b/keyboards/nacly/sodium50/sodium50.c deleted file mode 100644 index 74b2b5e16c..0000000000 --- a/keyboards/nacly/sodium50/sodium50.c +++ /dev/null @@ -1,16 +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 . - */ -#include "sodium50.h" diff --git a/keyboards/nacly/splitreus62/splitreus62.c b/keyboards/nacly/splitreus62/splitreus62.c deleted file mode 100644 index d6ea3f9135..0000000000 --- a/keyboards/nacly/splitreus62/splitreus62.c +++ /dev/null @@ -1 +0,0 @@ -#include "splitreus62.h" diff --git a/keyboards/nacly/ua62/ua62.c b/keyboards/nacly/ua62/ua62.c deleted file mode 100644 index cac45f3fbf..0000000000 --- a/keyboards/nacly/ua62/ua62.c +++ /dev/null @@ -1,17 +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 . - */ -#include "ua62.h" - diff --git a/keyboards/nasu/nasu.c b/keyboards/nasu/nasu.c deleted file mode 100644 index e7ae6a369e..0000000000 --- a/keyboards/nasu/nasu.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 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 . - */ -#include "nasu.h" diff --git a/keyboards/ncc1701kb/ncc1701kb.c b/keyboards/ncc1701kb/ncc1701kb.c deleted file mode 100644 index b654ece5ac..0000000000 --- a/keyboards/ncc1701kb/ncc1701kb.c +++ /dev/null @@ -1 +0,0 @@ -#include "ncc1701kb.h" diff --git a/keyboards/neito/neito.c b/keyboards/neito/neito.c deleted file mode 100644 index a05831ec17..0000000000 --- a/keyboards/neito/neito.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "neito.h" diff --git a/keyboards/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c deleted file mode 100644 index f7e1dd4d7b..0000000000 --- a/keyboards/nek_type_a/nek_type_a.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Mike Roberts - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nek_type_a.h" diff --git a/keyboards/nemui/nemui.c b/keyboards/nemui/nemui.c deleted file mode 100644 index cdfebb0555..0000000000 --- a/keyboards/nemui/nemui.c +++ /dev/null @@ -1,16 +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 . - */ -#include "nemui.h" diff --git a/keyboards/neokeys/g67/element_hs/element_hs.c b/keyboards/neokeys/g67/element_hs/element_hs.c deleted file mode 100644 index c5dd40fe6a..0000000000 --- a/keyboards/neokeys/g67/element_hs/element_hs.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "element_hs.h" diff --git a/keyboards/neokeys/g67/hotswap/hotswap.c b/keyboards/neokeys/g67/hotswap/hotswap.c deleted file mode 100644 index dfa980344e..0000000000 --- a/keyboards/neokeys/g67/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "hotswap.h" diff --git a/keyboards/neokeys/g67/soldered/soldered.c b/keyboards/neokeys/g67/soldered/soldered.c deleted file mode 100644 index a2c5a258aa..0000000000 --- a/keyboards/neokeys/g67/soldered/soldered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "soldered.h" diff --git a/keyboards/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c deleted file mode 100644 index 98add8ea0e..0000000000 --- a/keyboards/newgame40/newgame40.c +++ /dev/null @@ -1 +0,0 @@ -#include "newgame40.h" diff --git a/keyboards/nibiria/stream15/stream15.c b/keyboards/nibiria/stream15/stream15.c deleted file mode 100644 index eaafc85802..0000000000 --- a/keyboards/nibiria/stream15/stream15.c +++ /dev/null @@ -1,19 +0,0 @@ - /* Copyright 2021 Matt Clendaniel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "stream15.h" - - diff --git a/keyboards/nightingale_studios/hailey/hailey.c b/keyboards/nightingale_studios/hailey/hailey.c deleted file mode 100644 index ec537397d5..0000000000 --- a/keyboards/nightingale_studios/hailey/hailey.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 zvecr - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "hailey.h" diff --git a/keyboards/nightly_boards/alter/rev1/rev1.c b/keyboards/nightly_boards/alter/rev1/rev1.c deleted file mode 100644 index b250d32d12..0000000000 --- a/keyboards/nightly_boards/alter/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.c b/keyboards/nightly_boards/alter_lite/alter_lite.c deleted file mode 100644 index 90e2d8c5b3..0000000000 --- a/keyboards/nightly_boards/alter_lite/alter_lite.c +++ /dev/null @@ -1,16 +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 . - */ - -#include "alter_lite.h" diff --git a/keyboards/nightly_boards/conde60/conde60.c b/keyboards/nightly_boards/conde60/conde60.c deleted file mode 100644 index 2f31ade1be..0000000000 --- a/keyboards/nightly_boards/conde60/conde60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "conde60.h" diff --git a/keyboards/nightly_boards/daily60/daily60.c b/keyboards/nightly_boards/daily60/daily60.c deleted file mode 100644 index 88b9448777..0000000000 --- a/keyboards/nightly_boards/daily60/daily60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "daily60.h" diff --git a/keyboards/nightly_boards/jisoo/jisoo.c b/keyboards/nightly_boards/jisoo/jisoo.c deleted file mode 100644 index 96a85b4214..0000000000 --- a/keyboards/nightly_boards/jisoo/jisoo.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "jisoo.h" diff --git a/keyboards/nightly_boards/n2/n2.c b/keyboards/nightly_boards/n2/n2.c deleted file mode 100644 index d5daa06a64..0000000000 --- a/keyboards/nightly_boards/n2/n2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "n2.h" - diff --git a/keyboards/nightly_boards/n87/n87.c b/keyboards/nightly_boards/n87/n87.c deleted file mode 100644 index a9cf87a1b6..0000000000 --- a/keyboards/nightly_boards/n87/n87.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "n87.h" diff --git a/keyboards/nightly_boards/n9/n9.c b/keyboards/nightly_boards/n9/n9.c deleted file mode 100644 index e6b736aa8b..0000000000 --- a/keyboards/nightly_boards/n9/n9.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "n9.h" - diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.c b/keyboards/nightly_boards/octopadplus/octopadplus.c deleted file mode 100644 index 6e5c025ba2..0000000000 --- a/keyboards/nightly_boards/octopadplus/octopadplus.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "octopadplus.h" diff --git a/keyboards/nightly_boards/paraluman/paraluman.c b/keyboards/nightly_boards/paraluman/paraluman.c deleted file mode 100644 index 00769d9380..0000000000 --- a/keyboards/nightly_boards/paraluman/paraluman.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "paraluman.h" diff --git a/keyboards/nightly_boards/ph_arisu/ph_arisu.c b/keyboards/nightly_boards/ph_arisu/ph_arisu.c deleted file mode 100644 index e1cd5d3a04..0000000000 --- a/keyboards/nightly_boards/ph_arisu/ph_arisu.c +++ /dev/null @@ -1 +0,0 @@ -#include "ph_arisu.h" diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c deleted file mode 100644 index 301a8981a8..0000000000 --- a/keyboards/nightmare/nightmare.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 cfbender - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nightmare.h" diff --git a/keyboards/nimrod/nimrod.c b/keyboards/nimrod/nimrod.c deleted file mode 100644 index bed03197f8..0000000000 --- a/keyboards/nimrod/nimrod.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 cjcodell1 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nimrod.h" diff --git a/keyboards/nix_studio/n60_a/n60_a.c b/keyboards/nix_studio/n60_a/n60_a.c deleted file mode 100644 index 9a5563cb89..0000000000 --- a/keyboards/nix_studio/n60_a/n60_a.c +++ /dev/null @@ -1,16 +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 . - */ -#include "n60_a.h" diff --git a/keyboards/nopunin10did/jabberwocky/v1/v1.c b/keyboards/nopunin10did/jabberwocky/v1/v1.c deleted file mode 100644 index bea87aa889..0000000000 --- a/keyboards/nopunin10did/jabberwocky/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "v1.h" diff --git a/keyboards/nopunin10did/jabberwocky/v2/v2.c b/keyboards/nopunin10did/jabberwocky/v2/v2.c deleted file mode 100644 index 792093997b..0000000000 --- a/keyboards/nopunin10did/jabberwocky/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 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 . - */ - -#include "v2.h" diff --git a/keyboards/nopunin10did/railroad/rev0/rev0.c b/keyboards/nopunin10did/railroad/rev0/rev0.c deleted file mode 100644 index f9a51af643..0000000000 --- a/keyboards/nopunin10did/railroad/rev0/rev0.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev0.h" diff --git a/keyboards/novelkeys/novelpad/novelpad.c b/keyboards/novelkeys/novelpad/novelpad.c deleted file mode 100755 index 9f6ee7dae4..0000000000 --- a/keyboards/novelkeys/novelpad/novelpad.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "novelpad.h" diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c deleted file mode 100644 index a2f76a38a7..0000000000 --- a/keyboards/noxary/260/260.c +++ /dev/null @@ -1,16 +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 . - */ -#include "260.h" diff --git a/keyboards/noxary/268/268.c b/keyboards/noxary/268/268.c deleted file mode 100644 index 60ea6070d4..0000000000 --- a/keyboards/noxary/268/268.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "268.h" diff --git a/keyboards/noxary/268_2_rgb/268_2_rgb.c b/keyboards/noxary/268_2_rgb/268_2_rgb.c deleted file mode 100644 index 038d34c83c..0000000000 --- a/keyboards/noxary/268_2_rgb/268_2_rgb.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "268_2_rgb.h" diff --git a/keyboards/noxary/378/378.c b/keyboards/noxary/378/378.c deleted file mode 100644 index 10835509e3..0000000000 --- a/keyboards/noxary/378/378.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "378.h" diff --git a/keyboards/noxary/valhalla/valhalla.c b/keyboards/noxary/valhalla/valhalla.c deleted file mode 100644 index a8b2165091..0000000000 --- a/keyboards/noxary/valhalla/valhalla.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "valhalla.h" diff --git a/keyboards/noxary/vulcan/vulcan.c b/keyboards/noxary/vulcan/vulcan.c deleted file mode 100644 index a36569ecbd..0000000000 --- a/keyboards/noxary/vulcan/vulcan.c +++ /dev/null @@ -1,17 +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 . - */ -#include "vulcan.h" - diff --git a/keyboards/numatreus/numatreus.c b/keyboards/numatreus/numatreus.c deleted file mode 100644 index 0338210e86..0000000000 --- a/keyboards/numatreus/numatreus.c +++ /dev/null @@ -1 +0,0 @@ -#include "numatreus.h" \ No newline at end of file diff --git a/keyboards/nyhxis/nfr_70/nfr_70.c b/keyboards/nyhxis/nfr_70/nfr_70.c deleted file mode 100644 index 43d4a0e2c6..0000000000 --- a/keyboards/nyhxis/nfr_70/nfr_70.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Nyhxis (@nyhxis) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nfr_70.h" diff --git a/keyboards/obosob/arch_36/arch_36.c b/keyboards/obosob/arch_36/arch_36.c deleted file mode 100644 index d707e64195..0000000000 --- a/keyboards/obosob/arch_36/arch_36.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Obosob - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "arch_36.h" diff --git a/keyboards/ocean/addon/addon.c b/keyboards/ocean/addon/addon.c deleted file mode 100644 index 01a815a279..0000000000 --- a/keyboards/ocean/addon/addon.c +++ /dev/null @@ -1,15 +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 . - */ -#include "addon.h" diff --git a/keyboards/ocean/gin_v2/gin_v2.c b/keyboards/ocean/gin_v2/gin_v2.c deleted file mode 100644 index 3a8a328817..0000000000 --- a/keyboards/ocean/gin_v2/gin_v2.c +++ /dev/null @@ -1,15 +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 . - */ -#include "gin_v2.h" diff --git a/keyboards/ocean/slamz/slamz.c b/keyboards/ocean/slamz/slamz.c deleted file mode 100644 index fbfca8831a..0000000000 --- a/keyboards/ocean/slamz/slamz.c +++ /dev/null @@ -1,15 +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 . - */ -#include "slamz.h" diff --git a/keyboards/ocean/stealth/stealth.c b/keyboards/ocean/stealth/stealth.c deleted file mode 100644 index 656701cfd2..0000000000 --- a/keyboards/ocean/stealth/stealth.c +++ /dev/null @@ -1,15 +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 . - */ -#include "stealth.h" diff --git a/keyboards/ocean/sus/sus.c b/keyboards/ocean/sus/sus.c deleted file mode 100644 index d04a12bfba..0000000000 --- a/keyboards/ocean/sus/sus.c +++ /dev/null @@ -1,15 +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 . - */ -#include "sus.h" diff --git a/keyboards/ocean/wang_ergo/wang_ergo.c b/keyboards/ocean/wang_ergo/wang_ergo.c deleted file mode 100644 index 339c8465ec..0000000000 --- a/keyboards/ocean/wang_ergo/wang_ergo.c +++ /dev/null @@ -1,15 +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 . - */ -#include "wang_ergo.h" diff --git a/keyboards/ocean/wang_v2/wang_v2.c b/keyboards/ocean/wang_v2/wang_v2.c deleted file mode 100644 index b04df65bae..0000000000 --- a/keyboards/ocean/wang_v2/wang_v2.c +++ /dev/null @@ -1,15 +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 . - */ -#include "wang_v2.h" diff --git a/keyboards/ocean/yuri/yuri.c b/keyboards/ocean/yuri/yuri.c deleted file mode 100644 index f02e35dce7..0000000000 --- a/keyboards/ocean/yuri/yuri.c +++ /dev/null @@ -1,15 +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 . - */ -#include "yuri.h" diff --git a/keyboards/oddball/v1/v1.c b/keyboards/oddball/v1/v1.c deleted file mode 100644 index 932df2be2f..0000000000 --- a/keyboards/oddball/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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.h" diff --git a/keyboards/oddball/v1/v1.h b/keyboards/oddball/v1/v1.h deleted file mode 100644 index 08df4a7975..0000000000 --- a/keyboards/oddball/v1/v1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "oddball.h" diff --git a/keyboards/oddball/v2/v2.c b/keyboards/oddball/v2/v2.c deleted file mode 100644 index 319592b53d..0000000000 --- a/keyboards/oddball/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2.h" diff --git a/keyboards/oddball/v2/v2.h b/keyboards/oddball/v2/v2.h deleted file mode 100644 index 08df4a7975..0000000000 --- a/keyboards/oddball/v2/v2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "oddball.h" diff --git a/keyboards/oddball/v2_1/v2_1.c b/keyboards/oddball/v2_1/v2_1.c deleted file mode 100644 index 4c2433b413..0000000000 --- a/keyboards/oddball/v2_1/v2_1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2_1.h" diff --git a/keyboards/oddball/v2_1/v2_1.h b/keyboards/oddball/v2_1/v2_1.h deleted file mode 100644 index 08df4a7975..0000000000 --- a/keyboards/oddball/v2_1/v2_1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "oddball.h" diff --git a/keyboards/odelia/odelia.c b/keyboards/odelia/odelia.c deleted file mode 100644 index 97cf8b49be..0000000000 --- a/keyboards/odelia/odelia.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "odelia.h" diff --git a/keyboards/ogre/ergo_single/ergo_single.c b/keyboards/ogre/ergo_single/ergo_single.c deleted file mode 100644 index b48b0a02e2..0000000000 --- a/keyboards/ogre/ergo_single/ergo_single.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ergo_single.h" diff --git a/keyboards/ogre/ergo_split/ergo_split.c b/keyboards/ogre/ergo_split/ergo_split.c deleted file mode 100644 index 0d83a5e8e4..0000000000 --- a/keyboards/ogre/ergo_split/ergo_split.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ergo_split.h" diff --git a/keyboards/ok60/ok60.c b/keyboards/ok60/ok60.c deleted file mode 100644 index 052656205b..0000000000 --- a/keyboards/ok60/ok60.c +++ /dev/null @@ -1 +0,0 @@ -#include "ok60.h" diff --git a/keyboards/om60/om60.c b/keyboards/om60/om60.c deleted file mode 100644 index 9e66d6721c..0000000000 --- a/keyboards/om60/om60.c +++ /dev/null @@ -1,19 +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 . -*/ - -#include "om60.h" diff --git a/keyboards/orange75/orange75.c b/keyboards/orange75/orange75.c deleted file mode 100644 index 2d5f73048a..0000000000 --- a/keyboards/orange75/orange75.c +++ /dev/null @@ -1 +0,0 @@ -#include "orange75.h" \ No newline at end of file diff --git a/keyboards/owlab/jelly_epoch/hotswap/hotswap.c b/keyboards/owlab/jelly_epoch/hotswap/hotswap.c deleted file mode 100644 index 55fbd3ea20..0000000000 --- a/keyboards/owlab/jelly_epoch/hotswap/hotswap.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "hotswap.h" diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.c b/keyboards/owlab/jelly_epoch/soldered/soldered.c deleted file mode 100644 index a1af466d29..0000000000 --- a/keyboards/owlab/jelly_epoch/soldered/soldered.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "soldered.h" diff --git a/keyboards/owlab/suit80/ansi/ansi.c b/keyboards/owlab/suit80/ansi/ansi.c deleted file mode 100644 index 7e75773f1d..0000000000 --- a/keyboards/owlab/suit80/ansi/ansi.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "ansi.h" diff --git a/keyboards/owlab/suit80/iso/iso.c b/keyboards/owlab/suit80/iso/iso.c deleted file mode 100644 index e8f326d37e..0000000000 --- a/keyboards/owlab/suit80/iso/iso.c +++ /dev/null @@ -1,19 +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 . -*/ -#include "iso.h" diff --git a/keyboards/pabile/p18/p18.c b/keyboards/pabile/p18/p18.c deleted file mode 100644 index 94e74a8315..0000000000 --- a/keyboards/pabile/p18/p18.c +++ /dev/null @@ -1 +0,0 @@ -#include "p18.h" diff --git a/keyboards/pabile/p20/ver1/ver1.c b/keyboards/pabile/p20/ver1/ver1.c deleted file mode 100644 index 65e11630bc..0000000000 --- a/keyboards/pabile/p20/ver1/ver1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ver1.h" diff --git a/keyboards/pabile/p20/ver2/ver2.c b/keyboards/pabile/p20/ver2/ver2.c deleted file mode 100644 index fa7e1f2e39..0000000000 --- a/keyboards/pabile/p20/ver2/ver2.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ver2.h" diff --git a/keyboards/pabile/p40/p40.c b/keyboards/pabile/p40/p40.c deleted file mode 100644 index b1bfb7de2b..0000000000 --- a/keyboards/pabile/p40/p40.c +++ /dev/null @@ -1 +0,0 @@ -#include "p40.h" diff --git a/keyboards/pabile/p40_ortho/p40_ortho.c b/keyboards/pabile/p40_ortho/p40_ortho.c deleted file mode 100644 index b6573bd802..0000000000 --- a/keyboards/pabile/p40_ortho/p40_ortho.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "p40_ortho.h" diff --git a/keyboards/pabile/p42/p42.c b/keyboards/pabile/p42/p42.c deleted file mode 100644 index 63bf51bd58..0000000000 --- a/keyboards/pabile/p42/p42.c +++ /dev/null @@ -1 +0,0 @@ -#include "p42.h" diff --git a/keyboards/panc40/panc40.c b/keyboards/panc40/panc40.c deleted file mode 100644 index 8f6bd92dfb..0000000000 --- a/keyboards/panc40/panc40.c +++ /dev/null @@ -1 +0,0 @@ -#include "panc40.h" diff --git a/keyboards/panc60/panc60.c b/keyboards/panc60/panc60.c deleted file mode 100644 index 16f298eb8d..0000000000 --- a/keyboards/panc60/panc60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "panc60.h" diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.c b/keyboards/papercranekeyboards/gerald65/gerald65.c deleted file mode 100644 index a33f05d8dc..0000000000 --- a/keyboards/papercranekeyboards/gerald65/gerald65.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "gerald65.h" diff --git a/keyboards/parallel/parallel_65/hotswap/hotswap.c b/keyboards/parallel/parallel_65/hotswap/hotswap.c deleted file mode 100644 index 4189a8a80c..0000000000 --- a/keyboards/parallel/parallel_65/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "hotswap.h" diff --git a/keyboards/parallel/parallel_65/soldered/soldered.c b/keyboards/parallel/parallel_65/soldered/soldered.c deleted file mode 100644 index a74cd21dea..0000000000 --- a/keyboards/parallel/parallel_65/soldered/soldered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "soldered.h" diff --git a/keyboards/pdxkbc/pdxkbc.c b/keyboards/pdxkbc/pdxkbc.c deleted file mode 100644 index dd464c561a..0000000000 --- a/keyboards/pdxkbc/pdxkbc.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Franklin Harding - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pdxkbc.h" diff --git a/keyboards/pearl/pearl.c b/keyboards/pearl/pearl.c deleted file mode 100644 index 18ed9835d8..0000000000 --- a/keyboards/pearl/pearl.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "pearl.h" diff --git a/keyboards/pearlboards/pearl/pearl.c b/keyboards/pearlboards/pearl/pearl.c deleted file mode 100644 index f1ccf3fd9a..0000000000 --- a/keyboards/pearlboards/pearl/pearl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Koobaczech - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pearl.h" diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c deleted file mode 100644 index bbae5d6f4e..0000000000 --- a/keyboards/percent/booster/booster.c +++ /dev/null @@ -1,16 +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 . - */ -#include "booster.h" diff --git a/keyboards/percent/canoe/canoe.c b/keyboards/percent/canoe/canoe.c deleted file mode 100644 index 572ff50b01..0000000000 --- a/keyboards/percent/canoe/canoe.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "canoe.h" diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c deleted file mode 100644 index c44f0373fb..0000000000 --- a/keyboards/percent/skog/skog.c +++ /dev/null @@ -1,20 +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 . - -ps2avrGB support code by Kenneth A. (bminiex/.[ch]) -*/ - -#include "skog.h" diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c deleted file mode 100644 index c69843e617..0000000000 --- a/keyboards/percent/skog_lite/skog_lite.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "skog_lite.h" diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c deleted file mode 100644 index 5c478f82aa..0000000000 --- a/keyboards/phantom/phantom.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "phantom.h" diff --git a/keyboards/phase_studio/titan65/soldered/soldered.c b/keyboards/phase_studio/titan65/soldered/soldered.c deleted file mode 100644 index 65aee33f6b..0000000000 --- a/keyboards/phase_studio/titan65/soldered/soldered.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "soldered.h" diff --git a/keyboards/phrygian/ph100/ph100.c b/keyboards/phrygian/ph100/ph100.c deleted file mode 100644 index 45c2426961..0000000000 --- a/keyboards/phrygian/ph100/ph100.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "ph100.h" - -//Put software here \ No newline at end of file diff --git a/keyboards/picolab/frusta_fundamental/frusta_fundamental.c b/keyboards/picolab/frusta_fundamental/frusta_fundamental.c deleted file mode 100644 index 17d5df8090..0000000000 --- a/keyboards/picolab/frusta_fundamental/frusta_fundamental.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "frusta_fundamental.h" diff --git a/keyboards/pierce/pierce.c b/keyboards/pierce/pierce.c deleted file mode 100644 index 085ca9cdec..0000000000 --- a/keyboards/pierce/pierce.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 durken (https://github.com/durken1/) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pierce.h" diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.c b/keyboards/pimentoso/paddino02/rev1/rev1.c deleted file mode 100644 index 9ebd22df79..0000000000 --- a/keyboards/pimentoso/paddino02/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Michele Ferri - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.c b/keyboards/pimentoso/paddino02/rev2/left/left.c deleted file mode 100644 index 26e31efb89..0000000000 --- a/keyboards/pimentoso/paddino02/rev2/left/left.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Michele Ferri - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "left.h" diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.c b/keyboards/pimentoso/paddino02/rev2/right/right.c deleted file mode 100644 index 872541271a..0000000000 --- a/keyboards/pimentoso/paddino02/rev2/right/right.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Michele Ferri - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "right.h" diff --git a/keyboards/pimentoso/touhoupad/touhoupad.c b/keyboards/pimentoso/touhoupad/touhoupad.c deleted file mode 100644 index a7c7fa073f..0000000000 --- a/keyboards/pimentoso/touhoupad/touhoupad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Michele Ferri - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "touhoupad.h" diff --git a/keyboards/pixelspace/capsule65i/capsule65i.c b/keyboards/pixelspace/capsule65i/capsule65i.c deleted file mode 100644 index 30c1fed88e..0000000000 --- a/keyboards/pixelspace/capsule65i/capsule65i.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 PixelSpace 295033045@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 . - */ - -#include "capsule65i.h" diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.c b/keyboards/pizzakeyboards/pizza65/pizza65.c deleted file mode 100644 index 93d832af2b..0000000000 --- a/keyboards/pizzakeyboards/pizza65/pizza65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 mmonte - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pizza65.h" diff --git a/keyboards/pjb/eros/eros.c b/keyboards/pjb/eros/eros.c deleted file mode 100644 index 6dd56bfa7b..0000000000 --- a/keyboards/pjb/eros/eros.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 PJB - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "eros.h" diff --git a/keyboards/pkb65/pkb65.c b/keyboards/pkb65/pkb65.c deleted file mode 100644 index 3e07960320..0000000000 --- a/keyboards/pkb65/pkb65.c +++ /dev/null @@ -1,20 +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 . - - -*/ -#include "pkb65.h" diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h index 3e1a682f68..2e3485e1f3 100644 --- a/keyboards/planck/ez/ez.h +++ b/keyboards/planck/ez/ez.h @@ -19,10 +19,6 @@ #include "planck.h" -#ifdef KEYBOARD_planck_ez_glow -# include "glow.h" -#endif - #define LAYOUT_planck_1x2uC( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ diff --git a/keyboards/planck/ez/glow/glow.c b/keyboards/planck/ez/glow/glow.c deleted file mode 100644 index c6733bbe50..0000000000 --- a/keyboards/planck/ez/glow/glow.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2018 Jack Humbert - * Copyright 2015 ZSA Technology Labs Inc (@zsa) - * Copyright 2020 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 . - */ - -#include "glow.h" diff --git a/keyboards/planck/ez/glow/glow.h b/keyboards/planck/ez/glow/glow.h deleted file mode 100644 index cfc26b5e03..0000000000 --- a/keyboards/planck/ez/glow/glow.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2018 Jack Humbert - * Copyright 2015 ZSA Technology Labs Inc (@zsa) - * Copyright 2020 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 "ez.h" diff --git a/keyboards/playkbtw/ca66/ca66.c b/keyboards/playkbtw/ca66/ca66.c deleted file mode 100644 index 91f4826f99..0000000000 --- a/keyboards/playkbtw/ca66/ca66.c +++ /dev/null @@ -1 +0,0 @@ -#include "ca66.h" diff --git a/keyboards/playkbtw/helen80/helen80.c b/keyboards/playkbtw/helen80/helen80.c deleted file mode 100644 index 0401d92738..0000000000 --- a/keyboards/playkbtw/helen80/helen80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Play Keyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "helen80.h" diff --git a/keyboards/playkbtw/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c deleted file mode 100644 index 909230def2..0000000000 --- a/keyboards/playkbtw/pk60/pk60.c +++ /dev/null @@ -1 +0,0 @@ -#include "pk60.h" diff --git a/keyboards/plume/plume65/plume65.c b/keyboards/plume/plume65/plume65.c deleted file mode 100644 index 991a989af3..0000000000 --- a/keyboards/plume/plume65/plume65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "plume65.h" diff --git a/keyboards/plut0nium/0x3e/0x3e.c b/keyboards/plut0nium/0x3e/0x3e.c deleted file mode 100644 index 2f3683d8bc..0000000000 --- a/keyboards/plut0nium/0x3e/0x3e.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "0x3e.h" - diff --git a/keyboards/plx/plx.c b/keyboards/plx/plx.c deleted file mode 100644 index 65e4dfd28b..0000000000 --- a/keyboards/plx/plx.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Peac Design and Basekeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "plx.h" diff --git a/keyboards/plywrks/ahgase/ahgase.c b/keyboards/plywrks/ahgase/ahgase.c deleted file mode 100644 index 871101a97e..0000000000 --- a/keyboards/plywrks/ahgase/ahgase.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ahgase.h" diff --git a/keyboards/pohjolaworks/louhi/louhi.c b/keyboards/pohjolaworks/louhi/louhi.c deleted file mode 100644 index d5bb648b62..0000000000 --- a/keyboards/pohjolaworks/louhi/louhi.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Erkki Halinen - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "louhi.h" diff --git a/keyboards/poker87c/poker87c.c b/keyboards/poker87c/poker87c.c deleted file mode 100644 index 6009ce112d..0000000000 --- a/keyboards/poker87c/poker87c.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "poker87c.h" - - diff --git a/keyboards/poker87d/poker87d.c b/keyboards/poker87d/poker87d.c deleted file mode 100644 index 8faf286cff..0000000000 --- a/keyboards/poker87d/poker87d.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "poker87d.h" - - diff --git a/keyboards/polilla/polilla.c b/keyboards/polilla/polilla.c deleted file mode 100644 index b8bfba2d9e..0000000000 --- a/keyboards/polilla/polilla.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "polilla.h" \ No newline at end of file diff --git a/keyboards/polycarbdiet/s20/s20.c b/keyboards/polycarbdiet/s20/s20.c deleted file mode 100644 index f7b3fa9036..0000000000 --- a/keyboards/polycarbdiet/s20/s20.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Muhammad Galib (polycarbdiet) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "s20.h" diff --git a/keyboards/portal_66/hotswap/hotswap.c b/keyboards/portal_66/hotswap/hotswap.c deleted file mode 100644 index 4189a8a80c..0000000000 --- a/keyboards/portal_66/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "hotswap.h" diff --git a/keyboards/portal_66/soldered/soldered.c b/keyboards/portal_66/soldered/soldered.c deleted file mode 100644 index a74cd21dea..0000000000 --- a/keyboards/portal_66/soldered/soldered.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "soldered.h" diff --git a/keyboards/pos78/pos78.c b/keyboards/pos78/pos78.c deleted file mode 100644 index f2e98aba0f..0000000000 --- a/keyboards/pos78/pos78.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 smssmssms - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pos78.h" diff --git a/keyboards/primekb/meridian_rgb/meridian_rgb.c b/keyboards/primekb/meridian_rgb/meridian_rgb.c deleted file mode 100644 index 95bb63a91b..0000000000 --- a/keyboards/primekb/meridian_rgb/meridian_rgb.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "meridian_rgb.h" diff --git a/keyboards/primekb/prime_e/prime_e.c b/keyboards/primekb/prime_e/prime_e.c deleted file mode 100644 index 8e30f3c5f4..0000000000 --- a/keyboards/primekb/prime_e/prime_e.c +++ /dev/null @@ -1,16 +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 . - */ -#include "prime_e.h" diff --git a/keyboards/primekb/prime_m/prime_m.c b/keyboards/primekb/prime_m/prime_m.c deleted file mode 100644 index 168fec4edf..0000000000 --- a/keyboards/primekb/prime_m/prime_m.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat - * 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 . - */ -#include "prime_m.h" diff --git a/keyboards/primekb/prime_o/prime_o.c b/keyboards/primekb/prime_o/prime_o.c deleted file mode 100644 index 369347cf4c..0000000000 --- a/keyboards/primekb/prime_o/prime_o.c +++ /dev/null @@ -1,16 +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 . - */ -#include "prime_o.h" diff --git a/keyboards/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c deleted file mode 100644 index 3a08bed591..0000000000 --- a/keyboards/primekb/prime_r/prime_r.c +++ /dev/null @@ -1,16 +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 . - */ -#include "prime_r.h" diff --git a/keyboards/projectkb/signature65/signature65.c b/keyboards/projectkb/signature65/signature65.c deleted file mode 100644 index c5255dddb9..0000000000 --- a/keyboards/projectkb/signature65/signature65.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2022 Project Keyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "signature65.h" diff --git a/keyboards/projectkb/signature87/signature87.c b/keyboards/projectkb/signature87/signature87.c deleted file mode 100644 index e210f67de9..0000000000 --- a/keyboards/projectkb/signature87/signature87.c +++ /dev/null @@ -1 +0,0 @@ -#include "signature87.h" \ No newline at end of file diff --git a/keyboards/prototypist/allison/allison.c b/keyboards/prototypist/allison/allison.c deleted file mode 100644 index 4ca8bd07de..0000000000 --- a/keyboards/prototypist/allison/allison.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "allison.h" diff --git a/keyboards/prototypist/allison_numpad/allison_numpad.c b/keyboards/prototypist/allison_numpad/allison_numpad.c deleted file mode 100644 index 16f36e3140..0000000000 --- a/keyboards/prototypist/allison_numpad/allison_numpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "allison_numpad.h" diff --git a/keyboards/prototypist/j01/j01.c b/keyboards/prototypist/j01/j01.c deleted file mode 100644 index 4ebe2d351c..0000000000 --- a/keyboards/prototypist/j01/j01.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "j01.h" diff --git a/keyboards/protozoa/p01/p01.c b/keyboards/protozoa/p01/p01.c deleted file mode 100644 index b0a14e1212..0000000000 --- a/keyboards/protozoa/p01/p01.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 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 . - */ -#include "p01.h" diff --git a/keyboards/psuieee/pluto12/pluto12.c b/keyboards/psuieee/pluto12/pluto12.c deleted file mode 100644 index 15d5fad99f..0000000000 --- a/keyboards/psuieee/pluto12/pluto12.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021-22 Will McGloughlin (@wymcg) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "pluto12.h" diff --git a/keyboards/puck/puck.c b/keyboards/puck/puck.c deleted file mode 100644 index 0e26b9c3cd..0000000000 --- a/keyboards/puck/puck.c +++ /dev/null @@ -1 +0,0 @@ -#include "puck.h" diff --git a/keyboards/q4z/q4z.c b/keyboards/q4z/q4z.c deleted file mode 100644 index 537f1f5780..0000000000 --- a/keyboards/q4z/q4z.c +++ /dev/null @@ -1,16 +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 . - */ -#include "q4z.h" diff --git a/keyboards/qpockets/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c deleted file mode 100644 index 2287b9e278..0000000000 --- a/keyboards/qpockets/eggman/eggman.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Alan Lehners - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "eggman.h" diff --git a/keyboards/qpockets/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c deleted file mode 100644 index e639552cfb..0000000000 --- a/keyboards/qpockets/space_space/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ - -/* Copyright 2020 qpockets - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" diff --git a/keyboards/qpockets/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c deleted file mode 100644 index 15f3e64cb8..0000000000 --- a/keyboards/qpockets/wanten/wanten.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 qpockets - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wanten.h" diff --git a/keyboards/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c deleted file mode 100644 index 7f7d2fcc82..0000000000 --- a/keyboards/quantrik/kyuu/kyuu.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kyuu.h" diff --git a/keyboards/quarkeys/z60/hotswap/hotswap.c b/keyboards/quarkeys/z60/hotswap/hotswap.c deleted file mode 100644 index b45286e8ba..0000000000 --- a/keyboards/quarkeys/z60/hotswap/hotswap.c +++ /dev/null @@ -1,15 +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 . -*/ - -#include "hotswap.h" diff --git a/keyboards/quarkeys/z60/solder/solder.c b/keyboards/quarkeys/z60/solder/solder.c deleted file mode 100644 index 1aacc5168e..0000000000 --- a/keyboards/quarkeys/z60/solder/solder.c +++ /dev/null @@ -1,15 +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 . -*/ - -#include "solder.h" diff --git a/keyboards/quarkeys/z67/hotswap/hotswap.c b/keyboards/quarkeys/z67/hotswap/hotswap.c deleted file mode 100644 index b45286e8ba..0000000000 --- a/keyboards/quarkeys/z67/hotswap/hotswap.c +++ /dev/null @@ -1,15 +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 . -*/ - -#include "hotswap.h" diff --git a/keyboards/quarkeys/z67/solder/solder.c b/keyboards/quarkeys/z67/solder/solder.c deleted file mode 100644 index 1aacc5168e..0000000000 --- a/keyboards/quarkeys/z67/solder/solder.c +++ /dev/null @@ -1,15 +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 . -*/ - -#include "solder.h" diff --git a/keyboards/qwertlekeys/calice/calice.c b/keyboards/qwertlekeys/calice/calice.c deleted file mode 100644 index d284544964..0000000000 --- a/keyboards/qwertlekeys/calice/calice.c +++ /dev/null @@ -1,17 +0,0 @@ -/* copyright 2021 Joah Nelson (jels) -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERAHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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 "calice.h" diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.c b/keyboards/qwertykeys/qk65/hotswap/hotswap.c deleted file mode 100644 index 78de3ff275..0000000000 --- a/keyboards/qwertykeys/qk65/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 qwertykeys - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "hotswap.h" \ No newline at end of file diff --git a/keyboards/qwertykeys/qk65/solder/solder.c b/keyboards/qwertykeys/qk65/solder/solder.c deleted file mode 100644 index fc95c768fd..0000000000 --- a/keyboards/qwertykeys/qk65/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 qwertykeys - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "solder.h" \ No newline at end of file diff --git a/keyboards/rabbit/rabbit68/rabbit68.c b/keyboards/rabbit/rabbit68/rabbit68.c deleted file mode 100644 index 652d8417e7..0000000000 --- a/keyboards/rabbit/rabbit68/rabbit68.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rabbit68.h" diff --git a/keyboards/rad/rad.c b/keyboards/rad/rad.c deleted file mode 100644 index b3fed54696..0000000000 --- a/keyboards/rad/rad.c +++ /dev/null @@ -1,15 +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 . - */ -#include "rad.h" diff --git a/keyboards/rainkeebs/rainkeeb/rainkeeb.c b/keyboards/rainkeebs/rainkeeb/rainkeeb.c deleted file mode 100644 index b13ecb2483..0000000000 --- a/keyboards/rainkeebs/rainkeeb/rainkeeb.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rainkeeb.h" \ No newline at end of file diff --git a/keyboards/rainkeebs/yasui/yasui.c b/keyboards/rainkeebs/yasui/yasui.c deleted file mode 100644 index a87f7482a0..0000000000 --- a/keyboards/rainkeebs/yasui/yasui.c +++ /dev/null @@ -1,16 +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 . - */ -#include "yasui.h" diff --git a/keyboards/rart/rart45/rart45.c b/keyboards/rart/rart45/rart45.c deleted file mode 100644 index 480b05a808..0000000000 --- a/keyboards/rart/rart45/rart45.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart45.h" diff --git a/keyboards/rart/rart4x4/rart4x4.c b/keyboards/rart/rart4x4/rart4x4.c deleted file mode 100644 index 0d5e2dbade..0000000000 --- a/keyboards/rart/rart4x4/rart4x4.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart4x4.h" diff --git a/keyboards/rart/rart67/rart67.c b/keyboards/rart/rart67/rart67.c deleted file mode 100644 index 0ca3e00f22..0000000000 --- a/keyboards/rart/rart67/rart67.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart67.h" - - diff --git a/keyboards/rart/rart67m/rart67m.c b/keyboards/rart/rart67m/rart67m.c deleted file mode 100644 index 4aa99c5203..0000000000 --- a/keyboards/rart/rart67m/rart67m.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart67m.h" diff --git a/keyboards/rart/rart75/rart75.c b/keyboards/rart/rart75/rart75.c deleted file mode 100644 index 15ae54f9e8..0000000000 --- a/keyboards/rart/rart75/rart75.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart75.h" diff --git a/keyboards/rart/rart80/rart80.c b/keyboards/rart/rart80/rart80.c deleted file mode 100644 index 8eeb608a42..0000000000 --- a/keyboards/rart/rart80/rart80.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2022 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rart80.h" \ No newline at end of file diff --git a/keyboards/rart/rartand/rartand.c b/keyboards/rart/rartand/rartand.c deleted file mode 100644 index e9cff88ba5..0000000000 --- a/keyboards/rart/rartand/rartand.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2021 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rartand.h" diff --git a/keyboards/rart/rartlice/rartlice.c b/keyboards/rart/rartlice/rartlice.c deleted file mode 100644 index a970e96867..0000000000 --- a/keyboards/rart/rartlice/rartlice.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rartlice.h" diff --git a/keyboards/rart/rartpad/rartpad.c b/keyboards/rart/rartpad/rartpad.c deleted file mode 100644 index 4b5a9eb0c2..0000000000 --- a/keyboards/rart/rartpad/rartpad.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 Alabahuy - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rartpad.h" \ No newline at end of file diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c deleted file mode 100644 index 40e75fe1b0..0000000000 --- a/keyboards/rate/pistachio_mp/pistachio_mp.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "pistachio_mp.h" diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c deleted file mode 100644 index fda14471b7..0000000000 --- a/keyboards/rate/pistachio_pro/pistachio_pro.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "pistachio_pro.h" diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c b/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.c deleted file mode 100644 index dc6c727fb7..0000000000 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/rev_a.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_a.h" diff --git a/keyboards/rationalist/ratio65_solder/rev_a/rev_a.c b/keyboards/rationalist/ratio65_solder/rev_a/rev_a.c deleted file mode 100644 index dc6c727fb7..0000000000 --- a/keyboards/rationalist/ratio65_solder/rev_a/rev_a.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_a.h" diff --git a/keyboards/recompile_keys/choco60/choco60.c b/keyboards/recompile_keys/choco60/choco60.c deleted file mode 100644 index fc56c68ac8..0000000000 --- a/keyboards/recompile_keys/choco60/choco60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "choco60.h" diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.c b/keyboards/recompile_keys/choco60/rev1/rev1.c deleted file mode 100644 index fe60477e34..0000000000 --- a/keyboards/recompile_keys/choco60/rev1/rev1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev1.h" diff --git a/keyboards/recompile_keys/choco60/rev1/rev1.h b/keyboards/recompile_keys/choco60/rev1/rev1.h deleted file mode 100644 index fa161f267e..0000000000 --- a/keyboards/recompile_keys/choco60/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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" diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.c b/keyboards/recompile_keys/choco60/rev2/rev2.c deleted file mode 100644 index 5eabb33ac6..0000000000 --- a/keyboards/recompile_keys/choco60/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rev2.h" diff --git a/keyboards/recompile_keys/choco60/rev2/rev2.h b/keyboards/recompile_keys/choco60/rev2/rev2.h deleted file mode 100644 index fa161f267e..0000000000 --- a/keyboards/recompile_keys/choco60/rev2/rev2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 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" diff --git a/keyboards/recompile_keys/cocoa40/cocoa40.c b/keyboards/recompile_keys/cocoa40/cocoa40.c deleted file mode 100644 index fdc9f9c0ea..0000000000 --- a/keyboards/recompile_keys/cocoa40/cocoa40.c +++ /dev/null @@ -1,16 +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 . - */ -#include "cocoa40.h" diff --git a/keyboards/recompile_keys/mio/mio.c b/keyboards/recompile_keys/mio/mio.c deleted file mode 100644 index 154a89d26f..0000000000 --- a/keyboards/recompile_keys/mio/mio.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "mio.h" diff --git a/keyboards/rect44/rect44.c b/keyboards/rect44/rect44.c deleted file mode 100644 index b36aa7d40d..0000000000 --- a/keyboards/rect44/rect44.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020-2021 koshinoya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rect44.h" diff --git a/keyboards/redscarf_iiplus/verb/verb.c b/keyboards/redscarf_iiplus/verb/verb.c deleted file mode 100755 index 9313b2a792..0000000000 --- a/keyboards/redscarf_iiplus/verb/verb.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "verb.h" diff --git a/keyboards/redscarf_iiplus/verc/verc.c b/keyboards/redscarf_iiplus/verc/verc.c deleted file mode 100755 index 09edb5f1cd..0000000000 --- a/keyboards/redscarf_iiplus/verc/verc.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "verc.h" diff --git a/keyboards/redscarf_iiplus/verd/verd.c b/keyboards/redscarf_iiplus/verd/verd.c deleted file mode 100644 index fa5ef6bd2b..0000000000 --- a/keyboards/redscarf_iiplus/verd/verd.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2019 Andy Lee - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "verd.h" diff --git a/keyboards/retro_75/retro_75.c b/keyboards/retro_75/retro_75.c deleted file mode 100644 index d47def3720..0000000000 --- a/keyboards/retro_75/retro_75.c +++ /dev/null @@ -1 +0,0 @@ -#include "retro_75.h" diff --git a/keyboards/reversestudio/decadepad/decadepad.c b/keyboards/reversestudio/decadepad/decadepad.c deleted file mode 100644 index 699a4476bb..0000000000 --- a/keyboards/reversestudio/decadepad/decadepad.c +++ /dev/null @@ -1 +0,0 @@ -#include "decadepad.h" diff --git a/keyboards/reviung/reviung33/reviung33.c b/keyboards/reviung/reviung33/reviung33.c deleted file mode 100644 index 7684cb72c8..0000000000 --- a/keyboards/reviung/reviung33/reviung33.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "reviung33.h" diff --git a/keyboards/reviung/reviung34/reviung34.c b/keyboards/reviung/reviung34/reviung34.c deleted file mode 100755 index 00862d73e9..0000000000 --- a/keyboards/reviung/reviung34/reviung34.c +++ /dev/null @@ -1,16 +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 . - */ -#include "reviung34.h" diff --git a/keyboards/reviung/reviung39/reviung39.c b/keyboards/reviung/reviung39/reviung39.c deleted file mode 100644 index 0948106e9d..0000000000 --- a/keyboards/reviung/reviung39/reviung39.c +++ /dev/null @@ -1,16 +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 . - */ -#include "reviung39.h" diff --git a/keyboards/reviung/reviung41/reviung41.c b/keyboards/reviung/reviung41/reviung41.c deleted file mode 100644 index 05bb42160a..0000000000 --- a/keyboards/reviung/reviung41/reviung41.c +++ /dev/null @@ -1,16 +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 . - */ -#include "reviung41.h" diff --git a/keyboards/reviung/reviung5/reviung5.c b/keyboards/reviung/reviung5/reviung5.c deleted file mode 100644 index a8f98f0627..0000000000 --- a/keyboards/reviung/reviung5/reviung5.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "reviung5.h" diff --git a/keyboards/reviung/reviung53/reviung53.c b/keyboards/reviung/reviung53/reviung53.c deleted file mode 100644 index e2190aeccf..0000000000 --- a/keyboards/reviung/reviung53/reviung53.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 gtips (@gtips) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "reviung53.h" diff --git a/keyboards/reviung/reviung61/reviung61.c b/keyboards/reviung/reviung61/reviung61.c deleted file mode 100644 index 3cd69bf27f..0000000000 --- a/keyboards/reviung/reviung61/reviung61.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "reviung61.h" diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/rgbkb/zen/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c index 1fb1716a09..036bbd511a 100644 --- a/keyboards/rgbkb/zygomorph/rev1/rev1.c +++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "zygomorph.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.h b/keyboards/rgbkb/zygomorph/rev1/rev1.h index c667088d05..b0b5c7069a 100644 --- a/keyboards/rgbkb/zygomorph/rev1/rev1.h +++ b/keyboards/rgbkb/zygomorph/rev1/rev1.h @@ -1,6 +1,5 @@ #pragma once -#include "zygomorph.h" #include "quantum.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/rgbkb/zygomorph/zygomorph.c b/keyboards/rgbkb/zygomorph/zygomorph.c deleted file mode 100644 index 9f029813bc..0000000000 --- a/keyboards/rgbkb/zygomorph/zygomorph.c +++ /dev/null @@ -1 +0,0 @@ -#include "zygomorph.h" diff --git a/keyboards/rgbkb/zygomorph/zygomorph.h b/keyboards/rgbkb/zygomorph/zygomorph.h deleted file mode 100644 index 24198ed4c9..0000000000 --- a/keyboards/rgbkb/zygomorph/zygomorph.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "rev1.h" -#include "quantum.h" diff --git a/keyboards/rmi_kb/aelith/aelith.c b/keyboards/rmi_kb/aelith/aelith.c deleted file mode 100644 index e2153f7645..0000000000 --- a/keyboards/rmi_kb/aelith/aelith.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "aelith.h" diff --git a/keyboards/rmi_kb/chevron/chevron.c b/keyboards/rmi_kb/chevron/chevron.c deleted file mode 100644 index 5b15d3324c..0000000000 --- a/keyboards/rmi_kb/chevron/chevron.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "chevron.h" diff --git a/keyboards/rmi_kb/herringbone/pro/pro.c b/keyboards/rmi_kb/herringbone/pro/pro.c deleted file mode 100644 index 4c11baefcc..0000000000 --- a/keyboards/rmi_kb/herringbone/pro/pro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "pro.h" diff --git a/keyboards/rmi_kb/herringbone/v1/v1.c b/keyboards/rmi_kb/herringbone/v1/v1.c deleted file mode 100644 index 4bdb5fad38..0000000000 --- a/keyboards/rmi_kb/herringbone/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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.h" diff --git a/keyboards/rmi_kb/mona/v1/v1.c b/keyboards/rmi_kb/mona/v1/v1.c deleted file mode 100644 index d55373272d..0000000000 --- a/keyboards/rmi_kb/mona/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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.h" diff --git a/keyboards/rmi_kb/mona/v1_1/v1_1.c b/keyboards/rmi_kb/mona/v1_1/v1_1.c deleted file mode 100644 index d6ebf98053..0000000000 --- a/keyboards/rmi_kb/mona/v1_1/v1_1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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_1.h" diff --git a/keyboards/rmi_kb/mona/v32a/v32a.c b/keyboards/rmi_kb/mona/v32a/v32a.c deleted file mode 100644 index cc35f4d5ff..0000000000 --- a/keyboards/rmi_kb/mona/v32a/v32a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v32a.h" diff --git a/keyboards/rmi_kb/squishy65/squishy65.c b/keyboards/rmi_kb/squishy65/squishy65.c deleted file mode 100644 index 6d9fb24196..0000000000 --- a/keyboards/rmi_kb/squishy65/squishy65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "squishy65.h" diff --git a/keyboards/rmi_kb/squishyfrl/squishyfrl.c b/keyboards/rmi_kb/squishyfrl/squishyfrl.c deleted file mode 100644 index db2a2ae933..0000000000 --- a/keyboards/rmi_kb/squishyfrl/squishyfrl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "squishyfrl.h" diff --git a/keyboards/rmi_kb/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c deleted file mode 100644 index 9a63c81364..0000000000 --- a/keyboards/rmi_kb/squishytkl/squishytkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "squishytkl.h" diff --git a/keyboards/rmi_kb/tkl_ff/tkl_ff.c b/keyboards/rmi_kb/tkl_ff/tkl_ff.c deleted file mode 100644 index 4a4b7c204a..0000000000 --- a/keyboards/rmi_kb/tkl_ff/tkl_ff.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "tkl_ff.h" diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.c b/keyboards/rmi_kb/tkl_ff/v2/v2.c deleted file mode 100644 index de5f32e3ca..0000000000 --- a/keyboards/rmi_kb/tkl_ff/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2.h" diff --git a/keyboards/rmi_kb/tkl_ff/v2/v2.h b/keyboards/rmi_kb/tkl_ff/v2/v2.h deleted file mode 100644 index 7c4566defb..0000000000 --- a/keyboards/rmi_kb/tkl_ff/v2/v2.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" diff --git a/keyboards/rmi_kb/wete/v2/v2.c b/keyboards/rmi_kb/wete/v2/v2.c deleted file mode 100644 index de5f32e3ca..0000000000 --- a/keyboards/rmi_kb/wete/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ramon Imbao - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2.h" diff --git a/keyboards/rocketboard_16/rocketboard_16.c b/keyboards/rocketboard_16/rocketboard_16.c deleted file mode 100644 index a2710083df..0000000000 --- a/keyboards/rocketboard_16/rocketboard_16.c +++ /dev/null @@ -1 +0,0 @@ -#include "rocketboard_16.h" diff --git a/keyboards/rominronin/katana60/rev1/rev1.c b/keyboards/rominronin/katana60/rev1/rev1.c deleted file mode 100644 index e57ae2bbcb..0000000000 --- a/keyboards/rominronin/katana60/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/rominronin/katana60/rev2/rev2.c b/keyboards/rominronin/katana60/rev2/rev2.c deleted file mode 100644 index 3336fd0dc7..0000000000 --- a/keyboards/rominronin/katana60/rev2/rev2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 rominronin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev2.h" diff --git a/keyboards/roseslite/roseslite.c b/keyboards/roseslite/roseslite.c deleted file mode 100644 index fa3a93fed7..0000000000 --- a/keyboards/roseslite/roseslite.c +++ /dev/null @@ -1,16 +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 . - */ -#include "roseslite.h" diff --git a/keyboards/rotor/rotor.c b/keyboards/rotor/rotor.c deleted file mode 100644 index 2a21ed9b4f..0000000000 --- a/keyboards/rotor/rotor.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Densus Design and Basekeys.jp - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rotor.h" diff --git a/keyboards/rpiguy9907/southpaw66/southpaw66.c b/keyboards/rpiguy9907/southpaw66/southpaw66.c deleted file mode 100644 index ef61984b9d..0000000000 --- a/keyboards/rpiguy9907/southpaw66/southpaw66.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "southpaw66.h" diff --git a/keyboards/runes/skjoldr/skjoldr.c b/keyboards/runes/skjoldr/skjoldr.c deleted file mode 100644 index 2a8f003fc4..0000000000 --- a/keyboards/runes/skjoldr/skjoldr.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "skjoldr.h" diff --git a/keyboards/runes/vaengr/vaengr.c b/keyboards/runes/vaengr/vaengr.c deleted file mode 100644 index 7bea621495..0000000000 --- a/keyboards/runes/vaengr/vaengr.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "vaengr.h" diff --git a/keyboards/ryanbaekr/rb18/rb18.c b/keyboards/ryanbaekr/rb18/rb18.c deleted file mode 100644 index 366364e42f..0000000000 --- a/keyboards/ryanbaekr/rb18/rb18.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rb18.h" diff --git a/keyboards/ryanbaekr/rb69/rb69.c b/keyboards/ryanbaekr/rb69/rb69.c deleted file mode 100644 index 68d27ce39a..0000000000 --- a/keyboards/ryanbaekr/rb69/rb69.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rb69.h" diff --git a/keyboards/ryanbaekr/rb86/rb86.c b/keyboards/ryanbaekr/rb86/rb86.c deleted file mode 100644 index b3375cb4fc..0000000000 --- a/keyboards/ryanbaekr/rb86/rb86.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rb86.h" diff --git a/keyboards/ryanbaekr/rb87/rb87.c b/keyboards/ryanbaekr/rb87/rb87.c deleted file mode 100644 index 4fd8a3decd..0000000000 --- a/keyboards/ryanbaekr/rb87/rb87.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rb87.h" diff --git a/keyboards/ryloo_studio/m0110/m0110.c b/keyboards/ryloo_studio/m0110/m0110.c deleted file mode 100755 index c7bae90e15..0000000000 --- a/keyboards/ryloo_studio/m0110/m0110.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 newtonapple - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "m0110.h" diff --git a/keyboards/salicylic_acid3/7splus/7splus.c b/keyboards/salicylic_acid3/7splus/7splus.c deleted file mode 100644 index ca94ab0efa..0000000000 --- a/keyboards/salicylic_acid3/7splus/7splus.c +++ /dev/null @@ -1,17 +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 . -*/ -#include "7splus.h" diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.c b/keyboards/salicylic_acid3/ajisai74/ajisai74.c deleted file mode 100644 index 3c9342e6f7..0000000000 --- a/keyboards/salicylic_acid3/ajisai74/ajisai74.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ajisai74.h" diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c deleted file mode 100644 index 7d2c11e6ec..0000000000 --- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "ergoarrows.h" diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.c b/keyboards/salicylic_acid3/nafuda/nafuda.c deleted file mode 100644 index 334b3dab27..0000000000 --- a/keyboards/salicylic_acid3/nafuda/nafuda.c +++ /dev/null @@ -1 +0,0 @@ -#include "nafuda.h" diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.c b/keyboards/salicylic_acid3/nknl7en/nknl7en.c deleted file mode 100644 index 1f06cb7336..0000000000 --- a/keyboards/salicylic_acid3/nknl7en/nknl7en.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "nknl7en.h" diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c deleted file mode 100644 index 0395a3b678..0000000000 --- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "nknl7jp.h" diff --git a/keyboards/sam/s80/s80.c b/keyboards/sam/s80/s80.c deleted file mode 100644 index 7b56bd854e..0000000000 --- a/keyboards/sam/s80/s80.c +++ /dev/null @@ -1,20 +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 . - */ - -#include "s80.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sam/sg81m/sg81m.c b/keyboards/sam/sg81m/sg81m.c deleted file mode 100644 index 81f829c8be..0000000000 --- a/keyboards/sam/sg81m/sg81m.c +++ /dev/null @@ -1,16 +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 . - */ -#include "sg81m.h" diff --git a/keyboards/sanctified/dystopia/dystopia.c b/keyboards/sanctified/dystopia/dystopia.c deleted file mode 100644 index 64ad5abc82..0000000000 --- a/keyboards/sanctified/dystopia/dystopia.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Quentin Melis - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "dystopia.h" diff --git a/keyboards/sandwich/keeb68/keeb68.c b/keyboards/sandwich/keeb68/keeb68.c deleted file mode 100644 index c040d1a976..0000000000 --- a/keyboards/sandwich/keeb68/keeb68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 sandwich - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "keeb68.h" diff --git a/keyboards/satt/comet46/comet46.c b/keyboards/satt/comet46/comet46.c deleted file mode 100644 index 7c7edba93e..0000000000 --- a/keyboards/satt/comet46/comet46.c +++ /dev/null @@ -1 +0,0 @@ -#include "comet46.h" diff --git a/keyboards/satt/vision/vision.c b/keyboards/satt/vision/vision.c deleted file mode 100644 index ef23c5b1d1..0000000000 --- a/keyboards/satt/vision/vision.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "vision.h" diff --git a/keyboards/sauce/mild/mild.c b/keyboards/sauce/mild/mild.c deleted file mode 100644 index 963cbede9e..0000000000 --- a/keyboards/sauce/mild/mild.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Andy Yong (Sauce) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mild.h" diff --git a/keyboards/sawnsprojects/amber80/solder/solder.c b/keyboards/sawnsprojects/amber80/solder/solder.c deleted file mode 100644 index b7dbe1e558..0000000000 --- a/keyboards/sawnsprojects/amber80/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 SawnsProjects - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" diff --git a/keyboards/sawnsprojects/krush/krush60/solder/solder.c b/keyboards/sawnsprojects/krush/krush60/solder/solder.c deleted file mode 100644 index 2fb9b24f8c..0000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" \ No newline at end of file diff --git a/keyboards/sawnsprojects/vcl65/solder/solder.c b/keyboards/sawnsprojects/vcl65/solder/solder.c deleted file mode 100644 index 2fb9b24f8c..0000000000 --- a/keyboards/sawnsprojects/vcl65/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "solder.h" \ No newline at end of file diff --git a/keyboards/scatter42/scatter42.c b/keyboards/scatter42/scatter42.c deleted file mode 100644 index 4126382df6..0000000000 --- a/keyboards/scatter42/scatter42.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "scatter42.h" diff --git a/keyboards/sck/gtm/gtm.c b/keyboards/sck/gtm/gtm.c deleted file mode 100644 index 6adb9b39b6..0000000000 --- a/keyboards/sck/gtm/gtm.c +++ /dev/null @@ -1 +0,0 @@ -#include "gtm.h" diff --git a/keyboards/sck/m0116b/m0116b.c b/keyboards/sck/m0116b/m0116b.c deleted file mode 100644 index 368bc3eafd..0000000000 --- a/keyboards/sck/m0116b/m0116b.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "m0116b.h" diff --git a/keyboards/sck/neiso/neiso.c b/keyboards/sck/neiso/neiso.c deleted file mode 100644 index 8fe008e28b..0000000000 --- a/keyboards/sck/neiso/neiso.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "neiso.h" diff --git a/keyboards/sck/osa/osa.c b/keyboards/sck/osa/osa.c deleted file mode 100644 index 7f144035e5..0000000000 --- a/keyboards/sck/osa/osa.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "osa.h" diff --git a/keyboards/sendyyeah/75pixels/75pixels.c b/keyboards/sendyyeah/75pixels/75pixels.c deleted file mode 100644 index 62ec8df82c..0000000000 --- a/keyboards/sendyyeah/75pixels/75pixels.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "75pixels.h" diff --git a/keyboards/sendyyeah/bevi/bevi.c b/keyboards/sendyyeah/bevi/bevi.c deleted file mode 100644 index c5bf0fbe17..0000000000 --- a/keyboards/sendyyeah/bevi/bevi.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bevi.h" diff --git a/keyboards/senselessclay/ck65/ck65.c b/keyboards/senselessclay/ck65/ck65.c deleted file mode 100644 index 77128d9bf8..0000000000 --- a/keyboards/senselessclay/ck65/ck65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ck65.h" \ No newline at end of file diff --git a/keyboards/senselessclay/had60/had60.c b/keyboards/senselessclay/had60/had60.c deleted file mode 100644 index b90b89193e..0000000000 --- a/keyboards/senselessclay/had60/had60.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "had60.h" diff --git a/keyboards/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c deleted file mode 100644 index f323648714..0000000000 --- a/keyboards/sentraq/number_pad/number_pad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 QMK Community - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "number_pad.h" diff --git a/keyboards/sentraq/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c deleted file mode 100644 index 2a5bcfdd6d..0000000000 --- a/keyboards/sentraq/s60_x/default/default.c +++ /dev/null @@ -1 +0,0 @@ -#include "default.h" diff --git a/keyboards/sentraq/s60_x/rgb/rgb.c b/keyboards/sentraq/s60_x/rgb/rgb.c deleted file mode 100644 index 0117e14ae5..0000000000 --- a/keyboards/sentraq/s60_x/rgb/rgb.c +++ /dev/null @@ -1 +0,0 @@ -#include "rgb.h" diff --git a/keyboards/sentraq/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c deleted file mode 100644 index 7b20ee0696..0000000000 --- a/keyboards/sentraq/s65_plus/s65_plus.c +++ /dev/null @@ -1 +0,0 @@ -#include "s65_plus.h" diff --git a/keyboards/sentraq/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c deleted file mode 100644 index 09ce310b07..0000000000 --- a/keyboards/sentraq/s65_x/s65_x.c +++ /dev/null @@ -1 +0,0 @@ -#include "s65_x.h" diff --git a/keyboards/sets3n/kk980/kk980.c b/keyboards/sets3n/kk980/kk980.c deleted file mode 100644 index d5254b3fc0..0000000000 --- a/keyboards/sets3n/kk980/kk980.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "kk980.h" diff --git a/keyboards/shambles/shambles.c b/keyboards/shambles/shambles.c deleted file mode 100644 index b0ef6b8f99..0000000000 --- a/keyboards/shambles/shambles.c +++ /dev/null @@ -1 +0,0 @@ -#include "shambles.h" diff --git a/keyboards/shapeshifter4060/shapeshifter4060.c b/keyboards/shapeshifter4060/shapeshifter4060.c deleted file mode 100644 index abe6d65e76..0000000000 --- a/keyboards/shapeshifter4060/shapeshifter4060.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "shapeshifter4060.h" diff --git a/keyboards/shiro/shiro.c b/keyboards/shiro/shiro.c deleted file mode 100644 index 3f92c54a0b..0000000000 --- a/keyboards/shiro/shiro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 T.Shinohara - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "shiro.h" diff --git a/keyboards/shk9/shk9.c b/keyboards/shk9/shk9.c deleted file mode 100644 index 7608dcd424..0000000000 --- a/keyboards/shk9/shk9.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Sam Hudson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "shk9.h" diff --git a/keyboards/shoc/shoc.c b/keyboards/shoc/shoc.c deleted file mode 100644 index eabb767d28..0000000000 --- a/keyboards/shoc/shoc.c +++ /dev/null @@ -1,16 +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 . - */ -#include "shoc.h" diff --git a/keyboards/sidderskb/majbritt/rev1/rev1.c b/keyboards/sidderskb/majbritt/rev1/rev1.c deleted file mode 100644 index 79b2c9e601..0000000000 --- a/keyboards/sidderskb/majbritt/rev1/rev1.c +++ /dev/null @@ -1,21 +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 . - */ -#include "rev1.h" - - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.c b/keyboards/sidderskb/majbritt/rev2/rev2.c deleted file mode 100644 index f9120ab2a1..0000000000 --- a/keyboards/sidderskb/majbritt/rev2/rev2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "rev2.h" diff --git a/keyboards/signum/3_0/3_0.c b/keyboards/signum/3_0/3_0.c deleted file mode 100644 index 2775713bf6..0000000000 --- a/keyboards/signum/3_0/3_0.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Stan Gurenkov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "3_0.h" diff --git a/keyboards/singa/singa.c b/keyboards/singa/singa.c deleted file mode 100644 index 8605d6f471..0000000000 --- a/keyboards/singa/singa.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 amnesia0287 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "singa.h" diff --git a/keyboards/sirius/unigo66/unigo66.c b/keyboards/sirius/unigo66/unigo66.c deleted file mode 100644 index 6a2d2632bd..0000000000 --- a/keyboards/sirius/unigo66/unigo66.c +++ /dev/null @@ -1 +0,0 @@ -#include "unigo66.h" diff --git a/keyboards/skeletn87/hotswap/hotswap.c b/keyboards/skeletn87/hotswap/hotswap.c deleted file mode 100644 index 8b26d5cd84..0000000000 --- a/keyboards/skeletn87/hotswap/hotswap.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "hotswap.h" diff --git a/keyboards/skeletn87/soldered/soldered.c b/keyboards/skeletn87/soldered/soldered.c deleted file mode 100644 index b99b94e08a..0000000000 --- a/keyboards/skeletn87/soldered/soldered.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "soldered.h" diff --git a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c b/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c deleted file mode 100644 index 38c78ca56e..0000000000 --- a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 SkeletonKBD - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "skeletonnumpad.h" diff --git a/keyboards/skergo/skergo.c b/keyboards/skergo/skergo.c deleted file mode 100644 index 2d2f2b47ae..0000000000 --- a/keyboards/skergo/skergo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright (C) 2021 Keyz.io Ltd. -* -* This program is free software: you can 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 . -*/ - -#include "skergo.h" diff --git a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c b/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c deleted file mode 100644 index a97cc2307b..0000000000 --- a/keyboards/skippys_custom_pcs/rooboard65/rooboard65.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "rooboard65.h" diff --git a/keyboards/skippys_custom_pcs/roopad/roopad.c b/keyboards/skippys_custom_pcs/roopad/roopad.c deleted file mode 100644 index 408d7d56f1..0000000000 --- a/keyboards/skippys_custom_pcs/roopad/roopad.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "roopad.h" diff --git a/keyboards/slz40/slz40.c b/keyboards/slz40/slz40.c deleted file mode 100644 index 261b0bd892..0000000000 --- a/keyboards/slz40/slz40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 SithLord - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "slz40.h" diff --git a/keyboards/smithrune/iron180/iron180.c b/keyboards/smithrune/iron180/iron180.c deleted file mode 100644 index 236f8176f6..0000000000 --- a/keyboards/smithrune/iron180/iron180.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 "iron180.h" diff --git a/keyboards/smk60/smk60.c b/keyboards/smk60/smk60.c deleted file mode 100644 index 947bec03a0..0000000000 --- a/keyboards/smk60/smk60.c +++ /dev/null @@ -1,5 +0,0 @@ -/** - * smk60.c - */ - -#include "smk60.h" diff --git a/keyboards/snampad/snampad.c b/keyboards/snampad/snampad.c deleted file mode 100644 index 58413d0af5..0000000000 --- a/keyboards/snampad/snampad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Peter Tillemans - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "snampad.h" diff --git a/keyboards/sneakbox/disarray/ortho/ortho.c b/keyboards/sneakbox/disarray/ortho/ortho.c deleted file mode 100644 index d11c36b74c..0000000000 --- a/keyboards/sneakbox/disarray/ortho/ortho.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 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 . -*/ - -#include "ortho.h" diff --git a/keyboards/sneakbox/disarray/staggered/staggered.c b/keyboards/sneakbox/disarray/staggered/staggered.c deleted file mode 100644 index 247fc6eb5e..0000000000 --- a/keyboards/sneakbox/disarray/staggered/staggered.c +++ /dev/null @@ -1,19 +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 . -*/ - -#include "staggered.h" - diff --git a/keyboards/soda/cherish/cherish.c b/keyboards/soda/cherish/cherish.c deleted file mode 100644 index 76b2481d25..0000000000 --- a/keyboards/soda/cherish/cherish.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "cherish.h" diff --git a/keyboards/soup10/soup10.c b/keyboards/soup10/soup10.c deleted file mode 100644 index c08681392a..0000000000 --- a/keyboards/soup10/soup10.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 icesoup - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "soup10.h" diff --git a/keyboards/soy20/soy20.c b/keyboards/soy20/soy20.c deleted file mode 100644 index 1b259e8d88..0000000000 --- a/keyboards/soy20/soy20.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Soy20 PCB}} -Copyright (C) {{ 2020 }} {{ Drewkeys }} - -This program is free software: you can 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 .*/ - - -#include "soy20.h" diff --git a/keyboards/spaceman/pancake/rev1/rev1.c b/keyboards/spaceman/pancake/rev1/rev1.c deleted file mode 100644 index d226653296..0000000000 --- a/keyboards/spaceman/pancake/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 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 . - */ -#include "rev1.h" diff --git a/keyboards/spaceman/yun65/yun65.c b/keyboards/spaceman/yun65/yun65.c deleted file mode 100644 index c93cb7094b..0000000000 --- a/keyboards/spaceman/yun65/yun65.c +++ /dev/null @@ -1,16 +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 . - */ -#include "yun65.h" diff --git a/keyboards/sparrow62/sparrow62.c b/keyboards/sparrow62/sparrow62.c deleted file mode 100644 index 3fc7f62bdf..0000000000 --- a/keyboards/sparrow62/sparrow62.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "sparrow62.h" diff --git a/keyboards/specskeys/specskeys.c b/keyboards/specskeys/specskeys.c deleted file mode 100644 index 36b1dbc311..0000000000 --- a/keyboards/specskeys/specskeys.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Nico - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "specskeys.h" diff --git a/keyboards/spiderisland/split78/split78.c b/keyboards/spiderisland/split78/split78.c deleted file mode 100644 index 0301012749..0000000000 --- a/keyboards/spiderisland/split78/split78.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "split78.h" diff --git a/keyboards/splitography/splitography.c b/keyboards/splitography/splitography.c deleted file mode 100644 index 4fe3452ef2..0000000000 --- a/keyboards/splitography/splitography.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "splitography.h" diff --git a/keyboards/sporewoh/banime40/banime40.c b/keyboards/sporewoh/banime40/banime40.c deleted file mode 100644 index 4e55c6116e..0000000000 --- a/keyboards/sporewoh/banime40/banime40.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 sporewoh - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "banime40.h" diff --git a/keyboards/star75/star75.c b/keyboards/star75/star75.c deleted file mode 100644 index abadba8625..0000000000 --- a/keyboards/star75/star75.c +++ /dev/null @@ -1,4 +0,0 @@ -/* -Copyright 2022 Horns Lyn (@hornslyn) -SPDX-License-Identifier: GPL-2.0-or-later */ -#include "star75.h" diff --git a/keyboards/stello65/hs_rev1/hs_rev1.c b/keyboards/stello65/hs_rev1/hs_rev1.c deleted file mode 100644 index 527613abb0..0000000000 --- a/keyboards/stello65/hs_rev1/hs_rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "hs_rev1.h" diff --git a/keyboards/stello65/sl_rev1/sl_rev1.c b/keyboards/stello65/sl_rev1/sl_rev1.c deleted file mode 100644 index 502c376948..0000000000 --- a/keyboards/stello65/sl_rev1/sl_rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "sl_rev1.h" diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c b/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c deleted file mode 100644 index 3d5b3b23bb..0000000000 --- a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "pro_micro.h" diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c b/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c deleted file mode 100644 index b032a22f42..0000000000 --- a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Stefan Kerkmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rp_2040.h" - diff --git a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c b/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c deleted file mode 100644 index e690d0a886..0000000000 --- a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "usb_c.h" diff --git a/keyboards/stratos/stratos.c b/keyboards/stratos/stratos.c deleted file mode 100644 index 5de05cbc9d..0000000000 --- a/keyboards/stratos/stratos.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "stratos.h" diff --git a/keyboards/studiokestra/bourgeau/bourgeau.c b/keyboards/studiokestra/bourgeau/bourgeau.c deleted file mode 100644 index 87368df509..0000000000 --- a/keyboards/studiokestra/bourgeau/bourgeau.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "bourgeau.h" diff --git a/keyboards/studiokestra/cascade/cascade.c b/keyboards/studiokestra/cascade/cascade.c deleted file mode 100644 index e5c4ba279c..0000000000 --- a/keyboards/studiokestra/cascade/cascade.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Studio Kestra - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "cascade.h" diff --git a/keyboards/studiokestra/nascent/nascent.c b/keyboards/studiokestra/nascent/nascent.c deleted file mode 100644 index d7458be127..0000000000 --- a/keyboards/studiokestra/nascent/nascent.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nascent.h" diff --git a/keyboards/studiokestra/nue/nue.c b/keyboards/studiokestra/nue/nue.c deleted file mode 100644 index 869aaaa483..0000000000 --- a/keyboards/studiokestra/nue/nue.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Studio Kestra - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "nue.h" diff --git a/keyboards/suavity/ehan/ehan.c b/keyboards/suavity/ehan/ehan.c deleted file mode 100644 index cc5a9fdc4a..0000000000 --- a/keyboards/suavity/ehan/ehan.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2021 Henry Lum (@suavity) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "ehan.h" diff --git a/keyboards/subatomic/subatomic.c b/keyboards/subatomic/subatomic.c deleted file mode 100644 index f2120721c8..0000000000 --- a/keyboards/subatomic/subatomic.c +++ /dev/null @@ -1 +0,0 @@ -#include "subatomic.h" \ No newline at end of file diff --git a/keyboards/superuser/ext/ext.c b/keyboards/superuser/ext/ext.c deleted file mode 100644 index 0715f7d808..0000000000 --- a/keyboards/superuser/ext/ext.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 superuser - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ext.h" diff --git a/keyboards/superuser/frl/frl.c b/keyboards/superuser/frl/frl.c deleted file mode 100644 index 4ccf168cfa..0000000000 --- a/keyboards/superuser/frl/frl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 superuser - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "frl.h" diff --git a/keyboards/superuser/tkl/tkl.c b/keyboards/superuser/tkl/tkl.c deleted file mode 100644 index b59a26f44e..0000000000 --- a/keyboards/superuser/tkl/tkl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 superuser - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "tkl.h" diff --git a/keyboards/swiftrax/retropad/retropad.c b/keyboards/swiftrax/retropad/retropad.c deleted file mode 100644 index 3ffe29528f..0000000000 --- a/keyboards/swiftrax/retropad/retropad.c +++ /dev/null @@ -1,16 +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 . - */ -#include "retropad.h" \ No newline at end of file diff --git a/keyboards/switchplate/switchplate910/switchplate910.c b/keyboards/switchplate/switchplate910/switchplate910.c deleted file mode 100644 index fce0d30723..0000000000 --- a/keyboards/switchplate/switchplate910/switchplate910.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Stefan Karsch - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "switchplate910.h" - diff --git a/keyboards/tada68/tada68.c b/keyboards/tada68/tada68.c deleted file mode 100755 index 34534de747..0000000000 --- a/keyboards/tada68/tada68.c +++ /dev/null @@ -1 +0,0 @@ -#include "tada68.h" diff --git a/keyboards/takashicompany/center_enter/center_enter.c b/keyboards/takashicompany/center_enter/center_enter.c deleted file mode 100644 index 4973e6a643..0000000000 --- a/keyboards/takashicompany/center_enter/center_enter.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "center_enter.h" diff --git a/keyboards/takashicompany/heavy_left/heavy_left.c b/keyboards/takashicompany/heavy_left/heavy_left.c deleted file mode 100644 index 2af6d3fe61..0000000000 --- a/keyboards/takashicompany/heavy_left/heavy_left.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "heavy_left.h" diff --git a/keyboards/takashicompany/qoolee/qoolee.c b/keyboards/takashicompany/qoolee/qoolee.c deleted file mode 100644 index 5a86c3c5bf..0000000000 --- a/keyboards/takashicompany/qoolee/qoolee.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "qoolee.h" diff --git a/keyboards/takashicompany/radialex/radialex.c b/keyboards/takashicompany/radialex/radialex.c deleted file mode 100644 index 9146106973..0000000000 --- a/keyboards/takashicompany/radialex/radialex.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "radialex.h" diff --git a/keyboards/takashiski/hecomi/hecomi.c b/keyboards/takashiski/hecomi/hecomi.c deleted file mode 100644 index d527547119..0000000000 --- a/keyboards/takashiski/hecomi/hecomi.c +++ /dev/null @@ -1,17 +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 . - */ -#include "hecomi.h" -#include "split_util.h" diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c deleted file mode 100644 index 091b55c10d..0000000000 --- a/keyboards/takashiski/namecard2x4/namecard2x4.c +++ /dev/null @@ -1,16 +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 . - */ -#include "namecard2x4.h" diff --git a/keyboards/takashiski/otaku_split/rev0/rev0.c b/keyboards/takashiski/otaku_split/rev0/rev0.c deleted file mode 100644 index 6ec80aabb6..0000000000 --- a/keyboards/takashiski/otaku_split/rev0/rev0.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev0.h" diff --git a/keyboards/takashiski/otaku_split/rev1/rev1.c b/keyboards/takashiski/otaku_split/rev1/rev1.c deleted file mode 100644 index b63bb047aa..0000000000 --- a/keyboards/takashiski/otaku_split/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/teleport/numpad/numpad.c b/keyboards/teleport/numpad/numpad.c deleted file mode 100644 index 375e240589..0000000000 --- a/keyboards/teleport/numpad/numpad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "numpad.h" diff --git a/keyboards/tempo_turtle/bradpad/bradpad.c b/keyboards/tempo_turtle/bradpad/bradpad.c deleted file mode 100644 index 073f37a4cf..0000000000 --- a/keyboards/tempo_turtle/bradpad/bradpad.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2021 v3ritas -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "bradpad.h" diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.c b/keyboards/tender/macrowo_pad/macrowo_pad.c deleted file mode 100644 index 4dd6441e58..0000000000 --- a/keyboards/tender/macrowo_pad/macrowo_pad.c +++ /dev/null @@ -1,17 +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 . - */ -#include "macrowo_pad.h" - \ No newline at end of file diff --git a/keyboards/tenki/tenki.c b/keyboards/tenki/tenki.c deleted file mode 100644 index 318f8d4757..0000000000 --- a/keyboards/tenki/tenki.c +++ /dev/null @@ -1 +0,0 @@ -#include "tenki.h" diff --git a/keyboards/tetris/tetris.c b/keyboards/tetris/tetris.c deleted file mode 100755 index f78de2f7be..0000000000 --- a/keyboards/tetris/tetris.c +++ /dev/null @@ -1 +0,0 @@ -#include QMK_KEYBOARD_H diff --git a/keyboards/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c deleted file mode 100644 index fa7a970d5e..0000000000 --- a/keyboards/tg4x/tg4x.c +++ /dev/null @@ -1,16 +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 . - */ -#include "tg4x.h" diff --git a/keyboards/tgr/910/910.c b/keyboards/tgr/910/910.c deleted file mode 100644 index 8e0c785385..0000000000 --- a/keyboards/tgr/910/910.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 halfenergized - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "910.h" diff --git a/keyboards/tgr/910ce/910ce.c b/keyboards/tgr/910ce/910ce.c deleted file mode 100644 index 7538158c89..0000000000 --- a/keyboards/tgr/910ce/910ce.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "910ce.h" diff --git a/keyboards/tgr/alice/alice.c b/keyboards/tgr/alice/alice.c deleted file mode 100644 index 39aed2cf56..0000000000 --- a/keyboards/tgr/alice/alice.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "alice.h" diff --git a/keyboards/tgr/jane/v2/v2.c b/keyboards/tgr/jane/v2/v2.c deleted file mode 100644 index 3d98748516..0000000000 --- a/keyboards/tgr/jane/v2/v2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "v2.h" diff --git a/keyboards/tgr/jane/v2ce/v2ce.c b/keyboards/tgr/jane/v2ce/v2ce.c deleted file mode 100644 index 6d478efce9..0000000000 --- a/keyboards/tgr/jane/v2ce/v2ce.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "v2ce.h" diff --git a/keyboards/tgr/tris/tris.c b/keyboards/tgr/tris/tris.c deleted file mode 100644 index c2147b29c6..0000000000 --- a/keyboards/tgr/tris/tris.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 halfenergized - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "tris.h" diff --git a/keyboards/the_royal/liminal/liminal.c b/keyboards/the_royal/liminal/liminal.c deleted file mode 100644 index 6e1e935d44..0000000000 --- a/keyboards/the_royal/liminal/liminal.c +++ /dev/null @@ -1 +0,0 @@ -#include "liminal.h" \ No newline at end of file diff --git a/keyboards/the_royal/schwann/schwann.c b/keyboards/the_royal/schwann/schwann.c deleted file mode 100644 index 1ef8c93974..0000000000 --- a/keyboards/the_royal/schwann/schwann.c +++ /dev/null @@ -1 +0,0 @@ -#include "schwann.h" diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.c b/keyboards/themadnoodle/ncc1701kb/v2/v2.c deleted file mode 100644 index caf7c6f0f2..0000000000 --- a/keyboards/themadnoodle/ncc1701kb/v2/v2.c +++ /dev/null @@ -1 +0,0 @@ -#include "v2.h" diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.c b/keyboards/themadnoodle/noodlepad/noodlepad.c deleted file mode 100644 index afabf78629..0000000000 --- a/keyboards/themadnoodle/noodlepad/noodlepad.c +++ /dev/null @@ -1 +0,0 @@ -#include "noodlepad.h" diff --git a/keyboards/thevankeyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c deleted file mode 100644 index 88917cb74d..0000000000 --- a/keyboards/thevankeyboards/bananasplit/bananasplit.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 . - */ - -#include "bananasplit.h" diff --git a/keyboards/thevankeyboards/caravan/caravan.c b/keyboards/thevankeyboards/caravan/caravan.c deleted file mode 100644 index c4fa14f0c1..0000000000 --- a/keyboards/thevankeyboards/caravan/caravan.c +++ /dev/null @@ -1 +0,0 @@ -#include "caravan.h" diff --git a/keyboards/thevankeyboards/jetvan/jetvan.c b/keyboards/thevankeyboards/jetvan/jetvan.c deleted file mode 100644 index 750c200afd..0000000000 --- a/keyboards/thevankeyboards/jetvan/jetvan.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "jetvan.h" diff --git a/keyboards/thevankeyboards/minivan/minivan.c b/keyboards/thevankeyboards/minivan/minivan.c deleted file mode 100644 index 19996f9208..0000000000 --- a/keyboards/thevankeyboards/minivan/minivan.c +++ /dev/null @@ -1 +0,0 @@ -#include "minivan.h" diff --git a/keyboards/thevankeyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c deleted file mode 100644 index 0f3d7f6916..0000000000 --- a/keyboards/thevankeyboards/roadkit/roadkit.c +++ /dev/null @@ -1 +0,0 @@ -#include "roadkit.h" diff --git a/keyboards/tkc/california/california.c b/keyboards/tkc/california/california.c deleted file mode 100644 index 002732208f..0000000000 --- a/keyboards/tkc/california/california.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "california.h" diff --git a/keyboards/tkc/candybar/lefty/lefty.c b/keyboards/tkc/candybar/lefty/lefty.c deleted file mode 100644 index 6bda3805c7..0000000000 --- a/keyboards/tkc/candybar/lefty/lefty.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "lefty.h" diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.c b/keyboards/tkc/candybar/lefty_r3/lefty_r3.c deleted file mode 100644 index e5a821b7a9..0000000000 --- a/keyboards/tkc/candybar/lefty_r3/lefty_r3.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "lefty_r3.h" - diff --git a/keyboards/tkc/candybar/righty/righty.c b/keyboards/tkc/candybar/righty/righty.c deleted file mode 100644 index c3b6115747..0000000000 --- a/keyboards/tkc/candybar/righty/righty.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "righty.h" diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.c b/keyboards/tkc/candybar/righty_r3/righty_r3.c deleted file mode 100644 index 193c228f96..0000000000 --- a/keyboards/tkc/candybar/righty_r3/righty_r3.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "righty_r3.h" diff --git a/keyboards/tkc/godspeed75/godspeed75.c b/keyboards/tkc/godspeed75/godspeed75.c deleted file mode 100644 index e440ada48d..0000000000 --- a/keyboards/tkc/godspeed75/godspeed75.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "godspeed75.h" diff --git a/keyboards/tkc/tkl_ab87/tkl_ab87.c b/keyboards/tkc/tkl_ab87/tkl_ab87.c deleted file mode 100644 index 5d1b2d98a4..0000000000 --- a/keyboards/tkc/tkl_ab87/tkl_ab87.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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 . - */ -#include "tkl_ab87.h" diff --git a/keyboards/tkw/grandiceps/grandiceps.c b/keyboards/tkw/grandiceps/grandiceps.c deleted file mode 100644 index bfb67dfc2c..0000000000 --- a/keyboards/tkw/grandiceps/grandiceps.c +++ /dev/null @@ -1,16 +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 . - */ -#include "grandiceps.h" diff --git a/keyboards/tkw/stoutgat/v1/v1.c b/keyboards/tkw/stoutgat/v1/v1.c deleted file mode 100644 index 10c82fd9f9..0000000000 --- a/keyboards/tkw/stoutgat/v1/v1.c +++ /dev/null @@ -1,17 +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 . - */ - -#include QMK_KEYBOARD_H diff --git a/keyboards/tkw/stoutgat/v2/v2.c b/keyboards/tkw/stoutgat/v2/v2.c deleted file mode 100644 index 030f056abf..0000000000 --- a/keyboards/tkw/stoutgat/v2/v2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "v2.h" diff --git a/keyboards/tokyokeyboard/alix40/alix40.c b/keyboards/tokyokeyboard/alix40/alix40.c deleted file mode 100644 index af0f361199..0000000000 --- a/keyboards/tokyokeyboard/alix40/alix40.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2021 quadcube -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "alix40.h" diff --git a/keyboards/tokyokeyboard/tokyo60/tokyo60.c b/keyboards/tokyokeyboard/tokyo60/tokyo60.c deleted file mode 100644 index 67113700a5..0000000000 --- a/keyboards/tokyokeyboard/tokyo60/tokyo60.c +++ /dev/null @@ -1 +0,0 @@ -#include "tokyo60.h" diff --git a/keyboards/tominabox1/adalyn/adalyn.c b/keyboards/tominabox1/adalyn/adalyn.c deleted file mode 100644 index 837cb9c98a..0000000000 --- a/keyboards/tominabox1/adalyn/adalyn.c +++ /dev/null @@ -1,16 +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 . - */ -#include "adalyn.h" diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c b/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c deleted file mode 100644 index 67d6fd800d..0000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev1/rev1.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "rev1.h" diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c b/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c deleted file mode 100644 index 759d6f506d..0000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev2/rev2.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "rev2.h" diff --git a/keyboards/tominabox1/qaz/qaz.c b/keyboards/tominabox1/qaz/qaz.c deleted file mode 100644 index a9e72fa610..0000000000 --- a/keyboards/tominabox1/qaz/qaz.c +++ /dev/null @@ -1 +0,0 @@ -#include "qaz.h" diff --git a/keyboards/tominabox1/underscore33/rev1/rev1.c b/keyboards/tominabox1/underscore33/rev1/rev1.c deleted file mode 100644 index 4f763dbb49..0000000000 --- a/keyboards/tominabox1/underscore33/rev1/rev1.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev1.h" diff --git a/keyboards/tominabox1/underscore33/rev2/rev2.c b/keyboards/tominabox1/underscore33/rev2/rev2.c deleted file mode 100644 index e89b2938f9..0000000000 --- a/keyboards/tominabox1/underscore33/rev2/rev2.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rev2.h" diff --git a/keyboards/touchpad/touchpad.c b/keyboards/touchpad/touchpad.c deleted file mode 100644 index fe96d56b68..0000000000 --- a/keyboards/touchpad/touchpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "touchpad.h" diff --git a/keyboards/trashman/ketch/ketch.c b/keyboards/trashman/ketch/ketch.c deleted file mode 100644 index 5c38f47664..0000000000 --- a/keyboards/trashman/ketch/ketch.c +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "ketch.h" diff --git a/keyboards/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c deleted file mode 100644 index 466f294672..0000000000 --- a/keyboards/treasure/type9/type9.c +++ /dev/null @@ -1,16 +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 . - */ -#include "type9.h" diff --git a/keyboards/treasure/type9s2/type9s2.c b/keyboards/treasure/type9s2/type9s2.c deleted file mode 100644 index f5c86e0006..0000000000 --- a/keyboards/treasure/type9s2/type9s2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Treasure - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "type9s2.h" diff --git a/keyboards/tronguylabs/m122_3270/m122_3270.c b/keyboards/tronguylabs/m122_3270/m122_3270.c deleted file mode 100644 index 397d495c23..0000000000 --- a/keyboards/tronguylabs/m122_3270/m122_3270.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "m122_3270.h" diff --git a/keyboards/tszaboo/ortho4exent/ortho4exent.c b/keyboards/tszaboo/ortho4exent/ortho4exent.c deleted file mode 100644 index b6ef9fedcf..0000000000 --- a/keyboards/tszaboo/ortho4exent/ortho4exent.c +++ /dev/null @@ -1,16 +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 . - */ -#include "ortho4exent.h" diff --git a/keyboards/tunks/ergo33/ergo33.c b/keyboards/tunks/ergo33/ergo33.c deleted file mode 100644 index 9426558167..0000000000 --- a/keyboards/tunks/ergo33/ergo33.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ergo33.h" diff --git a/keyboards/tw40/tw40.c b/keyboards/tw40/tw40.c deleted file mode 100644 index 0bd8425ab3..0000000000 --- a/keyboards/tw40/tw40.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "tw40.h" diff --git a/keyboards/tzarc/djinn/rev1/rev1.c b/keyboards/tzarc/djinn/rev1/rev1.c deleted file mode 100644 index 95f0e20020..0000000000 --- a/keyboards/tzarc/djinn/rev1/rev1.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" diff --git a/keyboards/tzarc/djinn/rev1/rev1.h b/keyboards/tzarc/djinn/rev1/rev1.h deleted file mode 100644 index 1845cb8fdd..0000000000 --- a/keyboards/tzarc/djinn/rev1/rev1.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once diff --git a/keyboards/tzarc/djinn/rev2/rev2.c b/keyboards/tzarc/djinn/rev2/rev2.c deleted file mode 100644 index f55e0c224a..0000000000 --- a/keyboards/tzarc/djinn/rev2/rev2.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev2.h" diff --git a/keyboards/tzarc/djinn/rev2/rev2.h b/keyboards/tzarc/djinn/rev2/rev2.h deleted file mode 100644 index 1845cb8fdd..0000000000 --- a/keyboards/tzarc/djinn/rev2/rev2.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2018-2022 Nick Brassel (@tzarc) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once diff --git a/keyboards/ubest/vn/vn.c b/keyboards/ubest/vn/vn.c deleted file mode 100644 index 309812f675..0000000000 --- a/keyboards/ubest/vn/vn.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "vn.h" - - diff --git a/keyboards/uk78/uk78.c b/keyboards/uk78/uk78.c deleted file mode 100644 index 3611427d02..0000000000 --- a/keyboards/uk78/uk78.c +++ /dev/null @@ -1 +0,0 @@ -#include "uk78.h" diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c deleted file mode 100644 index cb5ec3dc12..0000000000 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Purdea Andrei - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "overnumpad_1xb.h" - -void keyboard_post_init_kb(void) -{ - //debug_enable=true; - //debug_matrix=true; -} - diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c deleted file mode 100644 index cb5ec3dc12..0000000000 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Purdea Andrei - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "overnumpad_1xb.h" - -void keyboard_post_init_kb(void) -{ - //debug_enable=true; - //debug_matrix=true; -} - diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c deleted file mode 100644 index cb5ec3dc12..0000000000 --- a/keyboards/unicomp/pc122/overnumpad_1xb/overnumpad_1xb.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 Purdea Andrei - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "overnumpad_1xb.h" - -void keyboard_post_init_kb(void) -{ - //debug_enable=true; - //debug_matrix=true; -} - diff --git a/keyboards/unikeyboard/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c deleted file mode 100644 index 4143b14275..0000000000 --- a/keyboards/unikeyboard/diverge3/diverge3.c +++ /dev/null @@ -1,16 +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 . - */ -#include "diverge3.h" diff --git a/keyboards/unikeyboard/divergetm2/divergetm2.c b/keyboards/unikeyboard/divergetm2/divergetm2.c deleted file mode 100644 index 61ea45416c..0000000000 --- a/keyboards/unikeyboard/divergetm2/divergetm2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 Christon DeWan (xton) - * 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 . - */ -#include "divergetm2.h" diff --git a/keyboards/unikeyboard/felix/felix.c b/keyboards/unikeyboard/felix/felix.c deleted file mode 100644 index 013360d043..0000000000 --- a/keyboards/unikeyboard/felix/felix.c +++ /dev/null @@ -1 +0,0 @@ -#include "felix.h" diff --git a/keyboards/unikorn/unikorn.c b/keyboards/unikorn/unikorn.c deleted file mode 100644 index d803ebf9da..0000000000 --- a/keyboards/unikorn/unikorn.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "unikorn.h" diff --git a/keyboards/uranuma/uranuma.c b/keyboards/uranuma/uranuma.c deleted file mode 100644 index e439177af7..0000000000 --- a/keyboards/uranuma/uranuma.c +++ /dev/null @@ -1 +0,0 @@ -#include "uranuma.h" diff --git a/keyboards/utd80/utd80.c b/keyboards/utd80/utd80.c deleted file mode 100644 index 7b1a269d7b..0000000000 --- a/keyboards/utd80/utd80.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 UTDKeyboard & Dominic Gan - * - * this program is free software: you can redistribute it and/or modify - * it under the terms of the gnu general public license as published by - * the free software foundation, either version 2 of the license, or - * (at your option) any later version. - * - * this program is distributed in the hope that it will be useful, - * but without any warranty; without even the implied warranty of - * merchantability or fitness for a particular purpose. see the - * gnu general 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 "utd80.h" diff --git a/keyboards/v4n4g0rth0n/v4n4g0rth0n.c b/keyboards/v4n4g0rth0n/v4n4g0rth0n.c deleted file mode 100644 index 983bd78787..0000000000 --- a/keyboards/v4n4g0rth0n/v4n4g0rth0n.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "v4n4g0rth0n.h" diff --git a/keyboards/vagrant_10/vagrant_10.c b/keyboards/vagrant_10/vagrant_10.c deleted file mode 100755 index 6c577b92c2..0000000000 --- a/keyboards/vagrant_10/vagrant_10.c +++ /dev/null @@ -1,25 +0,0 @@ -/** -MIT License - -Copyright (c) 2020 Shanduur & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "vagrant_10.h" diff --git a/keyboards/vertex/angler2/angler2.c b/keyboards/vertex/angler2/angler2.c deleted file mode 100644 index a6a4d21372..0000000000 --- a/keyboards/vertex/angler2/angler2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Vertex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "angler2.h" diff --git a/keyboards/vertex/arc60/arc60.c b/keyboards/vertex/arc60/arc60.c deleted file mode 100644 index d8fc41b794..0000000000 --- a/keyboards/vertex/arc60/arc60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 vertex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "arc60.h" diff --git a/keyboards/vertex/arc60h/arc60h.c b/keyboards/vertex/arc60h/arc60h.c deleted file mode 100644 index 2ef6bb3ff4..0000000000 --- a/keyboards/vertex/arc60h/arc60h.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 vertex - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "arc60h.h" diff --git a/keyboards/viktus/at101_bh/at101_bh.c b/keyboards/viktus/at101_bh/at101_bh.c deleted file mode 100644 index 3b519373b0..0000000000 --- a/keyboards/viktus/at101_bh/at101_bh.c +++ /dev/null @@ -1 +0,0 @@ -#include "at101_bh.h" diff --git a/keyboards/viktus/omnikey_bh/omnikey_bh.c b/keyboards/viktus/omnikey_bh/omnikey_bh.c deleted file mode 100644 index c2f52f30c3..0000000000 --- a/keyboards/viktus/omnikey_bh/omnikey_bh.c +++ /dev/null @@ -1 +0,0 @@ -#include "omnikey_bh.h" diff --git a/keyboards/viktus/styrka/styrka.c b/keyboards/viktus/styrka/styrka.c deleted file mode 100644 index 4bf6fef90b..0000000000 --- a/keyboards/viktus/styrka/styrka.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "styrka.h" diff --git a/keyboards/viktus/z150_bh/z150_bh.c b/keyboards/viktus/z150_bh/z150_bh.c deleted file mode 100644 index b75a1ff198..0000000000 --- a/keyboards/viktus/z150_bh/z150_bh.c +++ /dev/null @@ -1 +0,0 @@ -#include "z150_bh.h" diff --git a/keyboards/waldo/waldo.c b/keyboards/waldo/waldo.c deleted file mode 100644 index 33093d4bbd..0000000000 --- a/keyboards/waldo/waldo.c +++ /dev/null @@ -1 +0,0 @@ -#include "waldo.h" \ No newline at end of file diff --git a/keyboards/walletburner/cajal/cajal.c b/keyboards/walletburner/cajal/cajal.c deleted file mode 100644 index 8536a10258..0000000000 --- a/keyboards/walletburner/cajal/cajal.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "cajal.h" diff --git a/keyboards/walletburner/neuron/neuron.c b/keyboards/walletburner/neuron/neuron.c deleted file mode 100644 index b6ca44bd78..0000000000 --- a/keyboards/walletburner/neuron/neuron.c +++ /dev/null @@ -1 +0,0 @@ -#include "neuron.h" diff --git a/keyboards/wavtype/foundation/foundation.c b/keyboards/wavtype/foundation/foundation.c deleted file mode 100644 index 9ac8ba6b72..0000000000 --- a/keyboards/wavtype/foundation/foundation.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 wavtype (@wavtype) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "foundation.h" diff --git a/keyboards/wavtype/p01_ultra/p01_ultra.c b/keyboards/wavtype/p01_ultra/p01_ultra.c deleted file mode 100644 index a84eede45d..0000000000 --- a/keyboards/wavtype/p01_ultra/p01_ultra.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 wavtype - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "p01_ultra.h" diff --git a/keyboards/weirdo/geminate60/geminate60.c b/keyboards/weirdo/geminate60/geminate60.c deleted file mode 100644 index 3f0218c890..0000000000 --- a/keyboards/weirdo/geminate60/geminate60.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2020 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 . - */ -#include "geminate60.h" diff --git a/keyboards/weirdo/kelowna/rgb64/rgb64.c b/keyboards/weirdo/kelowna/rgb64/rgb64.c deleted file mode 100644 index dd57616161..0000000000 --- a/keyboards/weirdo/kelowna/rgb64/rgb64.c +++ /dev/null @@ -1,16 +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 . - */ -#include "rgb64.h" diff --git a/keyboards/weirdo/naiping/np64/np64.c b/keyboards/weirdo/naiping/np64/np64.c deleted file mode 100644 index ee4c08cd34..0000000000 --- a/keyboards/weirdo/naiping/np64/np64.c +++ /dev/null @@ -1,16 +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 . - */ -#include "np64.h" diff --git a/keyboards/weirdo/naiping/nphhkb/nphhkb.c b/keyboards/weirdo/naiping/nphhkb/nphhkb.c deleted file mode 100644 index 881522c0b3..0000000000 --- a/keyboards/weirdo/naiping/nphhkb/nphhkb.c +++ /dev/null @@ -1,16 +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 . - */ -#include "nphhkb.h" diff --git a/keyboards/weirdo/naiping/npminila/npminila.c b/keyboards/weirdo/naiping/npminila/npminila.c deleted file mode 100644 index ab9ebb45d7..0000000000 --- a/keyboards/weirdo/naiping/npminila/npminila.c +++ /dev/null @@ -1,16 +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 . - */ -#include "npminila.h" diff --git a/keyboards/weirdo/tiger910/tiger910.c b/keyboards/weirdo/tiger910/tiger910.c deleted file mode 100644 index d0964d9be9..0000000000 --- a/keyboards/weirdo/tiger910/tiger910.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "tiger910.h" diff --git a/keyboards/wekey/polaris/polaris.c b/keyboards/wekey/polaris/polaris.c deleted file mode 100644 index 413c56460e..0000000000 --- a/keyboards/wekey/polaris/polaris.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 @wekey - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "polaris.h" diff --git a/keyboards/westfoxtrot/aanzee/aanzee.c b/keyboards/westfoxtrot/aanzee/aanzee.c deleted file mode 100644 index bc90dcf2db..0000000000 --- a/keyboards/westfoxtrot/aanzee/aanzee.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 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 . -*/ - -#include "aanzee.h" diff --git a/keyboards/westfoxtrot/cyclops/cyclops.c b/keyboards/westfoxtrot/cyclops/cyclops.c deleted file mode 100644 index f28d626e44..0000000000 --- a/keyboards/westfoxtrot/cyclops/cyclops.c +++ /dev/null @@ -1,16 +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 . - */ -#include "cyclops.h" diff --git a/keyboards/westm/westm68/westm68.c b/keyboards/westm/westm68/westm68.c deleted file mode 100644 index e30df949a9..0000000000 --- a/keyboards/westm/westm68/westm68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 WestM - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "westm68.h" \ No newline at end of file diff --git a/keyboards/westm/westm9/westm9.c b/keyboards/westm/westm9/westm9.c deleted file mode 100644 index 45420db2e3..0000000000 --- a/keyboards/westm/westm9/westm9.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 WestM - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "westm9.h" \ No newline at end of file diff --git a/keyboards/westm/westmergo/westmergo.c b/keyboards/westm/westmergo/westmergo.c deleted file mode 100644 index 18055d3789..0000000000 --- a/keyboards/westm/westmergo/westmergo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 WestM - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "westmergo.h" \ No newline at end of file diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c deleted file mode 100644 index 86d93b82a1..0000000000 --- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "rama_works_m50_ax.h" diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c deleted file mode 100644 index fa19003600..0000000000 --- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2018 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 . - */ diff --git a/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c b/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/rama_works_u80_a/rama_works_u80_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt60_a/wt60_a.c b/keyboards/wilba_tech/wt60_a/wt60_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt60_a/wt60_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt60_b/wt60_b.c b/keyboards/wilba_tech/wt60_b/wt60_b.c deleted file mode 100644 index 051cbc6d43..0000000000 --- a/keyboards/wilba_tech/wt60_b/wt60_b.c +++ /dev/null @@ -1 +0,0 @@ -#include "wt60_b.h" diff --git a/keyboards/wilba_tech/wt60_bx/wt60_bx.c b/keyboards/wilba_tech/wt60_bx/wt60_bx.c deleted file mode 100644 index 2a52888ca0..0000000000 --- a/keyboards/wilba_tech/wt60_bx/wt60_bx.c +++ /dev/null @@ -1 +0,0 @@ -#include "wt60_bx.h" diff --git a/keyboards/wilba_tech/wt60_c/wt60_c.c b/keyboards/wilba_tech/wt60_c/wt60_c.c deleted file mode 100644 index 9b1cfe46e5..0000000000 --- a/keyboards/wilba_tech/wt60_c/wt60_c.c +++ /dev/null @@ -1 +0,0 @@ -#include "wt60_c.h" diff --git a/keyboards/wilba_tech/wt60_g/wt60_g.c b/keyboards/wilba_tech/wt60_g/wt60_g.c deleted file mode 100644 index 1c1eed8847..0000000000 --- a/keyboards/wilba_tech/wt60_g/wt60_g.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt60_g.h" diff --git a/keyboards/wilba_tech/wt60_g2/wt60_g2.c b/keyboards/wilba_tech/wt60_g2/wt60_g2.c deleted file mode 100644 index ac7b7151d0..0000000000 --- a/keyboards/wilba_tech/wt60_g2/wt60_g2.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "wt60_g2.h" diff --git a/keyboards/wilba_tech/wt60_h1/wt60_h1.c b/keyboards/wilba_tech/wt60_h1/wt60_h1.c deleted file mode 100644 index 5370394e15..0000000000 --- a/keyboards/wilba_tech/wt60_h1/wt60_h1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt60_h1.h" diff --git a/keyboards/wilba_tech/wt60_h2/wt60_h2.c b/keyboards/wilba_tech/wt60_h2/wt60_h2.c deleted file mode 100644 index 705535c18e..0000000000 --- a/keyboards/wilba_tech/wt60_h2/wt60_h2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt60_h2.h" diff --git a/keyboards/wilba_tech/wt60_h3/wt60_h3.c b/keyboards/wilba_tech/wt60_h3/wt60_h3.c deleted file mode 100644 index a6c839b5a4..0000000000 --- a/keyboards/wilba_tech/wt60_h3/wt60_h3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt60_h3.h" diff --git a/keyboards/wilba_tech/wt65_a/wt65_a.c b/keyboards/wilba_tech/wt65_a/wt65_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt65_a/wt65_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt65_b/wt65_b.c b/keyboards/wilba_tech/wt65_b/wt65_b.c deleted file mode 100644 index 365f2e8861..0000000000 --- a/keyboards/wilba_tech/wt65_b/wt65_b.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt65_d/wt65_d.c b/keyboards/wilba_tech/wt65_d/wt65_d.c deleted file mode 100644 index b734652c78..0000000000 --- a/keyboards/wilba_tech/wt65_d/wt65_d.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Jason Williams (@wilba) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "wt65_d.h" \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_f/wt65_f.c b/keyboards/wilba_tech/wt65_f/wt65_f.c deleted file mode 100644 index 18d29a5eed..0000000000 --- a/keyboards/wilba_tech/wt65_f/wt65_f.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "wt65_f.h" diff --git a/keyboards/wilba_tech/wt65_fx/wt65_fx.c b/keyboards/wilba_tech/wt65_fx/wt65_fx.c deleted file mode 100644 index 136adb8ba9..0000000000 --- a/keyboards/wilba_tech/wt65_fx/wt65_fx.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "wt65_fx.h" diff --git a/keyboards/wilba_tech/wt65_g/wt65_g.c b/keyboards/wilba_tech/wt65_g/wt65_g.c deleted file mode 100644 index 54e823cb7e..0000000000 --- a/keyboards/wilba_tech/wt65_g/wt65_g.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt65_g.h" diff --git a/keyboards/wilba_tech/wt65_g2/wt65_g2.c b/keyboards/wilba_tech/wt65_g2/wt65_g2.c deleted file mode 100644 index 585f579a33..0000000000 --- a/keyboards/wilba_tech/wt65_g2/wt65_g2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt65_g2.h" diff --git a/keyboards/wilba_tech/wt65_h1/wt65_h1.c b/keyboards/wilba_tech/wt65_h1/wt65_h1.c deleted file mode 100644 index e8e5466a98..0000000000 --- a/keyboards/wilba_tech/wt65_h1/wt65_h1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt65_h1.h" diff --git a/keyboards/wilba_tech/wt65_xt/wt65_xt.c b/keyboards/wilba_tech/wt65_xt/wt65_xt.c deleted file mode 100644 index 62be919a06..0000000000 --- a/keyboards/wilba_tech/wt65_xt/wt65_xt.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt65_xt.h" diff --git a/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c b/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c deleted file mode 100644 index 38aa7c362d..0000000000 --- a/keyboards/wilba_tech/wt65_xtx/wt65_xtx.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt65_xtx.h" diff --git a/keyboards/wilba_tech/wt75_a/wt75_a.c b/keyboards/wilba_tech/wt75_a/wt75_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt75_a/wt75_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt75_b/wt75_b.c b/keyboards/wilba_tech/wt75_b/wt75_b.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt75_b/wt75_b.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt75_c/wt75_c.c b/keyboards/wilba_tech/wt75_c/wt75_c.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt75_c/wt75_c.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt80_a/wt80_a.c b/keyboards/wilba_tech/wt80_a/wt80_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt80_a/wt80_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt80_bc/wt80_bc.c b/keyboards/wilba_tech/wt80_bc/wt80_bc.c deleted file mode 100644 index 1245a2fd0a..0000000000 --- a/keyboards/wilba_tech/wt80_bc/wt80_bc.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/wilba_tech/wt80_g/wt80_g.c b/keyboards/wilba_tech/wt80_g/wt80_g.c deleted file mode 100644 index 821cffc7d3..0000000000 --- a/keyboards/wilba_tech/wt80_g/wt80_g.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 . - */ - -#include "wt80_g.h" diff --git a/keyboards/wilba_tech/wt8_a/wt8_a.c b/keyboards/wilba_tech/wt8_a/wt8_a.c deleted file mode 100644 index ccff6d62c9..0000000000 --- a/keyboards/wilba_tech/wt8_a/wt8_a.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 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 . - */ - -// Nothing to see here, move along... ;-) diff --git a/keyboards/winkeyless/b87/b87.c b/keyboards/winkeyless/b87/b87.c deleted file mode 100644 index 46c5ad2bf0..0000000000 --- a/keyboards/winkeyless/b87/b87.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Joah Nelson (Jels) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// not much here - -#include "b87.h" diff --git a/keyboards/winkeyless/bface/bface.c b/keyboards/winkeyless/bface/bface.c deleted file mode 100644 index c1fcbe53b2..0000000000 --- a/keyboards/winkeyless/bface/bface.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "bface.h" diff --git a/keyboards/winkeyless/bmini/bmini.c b/keyboards/winkeyless/bmini/bmini.c deleted file mode 100644 index f44fd36a8c..0000000000 --- a/keyboards/winkeyless/bmini/bmini.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "bmini.h" diff --git a/keyboards/winkeyless/bminiex/bminiex.c b/keyboards/winkeyless/bminiex/bminiex.c deleted file mode 100644 index db127e030d..0000000000 --- a/keyboards/winkeyless/bminiex/bminiex.c +++ /dev/null @@ -1,18 +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 . -*/ - -#include "bminiex.h" diff --git a/keyboards/winry/winry25tc/winry25tc.c b/keyboards/winry/winry25tc/winry25tc.c deleted file mode 100644 index 938dadaf8f..0000000000 --- a/keyboards/winry/winry25tc/winry25tc.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Andrzej Ressel (andrzej.ressel@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 . - */ - -#include "winry25tc.h" diff --git a/keyboards/wolf/kuku65/kuku65.c b/keyboards/wolf/kuku65/kuku65.c deleted file mode 100644 index 9c1be8cb83..0000000000 --- a/keyboards/wolf/kuku65/kuku65.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "kuku65.h" diff --git a/keyboards/wolf/ryujin/ryujin.c b/keyboards/wolf/ryujin/ryujin.c deleted file mode 100644 index a2298a546d..0000000000 --- a/keyboards/wolf/ryujin/ryujin.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "ryujin.h" diff --git a/keyboards/wolf/sabre/sabre.c b/keyboards/wolf/sabre/sabre.c deleted file mode 100644 index 84577ef867..0000000000 --- a/keyboards/wolf/sabre/sabre.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "sabre.h" diff --git a/keyboards/wolf/ts60/ts60.c b/keyboards/wolf/ts60/ts60.c deleted file mode 100644 index 199c79c946..0000000000 --- a/keyboards/wolf/ts60/ts60.c +++ /dev/null @@ -1,14 +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 . -*/ -#include "ts60.h" diff --git a/keyboards/woodkeys/bigseries/4key/4key.c b/keyboards/woodkeys/bigseries/4key/4key.c deleted file mode 100755 index fdb9a92514..0000000000 --- a/keyboards/woodkeys/bigseries/4key/4key.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "4key.h" diff --git a/keyboards/woodkeys/meira/featherble/featherble.c b/keyboards/woodkeys/meira/featherble/featherble.c deleted file mode 100644 index 63ade21904..0000000000 --- a/keyboards/woodkeys/meira/featherble/featherble.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "meira.h" diff --git a/keyboards/woodkeys/meira/featherble/featherble.h b/keyboards/woodkeys/meira/featherble/featherble.h deleted file mode 100644 index eab7c639b9..0000000000 --- a/keyboards/woodkeys/meira/featherble/featherble.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "meira.h" diff --git a/keyboards/woodkeys/meira/promicro/promicro.c b/keyboards/woodkeys/meira/promicro/promicro.c deleted file mode 100644 index 63ade21904..0000000000 --- a/keyboards/woodkeys/meira/promicro/promicro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "meira.h" diff --git a/keyboards/woodkeys/meira/promicro/promicro.h b/keyboards/woodkeys/meira/promicro/promicro.h deleted file mode 100644 index eab7c639b9..0000000000 --- a/keyboards/woodkeys/meira/promicro/promicro.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "meira.h" diff --git a/keyboards/woodkeys/scarletbandana/scarletbandana.c b/keyboards/woodkeys/scarletbandana/scarletbandana.c deleted file mode 100644 index 6ef183c2cc..0000000000 --- a/keyboards/woodkeys/scarletbandana/scarletbandana.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 Cole Markham, WoodKeys.click - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "scarletbandana.h" - - - - - - diff --git a/keyboards/wsk/alpha9/alpha9.c b/keyboards/wsk/alpha9/alpha9.c deleted file mode 100644 index 0d9f32c49a..0000000000 --- a/keyboards/wsk/alpha9/alpha9.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "alpha9.h" diff --git a/keyboards/wsk/gothic50/gothic50.c b/keyboards/wsk/gothic50/gothic50.c deleted file mode 100644 index 66854ba846..0000000000 --- a/keyboards/wsk/gothic50/gothic50.c +++ /dev/null @@ -1 +0,0 @@ -#include "gothic50.h" diff --git a/keyboards/wsk/gothic70/gothic70.c b/keyboards/wsk/gothic70/gothic70.c deleted file mode 100644 index dde1471174..0000000000 --- a/keyboards/wsk/gothic70/gothic70.c +++ /dev/null @@ -1 +0,0 @@ -#include "gothic70.h" diff --git a/keyboards/wsk/houndstooth/houndstooth.c b/keyboards/wsk/houndstooth/houndstooth.c deleted file mode 100644 index 2dcd1aa8c3..0000000000 --- a/keyboards/wsk/houndstooth/houndstooth.c +++ /dev/null @@ -1 +0,0 @@ -#include "houndstooth.h" diff --git a/keyboards/wsk/jerkin/jerkin.c b/keyboards/wsk/jerkin/jerkin.c deleted file mode 100644 index d2ed417097..0000000000 --- a/keyboards/wsk/jerkin/jerkin.c +++ /dev/null @@ -1 +0,0 @@ -#include "jerkin.h" diff --git a/keyboards/wsk/kodachi50/kodachi50.c b/keyboards/wsk/kodachi50/kodachi50.c deleted file mode 100644 index 77ee65bbc1..0000000000 --- a/keyboards/wsk/kodachi50/kodachi50.c +++ /dev/null @@ -1 +0,0 @@ -#include "kodachi50.h" diff --git a/keyboards/wsk/pain27/pain27.c b/keyboards/wsk/pain27/pain27.c deleted file mode 100644 index 8fa76871f1..0000000000 --- a/keyboards/wsk/pain27/pain27.c +++ /dev/null @@ -1 +0,0 @@ -#include "pain27.h" diff --git a/keyboards/wsk/sl40/sl40.c b/keyboards/wsk/sl40/sl40.c deleted file mode 100644 index 6367367afb..0000000000 --- a/keyboards/wsk/sl40/sl40.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "sl40.h" diff --git a/keyboards/wsk/tkl30/tkl30.c b/keyboards/wsk/tkl30/tkl30.c deleted file mode 100644 index b25dc56a95..0000000000 --- a/keyboards/wsk/tkl30/tkl30.c +++ /dev/null @@ -1 +0,0 @@ -#include "tkl30.h" diff --git a/keyboards/wuque/creek70/creek70.c b/keyboards/wuque/creek70/creek70.c deleted file mode 100644 index f6ea64ee33..0000000000 --- a/keyboards/wuque/creek70/creek70.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "creek70.h" diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c b/keyboards/wuque/ikki68_aurora/ikki68_aurora.c deleted file mode 100644 index 8e4e4e5889..0000000000 --- a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 wuquestudio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ikki68_aurora.h" diff --git a/keyboards/wuque/promise87/ansi/ansi.c b/keyboards/wuque/promise87/ansi/ansi.c deleted file mode 100644 index 8e20dfb751..0000000000 --- a/keyboards/wuque/promise87/ansi/ansi.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ansi.h" diff --git a/keyboards/wuque/promise87/wkl/wkl.c b/keyboards/wuque/promise87/wkl/wkl.c deleted file mode 100644 index 6264f7b1d6..0000000000 --- a/keyboards/wuque/promise87/wkl/wkl.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "wkl.h" diff --git a/keyboards/wuque/tata80/wk/wk.c b/keyboards/wuque/tata80/wk/wk.c deleted file mode 100644 index 1846559718..0000000000 --- a/keyboards/wuque/tata80/wk/wk.c +++ /dev/null @@ -1,16 +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 . - */ -#include "wk.h" diff --git a/keyboards/wuque/tata80/wkl/wkl.c b/keyboards/wuque/tata80/wkl/wkl.c deleted file mode 100644 index 23811762d1..0000000000 --- a/keyboards/wuque/tata80/wkl/wkl.c +++ /dev/null @@ -1,17 +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 . - */ -#include "wkl.h" - diff --git a/keyboards/x16/x16.c b/keyboards/x16/x16.c deleted file mode 100644 index 82a2f65c68..0000000000 --- a/keyboards/x16/x16.c +++ /dev/null @@ -1,16 +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 . - */ -#include "x16.h" diff --git a/keyboards/xelus/dharma/dharma.c b/keyboards/xelus/dharma/dharma.c deleted file mode 100644 index 15493ff022..0000000000 --- a/keyboards/xelus/dharma/dharma.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "quantum.h" diff --git a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c b/keyboards/xelus/pachi/mini_32u4/mini_32u4.c deleted file mode 100644 index 98d2a80963..0000000000 --- a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "mini_32u4.h" - diff --git a/keyboards/xelus/pachi/rev1/rev1.c b/keyboards/xelus/pachi/rev1/rev1.c deleted file mode 100644 index 0a5ffe3723..0000000000 --- a/keyboards/xelus/pachi/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rev1.h" - diff --git a/keyboards/xelus/rs108/rs108.c b/keyboards/xelus/rs108/rs108.c deleted file mode 100644 index 7c23446466..0000000000 --- a/keyboards/xelus/rs108/rs108.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "rs108.h" diff --git a/keyboards/xelus/snap96/snap96.c b/keyboards/xelus/snap96/snap96.c deleted file mode 100644 index e7c728bb05..0000000000 --- a/keyboards/xelus/snap96/snap96.c +++ /dev/null @@ -1 +0,0 @@ -#include "snap96.h" diff --git a/keyboards/xelus/valor/rev1/rev1.c b/keyboards/xelus/valor/rev1/rev1.c deleted file mode 100644 index 614899aaed..0000000000 --- a/keyboards/xelus/valor/rev1/rev1.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Nothing to see here, move along... ;-) - -#include "rev1.h" \ No newline at end of file diff --git a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c deleted file mode 100644 index b5eca9abde..0000000000 --- a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Nothing to see here, move along... ;-) - -#include "valor_frl_tkl.h" diff --git a/keyboards/xelus/xs108/xs108.c b/keyboards/xelus/xs108/xs108.c deleted file mode 100644 index 41084d7be1..0000000000 --- a/keyboards/xelus/xs108/xs108.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "xs108.h" diff --git a/keyboards/xiudi/xd68/xd68.c b/keyboards/xiudi/xd68/xd68.c deleted file mode 100755 index 45e8a2b958..0000000000 --- a/keyboards/xiudi/xd68/xd68.c +++ /dev/null @@ -1 +0,0 @@ -#include "xd68.h" diff --git a/keyboards/xiudi/xd84/xd84.c b/keyboards/xiudi/xd84/xd84.c deleted file mode 100644 index dec4ef95e2..0000000000 --- a/keyboards/xiudi/xd84/xd84.c +++ /dev/null @@ -1,16 +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 . - */ -#include "xd84.h" diff --git a/keyboards/xiudi/xd84pro/xd84pro.c b/keyboards/xiudi/xd84pro/xd84pro.c deleted file mode 100644 index 0eb52fda0f..0000000000 --- a/keyboards/xiudi/xd84pro/xd84pro.c +++ /dev/null @@ -1,16 +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 . - */ -#include "xd84pro.h" diff --git a/keyboards/xiudi/xd87/xd87.c b/keyboards/xiudi/xd87/xd87.c deleted file mode 100644 index 1d21357e66..0000000000 --- a/keyboards/xiudi/xd87/xd87.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Alexander Fougner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "xd87.h" diff --git a/keyboards/xiudi/xd96/xd96.c b/keyboards/xiudi/xd96/xd96.c deleted file mode 100644 index 2c67ee3d7c..0000000000 --- a/keyboards/xiudi/xd96/xd96.c +++ /dev/null @@ -1,16 +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 . - */ -#include "xd96.h" diff --git a/keyboards/xmmx/xmmx.c b/keyboards/xmmx/xmmx.c deleted file mode 100644 index 399ae4eb44..0000000000 --- a/keyboards/xmmx/xmmx.c +++ /dev/null @@ -1 +0,0 @@ -#include "xmmx.h" diff --git a/keyboards/xw60/xw60.c b/keyboards/xw60/xw60.c deleted file mode 100644 index 98ae6a758b..0000000000 --- a/keyboards/xw60/xw60.c +++ /dev/null @@ -1 +0,0 @@ -#include "xw60.h" \ No newline at end of file diff --git a/keyboards/yandrstudio/eau87/eau87.c b/keyboards/yandrstudio/eau87/eau87.c deleted file mode 100644 index 6ab9edb788..0000000000 --- a/keyboards/yandrstudio/eau87/eau87.c +++ /dev/null @@ -1,16 +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 . - */ -#include "eau87.h" diff --git a/keyboards/yandrstudio/wave75/wave75.c b/keyboards/yandrstudio/wave75/wave75.c deleted file mode 100644 index 56ffa33ade..0000000000 --- a/keyboards/yandrstudio/wave75/wave75.c +++ /dev/null @@ -1,16 +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 . - */ -#include "wave75.h" diff --git a/keyboards/yandrstudio/zhou65/zhou65.c b/keyboards/yandrstudio/zhou65/zhou65.c deleted file mode 100644 index e527550c9d..0000000000 --- a/keyboards/yandrstudio/zhou65/zhou65.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "zhou65.h" diff --git a/keyboards/ydkb/chili/chili.c b/keyboards/ydkb/chili/chili.c deleted file mode 100644 index f629a6d60a..0000000000 --- a/keyboards/ydkb/chili/chili.c +++ /dev/null @@ -1,16 +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 . - */ -#include "chili.h" diff --git a/keyboards/ydkb/grape/grape.c b/keyboards/ydkb/grape/grape.c deleted file mode 100644 index c0d33b064b..0000000000 --- a/keyboards/ydkb/grape/grape.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 somepin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "grape.h" diff --git a/keyboards/ymdk/bface/bface.c b/keyboards/ymdk/bface/bface.c deleted file mode 100644 index fabc10498a..0000000000 --- a/keyboards/ymdk/bface/bface.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2019 Ethan Durrant (emdarcher) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "quantum.h" diff --git a/keyboards/ymdk/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c deleted file mode 100644 index 44e813586b..0000000000 --- a/keyboards/ymdk/melody96/melody96.c +++ /dev/null @@ -1 +0,0 @@ -#include "melody96.h" diff --git a/keyboards/ymdk/np21/np21.c b/keyboards/ymdk/np21/np21.c deleted file mode 100644 index 824cfb0d1a..0000000000 --- a/keyboards/ymdk/np21/np21.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro -Modified 2018 Kenneth A. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "np21.h" diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c b/keyboards/ymdk/np24/u4rgb6/u4rgb6.c deleted file mode 100644 index edd0c0552d..0000000000 --- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Simon Arlott - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "u4rgb6.h" diff --git a/keyboards/ymdk/wings/wings.c b/keyboards/ymdk/wings/wings.c deleted file mode 100644 index 4e696d97b8..0000000000 --- a/keyboards/ymdk/wings/wings.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 alittlepeace - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wings.h" diff --git a/keyboards/ymdk/wingshs/wingshs.c b/keyboards/ymdk/wingshs/wingshs.c deleted file mode 100644 index f82fe22197..0000000000 --- a/keyboards/ymdk/wingshs/wingshs.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 alittlepeace - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "wingshs.h" diff --git a/keyboards/ymdk/ym68/ym68.c b/keyboards/ymdk/ym68/ym68.c deleted file mode 100644 index 3ec4d97b22..0000000000 --- a/keyboards/ymdk/ym68/ym68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "ym68.h" diff --git a/keyboards/ymdk/ymd09/ymd09.c b/keyboards/ymdk/ymd09/ymd09.c deleted file mode 100644 index 179c0c6b3e..0000000000 --- a/keyboards/ymdk/ymd09/ymd09.c +++ /dev/null @@ -1 +0,0 @@ -#include "ymd09.h" diff --git a/keyboards/ymdk/ymd21/v2/v2.c b/keyboards/ymdk/ymd21/v2/v2.c deleted file mode 100644 index 7d498f738d..0000000000 --- a/keyboards/ymdk/ymd21/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 QMK / James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2.h" diff --git a/keyboards/ymdk/ymd40/v2/v2.c b/keyboards/ymdk/ymd40/v2/v2.c deleted file mode 100644 index 54450ccd15..0000000000 --- a/keyboards/ymdk/ymd40/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "v2.h" diff --git a/keyboards/ymdk/ymd67/ymd67.c b/keyboards/ymdk/ymd67/ymd67.c deleted file mode 100644 index f6d40ea0c3..0000000000 --- a/keyboards/ymdk/ymd67/ymd67.c +++ /dev/null @@ -1 +0,0 @@ -#include "ymd67.h" diff --git a/keyboards/ymdk/ymd96/ymd96.c b/keyboards/ymdk/ymd96/ymd96.c deleted file mode 100644 index 0c212f4abb..0000000000 --- a/keyboards/ymdk/ymd96/ymd96.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro -Modified 2018 Kenneth A. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "ymd96.h" diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.c b/keyboards/yoichiro/lunakey_macro/lunakey_macro.c deleted file mode 100644 index 5ef38f70c7..0000000000 --- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "lunakey_macro.h" diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c b/keyboards/yoichiro/lunakey_mini/lunakey_mini.c deleted file mode 100644 index 4114706374..0000000000 --- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "lunakey_mini.h" diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.c b/keyboards/yoichiro/lunakey_pico/lunakey_pico.c deleted file mode 100644 index 3e57edad68..0000000000 --- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Yoichiro Tanaka (@yoichiro) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "lunakey_pico.h" diff --git a/keyboards/yynmt/dozen0/dozen0.c b/keyboards/yynmt/dozen0/dozen0.c deleted file mode 100644 index 42872a2105..0000000000 --- a/keyboards/yynmt/dozen0/dozen0.c +++ /dev/null @@ -1,16 +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 . - */ -#include "dozen0.h" diff --git a/keyboards/yynmt/kagamidget/kagamidget.c b/keyboards/yynmt/kagamidget/kagamidget.c deleted file mode 100644 index e682357018..0000000000 --- a/keyboards/yynmt/kagamidget/kagamidget.c +++ /dev/null @@ -1,16 +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 . - */ -#include "kagamidget.h" diff --git a/keyboards/zfrontier/big_switch/big_switch.c b/keyboards/zfrontier/big_switch/big_switch.c deleted file mode 100644 index 53c3e34e7f..0000000000 --- a/keyboards/zfrontier/big_switch/big_switch.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 zFrontier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "big_switch.h" diff --git a/keyboards/ziggurat/ziggurat.c b/keyboards/ziggurat/ziggurat.c deleted file mode 100644 index 11afa56b76..0000000000 --- a/keyboards/ziggurat/ziggurat.c +++ /dev/null @@ -1,17 +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 . - */ - -#include "ziggurat.h" diff --git a/keyboards/zj68/zj68.c b/keyboards/zj68/zj68.c deleted file mode 100644 index 8de12a6452..0000000000 --- a/keyboards/zj68/zj68.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Collin Diekvoss - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "zj68.h" diff --git a/keyboards/zlant/zlant.c b/keyboards/zlant/zlant.c deleted file mode 100755 index b60e9425c7..0000000000 --- a/keyboards/zlant/zlant.c +++ /dev/null @@ -1 +0,0 @@ -#include "zlant.h" diff --git a/keyboards/ztboards/after/after.c b/keyboards/ztboards/after/after.c deleted file mode 100644 index 85278d342a..0000000000 --- a/keyboards/ztboards/after/after.c +++ /dev/null @@ -1,18 +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 . - */ - -#include "after.h" - diff --git a/keyboards/ztboards/noon/noon.c b/keyboards/ztboards/noon/noon.c deleted file mode 100644 index 8a60850d07..0000000000 --- a/keyboards/ztboards/noon/noon.c +++ /dev/null @@ -1,19 +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 . - */ - -#include "noon.h" - - -- cgit v1.3.1 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/0xcb/1337/config.h | 2 -- keyboards/1upkeyboards/1up60hse/config.h | 2 -- keyboards/1upkeyboards/1up60hte/config.h | 2 -- keyboards/1upkeyboards/1up60rgb/config.h | 2 -- keyboards/1upkeyboards/super16/config.h | 2 -- keyboards/1upkeyboards/super16v2/config.h | 2 -- keyboards/1upkeyboards/sweet16/v1/config.h | 2 -- keyboards/25keys/aleth42/rev0/config.h | 2 -- keyboards/25keys/aleth42/rev1/config.h | 2 -- keyboards/25keys/cassette42/config.h | 2 -- keyboards/40percentclub/gherkin/config.h | 17 ---------- keyboards/abacus/config.h | 2 -- keyboards/abstract/ellipse/rev1/config.h | 2 -- keyboards/acekeyboard/titan60/config.h | 2 -- keyboards/acheron/elongate/beta/config.h | 2 -- keyboards/ada/ada1800mini/config.h | 2 -- keyboards/ada/infinity81/config.h | 2 -- keyboards/adpenrose/kintsugi/config.h | 2 -- keyboards/adpenrose/obi/config.h | 2 -- keyboards/ai03/polaris/config.h | 2 -- keyboards/ai03/voyager60_alps/config.h | 2 -- keyboards/alf/dc60/config.h | 2 -- keyboards/alf/x11/config.h | 2 -- keyboards/alf/x2/config.h | 2 -- keyboards/alfredslab/swift65/hotswap/config.h | 2 -- keyboards/alfredslab/swift65/solder/config.h | 2 -- keyboards/alpha/config.h | 2 -- keyboards/amjkeyboard/amj60/config.h | 2 -- keyboards/amjkeyboard/amj96/config.h | 2 -- keyboards/aos/tkl/config.h | 2 -- keyboards/atlantis/ak81_ve/config.h | 3 -- keyboards/atxkb/1894/config.h | 2 -- keyboards/aves60/config.h | 2 -- keyboards/bioi/f60/config.h | 2 -- keyboards/blockboy/ac980mini/config.h | 1 - keyboards/bluebell/swoop/config.h | 2 -- keyboards/bolsa/bolsalice/config.h | 2 -- keyboards/bpiphany/four_banger/config.h | 2 -- keyboards/buildakb/potato65/config.h | 2 -- keyboards/buildakb/potato65hs/config.h | 2 -- keyboards/buildakb/potato65s/config.h | 2 -- keyboards/cablecardesigns/cypher/rev6/config.h | 2 -- keyboards/canary/canary60rgb/v1/config.h | 2 -- keyboards/cannonkeys/adelie/config.h | 2 -- keyboards/capsunlocked/cu7/config.h | 2 -- keyboards/charue/sunsetter_r2/config.h | 2 -- keyboards/cherrybstudio/cb1800/config.h | 2 -- keyboards/cherrybstudio/cb65/config.h | 2 -- keyboards/cherrybstudio/cb87/config.h | 2 -- keyboards/cherrybstudio/cb87v2/config.h | 2 -- keyboards/chlx/str_merro60/config.h | 2 -- keyboards/cmm_studio/fuji65/config.h | 2 -- keyboards/contra/keymaps/enigma/config.h | 2 -- keyboards/coseyfannitutti/mullet/config.h | 2 -- keyboards/craftwalk/config.h | 2 -- keyboards/crazy_keyboard_68/config.h | 2 -- keyboards/creatkeebs/glacier/config.h | 17 ---------- keyboards/creatkeebs/thera/config.h | 36 ---------------------- keyboards/delikeeb/flatbread60/config.h | 3 -- keyboards/delikeeb/vaguettelite/config.h | 2 -- keyboards/delikeeb/vanana/rev1/config.h | 2 -- keyboards/delikeeb/vanana/rev2/config.h | 2 -- keyboards/delikeeb/waaffle/rev3/config.h | 2 -- keyboards/demiurge/config.h | 2 -- keyboards/draculad/config.h | 2 -- keyboards/draytronics/daisy/config.h | 2 -- keyboards/draytronics/elise/config.h | 2 -- keyboards/draytronics/elise_v2/config.h | 2 -- keyboards/dz60/config.h | 2 -- keyboards/dztech/bocc/config.h | 2 -- keyboards/dztech/duo_s/config.h | 3 +- keyboards/dztech/endless80/config.h | 2 -- keyboards/ealdin/quadrant/config.h | 2 -- keyboards/eek/config.h | 2 -- keyboards/ein_60/config.h | 2 -- keyboards/elephant42/config.h | 2 -- keyboards/emi20/config.h | 34 -------------------- keyboards/exclusive/e65/config.h | 2 -- keyboards/exclusive/e6v2/le/config.h | 2 -- keyboards/exclusive/e6v2/oe/config.h | 2 -- keyboards/exclusive/e7v1/config.h | 2 -- keyboards/exclusive/e7v1se/config.h | 2 -- keyboards/exclusive/e85/config.h | 2 -- keyboards/fc660c/keymaps/default_rgb/config.h | 2 -- keyboards/fc660c/keymaps/via_rgb/config.h | 2 -- keyboards/flehrad/numbrero/config.h | 17 ---------- keyboards/flehrad/snagpad/config.h | 17 ---------- keyboards/flehrad/tradestation/config.h | 17 ---------- keyboards/flx/virgo/config.h | 2 -- keyboards/foxlab/key65/hotswap/config.h | 2 -- keyboards/foxlab/key65/universal/config.h | 2 -- keyboards/foxlab/leaf60/hotswap/config.h | 3 -- keyboards/foxlab/leaf60/universal/config.h | 2 -- keyboards/foxlab/time_re/hotswap/config.h | 2 -- keyboards/foxlab/time_re/universal/config.h | 2 -- keyboards/fractal/config.h | 17 ---------- keyboards/ft/mars65/config.h | 2 -- keyboards/gh60/v1p3/config.h | 2 -- keyboards/gh80_3000/config.h | 17 ---------- keyboards/ghs/rar/config.h | 2 -- keyboards/gkeyboard/gkb_m16/config.h | 2 -- keyboards/gray_studio/aero75/config.h | 2 -- keyboards/gray_studio/apollo80/config.h | 3 -- keyboards/gray_studio/cod67/config.h | 2 -- keyboards/gray_studio/space65/config.h | 2 -- keyboards/gray_studio/space65r3/config.h | 2 -- keyboards/gray_studio/think65/hotswap/config.h | 2 -- keyboards/gray_studio/think65/solder/config.h | 2 -- keyboards/grid600/press/config.h | 2 -- keyboards/halfcliff/config.h | 2 -- keyboards/handwired/2x5keypad/config.h | 17 ---------- keyboards/handwired/bento/rev1/config.h | 2 -- keyboards/handwired/consolekeyboard/18key/config.h | 2 -- keyboards/handwired/consolekeyboard/20key/config.h | 2 -- keyboards/handwired/consolekeyboard/27key/config.h | 2 -- keyboards/handwired/consolekeyboard/30key/config.h | 2 -- keyboards/handwired/croxsplit44/config.h | 3 -- keyboards/handwired/heisenberg/config.h | 2 -- keyboards/handwired/hexon38/config.h | 20 ------------ keyboards/handwired/jopr/config.h | 4 +-- keyboards/handwired/macroboard/config.h | 2 -- keyboards/handwired/marauder/config.h | 2 -- keyboards/handwired/owlet60/config.h | 2 -- keyboards/handwired/space_oddity/config.h | 17 ---------- keyboards/handwired/symmetry60/config.h | 2 -- keyboards/handwired/tennie/config.h | 2 -- keyboards/handwired/traveller/config.h | 2 -- keyboards/handwired/tsubasa/config.h | 2 -- keyboards/hineybush/h08_ocelot/config.h | 2 -- keyboards/hineybush/h60/config.h | 2 -- keyboards/hineybush/h65/config.h | 2 -- keyboards/hineybush/h65_hotswap/config.h | 2 -- keyboards/hineybush/h660s/config.h | 2 -- keyboards/hineybush/h75_singa/config.h | 2 -- keyboards/hineybush/h87a/config.h | 2 -- keyboards/hineybush/h88/config.h | 2 -- keyboards/hineybush/hbcp/config.h | 3 -- keyboards/hineybush/hineyg80/config.h | 17 ---------- keyboards/hineybush/physix/config.h | 2 -- keyboards/hineybush/sm68/config.h | 2 -- keyboards/hnahkb/vn66/config.h | 2 -- keyboards/hub20/config.h | 2 -- keyboards/idobao/id61/config.h | 2 +- keyboards/idobao/id63/config.h | 2 +- keyboards/idobao/id75/v1/config.h | 2 -- keyboards/idobao/id80/v2/config.h | 2 -- keyboards/idobao/id80/v3/ansi/config.h | 2 +- keyboards/idobao/id87/v1/config.h | 2 -- keyboards/idobao/id96/config.h | 2 -- keyboards/idobao/montex/v1/config.h | 2 -- keyboards/idobao/montex/v1rgb/config.h | 2 +- keyboards/idobao/montex/v2/config.h | 2 +- keyboards/irene/config.h | 2 -- keyboards/jacky_studio/bear_65/config.h | 3 -- keyboards/jacky_studio/s7_elephant/rev1/config.h | 2 -- keyboards/jacky_studio/s7_elephant/rev2/config.h | 2 -- keyboards/jc65/v32u4/config.h | 2 -- keyboards/jones/v03/config.h | 2 -- keyboards/jones/v03_1/config.h | 2 -- keyboards/jones/v1/config.h | 2 -- keyboards/jones/v1/keymaps/via/keymap.c | 2 -- keyboards/kabedon/kabedon78s/config.h | 2 -- keyboards/kabedon/kabedon980/config.h | 2 -- keyboards/kagizaraya/halberd/config.h | 2 -- keyboards/kagizaraya/scythe/config.h | 2 -- keyboards/kakunpc/angel17/rev1/config.h | 2 -- keyboards/kakunpc/angel64/alpha/config.h | 2 -- keyboards/kakunpc/angel64/rev1/config.h | 2 -- keyboards/kakunpc/business_card/alpha/config.h | 2 -- .../business_card/alpha/keymaps/default/config.h | 3 -- keyboards/kakunpc/business_card/beta/config.h | 2 -- .../business_card/beta/keymaps/default/config.h | 4 --- keyboards/kakunpc/rabbit_capture_plan/config.h | 2 -- keyboards/kakunpc/suihankey/alpha/config.h | 2 -- keyboards/kakunpc/suihankey/rev1/config.h | 2 -- keyboards/kakunpc/suihankey/split/alpha/config.h | 2 -- keyboards/kakunpc/suihankey/split/rev1/config.h | 2 -- keyboards/kakunpc/thedogkeyboard/config.h | 2 -- .../kapcave/gskt00/keymaps/default-poly/config.h | 3 -- keyboards/kapcave/paladin64/config.h | 2 -- keyboards/kapcave/paladinpad/rev1/config.h | 2 -- keyboards/kapcave/paladinpad/rev2/config.h | 3 -- keyboards/kb_elmo/isolation/config.h | 2 -- keyboards/kbdfans/bounce/75/hotswap/config.h | 3 +- keyboards/kbdfans/bounce/75/soldered/config.h | 3 +- keyboards/kbdfans/kbd19x/config.h | 2 -- keyboards/kbdfans/kbd4x/config.h | 2 -- keyboards/kbdfans/kbd67/hotswap/config.h | 2 -- keyboards/kbdfans/kbd67/rev1/config.h | 2 -- keyboards/kbdfans/kbd67/rev2/config.h | 2 -- .../kbdfans/kbd67/rev2/keymaps/tucznak/config.h | 2 -- keyboards/kbdfans/kbd6x/config.h | 2 -- keyboards/kbdfans/kbd75/config.h | 3 -- keyboards/kbdfans/kbd75/keymaps/tucznak/config.h | 2 -- keyboards/kbdfans/kbd75hs/config.h | 3 +- keyboards/kbdfans/kbd8x/config.h | 2 -- keyboards/kbdfans/kbd8x_mk2/config.h | 2 -- keyboards/kbdfans/kbdpad/mk2/config.h | 2 -- keyboards/kbdfans/niu_mini/config.h | 2 -- .../kbdfans/niu_mini/keymaps/tucznak/config.h | 2 -- keyboards/kbdfans/odin/soldered/config.h | 3 +- keyboards/kbdfans/odin/v2/config.h | 2 -- keyboards/kbdfans/phaseone/config.h | 3 +- keyboards/kc60/config.h | 2 -- keyboards/keebformom/config.h | 2 -- keyboards/keebio/bamfk1/config.h | 2 -- keyboards/keebio/bamfk4/config.h | 2 -- keyboards/keebio/bdn9/rev1/config.h | 2 -- keyboards/keebio/bdn9/rev2/config.h | 2 -- keyboards/keebio/chocopad/config.h | 2 -- keyboards/keebio/dilly/config.h | 2 -- keyboards/keebio/dsp40/rev1/config.h | 2 -- keyboards/keebio/ergodicity/config.h | 2 -- keyboards/keebio/iris/rev6/config.h | 2 -- keyboards/keebio/iris/rev6a/config.h | 2 -- keyboards/keebio/iris/rev6b/config.h | 2 -- keyboards/keebio/iris/rev7/config.h | 3 -- keyboards/keebio/stick/config.h | 2 -- keyboards/keebio/tukey/config.h | 4 --- keyboards/keebio/wtf60/config.h | 2 -- keyboards/keebmonkey/kbmg68/config.h | 2 -- keyboards/keebwerk/nano_slider/config.h | 2 -- keyboards/kegen/gboy/config.h | 2 -- keyboards/keybage/radpad/config.h | 2 -- keyboards/keycapsss/o4l_5x12/config.h | 2 -- keyboards/keyhive/absinthe/config.h | 2 -- keyboards/keyhive/smallice/config.h | 2 -- keyboards/keyhive/southpole/config.h | 17 ---------- keyboards/keyhive/ut472/config.h | 2 -- keyboards/keystonecaps/gameroyadvance/config.h | 2 -- .../kingly_keys/romac/keymaps/stanrc85/config.h | 2 -- keyboards/kiwikey/borderland/config.h | 2 -- keyboards/kopibeng/mnk88/config.h | 2 -- keyboards/kopibeng/xt60/config.h | 2 -- keyboards/kopibeng/xt60_singa/config.h | 2 -- keyboards/kopibeng/xt65/config.h | 2 -- keyboards/kopibeng/xt8x/config.h | 2 -- keyboards/kprepublic/bm16s/config.h | 2 -- keyboards/kprepublic/bm40hsrgb/config.h | 2 -- keyboards/kprepublic/bm43a/config.h | 2 -- keyboards/kprepublic/bm43hsrgb/config.h | 2 -- .../kprepublic/bm43hsrgb/keymaps/bitstarr/config.h | 2 -- keyboards/kprepublic/bm60hsrgb/rev1/config.h | 2 -- keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h | 3 -- keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h | 2 -- keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h | 2 -- keyboards/kprepublic/bm65hsrgb/rev1/config.h | 2 -- keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h | 2 -- keyboards/kprepublic/bm68hsrgb/rev1/config.h | 2 -- keyboards/kprepublic/bm80hsrgb/config.h | 5 --- keyboards/kprepublic/bm980hsrgb/config.h | 1 - keyboards/kprepublic/cospad/config.h | 2 -- keyboards/ktec/daisy/config.h | 2 -- keyboards/kwub/bloop/config.h | 17 ---------- keyboards/latincompass/latin17rgb/config.h | 2 -- keyboards/latincompass/latin47ble/config.h | 2 -- keyboards/lazydesigners/bolt/config.h | 2 -- keyboards/lazydesigners/cassette8/config.h | 3 -- keyboards/lazydesigners/dimple/config.h | 2 -- keyboards/lazydesigners/dimpleplus/config.h | 2 -- keyboards/lazydesigners/the40/config.h | 2 -- keyboards/lazydesigners/the50/config.h | 2 -- keyboards/lazydesigners/the60/rev2/config.h | 2 -- keyboards/lfkeyboards/lfk78/config.h | 3 -- keyboards/lfkeyboards/lfkpad/config.h | 3 -- keyboards/lm_keyboard/lm60n/config.h | 2 -- keyboards/longnald/corin/config.h | 2 -- keyboards/makrosu/config.h | 22 ------------- keyboards/manta60/config.h | 2 -- .../launchpad/keymaps/brandonschlack/config.h | 2 -- keyboards/marksard/leftover30/config.h | 2 -- keyboards/marksard/rhymestone/rev1/config.h | 1 - keyboards/marksard/treadstone32/lite/config.h | 2 -- keyboards/marksard/treadstone32/rev1/config.h | 2 -- keyboards/marksard/treadstone48/rev1/config.h | 2 -- keyboards/marksard/treadstone48/rev2/config.h | 2 -- keyboards/matrix/cain_re/config.h | 2 -- keyboards/matrix/m12og/rev2/config.h | 2 -- keyboards/mechanickeys/undead60m/config.h | 2 -- keyboards/mechbrewery/mb65s/config.h | 2 -- keyboards/mechkeys/espectro/config.h | 4 --- keyboards/mechkeys/mechmini/v2/config.h | 2 -- keyboards/mechkeys/mk60/config.h | 2 -- keyboards/mechlovin/foundation/config.h | 2 -- keyboards/mechlovin/kay60/config.h | 2 -- keyboards/mechlovin/kay65/config.h | 2 -- keyboards/mechlovin/pisces/config.h | 2 -- keyboards/mechlovin/zed60/config.h | 2 -- keyboards/mechlovin/zed65/mono_led/config.h | 2 -- .../zed65/no_backlight/wearhaus66/config.h | 4 +-- keyboards/mechstudio/ud_40_ortho/config.h | 2 -- keyboards/mechwild/mokulua/mirrored/config.h | 2 -- keyboards/mechwild/mokulua/standard/config.h | 2 -- keyboards/mechwild/murphpad/config.h | 2 -- keyboards/mechwild/obe/config.h | 2 -- keyboards/mechwild/puckbuddy/config.h | 2 -- keyboards/mechwild/waka60/config.h | 2 -- keyboards/meletrix/zoom87/config.h | 3 -- keyboards/melgeek/mj6xy/rev3/config.h | 2 -- keyboards/meow48/config.h | 2 -- keyboards/meson/config.h | 2 -- keyboards/miniaxe/config.h | 2 -- keyboards/misonoworks/chocolatebar/config.h | 2 -- keyboards/misonoworks/karina/config.h | 2 -- keyboards/misterknife/knife66/config.h | 2 -- keyboards/misterknife/knife66_iso/config.h | 2 -- keyboards/mixi/config.h | 2 -- keyboards/mt/mt64rgb/config.h | 2 -- keyboards/mt/mt84/config.h | 2 -- keyboards/mt/mt980/config.h | 2 -- keyboards/mt/ncr80/hotswap/config.h | 2 -- keyboards/mtbkeys/mtb60/hotswap/config.h | 2 -- keyboards/mtbkeys/mtb60/solder/config.h | 2 -- keyboards/mwstudio/mw65_black/config.h | 2 -- keyboards/nightly_boards/adellein/config.h | 3 -- keyboards/nightly_boards/alter/rev1/config.h | 2 -- keyboards/nightly_boards/conde60/config.h | 3 -- keyboards/nightly_boards/n2/config.h | 2 -- keyboards/nightly_boards/n40_o/config.h | 3 -- keyboards/nightly_boards/n60_s/config.h | 3 -- keyboards/nightly_boards/n87/config.h | 2 -- keyboards/nightly_boards/n9/config.h | 2 -- keyboards/nightly_boards/octopad/config.h | 3 -- keyboards/nix_studio/oxalys80/config.h | 2 -- keyboards/novelkeys/nk1/config.h | 2 -- keyboards/novelkeys/novelpad/config.h | 2 -- keyboards/noxary/268_2_rgb/config.h | 2 -- keyboards/noxary/x268/config.h | 2 -- keyboards/omnikeyish/config.h | 17 ---------- keyboards/orthocode/config.h | 2 -- keyboards/owlab/jelly_epoch/hotswap/config.h | 2 -- keyboards/owlab/jelly_epoch/soldered/config.h | 2 -- keyboards/owlab/spring/config.h | 4 --- keyboards/owlab/voice65/hotswap/config.h | 2 -- keyboards/owlab/voice65/soldered/config.h | 2 -- keyboards/panc40/config.h | 2 -- keyboards/pearlboards/atlas/config.h | 2 -- keyboards/pearlboards/pandora/config.h | 2 -- keyboards/pearlboards/pearl/config.h | 2 -- keyboards/pearlboards/zeus/config.h | 2 -- keyboards/pearlboards/zeuspad/config.h | 2 -- keyboards/percent/booster/config.h | 2 -- keyboards/phantom/config.h | 2 -- keyboards/picolab/frusta_fundamental/config.h | 2 -- keyboards/pimentoso/paddino02/rev1/config.h | 19 ------------ keyboards/pimentoso/paddino02/rev2/left/config.h | 19 ------------ keyboards/pimentoso/paddino02/rev2/right/config.h | 19 ------------ keyboards/pimentoso/touhoupad/config.h | 2 -- keyboards/pkb65/config.h | 19 ------------ keyboards/playkbtw/ca66/config.h | 2 -- keyboards/playkbtw/helen80/config.h | 2 -- keyboards/playkbtw/pk60/config.h | 2 -- keyboards/playkbtw/pk64rgb/config.h | 2 -- keyboards/plut0nium/0x3e/config.h | 2 -- keyboards/plywrks/lune/config.h | 2 -- keyboards/pohjolaworks/louhi/config.h | 2 -- keyboards/poker87c/config.h | 2 -- keyboards/poker87d/config.h | 2 -- keyboards/pom_keyboards/tnln95/config.h | 2 -- keyboards/primekb/prime_r/config.h | 17 ---------- keyboards/program_yoink/config.h | 2 -- keyboards/quad_h/lb75/config.h | 2 -- keyboards/qvex/lynepad/config.h | 2 -- keyboards/qwertyydox/config.h | 2 -- keyboards/rainkeebs/delilah/config.h | 2 -- keyboards/rainkeebs/yasui/config.h | 2 -- keyboards/rart/rart4x4/config.h | 2 -- keyboards/rart/rart67/config.h | 2 -- keyboards/rart/rart75hs/config.h | 2 -- keyboards/rart/rart80/config.h | 2 -- keyboards/rart/rartpad/config.h | 2 -- keyboards/recompile_keys/mio/config.h | 2 -- keyboards/reversestudio/decadepad/config.h | 2 -- keyboards/reviung/reviung33/config.h | 2 -- .../reviung/reviung34/keymaps/default_rgb/config.h | 2 -- .../reviung34/keymaps/default_rgb2u/config.h | 2 -- .../reviung/reviung39/keymaps/default/config.h | 2 -- .../reviung/reviung39/keymaps/default_s/config.h | 2 -- .../reviung/reviung39/keymaps/toshi0383/config.h | 2 -- keyboards/reviung/reviung41/config.h | 2 -- .../reviung/reviung41/keymaps/ciutadellla/config.h | 2 -- keyboards/reviung/reviung5/config.h | 2 -- keyboards/reviung/reviung53/config.h | 2 -- .../reviung/reviung61/keymaps/default_rgb/config.h | 3 -- keyboards/rmi_kb/squishyfrl/config.h | 2 -- keyboards/rmi_kb/squishytkl/config.h | 2 -- keyboards/rmi_kb/tkl_ff/v2/config.h | 2 -- keyboards/rmi_kb/wete/v2/config.h | 2 -- keyboards/runes/vaengr/config.h | 2 -- keyboards/ryanbaekr/rb18/config.h | 2 -- keyboards/ryanbaekr/rb69/config.h | 2 -- keyboards/ryanbaekr/rb87/config.h | 2 -- keyboards/ryloo_studio/m0110/config.h | 2 -- keyboards/sam/s80/config.h | 3 +- keyboards/sam/sg81m/config.h | 2 -- keyboards/sawnsprojects/amber80/solder/config.h | 2 -- .../sawnsprojects/krush/krush60/solder/config.h | 2 -- .../sawnsprojects/krush/krush65/hotswap/config.h | 2 -- .../sawnsprojects/krush/krush65/solder/config.h | 4 +-- keyboards/sawnsprojects/satxri6key/config.h | 2 -- keyboards/sawnsprojects/vcl65/solder/config.h | 2 -- keyboards/sck/osa/config.h | 2 -- keyboards/sendyyeah/pix/config.h | 2 -- keyboards/sentraq/number_pad/config.h | 2 -- keyboards/sentraq/s60_x/rgb/config.h | 2 -- keyboards/sets3n/kk980/config.h | 2 -- keyboards/shambles/config.h | 20 ------------ keyboards/silverbullet44/config.h | 2 -- keyboards/skeletn87/hotswap/config.h | 2 -- keyboards/skeletn87/soldered/config.h | 2 -- keyboards/skeletonkbd/skeletonnumpad/config.h | 2 -- keyboards/sneakbox/aliceclone/config.h | 18 ----------- keyboards/sneakbox/disarray/ortho/config.h | 17 ---------- keyboards/sneakbox/disarray/staggered/config.h | 17 ---------- keyboards/soda/cherish/config.h | 2 -- keyboards/soy20/config.h | 17 ---------- keyboards/spaceholdings/nebula12/config.h | 2 -- keyboards/spaceholdings/nebula68/config.h | 2 -- keyboards/star75/config.h | 2 -- keyboards/stello65/hs_rev1/config.h | 2 -- keyboards/stello65/sl_rev1/config.h | 2 -- keyboards/studiokestra/bourgeau/config.h | 2 -- keyboards/studiokestra/cascade/config.h | 2 -- keyboards/swiftrax/retropad/config.h | 2 -- keyboards/takashicompany/center_enter/config.h | 2 -- keyboards/takashicompany/compacx/config.h | 2 -- keyboards/takashicompany/dogtag/config.h | 2 -- keyboards/takashicompany/endzone34/config.h | 2 -- keyboards/takashicompany/heavy_left/config.h | 2 -- keyboards/takashicompany/minizone/config.h | 2 -- keyboards/takashicompany/qoolee/config.h | 2 -- keyboards/takashicompany/radialex/config.h | 2 -- keyboards/takashiski/hecomi/alpha/config.h | 2 -- keyboards/taleguers/taleguers75/config.h | 2 -- keyboards/tanuki/config.h | 2 -- keyboards/teahouse/ayleen/config.h | 2 -- keyboards/team0110/p1800fl/config.h | 2 -- keyboards/tg4x/config.h | 2 -- keyboards/tkc/m0lly/config.h | 2 -- keyboards/tkc/osav2/config.h | 2 -- keyboards/tkc/tkl_ab87/config.h | 2 -- keyboards/tmo50/config.h | 2 -- keyboards/toad/config.h | 17 ---------- keyboards/toffee_studio/blueberry/config.h | 2 -- keyboards/tokyokeyboard/alix40/config.h | 2 -- keyboards/tokyokeyboard/tokyo60/config.h | 2 -- keyboards/tominabox1/bigboy/config.h | 4 --- keyboards/tominabox1/qaz/config.h | 2 -- keyboards/tr60w/config.h | 2 -- keyboards/tszaboo/ortho4exent/config.h | 2 -- keyboards/ubest/vn/config.h | 2 -- keyboards/uk78/config.h | 2 -- keyboards/unison/keymaps/via/config.h | 2 -- keyboards/unison/keymaps/via/keymap.c | 2 -- keyboards/unison/v04/config.h | 2 -- keyboards/utd80/config.h | 2 -- keyboards/viktus/omnikey_bh/config.h | 17 ---------- keyboards/viktus/z150_bh/config.h | 17 ---------- keyboards/waldo/config.h | 2 -- keyboards/walletburner/cajal/config.h | 2 -- keyboards/walletburner/neuron/config.h | 2 -- keyboards/wavtype/foundation/config.h | 2 -- keyboards/wavtype/p01_ultra/config.h | 2 -- keyboards/westfoxtrot/aanzee/config.h | 2 -- .../westfoxtrot/cypher/rev1/keymaps/kwer/config.h | 2 -- keyboards/westfoxtrot/cypher/rev5/config.h | 2 -- keyboards/wilba_tech/wt70_jb/config.h | 2 -- keyboards/wolfmarkclub/wm1/config.h | 2 -- keyboards/wsk/alpha9/config.h | 2 -- keyboards/wsk/g4m3ralpha/config.h | 2 -- keyboards/wsk/gothic50/config.h | 2 -- keyboards/wsk/gothic70/config.h | 2 -- keyboards/wsk/jerkin/config.h | 17 ---------- keyboards/wsk/kodachi50/config.h | 2 -- keyboards/wsk/pain27/config.h | 2 -- keyboards/wsk/sl40/config.h | 2 -- keyboards/wsk/tkl30/config.h | 2 -- keyboards/wuque/creek70/config.h | 2 -- keyboards/wuque/ikki68/config.h | 2 -- keyboards/wuque/ikki68_aurora/config.h | 2 -- keyboards/wuque/promise87/ansi/config.h | 2 -- keyboards/wuque/promise87/wkl/config.h | 2 -- keyboards/xiudi/xd75/config.h | 2 -- keyboards/xiudi/xd84pro/config.h | 2 -- keyboards/xiudi/xd87/config.h | 2 -- keyboards/xmmx/config.h | 17 ---------- keyboards/ydkb/yd68/config.h | 2 -- keyboards/yeehaw/config.h | 2 -- keyboards/ymdk/melody96/config.h | 2 -- keyboards/ymdk/np24/u4rgb6/config.h | 2 -- keyboards/ymdk/wings/config.h | 3 -- keyboards/ymdk/wingshs/config.h | 5 --- keyboards/ymdk/ymd67/config.h | 2 -- keyboards/yoichiro/lunakey_macro/config.h | 2 -- keyboards/yoichiro/lunakey_mini/config.h | 2 -- keyboards/yushakobo/navpad/10/config.h | 2 -- .../yushakobo/navpad/10/keymaps/default/config.h | 4 --- keyboards/yushakobo/navpad/10/keymaps/via/config.h | 4 --- keyboards/yushakobo/navpad/10/rev1/config.h | 2 -- keyboards/yushakobo/navpad/10_helix_r/config.h | 8 ++--- .../navpad/10_helix_r/keymaps/default/config.h | 4 --- keyboards/yynmt/dozen0/config.h | 2 -- keyboards/zj68/config.h | 2 -- keyboards/zlant/config.h | 2 -- layouts/community/60_iso/unxmaal/config.h | 4 +-- .../keymaps/handwired/ms_sculpt_mobile/keymap.c | 2 -- 506 files changed, 18 insertions(+), 1594 deletions(-) delete mode 100644 keyboards/creatkeebs/thera/config.h delete mode 100644 keyboards/emi20/config.h delete mode 100644 keyboards/handwired/hexon38/config.h (limited to 'keyboards/maple_computing') diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index a247d1b367..9d1e7ab889 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -44,7 +43,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_SAT 232 #define RGBLIGHT_DEFAULT_VAR 255 #define RGBLIGHT_DEFAULT_SPD 2 -#endif // clang-format on /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index edcad67b86..7d0ad0b141 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index 1aa9d54fe1..59e80d7fd0 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index 348604d71c..6a83a74a89 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h index ef1a458c9d..68701e6a58 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring # define RGB_MATRIX_LED_COUNT RGBLED_NUM # ifdef RGBLIGHT_ENABLE @@ -90,7 +89,6 @@ along with this program. If not, see . # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # endif -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index d3235d95ff..c2f738c2ff 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -21,10 +21,8 @@ #define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 20 -#ifdef RGB_DI_PIN # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGBLIGHT_LIMIT_VAL 255 -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index bb68f2b5d4..426cd3ced7 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -8,7 +8,6 @@ /* Underglow options */ #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -23,4 +22,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index 0a8b6b948e..26a56a6373 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/rev0/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index 56ba105e5d..af95a5657d 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h index 686eea8fc7..bc4f1ab4aa 100644 --- a/keyboards/25keys/cassette42/config.h +++ b/keyboards/25keys/cassette42/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,6 +34,5 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif #define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c" diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h index 627d9d6dbb..5f36081323 100644 --- a/keyboards/40percentclub/gherkin/config.h +++ b/keyboards/40percentclub/gherkin/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -# define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index e579dea057..df3253e700 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_SNAKE # define RGBLIGHT_EFFECT_KNIGHT # define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h index d3feabbe20..c0984e0297 100644 --- a/keyboards/abstract/ellipse/rev1/config.h +++ b/keyboards/abstract/ellipse/rev1/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h index 3a01bebf93..c3755e12e0 100644 --- a/keyboards/acekeyboard/titan60/config.h +++ b/keyboards/acekeyboard/titan60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 30b0b74c95..a22e92e1b1 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h index 378ffa80b4..f32b0075bb 100644 --- a/keyboards/ada/ada1800mini/config.h +++ b/keyboards/ada/ada1800mini/config.h @@ -18,7 +18,6 @@ //TODO: implement RGB matrix when I get the hardware #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 100 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h index 0d64933ad9..8f369e4ae7 100644 --- a/keyboards/ada/infinity81/config.h +++ b/keyboards/ada/infinity81/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 107 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -21,7 +20,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 0e10856cc8..2895613932 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Underglow options: */ #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -37,4 +36,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index fd9156ca82..2eb0a46c99 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -7,7 +7,6 @@ /* Underglow options: */ #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -23,4 +22,3 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 3946e761c3..88099b805b 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h index 704a6879f5..7092a754a9 100644 --- a/keyboards/ai03/voyager60_alps/config.h +++ b/keyboards/ai03/voyager60_alps/config.h @@ -15,14 +15,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* * Feature disable options diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index b62a2cc0ac..7a2b73ef06 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index 1c4361c5c5..d862c69cd3 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 28 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 5faf0aad8b..7e3e14a532 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 1fc317877d..9f1b065678 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index ae3dc8c2e0..8acc73207e 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 0f104a2a5c..5b87358a06 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 0f15b43161..0d56015351 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h index 8511574b04..483ecc6888 100644 --- a/keyboards/amjkeyboard/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -54,7 +53,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h index 84928fb975..dd4a0cae4e 100644 --- a/keyboards/aos/tkl/config.h +++ b/keyboards/aos/tkl/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,4 +38,3 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 50 -#endif diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 9790c75556..4736c10f18 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -27,7 +27,6 @@ #define FORCE_NKRO #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS @@ -80,5 +79,3 @@ #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out - -#endif \ No newline at end of file diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h index 637150ae7b..e52677c73f 100644 --- a/keyboards/atxkb/1894/config.h +++ b/keyboards/atxkb/1894/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h index fef8226df6..ac972e6763 100644 --- a/keyboards/aves60/config.h +++ b/keyboards/aves60/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -22,7 +21,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 1df5ab5104..173d4ca15a 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#endif diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h index 66101c91f1..6547097b7f 100644 --- a/keyboards/blockboy/ac980mini/config.h +++ b/keyboards/blockboy/ac980mini/config.h @@ -7,7 +7,6 @@ #define RGB_DI_PIN B7 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 81 -//#ifdef RGB_DI_PIN # define RGBLED_NUM 81 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h index f46df6af82..6c9c0d59fd 100644 --- a/keyboards/bluebell/swoop/config.h +++ b/keyboards/bluebell/swoop/config.h @@ -25,7 +25,6 @@ // RGB underglow and per key #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT @@ -39,4 +38,3 @@ #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h index ce64cbe57f..36236ad0f7 100644 --- a/keyboards/bolsa/bolsalice/config.h +++ b/keyboards/bolsa/bolsalice/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h index 6bacff31f0..6eab475cf2 100644 --- a/keyboards/bpiphany/four_banger/config.h +++ b/keyboards/bpiphany/four_banger/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h index 7ed15ef362..06de33c6bd 100644 --- a/keyboards/buildakb/potato65/config.h +++ b/keyboards/buildakb/potato65/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -56,4 +55,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h index dba700af6c..8af6f10258 100644 --- a/keyboards/buildakb/potato65hs/config.h +++ b/keyboards/buildakb/potato65hs/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 240 # define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h index 53ad1077bb..4f13c2c49e 100644 --- a/keyboards/buildakb/potato65s/config.h +++ b/keyboards/buildakb/potato65s/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 240 # define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h index 8b17e3e199..139341bd7c 100644 --- a/keyboards/cablecardesigns/cypher/rev6/config.h +++ b/keyboards/cablecardesigns/cypher/rev6/config.h @@ -8,7 +8,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 @@ -25,4 +24,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 999ec9f108..b205964796 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +31,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h index 59f438cfca..2dd64009a5 100644 --- a/keyboards/cannonkeys/adelie/config.h +++ b/keyboards/cannonkeys/adelie/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h index 067756faab..22cec290b1 100644 --- a/keyboards/capsunlocked/cu7/config.h +++ b/keyboards/capsunlocked/cu7/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_LIMIT_VAL 50 -#endif diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h index e720d702d4..570020b306 100644 --- a/keyboards/charue/sunsetter_r2/config.h +++ b/keyboards/charue/sunsetter_r2/config.h @@ -5,7 +5,6 @@ /* RGB */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -17,7 +16,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h index fbd6d0e2fd..e59d5b3101 100644 --- a/keyboards/cherrybstudio/cb1800/config.h +++ b/keyboards/cherrybstudio/cb1800/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -29,4 +28,3 @@ along with this program. If not, see . # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h index 6251ae58ef..4f962bc935 100644 --- a/keyboards/cherrybstudio/cb65/config.h +++ b/keyboards/cherrybstudio/cb65/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . /* RGB Lighting */ #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,4 +29,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h index 2d7e2722e5..c936f7b66e 100644 --- a/keyboards/cherrybstudio/cb87/config.h +++ b/keyboards/cherrybstudio/cb87/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -29,4 +28,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h index 03549bc495..6a8c94b70b 100644 --- a/keyboards/cherrybstudio/cb87v2/config.h +++ b/keyboards/cherrybstudio/cb87v2/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -29,4 +28,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 5a54a2ab89..1836493d9f 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,7 +35,6 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h index 5cf553bca9..140473a367 100644 --- a/keyboards/cmm_studio/fuji65/config.h +++ b/keyboards/cmm_studio/fuji65/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,7 +32,6 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h index 87f0199876..da3e8250b6 100644 --- a/keyboards/contra/keymaps/enigma/config.h +++ b/keyboards/contra/keymaps/enigma/config.h @@ -17,11 +17,9 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_SNAKE #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif \ No newline at end of file diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h index d56fccaf1f..9dd86992c1 100644 --- a/keyboards/coseyfannitutti/mullet/config.h +++ b/keyboards/coseyfannitutti/mullet/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* * Feature disable options diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h index 5b878f779e..9e0f2cf8ff 100644 --- a/keyboards/craftwalk/config.h +++ b/keyboards/craftwalk/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h index 5298ea8a77..1cc20d3daf 100644 --- a/keyboards/crazy_keyboard_68/config.h +++ b/keyboards/crazy_keyboard_68/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 84 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h index 76fcf3fa59..81016b23a0 100644 --- a/keyboards/creatkeebs/glacier/config.h +++ b/keyboards/creatkeebs/glacier/config.h @@ -21,20 +21,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h deleted file mode 100644 index 72e4f39e53..0000000000 --- a/keyboards/creatkeebs/thera/config.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 Tim (https://github.com/Timliuzhaolu) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif - - diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h index 5a33d5d981..cdb8d46ac7 100644 --- a/keyboards/delikeeb/flatbread60/config.h +++ b/keyboards/delikeeb/flatbread60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -37,8 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h index 4bf4e669c1..6237b13a80 100644 --- a/keyboards/delikeeb/vaguettelite/config.h +++ b/keyboards/delikeeb/vaguettelite/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 9 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT // # define RGBLIGHT_EFFECT_RGB_TEST // # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index fe6ada22ec..232c6ef861 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define B7_AUDIO #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index 2f93c2a799..2103fdd52f 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define B7_AUDIO #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 2bdd2a4f2c..6f51a0bbc7 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 10 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT // # define RGBLIGHT_EFFECT_RGB_TEST // # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h index ab19a9a57e..de0e50da21 100755 --- a/keyboards/demiurge/config.h +++ b/keyboards/demiurge/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 21 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,7 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_LIMIT_VAL 153 -#endif /* * Feature disable options diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h index 13bc6fedfe..f1794bef02 100644 --- a/keyboards/draculad/config.h +++ b/keyboards/draculad/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #endif #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif #define EE_HANDS diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h index 6be876da3d..fd32344d06 100644 --- a/keyboards/draytronics/daisy/config.h +++ b/keyboards/draytronics/daisy/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . //Underglow #define RGB_DI_PIN D4 // Underglow led pin -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -58,4 +57,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h index 601a3befa8..4fc60e596e 100644 --- a/keyboards/draytronics/elise/config.h +++ b/keyboards/draytronics/elise/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . // ws2812 options #define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -43,4 +42,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h index 2c590e67c6..c7b5965ae9 100644 --- a/keyboards/draytronics/elise_v2/config.h +++ b/keyboards/draytronics/elise_v2/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . // ws2812 options #define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -43,4 +42,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h index 0202967002..9340d17a1a 100644 --- a/keyboards/dz60/config.h +++ b/keyboards/dz60/config.h @@ -1,7 +1,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -17,7 +16,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index b6b02cd5ec..53e997559c 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +31,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 419464662b..0f6db721ce 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +34,7 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index 2200253ff1..eca064ab96 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,4 +33,3 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -#endif diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h index efeb89011c..59b20b1110 100644 --- a/keyboards/ealdin/quadrant/config.h +++ b/keyboards/ealdin/quadrant/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h index 54d5cae5b6..73004cc215 100644 --- a/keyboards/eek/config.h +++ b/keyboards/eek/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 36 #define RGBLIGHT_HUE_STEP 4 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 36 diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h index 077a3d6efe..d59cc7f724 100644 --- a/keyboards/ein_60/config.h +++ b/keyboards/ein_60/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #endif #define RGB_DI_PIN E7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 38 # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 8 @@ -47,7 +46,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 38 diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h index 8aa3a46e8a..0346bc6f74 100644 --- a/keyboards/elephant42/config.h +++ b/keyboards/elephant42/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_SPLIT { 27, 27 } # define RGBLED_NUM 54 // backlight x42 + underglow x12 # define RGBLIGHT_HUE_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif #ifdef RGB_MATRIX_ENABLE # define SPLIT_TRANSPORT_MIRROR diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h deleted file mode 100644 index 06a88a7240..0000000000 --- a/keyboards/emi20/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h index 9ec802d8d4..9e6e361cfd 100644 --- a/keyboards/exclusive/e65/config.h +++ b/keyboards/exclusive/e65/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h index 865d5e5ead..7929919544 100644 --- a/keyboards/exclusive/e6v2/le/config.h +++ b/keyboards/exclusive/e6v2/le/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h index b7fd9fcff4..027e59246d 100644 --- a/keyboards/exclusive/e6v2/oe/config.h +++ b/keyboards/exclusive/e6v2/oe/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h index 6d2de14931..d0eaefef13 100644 --- a/keyboards/exclusive/e7v1/config.h +++ b/keyboards/exclusive/e7v1/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h index 81c34a03b1..0225067acb 100644 --- a/keyboards/exclusive/e7v1se/config.h +++ b/keyboards/exclusive/e7v1se/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h index 98d2fd8634..7558ddd829 100644 --- a/keyboards/exclusive/e85/config.h +++ b/keyboards/exclusive/e85/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h index 48a7a053cb..592c6beca0 100644 --- a/keyboards/fc660c/keymaps/default_rgb/config.h +++ b/keyboards/fc660c/keymaps/default_rgb/config.h @@ -21,7 +21,6 @@ /*RGB*/ /*Repurpose Insert LED */ #define RGB_DI_PIN B5 - #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 @@ -39,4 +38,3 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT //#define RGBLIGHT_EFFECT_RGB_TEST //#define RGBLIGHT_EFFECT_ALTERNATING - #endif diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h index 48a7a053cb..592c6beca0 100644 --- a/keyboards/fc660c/keymaps/via_rgb/config.h +++ b/keyboards/fc660c/keymaps/via_rgb/config.h @@ -21,7 +21,6 @@ /*RGB*/ /*Repurpose Insert LED */ #define RGB_DI_PIN B5 - #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 @@ -39,4 +38,3 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT //#define RGBLIGHT_EFFECT_RGB_TEST //#define RGBLIGHT_EFFECT_ALTERNATING - #endif diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h index c04d29e83b..5f36081323 100644 --- a/keyboards/flehrad/numbrero/config.h +++ b/keyboards/flehrad/numbrero/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 5 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/flehrad/snagpad/config.h b/keyboards/flehrad/snagpad/config.h index 56d04557a7..57ae786026 100644 --- a/keyboards/flehrad/snagpad/config.h +++ b/keyboards/flehrad/snagpad/config.h @@ -8,20 +8,3 @@ /* prevent stuck modifiers */ //#define STRICT_LAYER_RELEASE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h index bd178662c5..41dafc075d 100644 --- a/keyboards/flehrad/tradestation/config.h +++ b/keyboards/flehrad/tradestation/config.h @@ -20,20 +20,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - #define RGBLED_NUM 5 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h index fe61b1ada8..77888f89ed 100644 --- a/keyboards/flx/virgo/config.h +++ b/keyboards/flx/virgo/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 0 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h index 2ae5d9b328..35adcaa8b9 100644 --- a/keyboards/foxlab/key65/hotswap/config.h +++ b/keyboards/foxlab/key65/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h index 48e6e2484e..6672972dc7 100644 --- a/keyboards/foxlab/key65/universal/config.h +++ b/keyboards/foxlab/key65/universal/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h index 6176399052..e5dbe79cf4 100644 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ b/keyboards/foxlab/leaf60/hotswap/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,8 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h index 9d4ebe73a2..e5dbe79cf4 100644 --- a/keyboards/foxlab/leaf60/universal/config.h +++ b/keyboards/foxlab/leaf60/universal/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h index 9431d13f2e..b444fee611 100644 --- a/keyboards/foxlab/time_re/hotswap/config.h +++ b/keyboards/foxlab/time_re/hotswap/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,4 +35,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h index 9431d13f2e..b444fee611 100644 --- a/keyboards/foxlab/time_re/universal/config.h +++ b/keyboards/foxlab/time_re/universal/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,4 +35,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h index b44dfaac52..5f36081323 100755 --- a/keyboards/fractal/config.h +++ b/keyboards/fractal/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index abc2e5cea2..94c7425276 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -21,7 +20,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index 5382607589..52fab19b7e 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h index b44dfaac52..5f36081323 100644 --- a/keyboards/gh80_3000/config.h +++ b/keyboards/gh80_3000/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index ea09e835d0..efc9f5f3f5 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 17 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -30,7 +29,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 036340f2fd..7be3421eeb 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h index 70ee32e0a3..932b259288 100644 --- a/keyboards/gray_studio/aero75/config.h +++ b/keyboards/gray_studio/aero75/config.h @@ -6,7 +6,6 @@ #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -25,7 +24,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h index ceab86fb29..0b9d6bc1c0 100644 --- a/keyboards/gray_studio/apollo80/config.h +++ b/keyboards/gray_studio/apollo80/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -37,5 +36,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index ee5248471a..fb5934be40 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index 1b3e39536f..26718866d0 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h index 089bb27b17..c0a4304abe 100644 --- a/keyboards/gray_studio/space65r3/config.h +++ b/keyboards/gray_studio/space65r3/config.h @@ -5,7 +5,6 @@ #define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -24,7 +23,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index 1934bc77ad..354b981ec2 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/hotswap/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index 1934bc77ad..354b981ec2 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h index 38cde33eec..82d7c06c48 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h index 07d53e4e49..d477fb01e8 100644 --- a/keyboards/halfcliff/config.h +++ b/keyboards/halfcliff/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 } #define RGB_DI_PIN D3 - #ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 5, 5 } @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h index 4b1dc39862..819f0f640f 100644 --- a/keyboards/handwired/2x5keypad/config.h +++ b/keyboards/handwired/2x5keypad/config.h @@ -8,20 +8,3 @@ /* Tap dancing params */ #define TAPPING_TERM 250 - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h index 62c3144cc5..e23bcab286 100644 --- a/keyboards/handwired/bento/rev1/config.h +++ b/keyboards/handwired/bento/rev1/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h index 800ed9d19a..5ada7d8564 100644 --- a/keyboards/handwired/consolekeyboard/18key/config.h +++ b/keyboards/handwired/consolekeyboard/18key/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h index 800ed9d19a..5ada7d8564 100644 --- a/keyboards/handwired/consolekeyboard/20key/config.h +++ b/keyboards/handwired/consolekeyboard/20key/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h index 800ed9d19a..5ada7d8564 100644 --- a/keyboards/handwired/consolekeyboard/27key/config.h +++ b/keyboards/handwired/consolekeyboard/27key/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h index 305448feec..d08d7e3c1a 100644 --- a/keyboards/handwired/consolekeyboard/30key/config.h +++ b/keyboards/handwired/consolekeyboard/30key/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h index be2926baf4..ffb07b649f 100644 --- a/keyboards/handwired/croxsplit44/config.h +++ b/keyboards/handwired/croxsplit44/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 42 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,5 +33,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#endif \ No newline at end of file diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h index ced4a9b4e5..345e1da87a 100644 --- a/keyboards/handwired/heisenberg/config.h +++ b/keyboards/handwired/heisenberg/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h deleted file mode 100644 index 599f001661..0000000000 --- a/keyboards/handwired/hexon38/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#pragma once - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h index 00bbcf507d..e12034a6b8 100644 --- a/keyboards/handwired/jopr/config.h +++ b/keyboards/handwired/jopr/config.h @@ -9,10 +9,8 @@ #define NO_ACTION_ONESHOT #define TAPPING_TOGGLE 3 -/*#define RGB_DI_PIN F4*/ -#ifdef RGB_DI_PIN +#define RGB_DI_PIN F4 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 1 #define RGBLIGHT_SAT_STEP 1 #define RGBLIGHT_VAL_STEP 1 -#endif diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index a3de56d076..5da6e9ac53 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define WS2812_PWM_TARGET_PERIOD 800000 #define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 } -#ifdef RGB_DI_PIN # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -42,7 +41,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h index 1d6272b3d4..6c9be12a17 100644 --- a/keyboards/handwired/marauder/config.h +++ b/keyboards/handwired/marauder/config.h @@ -19,11 +19,9 @@ #define LAYER_STATE_8BIT #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h index 9eff47d07e..4cb293cf88 100644 --- a/keyboards/handwired/owlet60/config.h +++ b/keyboards/handwired/owlet60/config.h @@ -41,7 +41,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -58,7 +57,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h index 9a1e829e46..400303c8b9 100644 --- a/keyboards/handwired/space_oddity/config.h +++ b/keyboards/handwired/space_oddity/config.h @@ -12,20 +12,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h index 776749f54a..0f33d65386 100644 --- a/keyboards/handwired/symmetry60/config.h +++ b/keyboards/handwired/symmetry60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index b24f5b8c97..2f4d7d4ad8 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGBW #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h index 4c71623b24..c09d1503d9 100644 --- a/keyboards/handwired/traveller/config.h +++ b/keyboards/handwired/traveller/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 1 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_VAL_STEP 17 //# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* * Feature disable options diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h index 6bfe335593..7f21279edf 100644 --- a/keyboards/handwired/tsubasa/config.h +++ b/keyboards/handwired/tsubasa/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define MASTER_RIGHT #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_SPLIT # define RGBLED_SPLIT {6, 6} @@ -30,7 +29,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif #define SPLIT_WPM_ENABLE #define SPLIT_LAYER_STATE_ENABLE diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h index 27c2811e68..88fbf86297 100644 --- a/keyboards/hineybush/h08_ocelot/config.h +++ b/keyboards/hineybush/h08_ocelot/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 7 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h index c0365b76e7..27e25fba40 100644 --- a/keyboards/hineybush/h60/config.h +++ b/keyboards/hineybush/h60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 - #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -46,7 +45,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h index 49d4991b06..df9fd8dee6 100644 --- a/keyboards/hineybush/h65/config.h +++ b/keyboards/hineybush/h65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h index 49d4991b06..df9fd8dee6 100644 --- a/keyboards/hineybush/h65_hotswap/config.h +++ b/keyboards/hineybush/h65_hotswap/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h index 707d202266..f63efa630a 100644 --- a/keyboards/hineybush/h660s/config.h +++ b/keyboards/hineybush/h660s/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h index 45e93b7ebd..4581ff80f0 100644 --- a/keyboards/hineybush/h75_singa/config.h +++ b/keyboards/hineybush/h75_singa/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h index 652b910feb..cf128b7009 100644 --- a/keyboards/hineybush/h87a/config.h +++ b/keyboards/hineybush/h87a/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep -#endif diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h index 3f57906377..bd734e3303 100644 --- a/keyboards/hineybush/h88/config.h +++ b/keyboards/hineybush/h88/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,4 +38,3 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep -#endif diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h index e0eed7f414..678eacc21c 100644 --- a/keyboards/hineybush/hbcp/config.h +++ b/keyboards/hineybush/hbcp/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define DIODE_DIRECTION EITHERWAY #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 27 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -57,8 +56,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h index b44dfaac52..5f36081323 100644 --- a/keyboards/hineybush/hineyg80/config.h +++ b/keyboards/hineybush/hineyg80/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h index 77d8169cfe..d5d533c627 100644 --- a/keyboards/hineybush/physix/config.h +++ b/keyboards/hineybush/physix/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 26 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h index 95d44f631d..7fcccd170f 100644 --- a/keyboards/hineybush/sm68/config.h +++ b/keyboards/hineybush/sm68/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h index 6e62054150..c489d1bb88 100644 --- a/keyboards/hnahkb/vn66/config.h +++ b/keyboards/hnahkb/vn66/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h index c619b2d24d..879d8b947f 100644 --- a/keyboards/hub20/config.h +++ b/keyboards/hub20/config.h @@ -22,9 +22,7 @@ along with this program. If not, see . #define RGBLED_NUM 27 #define RGB_MATRIX_LED_COUNT 27 -#ifdef RGB_DI_PIN #define RGBLED_NUM 27 -#endif #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h index d2a803a1e4..2824a91000 100644 --- a/keyboards/idobao/id61/config.h +++ b/keyboards/idobao/id61/config.h @@ -11,7 +11,7 @@ #define RGB_DI_PIN F0 // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #ifndef ID61_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 71 diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h index 13a4068822..f3a8c7a3e9 100644 --- a/keyboards/idobao/id63/config.h +++ b/keyboards/idobao/id63/config.h @@ -13,7 +13,7 @@ #define RGB_DI_PIN B7 // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) /* Denwir case is solid back. Please disable underglow at compile with compile command line: * diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 4f15181dfd..21f3ca0cc8 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index fc65958e3e..34f8b57fa9 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,4 +35,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_SNAKE #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h index bdabde0782..515f2d8cfa 100644 --- a/keyboards/idobao/id80/v3/ansi/config.h +++ b/keyboards/idobao/id80/v3/ansi/config.h @@ -10,7 +10,7 @@ #define RGB_DI_PIN E2 // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #define RGB_MATRIX_LED_COUNT 94 diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 881174152c..f856e51c82 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -31,4 +30,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 1d968410b1..41471a4e97 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 0cb9bb1f19..85cbcfcc14 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -39,4 +38,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index 4851844dad..e405e2059f 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -5,7 +5,7 @@ #define RGB_DI_PIN B1 -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index 47e51e9268..a7527d4bb7 100755 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -7,7 +7,7 @@ /* LED Matrix & Animations */ #define RGB_DI_PIN B1 -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #ifndef ID27_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected #else diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h index 9386d03e74..fb7a568062 100644 --- a/keyboards/irene/config.h +++ b/keyboards/irene/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 23 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index cde00d1c4d..2f282d4c30 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -10,7 +10,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_DEFAULT_VAL 50 #define RGBLIGHT_EFFECT_BREATHING @@ -29,5 +28,3 @@ #define RGBLIGHT_VAL_STEP 8 /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_SLEEP - -#endif diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index 7b1324e3f3..fa1b028939 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index 1359eafc9a..a14efa38ca 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif // RGB_DI_PIN /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index 68e8005dec..56fe657427 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h index fc1ae1ff77..11ea425f18 100644 --- a/keyboards/jones/v03/config.h +++ b/keyboards/jones/v03/config.h @@ -49,7 +49,6 @@ along with this program. If not, see . #endif #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 // Left(4) + Right(2) #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -69,7 +68,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* * Feature disable options diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h index 548b98e675..fe7a5efa9e 100644 --- a/keyboards/jones/v03_1/config.h +++ b/keyboards/jones/v03_1/config.h @@ -49,7 +49,6 @@ along with this program. If not, see . #endif #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8) #define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under #define RGBLIGHT_HUE_STEP 8 @@ -70,7 +69,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* * Feature disable options diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index acf9a541b3..c4707355dd 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /* RGBLIGHT */ #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 // Left(2) + Right(2) #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . /*== Lighting Layers ==*/ #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status -#endif /* External EEPROM */ // Use 24LC64 EEPROM diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c index 31a182733a..3304b13700 100644 --- a/keyboards/jones/v1/keymaps/via/keymap.c +++ b/keyboards/jones/v1/keymaps/via/keymap.c @@ -212,7 +212,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) { //------------------------------------------------------------------------------ void keyboard_post_init_user(void) { debug_enable=true; -#ifdef RGB_DI_PIN #ifdef RGBLIGHT_LAYERS // Enable the LED layers. rgblight_layers = my_rgb_layers; @@ -220,6 +219,5 @@ debug_enable=true; // prevent RGB light overrides layer indicator. layer_state_set(default_layer_state); #endif -#endif } diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h index d3ff10faa3..c9f6428730 100644 --- a/keyboards/kabedon/kabedon78s/config.h +++ b/keyboards/kabedon/kabedon78s/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h index 1fac2485f7..552a23568d 100644 --- a/keyboards/kabedon/kabedon980/config.h +++ b/keyboards/kabedon/kabedon980/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 3 #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,4 +35,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h index 175c33a7f3..f7bf067a74 100644 --- a/keyboards/kagizaraya/halberd/config.h +++ b/keyboards/kagizaraya/halberd/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h index 81892324aa..f581bee9a4 100644 --- a/keyboards/kagizaraya/scythe/config.h +++ b/keyboards/kagizaraya/scythe/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define RGBLIGHT_SPLIT 1 #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h index 637881b917..759a25915b 100644 --- a/keyboards/kakunpc/angel17/rev1/config.h +++ b/keyboards/kakunpc/angel17/rev1/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 17 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h index 39d8fcf0cd..b8f4396d69 100644 --- a/keyboards/kakunpc/angel64/alpha/config.h +++ b/keyboards/kakunpc/angel64/alpha/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 64 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -47,7 +46,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h index 39d8fcf0cd..b8f4396d69 100644 --- a/keyboards/kakunpc/angel64/rev1/config.h +++ b/keyboards/kakunpc/angel64/rev1/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 64 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -47,7 +46,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h index e96decbc87..9c35d57bca 100644 --- a/keyboards/kakunpc/business_card/alpha/config.h +++ b/keyboards/kakunpc/business_card/alpha/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h index ff2381020a..dec4c0dd7b 100644 --- a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h +++ b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h @@ -16,8 +16,6 @@ #pragma once -// place overrides here -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -28,4 +26,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h index e96decbc87..9c35d57bca 100644 --- a/keyboards/kakunpc/business_card/beta/config.h +++ b/keyboards/kakunpc/business_card/beta/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h index fb0c1ab3a3..dec4c0dd7b 100644 --- a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h +++ b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h @@ -16,9 +16,6 @@ #pragma once -// place overrides here - -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -29,4 +26,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h index 1f12a638e2..9167b2345e 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/config.h +++ b/keyboards/kakunpc/rabbit_capture_plan/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_SPLIT {32, 37} # define RGBLED_NUM 69 # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h index ee45daecdb..825d820ed6 100644 --- a/keyboards/kakunpc/suihankey/alpha/config.h +++ b/keyboards/kakunpc/suihankey/alpha/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h index ee45daecdb..825d820ed6 100644 --- a/keyboards/kakunpc/suihankey/rev1/config.h +++ b/keyboards/kakunpc/suihankey/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index dae056200b..59d95deb8d 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/alpha/config.h @@ -22,14 +22,12 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index bb80874bed..b71d359f01 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/rev1/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h index fe05231b6f..4297ca3d0b 100644 --- a/keyboards/kakunpc/thedogkeyboard/config.h +++ b/keyboards/kakunpc/thedogkeyboard/config.h @@ -36,14 +36,12 @@ along with this program. If not, see . #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 111 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 50 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h index 2db5749cb5..8a23e16f19 100644 --- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h +++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { D3 } #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h index e5da848720..3d22c45494 100755 --- a/keyboards/kapcave/paladin64/config.h +++ b/keyboards/kapcave/paladin64/config.h @@ -79,7 +79,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -94,4 +93,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h index 4fcbe6d698..b2cfbb1057 100644 --- a/keyboards/kapcave/paladinpad/rev1/config.h +++ b/keyboards/kapcave/paladinpad/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h index 8229921777..35167881f9 100644 --- a/keyboards/kapcave/paladinpad/rev2/config.h +++ b/keyboards/kapcave/paladinpad/rev2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h index 4aeb5eaa00..4cf7eed2cd 100644 --- a/keyboards/kb_elmo/isolation/config.h +++ b/keyboards/kb_elmo/isolation/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB backlight */ #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 15550775e2..0d43c4783d 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,5 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 7448ffef3d..ef5e9ca782 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,5 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 27228e040b..51aeb2bf03 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index b1a70ae409..2e644f4d60 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 9ea1e9b842..084f366ac3 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -37,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index d0a39afdf2..5ab0791004 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 28ce0dd707..4b631cf615 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h index 234a44ae70..9a72f85030 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h @@ -11,6 +11,4 @@ #define RETRO_TAPPING /* turn off RGB when computer sleeps */ -#ifdef RGB_DI_PIN #define RGBLIGHT_SLEEP -#endif \ No newline at end of file diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 917b37c2b7..30a1e61130 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index 38211cdee5..f22102c361 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -10,7 +10,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -27,5 +26,3 @@ #define RGBLIGHT_VAL_STEP 8 /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_SLEEP - -#endif diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h index f93cd66bfb..e42b60811c 100644 --- a/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h +++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/config.h @@ -11,9 +11,7 @@ #define RETRO_TAPPING /* turn off RGB when computer sleeps */ -#ifdef RGB_DI_PIN #define RGBLIGHT_SLEEP -#endif #ifdef BACKLIGHT_LEVELS #undef BACKLIGHT_LEVELS diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 10fc5ca8b5..09990d1cfc 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -19,7 +19,6 @@ #define FORCE_NKRO #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -37,5 +36,5 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index d98d6cb41d..1f7a62b929 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 556f2f82d4..ae7eadad0d 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index a2a29bccf7..5ea4fba8e2 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index 70f86c6dbc..616fc639af 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* * Feature disable options diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h index cfcda1bf7d..437907759d 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h +++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h @@ -7,9 +7,7 @@ #define PRODUCT "Qt3.14" /* turn off RGB when computer sleeps */ -#ifdef RGB_DI_PIN #define RGBLIGHT_SLEEP -#endif /* send tap key if no layer key was used even after tap delay */ #define TAPPING_TERM 50 diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index 28cb2aba4b..49c3ab9233 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -35,5 +34,5 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_SLEEP -#endif + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index 13a06b3209..d156ae5103 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -18,7 +18,6 @@ #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,4 +33,3 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index 825a7f5bbc..68fc32caaa 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -21,7 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,5 +38,5 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h index b30d0e92b8..eae2b0da6e 100644 --- a/keyboards/kc60/config.h +++ b/keyboards/kc60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F5 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h index 08547b17a7..190f88658f 100644 --- a/keyboards/keebformom/config.h +++ b/keyboards/keebformom/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 40 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -27,7 +26,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif /* * Feature disable options diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 590cce19c5..901a26fe8d 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -12,7 +12,6 @@ #define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } } #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -28,7 +27,6 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h index 8ef3598f38..426bde52b1 100644 --- a/keyboards/keebio/bamfk4/config.h +++ b/keyboards/keebio/bamfk4/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 32 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -69,7 +68,6 @@ # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES //# endif -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h index fbd33490d6..22d7643005 100644 --- a/keyboards/keebio/bdn9/rev1/config.h +++ b/keyboards/keebio/bdn9/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h index ee2065f176..30c53e2f86 100644 --- a/keyboards/keebio/bdn9/rev2/config.h +++ b/keyboards/keebio/bdn9/rev2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -91,7 +90,6 @@ along with this program. If not, see . # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # endif -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h index 213ffd7936..3dc169cf79 100644 --- a/keyboards/keebio/chocopad/config.h +++ b/keyboards/keebio/chocopad/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -20,6 +19,5 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif #define RGB_DI_PIN D3 #define RGBLED_NUM 4 diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h index 1d2a07e38a..1b80f5bfd1 100644 --- a/keyboards/keebio/dilly/config.h +++ b/keyboards/keebio/dilly/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -20,7 +19,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif #define RGB_DI_PIN D3 #define RGBLED_NUM 10 diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h index 1b45aa5ed6..3f722a5801 100644 --- a/keyboards/keebio/dsp40/rev1/config.h +++ b/keyboards/keebio/dsp40/rev1/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 1 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -40,7 +39,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h index 3d35f8b66c..dd4726a35d 100644 --- a/keyboards/keebio/ergodicity/config.h +++ b/keyboards/keebio/ergodicity/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index 98ed5187f3..0ed1cb78eb 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/keyboards/keebio/iris/rev6/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 @@ -88,4 +87,3 @@ along with this program. If not, see . # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES # endif -#endif diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index 430abd2ef0..fe802cef2e 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 @@ -88,4 +87,3 @@ along with this program. If not, see . # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES //# endif -#endif diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index 430abd2ef0..fe802cef2e 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 @@ -88,4 +87,3 @@ along with this program. If not, see . # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES //# endif -#endif diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h index e51677e6d2..f7599e3e4d 100644 --- a/keyboards/keebio/iris/rev7/config.h +++ b/keyboards/keebio/iris/rev7/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 @@ -88,5 +87,3 @@ along with this program. If not, see . # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES //# endif -#endif - diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h index c4b27e4324..f8582148f9 100644 --- a/keyboards/keebio/stick/config.h +++ b/keyboards/keebio/stick/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* WS2812 RGB LED */ #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -88,6 +87,5 @@ along with this program. If not, see . # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # endif -#endif #define TAPPING_TERM 200 diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h index b62aef8a09..e93b57b8e7 100644 --- a/keyboards/keebio/tukey/config.h +++ b/keyboards/keebio/tukey/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,9 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h index 6d29b5bb9e..34869d5107 100644 --- a/keyboards/keebio/wtf60/config.h +++ b/keyboards/keebio/wtf60/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h index 7ed31afbd2..2342941340 100644 --- a/keyboards/keebmonkey/kbmg68/config.h +++ b/keyboards/keebmonkey/kbmg68/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 68 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h index 7d84b547ad..92023404ec 100644 --- a/keyboards/keebwerk/nano_slider/config.h +++ b/keyboards/keebwerk/nano_slider/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SLIDER_PIN D4 #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h index ce174f57bb..c34099cfa8 100644 --- a/keyboards/kegen/gboy/config.h +++ b/keyboards/kegen/gboy/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index fb5f8a8f60..e8a729c95f 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING @@ -31,7 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* OLED Configuration */ #ifdef OLED_ENABLE diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index 8abe34ac3d..fc78e6bb03 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -1,7 +1,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 4 @@ -18,7 +17,6 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h index f33378524b..ded3dc8236 100644 --- a/keyboards/keyhive/absinthe/config.h +++ b/keyboards/keyhive/absinthe/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 32 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h index 450f080684..a770d8e47d 100644 --- a/keyboards/keyhive/smallice/config.h +++ b/keyboards/keyhive/smallice/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/keyhive/southpole/config.h b/keyboards/keyhive/southpole/config.h index b44dfaac52..5f36081323 100644 --- a/keyboards/keyhive/southpole/config.h +++ b/keyboards/keyhive/southpole/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h index e96f645d6a..c007f92fe7 100644 --- a/keyboards/keyhive/ut472/config.h +++ b/keyboards/keyhive/ut472/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN C6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -37,4 +36,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h index ccd1b1da6c..20abd283ee 100644 --- a/keyboards/keystonecaps/gameroyadvance/config.h +++ b/keyboards/keystonecaps/gameroyadvance/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,4 +38,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h index 41bba326c4..a8da1ae072 100644 --- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h +++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h @@ -2,7 +2,6 @@ #define RGBLED_NUM 16 #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 @@ -16,4 +15,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h index 08467cfd14..92436e41fb 100644 --- a/keyboards/kiwikey/borderland/config.h +++ b/keyboards/kiwikey/borderland/config.h @@ -6,7 +6,6 @@ #define TAP_CODE_DELAY 10 #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -23,7 +22,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h index f2b51fa065..45ad8961c6 100644 --- a/keyboards/kopibeng/mnk88/config.h +++ b/keyboards/kopibeng/mnk88/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN A10 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,7 +32,6 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h index 6163c3555d..269ad00f60 100644 --- a/keyboards/kopibeng/xt60/config.h +++ b/keyboards/kopibeng/xt60/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,7 +32,6 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h index 6163c3555d..269ad00f60 100644 --- a/keyboards/kopibeng/xt60_singa/config.h +++ b/keyboards/kopibeng/xt60_singa/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,7 +32,6 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h index 04a7030393..9e5acfa2e0 100644 --- a/keyboards/kopibeng/xt65/config.h +++ b/keyboards/kopibeng/xt65/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h index 053c826450..4210713a65 100644 --- a/keyboards/kopibeng/xt8x/config.h +++ b/keyboards/kopibeng/xt8x/config.h @@ -19,7 +19,6 @@ #define INDICATOR_PIN_0 B13 #define RGB_DI_PIN A10 -#ifdef RGB_DI_PIN #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h index c629c8721a..26be1e8187 100755 --- a/keyboards/kprepublic/bm16s/config.h +++ b/keyboards/kprepublic/bm16s/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h index 2e4942bf63..60324e48b1 100755 --- a/keyboards/kprepublic/bm40hsrgb/config.h +++ b/keyboards/kprepublic/bm40hsrgb/config.h @@ -23,10 +23,8 @@ #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 53 -#ifdef RGB_DI_PIN # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h index fd6a1a0806..fc549b862d 100644 --- a/keyboards/kprepublic/bm43a/config.h +++ b/keyboards/kprepublic/bm43a/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value #endif diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h index c19ed0598b..151488c516 100755 --- a/keyboards/kprepublic/bm43hsrgb/config.h +++ b/keyboards/kprepublic/bm43hsrgb/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 53 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h index 50c75ee7f6..6f98093e33 100755 --- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h +++ b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS #define UNICODE_CYCLE_PERSIST false -#ifdef RGB_DI_PIN #undef RGBLIGHT_EFFECT_BREATHING #undef RGBLIGHT_EFFECT_RAINBOW_MOOD #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,4 +29,3 @@ along with this program. If not, see . #undef RGBLIGHT_EFFECT_RGB_TEST #undef RGBLIGHT_EFFECT_ALTERNATING #undef RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h index c46ccd05a6..df94a6d357 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h @@ -19,11 +19,9 @@ along with this program. If not, see . #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 69 -#ifdef RGB_DI_PIN # define RGBLED_NUM 69 # define RGB_MATRIX_KEYPRESSES # define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h index 242d2dfffd..bf7208c547 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h @@ -18,7 +18,6 @@ #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 69 -#ifdef RGB_DI_PIN #define RGBLED_NUM 69 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140 @@ -65,5 +64,3 @@ #define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif - diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h index 18b28b7560..bbfeb14e39 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 70 -#ifdef RGB_DI_PIN # define RGBLED_NUM 70 # define RGB_MATRIX_KEYPRESSES // #define RGBLIGHT_HUE_STEP 8 @@ -27,7 +26,6 @@ along with this program. If not, see . // #define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h index 31751e6214..5382f10e8c 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 67 -#ifdef RGB_DI_PIN #define RGBLED_NUM 67 #define RGB_MATRIX_KEYPRESSES #define RGBLIGHT_HUE_STEP 8 @@ -37,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h index 8ed57405b5..9bd8375e25 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h @@ -21,10 +21,8 @@ along with this program. If not, see . #define RGB_DI_PIN E2 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 73 -#ifdef RGB_DI_PIN #define RGBLED_NUM 73 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h index 7712c86201..501e7d6a52 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 74 -#ifdef RGB_DI_PIN #define RGBLED_NUM 74 #define RGB_MATRIX_KEYPRESSES #define RGBLIGHT_HUE_STEP 8 @@ -92,4 +91,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h index b0266a1307..ee7d425a76 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h @@ -21,11 +21,9 @@ along with this program. If not, see . #define RGB_DI_PIN E2 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 74 -#ifdef RGB_DI_PIN # define RGBLED_NUM 74 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value -#endif #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h index 0e1861574a..8ae02d0c63 100644 --- a/keyboards/kprepublic/bm80hsrgb/config.h +++ b/keyboards/kprepublic/bm80hsrgb/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 87 -#ifdef RGB_DI_PIN #define RGBLED_NUM 87 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) @@ -85,10 +84,6 @@ along with this program. If not, see . // # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended // does not work for some reason, might revisit - - -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h index 73cb52e6f8..fa4093651f 100644 --- a/keyboards/kprepublic/bm980hsrgb/config.h +++ b/keyboards/kprepublic/bm980hsrgb/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 98 -//#ifdef RGB_DI_PIN # define RGBLED_NUM 98 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses //#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h index a28b6c8c1f..250391e5e0 100644 --- a/keyboards/kprepublic/cospad/config.h +++ b/keyboards/kprepublic/cospad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h index 3e49bfe194..716b36a6e8 100644 --- a/keyboards/ktec/daisy/config.h +++ b/keyboards/ktec/daisy/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 12 # define RGBLIGHT_SAT_STEP 25 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kwub/bloop/config.h b/keyboards/kwub/bloop/config.h index 700e885658..87dc81c24d 100644 --- a/keyboards/kwub/bloop/config.h +++ b/keyboards/kwub/bloop/config.h @@ -21,20 +21,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -# define RGBLIGHT_EFFECT_TWINKLE -# define RGBLED_NUM 0 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h index 5bbd2a8d23..ac78eb6330 100644 --- a/keyboards/latincompass/latin17rgb/config.h +++ b/keyboards/latincompass/latin17rgb/config.h @@ -86,7 +86,6 @@ #endif #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -102,4 +101,3 @@ #define RGBLIGHT_SAT_STEP 5 #define RGBLIGHT_VAL_STEP 5 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h index a81c2f86ba..13c9d76aa1 100644 --- a/keyboards/latincompass/latin47ble/config.h +++ b/keyboards/latincompass/latin47ble/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #define TAPPING_TERM 250 diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h index e5f50f6c28..53f60d653f 100644 --- a/keyboards/lazydesigners/bolt/config.h +++ b/keyboards/lazydesigners/bolt/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RBG underglow */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ along with this program. If not, see . /* #define RGBLIGHT_HUE_STEP 8 */ /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ -#endif diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h index c7e4f41f74..467bd22735 100755 --- a/keyboards/lazydesigners/cassette8/config.h +++ b/keyboards/lazydesigners/cassette8/config.h @@ -18,7 +18,6 @@ /* RBG underglow */ #define RGB_DI_PIN C2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,5 +33,3 @@ /* #define RGBLIGHT_HUE_STEP 8 */ /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ -#endif - diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h index d35dbea6ce..4f129374cd 100644 --- a/keyboards/lazydesigners/dimple/config.h +++ b/keyboards/lazydesigners/dimple/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* RBG underglow */ #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . /* #define RGBLIGHT_HUE_STEP 8 */ /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ -#endif diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h index 25b86175b7..d5722dd113 100644 --- a/keyboards/lazydesigners/dimpleplus/config.h +++ b/keyboards/lazydesigners/dimpleplus/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RBG underglow */ #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ along with this program. If not, see . /* #define RGBLIGHT_HUE_STEP 8 */ /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ -#endif diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h index 65b240df1e..c2a827ca3e 100644 --- a/keyboards/lazydesigners/the40/config.h +++ b/keyboards/lazydesigners/the40/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h index 5e0e04031a..b69bb222b6 100644 --- a/keyboards/lazydesigners/the50/config.h +++ b/keyboards/lazydesigners/the50/config.h @@ -7,7 +7,5 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h index 2c39a1e047..41dc029181 100755 --- a/keyboards/lazydesigners/the60/rev2/config.h +++ b/keyboards/lazydesigners/the60/rev2/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h index e71fd36273..021f187638 100644 --- a/keyboards/lfkeyboards/lfk78/config.h +++ b/keyboards/lfkeyboards/lfk78/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile -#ifdef RGB_DI_PIN # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_VAL_STEP 17 @@ -40,8 +39,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h index 4db1c623ce..80bfbee9d1 100644 --- a/keyboards/lfkeyboards/lfkpad/config.h +++ b/keyboards/lfkeyboards/lfkpad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile -#ifdef RGB_DI_PIN # define RGBLED_NUM 28 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 @@ -34,8 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif - #define TAPPING_TERM 200 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h index edbcf0fd48..50b7e405d2 100644 --- a/keyboards/lm_keyboard/lm60n/config.h +++ b/keyboards/lm_keyboard/lm60n/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 41 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h index 4786eed6af..7ad280d763 100644 --- a/keyboards/longnald/corin/config.h +++ b/keyboards/longnald/corin/config.h @@ -19,7 +19,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 64 # define RGBLIGHT_HUE_STEP 20 # define RGBLIGHT_SAT_STEP 20 @@ -30,4 +29,3 @@ # define RGBLIGHT_EFFECT_RAINBOW_SWIRL # define RGBLIGHT_EFFECT_SNAKE # define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h index 98108cce78..64f4553f90 100644 --- a/keyboards/makrosu/config.h +++ b/keyboards/makrosu/config.h @@ -23,25 +23,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - - -// EEPROM usage - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h index 9051dd7f4e..d7722de7c2 100644 --- a/keyboards/manta60/config.h +++ b/keyboards/manta60/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 1 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 68 # define RGBLIGHT_SPLIT # define RGBLED_SPLIT { 34, 34 } @@ -44,7 +43,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) # define USB_MAX_POWER_CONSUMPTION 400 diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h index 6aaf996e57..b68a1ee51e 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h @@ -16,12 +16,10 @@ #pragma once /* Underlight Configuration */ -#ifdef RGB_DI_PIN #undef RGB_DI_PIN #define RGB_DI_PIN F4 #undef RGBLED_NUM #define RGBLED_NUM 2 // Number of LEDs -#endif #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h index 9a15aa3826..81456d8caa 100644 --- a/keyboards/marksard/leftover30/config.h +++ b/keyboards/marksard/leftover30/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index b832cd5ce3..e8d681ff7f 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE -// #ifdef RGB_DI_PIN #define RGBLED_NUM 40 #define RGBLED_SPLIT {20, 20} #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index 1da59006d4..3524cb7f45 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index 573427ff75..36f4dce58d 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index a9fd1ad829..169c09cc0a 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #ifndef RS_EXTRA_LED #define RGBLED_NUM 12 #define RGBLED_SPLIT {12, 0} @@ -40,7 +39,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h index 87136e222f..4919c1072e 100644 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ b/keyboards/marksard/treadstone48/rev2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 77077bad34..70e5bca590 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -21,7 +21,6 @@ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,7 +39,6 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP #define RGBLIGHT_LED_MAP { 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 2, 3 } -#endif #define CAPS_PIN D3 #define NUM_PIN F7 diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h index 415ab3dbdd..8494950e6d 100644 --- a/keyboards/matrix/m12og/rev2/config.h +++ b/keyboards/matrix/m12og/rev2/config.h @@ -6,7 +6,6 @@ #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -23,4 +22,3 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#endif diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h index 9611e47e2b..6b153b0c78 100644 --- a/keyboards/mechanickeys/undead60m/config.h +++ b/keyboards/mechanickeys/undead60m/config.h @@ -18,7 +18,6 @@ /* RGB Underglow */ #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING @@ -31,4 +30,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h index a9375a9833..c806fd05c7 100644 --- a/keyboards/mechbrewery/mb65s/config.h +++ b/keyboards/mechbrewery/mb65s/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h index 644ebeda46..feec17629e 100755 --- a/keyboards/mechkeys/espectro/config.h +++ b/keyboards/mechkeys/espectro/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 @@ -39,6 +38,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - - -#endif diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h index 35421a3b29..0b6a0e6760 100755 --- a/keyboards/mechkeys/mechmini/v2/config.h +++ b/keyboards/mechkeys/mechmini/v2/config.h @@ -22,7 +22,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -37,4 +36,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h index 7b63a204c3..810f25652a 100644 --- a/keyboards/mechkeys/mk60/config.h +++ b/keyboards/mechkeys/mk60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index 0cf3af4a8a..bc6d0e564c 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLED_NUM 22 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,6 +34,5 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif #define TAP_CODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h index aadc6fcaaa..5643462b8a 100644 --- a/keyboards/mechlovin/kay60/config.h +++ b/keyboards/mechlovin/kay60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 22 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h index c6168d930f..e6064163fd 100644 --- a/keyboards/mechlovin/kay65/config.h +++ b/keyboards/mechlovin/kay65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 75887406ac..7771a968a4 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h index ff9aea4a02..36be5c04ca 100644 --- a/keyboards/mechlovin/zed60/config.h +++ b/keyboards/mechlovin/zed60/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define WS2812_SPI SPID1 // default: SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5 -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 9f8d4f46f5..917a3a9fc8 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -62,7 +62,6 @@ along with this program. If not, see . #endif #define RGB_DI_PIN A7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -79,4 +78,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h index 7c9062f319..39b8dcb84a 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define WS2812_SPI SPID2 // default: SPID1 #define WS2812_SPI_MOSI_PAL_MODE 0 // MOSI pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5 -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 @@ -42,4 +40,4 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif \ No newline at end of file +#endif diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h index 7c6f10131d..5c82ff9eb7 100644 --- a/keyboards/mechstudio/ud_40_ortho/config.h +++ b/keyboards/mechstudio/ud_40_ortho/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B7 - #ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index a91a4bf79c..a326faf710 100644 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ b/keyboards/mechwild/mokulua/mirrored/config.h @@ -18,7 +18,6 @@ /* RGB options */ #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ //# define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index f33d6c5944..ed5eb12a66 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/standard/config.h @@ -18,7 +18,6 @@ /* RGB options */ #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ //# define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index 68217b33bf..d9b0f0fa8d 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c" #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index a130b99d1e..bebb1126e9 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 10 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index 13e8bbfed2..eb1674aadd 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -33,7 +33,6 @@ /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -49,7 +48,6 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index b427adc33c..3babce4a10 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* RGB settings, uncomment this define to enable RGB */ #define RGB_DI_PIN A1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h index fd83302d27..4c3bb24d3e 100644 --- a/keyboards/meletrix/zoom87/config.h +++ b/keyboards/meletrix/zoom87/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,5 +34,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index 7150128436..a5a8d8883f 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -18,7 +18,6 @@ #define RGB_DI_PIN C6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,4 +35,3 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h index fb0353c631..f214ffbbf6 100644 --- a/keyboards/meow48/config.h +++ b/keyboards/meow48/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define OLED_BRIGHTNESS 100 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 48 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h index c5f295bfee..1ca066fcf9 100644 --- a/keyboards/meson/config.h +++ b/keyboards/meson/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define USE_I2C #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 5, 5 } @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h index 3b9010455c..ffc36b1c0b 100644 --- a/keyboards/miniaxe/config.h +++ b/keyboards/miniaxe/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Uncomment below if use underglow */ #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h index dd6c07768b..04a746121b 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define FORCE_NKRO #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -32,4 +31,3 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index e38f18b40a..88500712e7 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 19 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -37,4 +36,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h index 4efe1466c6..188bfaa7c1 100644 --- a/keyboards/misterknife/knife66/config.h +++ b/keyboards/misterknife/knife66/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN A9 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 -#endif #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h index d13ee6a334..3d9141e11e 100644 --- a/keyboards/misterknife/knife66_iso/config.h +++ b/keyboards/misterknife/knife66_iso/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define RGB_DI_PIN A9 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 160 -#endif #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index ed82723108..b96eeed91c 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -26,4 +25,3 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYER_BLINK -#endif diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index e7c1302a0b..357553c951 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -81,7 +81,6 @@ #endif #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -97,7 +96,6 @@ #define RGBLIGHT_SAT_STEP 5 #define RGBLIGHT_VAL_STEP 5 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h index 394193bcdd..012c209f77 100644 --- a/keyboards/mt/mt84/config.h +++ b/keyboards/mt/mt84/config.h @@ -84,7 +84,6 @@ #endif #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RAINBOW_SWIRL # define RGBLIGHT_EFFECT_BREATHING @@ -93,7 +92,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h index d6697fc076..ff91085de3 100644 --- a/keyboards/mt/mt980/config.h +++ b/keyboards/mt/mt980/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -23,4 +22,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 185 -#endif diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h index 29eb3ae608..fd1cc98c7f 100644 --- a/keyboards/mt/ncr80/hotswap/config.h +++ b/keyboards/mt/ncr80/hotswap/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,4 +33,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 180 -#endif diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h index 114c8feab4..21b234cc19 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ b/keyboards/mtbkeys/mtb60/hotswap/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* Pin WS2812 RGB LEDs are connected to */ #define RGB_DI_PIN D4 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_TWINKLE # define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */ -#endif /* RGB_DI_PIN */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h index 3ab3171076..18a568fc48 100644 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ b/keyboards/mtbkeys/mtb60/solder/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* Pin WS2812 RGB LEDs are connected to */ #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_TWINKLE # define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */ -#endif /* RGB_DI_PIN */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h index 6ed183cb4c..c54f6bf281 100644 --- a/keyboards/mwstudio/mw65_black/config.h +++ b/keyboards/mwstudio/mw65_black/config.h @@ -17,9 +17,7 @@ #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 21 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index 031895cf23..cefed954f8 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,8 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Encoders */ #define ENCODERS_CW_KEY { { 3, 3 } } #define ENCODERS_CCW_KEY { { 1, 3 } } diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index b576b720e3..095aea8e07 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -32,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 4fdd3f76a1..6f005a97a0 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,8 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index 3ca1b97be1..37e99fe794 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -32,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 9a4fbf033b..671e700ce3 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN B4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -34,8 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Encoders */ #define ENCODERS_CW_KEY { { 2, 4 },{ 4, 4 },{ 6, 4 } } #define ENCODERS_CCW_KEY { { 1, 4 },{ 3, 4 },{ 5, 4 } } diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index 0c240b4a47..c87c581a88 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . /* Underglow */ #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -46,8 +45,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_ALTERNATING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 41defb8722..90a38e8d6a 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #define AUDIO_PIN B7 diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index d53385a03c..f76c2bd366 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -32,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index db8a106663..25b30b0a41 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,8 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Encoders */ #define ENCODERS_CW_KEY { { 3, 2 },{ 1, 2 } } #define ENCODERS_CCW_KEY { { 2, 2 },{ 0, 2 } } diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h index fe3a23e110..058287b281 100644 --- a/keyboards/nix_studio/oxalys80/config.h +++ b/keyboards/nix_studio/oxalys80/config.h @@ -22,7 +22,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,4 +38,3 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep -#endif diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h index c168aca492..c44f3c17a8 100644 --- a/keyboards/novelkeys/nk1/config.h +++ b/keyboards/novelkeys/nk1/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* There is only 1 Button so limiting VIA to 1 layer */ #define DYNAMIC_KEYMAP_LAYER_COUNT 1 diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h index 5aa35ad4d8..e1d9ada105 100755 --- a/keyboards/novelkeys/novelpad/config.h +++ b/keyboards/novelkeys/novelpad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h index 9c615ac388..8fcd63e7b2 100644 --- a/keyboards/noxary/268_2_rgb/config.h +++ b/keyboards/noxary/268_2_rgb/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . /* ws2812b options */ #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 /*#define RGBLIGHT_LIMIT_VAL 255 */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h index fc391c7074..8c659d5a21 100644 --- a/keyboards/noxary/x268/config.h +++ b/keyboards/noxary/x268/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* ws2812b options */ #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 /*#define RGBLIGHT_LIMIT_VAL 255 */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h index cc80606a97..daacf8f8a6 100644 --- a/keyboards/omnikeyish/config.h +++ b/keyboards/omnikeyish/config.h @@ -23,23 +23,6 @@ /* force n-key rollover*/ #define FORCE_NKRO -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif - #define DYNAMIC_MACRO_COUNT 12 #define DYNAMIC_MACRO_SIZE 48 #define DYNAMIC_MACRO_EEPROM_STORAGE diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h index 7a221472cc..62b80bcd5d 100644 --- a/keyboards/orthocode/config.h +++ b/keyboards/orthocode/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 /*Change for the number of leds on the strip you attach*/ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -37,7 +36,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h index b4a9e0e6bc..6544962d74 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/config.h +++ b/keyboards/owlab/jelly_epoch/hotswap/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* RGB Strip*/ #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS @@ -37,4 +36,3 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 10 # define RGBLIGHT_LIMIT_VAL 255 -#endif diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h index b4a9e0e6bc..6544962d74 100644 --- a/keyboards/owlab/jelly_epoch/soldered/config.h +++ b/keyboards/owlab/jelly_epoch/soldered/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* RGB Strip*/ #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS @@ -37,4 +36,3 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 10 # define RGBLIGHT_LIMIT_VAL 255 -#endif diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h index 6785a26580..b0168c4763 100644 --- a/keyboards/owlab/spring/config.h +++ b/keyboards/owlab/spring/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* RGB Strip*/ #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,6 +39,3 @@ along with this program. If not, see . # define RGBLIGHT_LIMIT_VAL 255 # define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL # define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL/2 -#endif - - diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h index fb7ee7f1cc..4bbbb43a33 100644 --- a/keyboards/owlab/voice65/hotswap/config.h +++ b/keyboards/owlab/voice65/hotswap/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* RGB stripe */ #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS @@ -38,7 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 10 # define RGBLIGHT_LIMIT_VAL 180 # define OWL_VOLUME_RANGE 50 -#endif /* RGB matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h index 444ca29714..c873464c72 100644 --- a/keyboards/owlab/voice65/soldered/config.h +++ b/keyboards/owlab/voice65/soldered/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* RGB stripe */ #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS @@ -38,7 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 10 # define RGBLIGHT_LIMIT_VAL 180 # define OWL_VOLUME_RANGE 50 -#endif /* RGB matrix*/ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h index 89d5a52301..96117cf81c 100644 --- a/keyboards/panc40/config.h +++ b/keyboards/panc40/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h index 8725d8ab07..455b46c8eb 100644 --- a/keyboards/pearlboards/atlas/config.h +++ b/keyboards/pearlboards/atlas/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -47,7 +46,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h index 984541d1d6..dea50e6a4d 100644 --- a/keyboards/pearlboards/pandora/config.h +++ b/keyboards/pearlboards/pandora/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -37,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h index 5f9978cbdc..47cb682e7a 100644 --- a/keyboards/pearlboards/pearl/config.h +++ b/keyboards/pearlboards/pearl/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -48,7 +47,6 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h index 4185a8f850..0b72f187a4 100644 --- a/keyboards/pearlboards/zeus/config.h +++ b/keyboards/pearlboards/zeus/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -51,7 +50,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h index bc31fb049e..c6c843dddd 100644 --- a/keyboards/pearlboards/zeuspad/config.h +++ b/keyboards/pearlboards/zeuspad/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -42,7 +41,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h index 35a7541060..2978c96efd 100644 --- a/keyboards/percent/booster/config.h +++ b/keyboards/percent/booster/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h index 2496cdd216..1e64cede55 100644 --- a/keyboards/phantom/config.h +++ b/keyboards/phantom/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h index 51b917771a..d8f00513d8 100644 --- a/keyboards/picolab/frusta_fundamental/config.h +++ b/keyboards/picolab/frusta_fundamental/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h index 47143f7cd6..5f36081323 100755 --- a/keyboards/pimentoso/paddino02/rev1/config.h +++ b/keyboards/pimentoso/paddino02/rev1/config.h @@ -5,22 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h index 47143f7cd6..5f36081323 100755 --- a/keyboards/pimentoso/paddino02/rev2/left/config.h +++ b/keyboards/pimentoso/paddino02/rev2/left/config.h @@ -5,22 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h index 47143f7cd6..5f36081323 100755 --- a/keyboards/pimentoso/paddino02/rev2/right/config.h +++ b/keyboards/pimentoso/paddino02/rev2/right/config.h @@ -5,22 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h index 0916e7b729..14ef447bed 100644 --- a/keyboards/pimentoso/touhoupad/config.h +++ b/keyboards/pimentoso/touhoupad/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -27,4 +26,3 @@ #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h index 7114397adf..7f37e40119 100644 --- a/keyboards/pkb65/config.h +++ b/keyboards/pkb65/config.h @@ -26,22 +26,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h index f7e0e04949..f5dcc375fa 100644 --- a/keyboards/playkbtw/ca66/config.h +++ b/keyboards/playkbtw/ca66/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h index 2a5d98951a..2a8c2d30c3 100644 --- a/keyboards/playkbtw/helen80/config.h +++ b/keyboards/playkbtw/helen80/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 87 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h index dd2126d072..398e870462 100644 --- a/keyboards/playkbtw/pk60/config.h +++ b/keyboards/playkbtw/pk60/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index 4adfcb7db2..13b3cb90a2 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h @@ -41,7 +41,6 @@ #endif #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -56,7 +55,6 @@ # define RGBLIGHT_SAT_STEP 5 # define RGBLIGHT_VAL_STEP 5 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h index 2e0377a2c9..d300277060 100644 --- a/keyboards/plut0nium/0x3e/config.h +++ b/keyboards/plut0nium/0x3e/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . * RGB Underglow */ #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 8 @@ -37,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* * Feature disable options diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h index e6bfca0aa4..e96a51c2a4 100644 --- a/keyboards/plywrks/lune/config.h +++ b/keyboards/plywrks/lune/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 8 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h index 59c9e7b69e..80408e3cf6 100644 --- a/keyboards/pohjolaworks/louhi/config.h +++ b/keyboards/pohjolaworks/louhi/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN # define RGBLED_NUM 14 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 230 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h index dfec066dab..db6b79a45a 100644 --- a/keyboards/poker87c/config.h +++ b/keyboards/poker87c/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 95 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h index 2c30da7685..8d13c9fad8 100644 --- a/keyboards/poker87d/config.h +++ b/keyboards/poker87d/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 125 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h index 9b560ee1f5..c09fcf6fbf 100644 --- a/keyboards/pom_keyboards/tnln95/config.h +++ b/keyboards/pom_keyboards/tnln95/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* RGB Configs */ #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -44,4 +43,3 @@ along with this program. If not, see . // #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 225 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 // #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set -#endif diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h index 20892b683f..2baa495f2c 100644 --- a/keyboards/primekb/prime_r/config.h +++ b/keyboards/primekb/prime_r/config.h @@ -22,20 +22,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h index cd0eaa142b..7e1c6cc785 100644 --- a/keyboards/program_yoink/config.h +++ b/keyboards/program_yoink/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /*RGB*/ #define RGB_DI_PIN D4 - #ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_STATIC_GRADIENT //#define RGBLIGHT_EFFECT_RGB_TEST //#define RGBLIGHT_EFFECT_ALTERNATING - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index 25ceace965..143efc9e0d 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h index 7ba4700cde..8779e34349 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* LEDs */ #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 -#endif /* Definitions for encoder tilt/press support */ #define ENC_TILT_THRESHOLD 1 diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h index 44ad35a7ca..a816a920e2 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h index e08cc5152e..e26458be8e 100644 --- a/keyboards/rainkeebs/delilah/config.h +++ b/keyboards/rainkeebs/delilah/config.h @@ -23,7 +23,6 @@ #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h index e256260367..7d9d92abe3 100644 --- a/keyboards/rainkeebs/yasui/config.h +++ b/keyboards/rainkeebs/yasui/config.h @@ -23,7 +23,6 @@ #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h index d4607263a4..c5334b4230 100644 --- a/keyboards/rart/rart4x4/config.h +++ b/keyboards/rart/rart4x4/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h index ed3fe5d464..983dca5505 100644 --- a/keyboards/rart/rart67/config.h +++ b/keyboards/rart/rart67/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h index cb8685a3f8..bf5963648d 100644 --- a/keyboards/rart/rart75hs/config.h +++ b/keyboards/rart/rart75hs/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN C0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h index a48b3d4eea..e98417be6d 100644 --- a/keyboards/rart/rart80/config.h +++ b/keyboards/rart/rart80/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h index 344ebec135..5da34f7ad3 100644 --- a/keyboards/rart/rartpad/config.h +++ b/keyboards/rart/rartpad/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h index 9403ff760d..cabcaa1388 100644 --- a/keyboards/recompile_keys/mio/config.h +++ b/keyboards/recompile_keys/mio/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h index f068ad9fd7..7c718c6bd2 100644 --- a/keyboards/reversestudio/decadepad/config.h +++ b/keyboards/reversestudio/decadepad/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* * Feature disable options diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h index 511011a96c..26b116c747 100644 --- a/keyboards/reviung/reviung33/config.h +++ b/keyboards/reviung/reviung33/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 16 # define RGBLIGHT_SAT_STEP 16 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h index 3ac57603a6..f19b1a1f26 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h @@ -19,7 +19,6 @@ // place overrides here #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -37,4 +36,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h index 3ac57603a6..f19b1a1f26 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h @@ -19,7 +19,6 @@ // place overrides here #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -37,4 +36,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h index 11a0609742..fecd9083e6 100644 --- a/keyboards/reviung/reviung39/keymaps/default/config.h +++ b/keyboards/reviung/reviung39/keymaps/default/config.h @@ -19,7 +19,6 @@ // place overrides here #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -36,4 +35,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h index a18a508371..b8a8e3c6e1 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/config.h +++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h @@ -19,7 +19,6 @@ // place overrides here #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -36,4 +35,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h index d27f9ee4a8..3c1583a1c4 100644 --- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h +++ b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h @@ -19,7 +19,6 @@ // place overrides here #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -42,4 +41,3 @@ // /*==== use exp() and sin() ====*/ // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -#endif diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h index 3cfd68e72f..f44fafc2b0 100644 --- a/keyboards/reviung/reviung41/config.h +++ b/keyboards/reviung/reviung41/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h index 4e26907640..1d7ad67a62 100644 --- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h +++ b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h @@ -16,12 +16,10 @@ #pragma once #define RGBLIGHT_LAYERS -#ifdef RGB_DI_PIN // /*== or choose animations ==*/ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif #define TAPPING_TERM 200 #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h index 7ed2eada3e..da04717af0 100644 --- a/keyboards/reviung/reviung5/config.h +++ b/keyboards/reviung/reviung5/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 # define RGBLIGHT_HUE_STEP 16 # define RGBLIGHT_SAT_STEP 16 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h index 207bbe158e..a234905969 100644 --- a/keyboards/reviung/reviung53/config.h +++ b/keyboards/reviung/reviung53/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -21,7 +20,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h index 280fd92954..bf11c1c5b7 100644 --- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h @@ -20,7 +20,6 @@ // --- RGB underglow --- #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -37,5 +36,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#endif diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index f7cae14b1b..fd42b9f29b 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C15 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h index f7cae14b1b..fd42b9f29b 100644 --- a/keyboards/rmi_kb/squishytkl/config.h +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C15 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h index dd3984c869..cdcae9d159 100644 --- a/keyboards/rmi_kb/tkl_ff/v2/config.h +++ b/keyboards/rmi_kb/tkl_ff/v2/config.h @@ -20,7 +20,6 @@ #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 26 # define RGBLIGHT_HUE_STEP 32 # define RGBLIGHT_SAT_STEP 32 @@ -36,4 +35,3 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h index 475cb25078..10d9733e05 100644 --- a/keyboards/rmi_kb/wete/v2/config.h +++ b/keyboards/rmi_kb/wete/v2/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 18 # define RGBLIGHT_HUE_STEP 32 # define RGBLIGHT_SAT_STEP 32 @@ -37,7 +36,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h index 0bc3b5bed4..592d5f5615 100644 --- a/keyboards/runes/vaengr/config.h +++ b/keyboards/runes/vaengr/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 17 // # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif #define FORCE_NKRO diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h index f93a6e3d04..e7618bfdb6 100644 --- a/keyboards/ryanbaekr/rb18/config.h +++ b/keyboards/ryanbaekr/rb18/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underglow options */ #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLED_HUE_STEP 8 #define RGBLED_SAT_STEP 8 #define RGBLED_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h index 2d312f69bb..a9724ad47a 100644 --- a/keyboards/ryanbaekr/rb69/config.h +++ b/keyboards/ryanbaekr/rb69/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underglow options */ #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLED_HUE_STEP 8 #define RGBLED_SAT_STEP 8 #define RGBLED_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h index d55efcf86b..beeaf9e25c 100644 --- a/keyboards/ryanbaekr/rb87/config.h +++ b/keyboards/ryanbaekr/rb87/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underglow options */ #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,7 +33,6 @@ along with this program. If not, see . #define RGBLED_HUE_STEP 8 #define RGBLED_SAT_STEP 8 #define RGBLED_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h index be974b6787..4527345d8d 100755 --- a/keyboards/ryloo_studio/m0110/config.h +++ b/keyboards/ryloo_studio/m0110/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ along with this program. If not, see . # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 123 -#endif diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index 3d6d768957..e2248fee36 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/config.h @@ -17,13 +17,12 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif + // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h index 946649d038..ad4a16b65a 100644 --- a/keyboards/sam/sg81m/config.h +++ b/keyboards/sam/sg81m/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E6 //reserved pin for potential underglow rgb -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index a20ec04bdb..9a9418e9b2 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/config.h @@ -18,7 +18,6 @@ /* RGB */ #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 6a5ac54353..0e918d90f6 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif \ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index ef7cb26289..0a80e4d7f3 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -23,7 +23,6 @@ /* RGB */ #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -41,4 +40,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif \ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 6a5ac54353..fe32525c06 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,5 +33,4 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#endif \ No newline at end of file +#define RGBLIGHT_EFFECT_TWINKLE \ No newline at end of file diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index a5f61e98e7..50f9d0cefd 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #define RGB_MATRIX_LED_COUNT 6 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index 5cb0b63ba9..2dd2cc25c9 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,4 +35,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif \ No newline at end of file diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index b81c970db7..1d94c2ae02 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -18,14 +18,12 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D4 - #ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - #endif /* * Feature disable options diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index 5bbc6a38f9..2f89717aa5 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -28,7 +28,6 @@ #define USB_MAX_POWER_CONSUMPTION 500 #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 15 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -47,4 +46,3 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYER_BLINK -#endif diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index fe49e0c521..0d1abf3c24 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 13 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 85f6271c32..443b6d7649 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h index b360e531a8..734cdcc7ae 100644 --- a/keyboards/sets3n/kk980/config.h +++ b/keyboards/sets3n/kk980/config.h @@ -34,7 +34,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 102 #define RGBLIGHT_LED_MAP { 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, \ @@ -50,7 +49,6 @@ #define RGBLIGHT_LIMIT_VAL 230 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#endif #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/shambles/config.h b/keyboards/shambles/config.h index db73ba34a9..5f36081323 100644 --- a/keyboards/shambles/config.h +++ b/keyboards/shambles/config.h @@ -5,23 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* key combination for command */ - - -#ifdef RGB_DI_PIN -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -# define RGBLIGHT_EFFECT_TWINKLE -# define RGBLED_NUM 0 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 70f72f1d00..f412f715e4 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define MASTER_RIGHT #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN //#define RGBLIGHT_SPLIT #define RGBLED_SPLIT {26, 26} #define RGBLED_NUM 52 @@ -66,7 +65,6 @@ along with this program. If not, see . /*== customize knight effect ==*/ #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6 #endif -#endif /* Audio */ #ifdef AUDIO_ENABLE diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 7af4feb363..6c80c4d3ee 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index 698eecb6fc..de02ac11f8 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,4 +34,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h index c8ed85b89e..b7b3399970 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/config.h +++ b/keyboards/skeletonkbd/skeletonnumpad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D4 -#ifdef RGB_DI_PIN # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h index 31e6bd43c8..7c7cad2390 100644 --- a/keyboards/sneakbox/aliceclone/config.h +++ b/keyboards/sneakbox/aliceclone/config.h @@ -22,21 +22,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h index f71cc2ebbb..25382dd5f1 100644 --- a/keyboards/sneakbox/disarray/ortho/config.h +++ b/keyboards/sneakbox/disarray/ortho/config.h @@ -22,20 +22,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h index f71cc2ebbb..25382dd5f1 100644 --- a/keyboards/sneakbox/disarray/staggered/config.h +++ b/keyboards/sneakbox/disarray/staggered/config.h @@ -22,20 +22,3 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h index fdcd9d801b..1f14d0f534 100644 --- a/keyboards/soda/cherish/config.h +++ b/keyboards/soda/cherish/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT #define RGB_DI_PIN A13 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -54,4 +53,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif \ No newline at end of file diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 6e73672c8d..14fc40cd62 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -21,20 +21,3 @@ along with this program. If not, see .*/ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h index 8199836860..36ed0fa73a 100755 --- a/keyboards/spaceholdings/nebula12/config.h +++ b/keyboards/spaceholdings/nebula12/config.h @@ -41,7 +41,6 @@ along with this program. If not, see . #define WS2812_SPI_SCK_PIN B13 #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -57,7 +56,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Backlight options */ diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index a3b44e4afe..eaefff82df 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define RGB_DI_PIN A7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -40,7 +39,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Backlight options */ diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h index a9e98683c5..5af3c1452a 100644 --- a/keyboards/star75/config.h +++ b/keyboards/star75/config.h @@ -11,7 +11,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,4 +29,3 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 180 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#endif diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h index 6511724728..cf9c8a3b6b 100644 --- a/keyboards/stello65/hs_rev1/config.h +++ b/keyboards/stello65/hs_rev1/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -22,7 +21,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h index 0247bae3a1..b806ad5cd6 100644 --- a/keyboards/stello65/sl_rev1/config.h +++ b/keyboards/stello65/sl_rev1/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 @@ -22,7 +21,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h index e17664611c..2e9ef28615 100644 --- a/keyboards/studiokestra/bourgeau/config.h +++ b/keyboards/studiokestra/bourgeau/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h index d48b336fe7..08d63c8001 100644 --- a/keyboards/studiokestra/cascade/config.h +++ b/keyboards/studiokestra/cascade/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index 66a3ef6740..49157532f2 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index b2ec9d3895..49c2326a25 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 7ecb336fa1..a095aa04c0 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index 2bb3073b6f..6cc2fc87e5 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 * 2 # define RGBLED_SPLIT { 4, 4 } # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 48f3f2c1e4..4a26be606e 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index 1b1e657583..bacecb13db 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 * 2 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 70c5c58f02..f4d136f808 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -20,7 +19,6 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index b2ec9d3895..49c2326a25 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 28ef095000..f6ab4c4b3a 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h index 82e2bd70d6..3f57dc2380 100644 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ b/keyboards/takashiski/hecomi/alpha/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . //#define USE_I2C #define RGB_DI_PIN D4 - #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h index d8fe1a3f66..8ca22c4c3a 100644 --- a/keyboards/taleguers/taleguers75/config.h +++ b/keyboards/taleguers/taleguers75/config.h @@ -24,7 +24,6 @@ #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +40,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h index abc8f0f6e0..4e8095c0bc 100644 --- a/keyboards/tanuki/config.h +++ b/keyboards/tanuki/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_SLEEP -#endif #define TAPPING_TERM 200 /* diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h index e172b87ae2..0c39df4272 100644 --- a/keyboards/teahouse/ayleen/config.h +++ b/keyboards/teahouse/ayleen/config.h @@ -6,7 +6,6 @@ #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -15,7 +14,6 @@ #define RGBLIGHT_LAYERS 2 #define RGBLIGHT_LAYER_BLINK #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h index 81132526c5..8f66213bc2 100644 --- a/keyboards/team0110/p1800fl/config.h +++ b/keyboards/team0110/p1800fl/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB Lighting */ #define RGB_DI_PIN C6 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,7 +35,6 @@ along with this program. If not, see . # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 255 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h index 83352fd922..354e163b39 100644 --- a/keyboards/tg4x/config.h +++ b/keyboards/tg4x/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 47d5d0c2dc..1ffe54ec23 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 30 # define RGBLIGHT_HUE_STEP 5 # define RGBLIGHT_SAT_STEP 10 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h index eec83e8dc0..77c08941d7 100644 --- a/keyboards/tkc/osav2/config.h +++ b/keyboards/tkc/osav2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D4 - #ifdef RGB_DI_PIN #define RGBLED_NUM 9 // #define RGBLIGHT_HUE_STEP 10 // #define RGBLIGHT_SAT_STEP 17 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif /* * Feature disable options diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h index dc3cfae9e6..af2168c781 100644 --- a/keyboards/tkc/tkl_ab87/config.h +++ b/keyboards/tkc/tkl_ab87/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -38,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h index 267b5a65ac..d14e063f7d 100644 --- a/keyboards/tmo50/config.h +++ b/keyboards/tmo50/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h index b44dfaac52..5f36081323 100644 --- a/keyboards/toad/config.h +++ b/keyboards/toad/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h index ca65d24ae1..72887d0490 100644 --- a/keyboards/toffee_studio/blueberry/config.h +++ b/keyboards/toffee_studio/blueberry/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 22 /* RGB LED logical order map */ @@ -38,7 +37,6 @@ # define RGBLIGHT_EFFECT_CHRISTMAS # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index d56a8a1a55..bf30035c5c 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#endif /* Bluetooth */ #define BATTERY_LEVEL_PIN B6 diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index bf86645ce5..c762abeac5 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -10,7 +10,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -25,4 +24,3 @@ #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h index b758c909d2..968161c7ea 100755 --- a/keyboards/tominabox1/bigboy/config.h +++ b/keyboards/tominabox1/bigboy/config.h @@ -18,8 +18,6 @@ #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN - #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 @@ -35,5 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#endif /* RGB_DI_PIN */ diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h index e842bb0714..05c3c91539 100644 --- a/keyboards/tominabox1/qaz/config.h +++ b/keyboards/tominabox1/qaz/config.h @@ -7,7 +7,6 @@ #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h index 57fac54322..dadd48d994 100644 --- a/keyboards/tr60w/config.h +++ b/keyboards/tr60w/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h index ed4b55a483..07495a6099 100644 --- a/keyboards/tszaboo/ortho4exent/config.h +++ b/keyboards/tszaboo/ortho4exent/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B6 - #ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h index 3922bd8251..5b5632009c 100644 --- a/keyboards/ubest/vn/config.h +++ b/keyboards/ubest/vn/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index da31c3d933..7142253136 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* ws2812b options */ #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,4 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/unison/keymaps/via/config.h b/keyboards/unison/keymaps/via/config.h index 8475af2baa..48fe417a5d 100644 --- a/keyboards/unison/keymaps/via/config.h +++ b/keyboards/unison/keymaps/via/config.h @@ -16,10 +16,8 @@ #pragma once -#ifdef RGB_DI_PIN #undef RGBLED_NUM #define RGBLED_NUM 17 // Layer Indicator(2) + Rotary Encoder(5) + Optional(2) + Under(8) #undef RGBLIGHT_LED_MAP #define RGBLIGHT_LED_MAP {2, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16} // Left to Right to Under -#endif diff --git a/keyboards/unison/keymaps/via/keymap.c b/keyboards/unison/keymaps/via/keymap.c index fe3ff4e82f..f61574ac12 100644 --- a/keyboards/unison/keymaps/via/keymap.c +++ b/keyboards/unison/keymaps/via/keymap.c @@ -128,10 +128,8 @@ layer_state_t layer_state_set_user(layer_state_t state) { Post Initialize ------------------------------------------------------------------------------ */ void keyboard_post_init_user(void) { - #ifdef RGB_DI_PIN // RGB Lighting: Set effect range from just after indicator. rgblight_set_effect_range(1, 16); - #endif #ifdef RGBLIGHT_LAYERS // RGB Lighting Layers: Setup LED layers rgblight_layers = my_rgb_layers; diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h index ea285f4082..27309c9b72 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . /* RGB Lighting */ #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5) #define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right #define RGBLIGHT_HUE_STEP 4 @@ -49,7 +48,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index ad29207062..73f9e9e2c2 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -22,7 +22,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -37,4 +36,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h index d035c79a90..ada0ff6e76 100644 --- a/keyboards/viktus/omnikey_bh/config.h +++ b/keyboards/viktus/omnikey_bh/config.h @@ -8,20 +8,3 @@ /* force n-key rollover*/ #define FORCE_NKRO - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h index d035c79a90..ada0ff6e76 100644 --- a/keyboards/viktus/z150_bh/config.h +++ b/keyboards/viktus/z150_bh/config.h @@ -8,20 +8,3 @@ /* force n-key rollover*/ #define FORCE_NKRO - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h index 097b1818ae..bdb41e4e57 100644 --- a/keyboards/waldo/config.h +++ b/keyboards/waldo/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . // RGB LED #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -56,4 +55,3 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h index 9b9506927f..0bc18e3730 100644 --- a/keyboards/walletburner/cajal/config.h +++ b/keyboards/walletburner/cajal/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h index 905e59e17e..92f42ed901 100644 --- a/keyboards/walletburner/neuron/config.h +++ b/keyboards/walletburner/neuron/config.h @@ -8,7 +8,6 @@ #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -23,4 +22,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h index 91ce68b938..67683c158c 100644 --- a/keyboards/wavtype/foundation/config.h +++ b/keyboards/wavtype/foundation/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -21,7 +20,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h index 534b0f83da..1db4974e40 100644 --- a/keyboards/wavtype/p01_ultra/config.h +++ b/keyboards/wavtype/p01_ultra/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 18 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index c1e79e7699..bca35e1b85 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #define RGBW /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h index 947e340c32..080681e53f 100644 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h +++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 15 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -28,6 +27,5 @@ #define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5 #define RGBLIGHT_EFFECT_STATIC_GRADIENT - #endif // place overrides here diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h index 050bb413f7..b4cdf23d93 100644 --- a/keyboards/westfoxtrot/cypher/rev5/config.h +++ b/keyboards/westfoxtrot/cypher/rev5/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define GRAVE_ESC_CTRL_OVERRIDE #define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 @@ -45,4 +44,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h index afc09fb5fe..50759df781 100644 --- a/keyboards/wilba_tech/wt70_jb/config.h +++ b/keyboards/wilba_tech/wt70_jb/config.h @@ -22,7 +22,6 @@ // RGBLIGHT configuation #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -37,4 +36,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h index 93b0d14a3a..9a3613f6c5 100644 --- a/keyboards/wolfmarkclub/wm1/config.h +++ b/keyboards/wolfmarkclub/wm1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN A3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h index 9796f37b97..9a9dd8e470 100644 --- a/keyboards/wsk/alpha9/config.h +++ b/keyboards/wsk/alpha9/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h index 98d3d12d3d..657fe0e273 100644 --- a/keyboards/wsk/g4m3ralpha/config.h +++ b/keyboards/wsk/g4m3ralpha/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h index b893b35e69..1ad6c6652b 100644 --- a/keyboards/wsk/gothic50/config.h +++ b/keyboards/wsk/gothic50/config.h @@ -1,7 +1,6 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -16,7 +15,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h index de29eadb14..ad03105a86 100644 --- a/keyboards/wsk/gothic70/config.h +++ b/keyboards/wsk/gothic70/config.h @@ -1,7 +1,6 @@ #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -16,7 +15,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wsk/jerkin/config.h b/keyboards/wsk/jerkin/config.h index 68d4a8fef7..5f36081323 100644 --- a/keyboards/wsk/jerkin/config.h +++ b/keyboards/wsk/jerkin/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -// #define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h index eecc8ba082..3227e9a087 100644 --- a/keyboards/wsk/kodachi50/config.h +++ b/keyboards/wsk/kodachi50/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h index 5ddf06145f..56fee4fd44 100644 --- a/keyboards/wsk/pain27/config.h +++ b/keyboards/wsk/pain27/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h index ed32129b59..80d7ef3f3d 100644 --- a/keyboards/wsk/sl40/config.h +++ b/keyboards/wsk/sl40/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h index 4cb0e034be..4decec3392 100644 --- a/keyboards/wsk/tkl30/config.h +++ b/keyboards/wsk/tkl30/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h index 4f17871ab0..89b02120ac 100644 --- a/keyboards/wuque/creek70/config.h +++ b/keyboards/wuque/creek70/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 7 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,4 +33,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h index 53b2870640..a73d36b72a 100644 --- a/keyboards/wuque/ikki68/config.h +++ b/keyboards/wuque/ikki68/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -42,4 +41,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h index 496e22c07a..26d5f82b09 100644 --- a/keyboards/wuque/ikki68_aurora/config.h +++ b/keyboards/wuque/ikki68_aurora/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -42,4 +41,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h index 814dbd2d02..fde25201aa 100644 --- a/keyboards/wuque/promise87/ansi/config.h +++ b/keyboards/wuque/promise87/ansi/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -28,4 +27,3 @@ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h index 814dbd2d02..fde25201aa 100644 --- a/keyboards/wuque/promise87/wkl/config.h +++ b/keyboards/wuque/promise87/wkl/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -28,4 +27,3 @@ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h index 644c29d1fd..0824eae60e 100644 --- a/keyboards/xiudi/xd75/config.h +++ b/keyboards/xiudi/xd75/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 12 # define RGBLIGHT_SAT_STEP 25 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h index ed2af55ce6..ec27530f45 100644 --- a/keyboards/xiudi/xd84pro/config.h +++ b/keyboards/xiudi/xd84pro/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN F6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h index 29c8abfb23..a5020cc807 100644 --- a/keyboards/xiudi/xd87/config.h +++ b/keyboards/xiudi/xd87/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h index b44dfaac52..5f36081323 100644 --- a/keyboards/xmmx/config.h +++ b/keyboards/xmmx/config.h @@ -5,20 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h index 788e0e02fe..d47f6e3992 100644 --- a/keyboards/ydkb/yd68/config.h +++ b/keyboards/ydkb/yd68/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* * Feature disable options diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h index 4ead2dc6f2..63780b4581 100644 --- a/keyboards/yeehaw/config.h +++ b/keyboards/yeehaw/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -33,4 +32,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 782e711cfd..56495cac2c 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index cbb4974c09..3ab1f3b604 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -28,4 +27,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 013df9fa12..d1812a65ed 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -33,5 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - -#endif diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 034d338d35..84b368eb33 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 80 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,7 +30,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 160 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - -#endif - - diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index dc7ebdc8bc..c78fae6957 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -6,7 +6,6 @@ /* prevent stuck modifiers */ #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -21,4 +20,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h index 504d6ba541..4e835b92f3 100644 --- a/keyboards/yoichiro/lunakey_macro/config.h +++ b/keyboards/yoichiro/lunakey_macro/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 3 #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,7 +48,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* * Feature disable options diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index b674473983..4d680d5306 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 6, 6 } @@ -39,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Audio Support */ #define AUDIO_PIN C6 diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 4a567f22b1..3b3c9b14dc 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 9 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* disable action features */ //#define NO_ACTION_LAYER diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/config.h b/keyboards/yushakobo/navpad/10/keymaps/default/config.h index b4d2122ab4..10ba897cce 100644 --- a/keyboards/yushakobo/navpad/10/keymaps/default/config.h +++ b/keyboards/yushakobo/navpad/10/keymaps/default/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once -#ifdef RGB_DI_PIN - #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 6 - -#endif diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/config.h b/keyboards/yushakobo/navpad/10/keymaps/via/config.h index b4d2122ab4..10ba897cce 100644 --- a/keyboards/yushakobo/navpad/10/keymaps/via/config.h +++ b/keyboards/yushakobo/navpad/10/keymaps/via/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once -#ifdef RGB_DI_PIN - #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 6 - -#endif diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index 4c69a35dea..d4a4e48d77 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#ifdef RGB_DI_PIN # define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 } -#endif diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index ae49a16f3b..5b59cf5d5e 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -19,17 +19,14 @@ along with this program. If not, see . #define EE_HANDS -#ifdef RGB_DI_PIN -# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side - 9, 10, 11, 12, 13, 14, \//helix side +# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \ + 9, 10, 11, 12, 13, 14, \ 20, 19, 18, 17, 16, 15, \ 21, 22, 23, 24, 25, 26, \ 33, 32, 31, 30, 29, 28, 27, \ 34, 35, 36, 37, 38, 39, 40 } -#endif #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 9+32 # define RGBLED_SPLIT { 9, 32 } # define RGBLIGHT_HUE_STEP 8 @@ -46,7 +43,6 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* disable action features */ //#define NO_ACTION_LAYER diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h index b4d2122ab4..10ba897cce 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h @@ -17,9 +17,5 @@ along with this program. If not, see . #pragma once -#ifdef RGB_DI_PIN - #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 6 - -#endif diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h index 4994ead6bc..2eafd24586 100644 --- a/keyboards/yynmt/dozen0/config.h +++ b/keyboards/yynmt/dozen0/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index 2df5b9daaf..b60f50713b 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -39,4 +38,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index f6311ba013..b66aed55c7 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN D6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -22,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h index 026f20dc8f..63d02fc807 100644 --- a/layouts/community/60_iso/unxmaal/config.h +++ b/layouts/community/60_iso/unxmaal/config.h @@ -17,8 +17,7 @@ along with this program. If not, see . #pragma once -#ifndef RGB_DI_PIN - #define RGB_DI_PIN F4 +#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c index 17122f4a63..12547ec508 100644 --- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c +++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c @@ -248,9 +248,7 @@ void keyboard_post_init_user(void) { void matrix_init_user(void) { #ifdef RGBLIGHT_ENABLE - #ifdef RGB_DI_PIN rgblight_setrgb(RGB_GREEN); - #endif #endif //RGB_matrix } -- cgit v1.3.1 From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/0_sixty/0_sixty.h | 97 --- keyboards/0_sixty/info.json | 590 +++++++-------- keyboards/1upkeyboards/super16/info.json | 41 +- keyboards/1upkeyboards/super16/super16.c | 2 +- keyboards/1upkeyboards/super16/super16.h | 51 -- keyboards/1upkeyboards/super16v2/info.json | 22 +- keyboards/1upkeyboards/super16v2/super16v2.c | 2 +- keyboards/1upkeyboards/super16v2/super16v2.h | 39 - keyboards/1upkeyboards/sweet16/info.json | 41 +- keyboards/1upkeyboards/sweet16/sweet16.h | 30 - keyboards/1upkeyboards/sweet16/v1/v1.c | 1 - keyboards/1upkeyboards/sweet16/v1/v1.h | 30 - keyboards/25keys/zinc/info.json | 7 +- keyboards/25keys/zinc/rev1/info.json | 60 ++ keyboards/25keys/zinc/rev1/rev1.h | 24 - keyboards/25keys/zinc/reva/info.json | 57 ++ keyboards/25keys/zinc/reva/reva.h | 24 - keyboards/40percentclub/5x5/5x5.h | 53 -- keyboards/40percentclub/5x5/info.json | 300 ++++---- keyboards/40percentclub/gherkin/gherkin.h | 15 - keyboards/40percentclub/gherkin/info.json | 35 +- keyboards/40percentclub/i75/info.json | 6 - keyboards/40percentclub/i75/promicro/info.json | 88 ++- keyboards/40percentclub/i75/promicro/promicro.h | 46 -- keyboards/40percentclub/i75/teensy2/info.json | 88 ++- keyboards/40percentclub/i75/teensy2/teensy2.h | 46 -- keyboards/40percentclub/nori/info.json | 204 +++--- keyboards/40percentclub/nori/nori.h | 56 -- keyboards/40percentclub/polyandry/info.json | 22 - .../40percentclub/polyandry/promicro/info.json | 23 +- .../40percentclub/polyandry/promicro/promicro.h | 27 - .../40percentclub/polyandry/teensy2/info.json | 23 +- .../40percentclub/polyandry/teensy2/teensy2.h | 32 - keyboards/40percentclub/tomato/info.json | 35 +- keyboards/40percentclub/tomato/tomato.h | 15 - keyboards/7c8/framework/framework.h | 59 -- keyboards/7c8/framework/info.json | 354 ++++----- keyboards/acheron/shark/alpha/alpha.h | 39 - keyboards/acheron/shark/alpha/info.json | 99 +-- keyboards/acheron/shark/beta/beta.c | 3 +- keyboards/acheron/shark/beta/beta.h | 31 - keyboards/acheron/shark/beta/info.json | 99 +-- keyboards/adkb96/info.json | 584 +++------------ keyboards/adkb96/rev1/rev1.h | 31 - keyboards/ai03/soyuz/info.json | 84 +-- keyboards/ai03/soyuz/soyuz.h | 69 -- keyboards/amjkeyboard/amj40/amj40.h | 109 --- keyboards/amjkeyboard/amj40/info.json | 342 ++++----- keyboards/amjkeyboard/amjpad/amjpad.h | 58 -- keyboards/amjkeyboard/amjpad/info.json | 61 +- keyboards/atomic/atomic.c | 2 +- keyboards/atomic/atomic.h | 51 -- keyboards/atomic/info.json | 282 ++++---- keyboards/barracuda/barracuda.h | 41 -- keyboards/barracuda/info.json | 66 +- keyboards/boardwalk/boardwalk.h | 93 --- keyboards/boardwalk/info.json | 796 ++++++++++---------- keyboards/bobpad/bobpad.c | 2 +- keyboards/bobpad/bobpad.h | 27 - keyboards/bobpad/info.json | 13 +- keyboards/bpiphany/four_banger/four_banger.h | 11 - keyboards/bpiphany/four_banger/info.json | 8 +- keyboards/cannonkeys/atlas/atlas.h | 48 -- keyboards/cannonkeys/atlas/info.json | 366 +++++----- keyboards/cannonkeys/atlas_alps/atlas_alps.h | 33 - keyboards/cannonkeys/atlas_alps/info.json | 67 +- keyboards/cannonkeys/ortho48/info.json | 196 ++--- keyboards/cannonkeys/ortho48/ortho48.h | 29 - keyboards/cannonkeys/ortho60/info.json | 246 ++++--- keyboards/cannonkeys/ortho60/ortho60.h | 33 - keyboards/cannonkeys/ortho75/info.json | 154 ++-- keyboards/cannonkeys/ortho75/ortho75.c | 2 +- keyboards/cannonkeys/ortho75/ortho75.h | 18 - keyboards/checkerboards/phoenix45_ortho/info.json | 161 ++++- .../phoenix45_ortho/phoenix45_ortho.c | 2 +- .../phoenix45_ortho/phoenix45_ortho.h | 58 -- keyboards/checkerboards/quark/info.json | 716 +++++++++--------- keyboards/checkerboards/quark/quark.c | 2 +- keyboards/checkerboards/quark/quark.h | 115 --- keyboards/checkerboards/quark_lp/info.json | 159 +++- keyboards/checkerboards/quark_lp/quark_lp.c | 2 +- keyboards/checkerboards/quark_lp/quark_lp.h | 58 -- keyboards/ckeys/handwire_101/handwire_101.h | 32 - keyboards/ckeys/handwire_101/info.json | 32 +- keyboards/ckeys/nakey/info.json | 24 +- keyboards/ckeys/nakey/nakey.h | 39 - keyboards/ckeys/obelus/info.json | 22 +- keyboards/ckeys/obelus/obelus.c | 2 +- keyboards/ckeys/obelus/obelus.h | 19 - keyboards/clawsome/numeros/info.json | 34 +- keyboards/clawsome/numeros/numeros.h | 32 - keyboards/coseyfannitutti/discipad/discipad.h | 43 -- keyboards/coseyfannitutti/discipad/info.json | 24 +- keyboards/coseyfannitutti/mulletpad/info.json | 24 +- keyboards/coseyfannitutti/mulletpad/mulletpad.h | 42 -- keyboards/crawlpad/crawlpad.h | 16 - keyboards/crawlpad/info.json | 35 +- keyboards/crbn/crbn.c | 3 +- keyboards/crbn/crbn.h | 54 -- keyboards/crbn/info.json | 294 ++++---- keyboards/custommk/genesis/rev1/info.json | 51 +- keyboards/custommk/genesis/rev1/rev1.c | 2 +- keyboards/custommk/genesis/rev1/rev1.h | 48 -- keyboards/custommk/genesis/rev2/info.json | 141 ++-- keyboards/custommk/genesis/rev2/rev2.c | 2 +- keyboards/custommk/genesis/rev2/rev2.h | 66 -- .../cutie_club/giant_macro_pad/giant_macro_pad.h | 72 -- keyboards/cutie_club/giant_macro_pad/info.json | 800 ++++++++++----------- keyboards/cybergear/macro25/info.json | 13 +- keyboards/cybergear/macro25/macro25.h | 27 - keyboards/dc01/numpad/info.json | 51 +- keyboards/dc01/numpad/numpad.h | 48 -- keyboards/delikeeb/flatbread60/flatbread60.h | 42 -- keyboards/delikeeb/flatbread60/info.json | 304 ++------ keyboards/delikeeb/vaneela/info.json | 120 ++-- keyboards/delikeeb/vaneela/vaneela.h | 42 -- keyboards/delikeeb/waaffle/rev3/info.json | 97 ++- keyboards/delikeeb/waaffle/rev3/rev3.h | 44 -- keyboards/deltapad/deltapad.h | 51 -- keyboards/deltapad/info.json | 41 +- keyboards/deng/thirty/info.json | 62 +- keyboards/deng/thirty/thirty.c | 2 +- keyboards/deng/thirty/thirty.h | 31 - keyboards/dm9records/plaid/info.json | 203 +++--- keyboards/dm9records/plaid/plaid.h | 30 - keyboards/draytronics/scarlet/info.json | 34 +- keyboards/draytronics/scarlet/scarlet.h | 35 - keyboards/drhigsby/ogurec/info.json | 83 +-- keyboards/drhigsby/ogurec/left_pm/info.json | 87 +++ keyboards/drhigsby/ogurec/left_pm/left_pm.h | 49 -- keyboards/drhigsby/ogurec/right_pm/info.json | 87 +++ keyboards/drhigsby/ogurec/right_pm/right_pm.h | 49 -- keyboards/ealdin/quadrant/info.json | 390 +++++++++- keyboards/ealdin/quadrant/quadrant.c | 2 +- keyboards/ealdin/quadrant/quadrant.h | 103 --- keyboards/edi/hardlight/mk1/info.json | 131 ++-- keyboards/edi/hardlight/mk1/mk1.h | 41 -- keyboards/edi/hardlight/mk2/info.json | 131 ++-- keyboards/edi/hardlight/mk2/mk2.h | 37 - keyboards/edi/standaside/info.json | 128 ++-- keyboards/edi/standaside/standaside.h | 23 - keyboards/efreet/efreet.h | 60 -- keyboards/efreet/info.json | 190 ++--- keyboards/emi20/emi20.h | 33 - keyboards/emi20/info.json | 40 +- keyboards/evancookaudio/tenpad/info.json | 28 +- keyboards/evancookaudio/tenpad/tenpad.h | 26 - keyboards/evyd13/eon40/eon40.h | 67 -- keyboards/evyd13/eon40/info.json | 159 +++- keyboards/evyd13/gh80_3700/gh80_3700.c | 2 +- keyboards/evyd13/gh80_3700/gh80_3700.h | 63 -- keyboards/evyd13/gh80_3700/info.json | 103 +-- keyboards/evyd13/pockettype/info.json | 54 +- keyboards/evyd13/pockettype/pockettype.c | 2 +- keyboards/evyd13/pockettype/pockettype.h | 40 -- keyboards/flehrad/snagpad/info.json | 82 ++- keyboards/flehrad/snagpad/snagpad.h | 30 - keyboards/flehrad/tradestation/info.json | 56 +- keyboards/flehrad/tradestation/tradestation.h | 42 -- keyboards/fleuron/fleuron.h | 41 -- keyboards/fleuron/info.json | 201 +++--- keyboards/fractal/fractal.h | 31 - keyboards/fractal/info.json | 139 +++- keyboards/gizmo_engineering/gk6/gk6.c | 2 +- keyboards/gizmo_engineering/gk6/gk6.h | 64 -- keyboards/gizmo_engineering/gk6/info.json | 354 ++++----- keyboards/gkeyboard/gkb_m16/gkb_m16.h | 40 -- keyboards/gkeyboard/gkb_m16/info.json | 35 +- keyboards/glenpickle/chimera_ls/chimera_ls.h | 19 - keyboards/glenpickle/chimera_ls/info.json | 54 +- keyboards/gowla/gowla.h | 13 - keyboards/gowla/info.json | 18 +- keyboards/handwired/412_64/412_64.h | 23 - keyboards/handwired/412_64/info.json | 128 ++-- keyboards/handwired/cans12er/cans12er.h | 13 - keyboards/handwired/cans12er/info.json | 24 +- keyboards/handwired/floorboard/floorboard.h | 41 -- keyboards/handwired/floorboard/info.json | 96 +-- keyboards/handwired/jot50/info.json | 120 ++-- keyboards/handwired/jot50/jot50.h | 19 - keyboards/handwired/jotanck/info.json | 96 +-- keyboards/handwired/jotanck/jotanck.c | 2 +- keyboards/handwired/jotanck/jotanck.h | 32 - keyboards/handwired/jotpad16/info.json | 32 +- keyboards/handwired/jotpad16/jotpad16.c | 2 +- keyboards/handwired/jotpad16/jotpad16.h | 18 - keyboards/handwired/k_numpad17/info.json | 34 +- keyboards/handwired/k_numpad17/k_numpad17.h | 35 - .../handwired/m40/5x5_macropad/5x5_macropad.h | 27 - keyboards/handwired/m40/5x5_macropad/info.json | 59 +- keyboards/handwired/macroboard/info.json | 64 +- keyboards/handwired/macroboard/macroboard.h | 41 -- keyboards/handwired/ortho_brass/info.json | 193 ++--- keyboards/handwired/ortho_brass/ortho_brass.c | 2 +- keyboards/handwired/ortho_brass/ortho_brass.h | 47 -- keyboards/handwired/reclined/info.json | 99 +-- keyboards/handwired/reclined/reclined.h | 35 - keyboards/handwired/riblee_f401/info.json | 120 ++-- keyboards/handwired/riblee_f401/riblee_f401.h | 34 - keyboards/handwired/riblee_f411/info.json | 120 ++-- keyboards/handwired/riblee_f411/riblee_f411.h | 34 - keyboards/handwired/rs60/info.json | 120 ++-- keyboards/handwired/rs60/rs60.h | 34 - keyboards/handwired/sick_pad/info.json | 34 +- keyboards/handwired/sick_pad/sick_pad.h | 33 - keyboards/handwired/swiftrax/joypad/info.json | 32 +- keyboards/handwired/swiftrax/joypad/joypad.h | 33 - keyboards/handwired/symmetry60/info.json | 148 ++-- keyboards/handwired/symmetry60/symmetry60.h | 42 -- keyboards/handwired/tritium_numpad/info.json | 91 ++- .../handwired/tritium_numpad/tritium_numpad.h | 95 --- keyboards/handwired/woodpad/info.json | 40 +- keyboards/handwired/woodpad/woodpad.h | 22 - keyboards/handwired/wulkan/info.json | 57 +- keyboards/handwired/wulkan/wulkan.h | 21 - keyboards/hineybush/h10/h10.c | 2 +- keyboards/hineybush/h10/h10.h | 146 ---- keyboards/hineybush/h10/info.json | 384 +++++----- keyboards/idobao/id75/v1/info.json | 82 ++- keyboards/idobao/id75/v1/v1.h | 41 -- keyboards/idobao/id75/v2/info.json | 150 ++-- keyboards/idobao/id75/v2/v2.c | 2 +- keyboards/idobao/id75/v2/v2.h | 41 -- keyboards/idobao/montex/v1/info.json | 54 +- keyboards/idobao/montex/v1/v1.h | 35 - keyboards/idobao/montex/v1rgb/info.json | 59 +- keyboards/idobao/montex/v1rgb/v1rgb.c | 2 +- keyboards/idobao/montex/v1rgb/v1rgb.h | 24 - keyboards/kakunpc/angel17/alpha/alpha.h | 40 -- keyboards/kakunpc/angel17/alpha/info.json | 29 +- keyboards/kakunpc/angel17/info.json | 29 +- keyboards/kakunpc/angel17/rev1/info.json | 29 +- keyboards/kakunpc/angel17/rev1/rev1.h | 40 -- keyboards/kapcave/paladinpad/info.json | 114 +-- keyboards/kapcave/paladinpad/paladinpad.h | 103 --- keyboards/kb_elmo/elmopad/elmopad.h | 43 -- keyboards/kb_elmo/elmopad/info.json | 47 +- keyboards/kb_elmo/twelvekey/info.json | 27 +- keyboards/kb_elmo/twelvekey/twelvekey.h | 37 - keyboards/kbdfans/bounce/pad/info.json | 42 +- keyboards/kbdfans/bounce/pad/pad.h | 35 - keyboards/kbdfans/kbd4x/info.json | 196 ++--- keyboards/kbdfans/kbd4x/kbd4x.h | 45 -- keyboards/kbdfans/kbdpad/mk1/info.json | 128 ++-- keyboards/kbdfans/kbdpad/mk1/mk1.h | 71 -- keyboards/kbdfans/kbdpad/mk2/info.json | 85 ++- keyboards/kbdfans/kbdpad/mk2/mk2.h | 60 -- keyboards/kbdfans/niu_mini/info.json | 199 ++--- keyboards/kbdfans/niu_mini/niu_mini.c | 2 +- keyboards/kbdfans/niu_mini/niu_mini.h | 31 - keyboards/keebformom/info.json | 84 +-- keyboards/keebformom/keebformom.h | 40 -- keyboards/keebio/chocopad/chocopad.c | 2 +- keyboards/keebio/chocopad/chocopad.h | 15 - keyboards/keebio/chocopad/info.json | 22 +- keyboards/keebio/dilly/dilly.c | 2 +- keyboards/keebio/dilly/dilly.h | 16 - keyboards/keebio/dilly/info.json | 35 +- keyboards/keebio/dsp40/rev1/info.json | 189 ++--- keyboards/keebio/dsp40/rev1/rev1.c | 2 +- keyboards/keebio/dsp40/rev1/rev1.h | 46 -- keyboards/keebio/levinson/info.json | 7 +- keyboards/keebio/levinson/rev1/info.json | 5 + keyboards/keebio/levinson/rev2/info.json | 5 + keyboards/keebio/levinson/rev3/info.json | 64 ++ keyboards/keebio/levinson/rev3/rev3.c | 2 +- keyboards/keebio/levinson/rev3/rev3.h | 22 - keyboards/keebio/nyquist/info.json | 10 +- keyboards/keebio/nyquist/rev1/info.json | 10 +- keyboards/keebio/nyquist/rev2/info.json | 10 +- keyboards/keebio/nyquist/rev3/info.json | 139 +++- keyboards/keebio/nyquist/rev3/rev3.c | 2 +- keyboards/keebio/nyquist/rev3/rev3.h | 44 -- keyboards/keebio/viterbi/info.json | 82 +-- keyboards/keebio/viterbi/rev1/info.json | 82 ++- keyboards/keebio/viterbi/rev2/info.json | 88 +++ keyboards/keebio/viterbi/rev2/rev2.c | 2 +- keyboards/keebio/viterbi/rev2/rev2.h | 25 - keyboards/keebio/wavelet/info.json | 62 +- keyboards/keebio/wavelet/wavelet.c | 2 +- keyboards/keebio/wavelet/wavelet.h | 22 - keyboards/keebsforall/freebirdnp/lite/info.json | 233 ++---- keyboards/keebsforall/freebirdnp/lite/lite.h | 48 -- keyboards/keebsforall/freebirdnp/pro/info.json | 90 +-- keyboards/keebsforall/freebirdnp/pro/pro.c | 2 +- keyboards/keebsforall/freebirdnp/pro/pro.h | 52 -- keyboards/keycapsss/o4l_5x12/info.json | 354 ++++----- keyboards/keycapsss/o4l_5x12/o4l_5x12.h | 47 -- keyboards/keycapsss/plaid_pad/info.json | 35 +- keyboards/keycapsss/plaid_pad/plaid_pad.h | 31 - keyboards/keyhive/maypad/info.json | 76 +- keyboards/keyhive/maypad/maypad.h | 75 -- keyboards/keyprez/rhino/info.json | 304 ++++---- keyboards/keyprez/rhino/rhino.c | 3 +- keyboards/keyprez/rhino/rhino.h | 80 --- keyboards/keyten/kt3700/info.json | 115 +-- keyboards/keyten/kt3700/kt3700.h | 87 --- keyboards/kingly_keys/ave/ortho/info.json | 336 ++++----- keyboards/kingly_keys/ave/ortho/ortho.h | 67 -- keyboards/kiwikey/kawii9/info.json | 20 +- keyboards/kiwikey/kawii9/kawii9.h | 38 - keyboards/kprepublic/bm16s/bm16s.h | 15 - keyboards/kprepublic/bm16s/info.json | 35 +- keyboards/kprepublic/cospad/cospad.h | 202 ------ keyboards/kprepublic/cospad/info.json | 330 ++++----- keyboards/kprepublic/jj40/info.json | 163 ++++- keyboards/kprepublic/jj40/jj40.h | 66 -- keyboards/kprepublic/jj4x4/info.json | 35 +- keyboards/kprepublic/jj4x4/jj4x4.h | 40 -- keyboards/kprepublic/jj50/info.json | 120 ++-- keyboards/kprepublic/jj50/jj50.h | 36 - keyboards/latincompass/latin17rgb/info.json | 37 +- keyboards/latincompass/latin17rgb/latin17rgb.c | 2 +- keyboards/latincompass/latin17rgb/latin17rgb.h | 36 - keyboards/latincompass/latin6rgb/info.json | 13 +- keyboards/latincompass/latin6rgb/latin6rgb.c | 2 +- keyboards/latincompass/latin6rgb/latin6rgb.h | 30 - keyboards/lazydesigners/dimple/ortho/info.json | 277 +++---- keyboards/lazydesigners/dimple/ortho/ortho.h | 91 --- keyboards/lazydesigners/the30/info.json | 62 +- keyboards/lazydesigners/the30/the30.h | 38 - keyboards/lets_split/info.json | 7 +- keyboards/lets_split/rev1/info.json | 64 ++ keyboards/lets_split/rev1/rev1.h | 22 - keyboards/lets_split/rev2/info.json | 5 + keyboards/lets_split/sockets/info.json | 5 + keyboards/lfkeyboards/lfkpad/info.json | 47 +- keyboards/lfkeyboards/lfkpad/lfkpad.c | 2 - keyboards/lfkeyboards/lfkpad/lfkpad.h | 21 - keyboards/manyboard/macro/info.json | 35 +- keyboards/manyboard/macro/macro.h | 31 - keyboards/maple_computing/c39/c39.h | 17 - keyboards/maple_computing/c39/info.json | 49 +- keyboards/maple_computing/jnao/info.json | 223 +++--- keyboards/maple_computing/jnao/jnao.h | 32 - keyboards/maple_computing/lets_split_eh/eh/eh.h | 22 - .../maple_computing/lets_split_eh/eh/info.json | 105 +-- keyboards/matchstickworks/southpad/info.json | 42 +- keyboards/matchstickworks/southpad/southpad.h | 44 -- keyboards/maxipad/info.json | 79 +- keyboards/maxipad/maxipad.h | 61 -- keyboards/mechlovin/delphine/delphine.h | 73 -- keyboards/mechlovin/delphine/info.json | 95 +-- keyboards/mechstudio/ud_40_ortho/info.json | 54 +- keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h | 39 - keyboards/minimon/index_tab/index_tab.h | 94 --- keyboards/minimon/index_tab/info.json | 452 ++++++------ keyboards/miuni32/info.json | 78 +- keyboards/miuni32/miuni32.h | 27 - keyboards/mlego/m48/info.json | 54 +- keyboards/mlego/m48/m48.h | 12 - keyboards/mlego/m60/info.json | 67 +- keyboards/mlego/m60/m60.h | 14 - keyboards/mlego/m60_split/info.json | 72 +- keyboards/mlego/m60_split/m60_split.h | 20 - keyboards/mlego/m65/info.json | 130 ++-- keyboards/mlego/m65/m65.h | 14 - keyboards/montsinger/rebound/rev1/info.json | 99 +-- keyboards/montsinger/rebound/rev1/rev1.h | 39 - keyboards/montsinger/rebound/rev2/info.json | 195 +++-- keyboards/montsinger/rebound/rev2/rev2.h | 53 -- keyboards/montsinger/rebound/rev3/info.json | 199 +++-- keyboards/montsinger/rebound/rev3/rev3.h | 53 -- keyboards/montsinger/rebound/rev4/info.json | 199 +++-- keyboards/montsinger/rebound/rev4/rev4.h | 59 -- keyboards/montsinger/rewind/info.json | 100 +-- keyboards/montsinger/rewind/rewind.h | 41 -- keyboards/mountainblocks/mb17/info.json | 24 +- keyboards/mountainblocks/mb17/mb17.h | 35 - keyboards/nack/info.json | 104 +-- keyboards/nack/nack.h | 31 - keyboards/newgame40/info.json | 46 +- keyboards/newgame40/newgame40.h | 15 - keyboards/nibiria/stream15/info.json | 33 +- keyboards/nibiria/stream15/stream15.h | 31 - keyboards/nightly_boards/n40_o/info.json | 346 ++++----- keyboards/nightly_boards/n40_o/n40_o.c | 3 +- keyboards/nightly_boards/n40_o/n40_o.h | 68 -- keyboards/nimrod/info.json | 375 +++++----- keyboards/nimrod/nimrod.h | 85 --- keyboards/novelkeys/novelpad/info.json | 43 +- keyboards/novelkeys/novelpad/novelpad.h | 36 - keyboards/noxary/220/220.c | 2 +- keyboards/noxary/220/220.h | 42 -- keyboards/noxary/220/info.json | 32 +- keyboards/ocean/sus/info.json | 24 +- keyboards/ocean/sus/sus.h | 31 - keyboards/opendeck/32/info.json | 41 -- keyboards/opendeck/32/rev1/info.json | 43 +- keyboards/opendeck/32/rev1/rev1.h | 14 - keyboards/ortho5by12/info.json | 248 ++++--- keyboards/ortho5by12/ortho5by12.c | 2 +- keyboards/ortho5by12/ortho5by12.h | 57 -- keyboards/pabile/p20/info.json | 57 +- keyboards/pabile/p20/ver1/info.json | 57 +- keyboards/pabile/p20/ver1/ver1.h | 50 -- keyboards/pabile/p20/ver2/info.json | 57 +- keyboards/pabile/p20/ver2/ver2.h | 50 -- keyboards/pabile/p40/info.json | 84 +-- keyboards/pabile/p40/p40.h | 16 - keyboards/pabile/p40_ortho/info.json | 131 ++-- keyboards/pabile/p40_ortho/p40_ortho.h | 45 -- keyboards/peej/lumberjack/info.json | 124 ++-- keyboards/peej/lumberjack/lumberjack.h | 16 - keyboards/peej/rosaline/ortho/info.json | 123 ++-- keyboards/peej/rosaline/ortho/ortho.h | 56 -- keyboards/peej/tripel/info.json | 77 +- keyboards/peej/tripel/left/info.json | 81 +++ keyboards/peej/tripel/left/left.h | 38 - keyboards/peej/tripel/middle/info.json | 81 +++ keyboards/peej/tripel/middle/middle.h | 38 - keyboards/peej/tripel/right/info.json | 81 +++ keyboards/peej/tripel/right/right.h | 38 - keyboards/percent/booster/booster.h | 32 - keyboards/percent/booster/info.json | 38 +- keyboards/planck/ez/ez.h | 39 +- keyboards/planck/ez/info.json | 200 +++--- keyboards/planck/info.json | 105 +-- keyboards/planck/light/info.json | 201 +++--- keyboards/planck/light/light.c | 2 +- keyboards/planck/light/light.h | 48 -- keyboards/planck/planck.c | 3 +- keyboards/planck/planck.h | 41 -- keyboards/planck/rev1/info.json | 201 +++--- keyboards/planck/rev1/rev1.c | 2 +- keyboards/planck/rev1/rev1.h | 33 - keyboards/planck/rev2/info.json | 201 +++--- keyboards/planck/rev2/rev2.c | 2 +- keyboards/planck/rev2/rev2.h | 33 - keyboards/planck/rev3/info.json | 201 +++--- keyboards/planck/rev3/rev3.c | 2 +- keyboards/planck/rev3/rev3.h | 33 - keyboards/planck/rev4/info.json | 201 +++--- keyboards/planck/rev4/rev4.c | 2 +- keyboards/planck/rev4/rev4.h | 33 - keyboards/planck/rev5/info.json | 201 +++--- keyboards/planck/rev5/rev5.c | 2 +- keyboards/planck/rev5/rev5.h | 33 - keyboards/planck/rev6/info.json | 490 +++++++------ keyboards/planck/rev6/rev6.c | 2 +- keyboards/planck/rev6/rev6.h | 104 --- keyboards/planck/rev6_drop/info.json | 490 +++++++------ keyboards/planck/rev6_drop/rev6_drop.c | 2 +- keyboards/planck/rev6_drop/rev6_drop.h | 108 --- keyboards/planck/thk/info.json | 190 ++--- keyboards/planck/thk/thk.c | 2 +- keyboards/planck/thk/thk.h | 49 -- keyboards/polycarbdiet/s20/info.json | 113 +-- keyboards/polycarbdiet/s20/s20.h | 61 -- keyboards/pos78/info.json | 89 ++- keyboards/pos78/pos78.h | 43 -- keyboards/preonic/info.json | 139 +--- keyboards/preonic/preonic.c | 3 +- keyboards/preonic/preonic.h | 41 -- keyboards/preonic/rev1/info.json | 142 +++- keyboards/preonic/rev1/rev1.c | 2 +- keyboards/preonic/rev1/rev1.h | 47 -- keyboards/preonic/rev2/info.json | 142 +++- keyboards/preonic/rev2/rev2.c | 2 +- keyboards/preonic/rev2/rev2.h | 47 -- keyboards/preonic/rev3/info.json | 593 +++++++-------- keyboards/preonic/rev3/rev3.c | 2 +- keyboards/preonic/rev3/rev3.h | 114 --- keyboards/preonic/rev3_drop/info.json | 593 +++++++-------- keyboards/preonic/rev3_drop/rev3_drop.c | 2 +- keyboards/preonic/rev3_drop/rev3_drop.h | 115 --- keyboards/primekb/prime_m/info.json | 99 ++- keyboards/primekb/prime_m/prime_m.h | 47 -- keyboards/program_yoink/ortho/info.json | 190 ++--- keyboards/program_yoink/ortho/ortho.h | 55 -- .../prototypist/allison_numpad/allison_numpad.h | 61 -- keyboards/prototypist/allison_numpad/info.json | 90 +-- keyboards/punk75/info.json | 150 ++-- keyboards/punk75/punk75.c | 2 +- keyboards/punk75/punk75.h | 43 -- keyboards/rart/rart4x4/info.json | 32 +- keyboards/rart/rart4x4/rart4x4.h | 37 - keyboards/rart/rartpad/info.json | 90 +-- keyboards/rart/rartpad/rartpad.h | 41 -- keyboards/redscarf_i/info.json | 182 ++--- keyboards/redscarf_i/redscarf_i.c | 2 +- keyboards/redscarf_i/redscarf_i.h | 85 --- keyboards/reversestudio/decadepad/decadepad.h | 19 - keyboards/reversestudio/decadepad/info.json | 44 +- keyboards/rgbkb/zygomorph/rev1/info.json | 188 ++++- keyboards/rgbkb/zygomorph/rev1/rev1.c | 2 +- keyboards/rgbkb/zygomorph/rev1/rev1.h | 86 --- keyboards/rmkeebs/rm_numpad/info.json | 196 ++--- keyboards/rmkeebs/rm_numpad/rm_numpad.c | 2 +- keyboards/rmkeebs/rm_numpad/rm_numpad.h | 158 ---- keyboards/ryanbaekr/rb18/info.json | 34 +- keyboards/ryanbaekr/rb18/rb18.h | 35 - keyboards/salicylic_acid3/setta21/rev1/info.json | 42 +- keyboards/salicylic_acid3/setta21/rev1/rev1.c | 2 +- keyboards/salicylic_acid3/setta21/rev1/rev1.h | 18 - keyboards/sendyyeah/75pixels/75pixels.h | 38 - keyboards/sendyyeah/75pixels/info.json | 154 ++-- keyboards/sentraq/number_pad/info.json | 55 +- keyboards/sentraq/number_pad/number_pad.h | 56 -- keyboards/shk9/info.json | 20 +- keyboards/shk9/shk9.h | 37 - keyboards/signum/3_0/3_0.h | 32 - keyboards/signum/3_0/info.json | 98 +-- keyboards/sixkeyboard/info.json | 10 +- keyboards/sixkeyboard/matrix.c | 2 +- keyboards/sixkeyboard/sixkeyboard.c | 2 +- keyboards/sixkeyboard/sixkeyboard.h | 18 - keyboards/skeletonkbd/skeletonnumpad/info.json | 34 +- .../skeletonkbd/skeletonnumpad/skeletonnumpad.h | 42 -- keyboards/smallkeyboard/info.json | 13 +- keyboards/smallkeyboard/smallkeyboard.c | 2 +- keyboards/smallkeyboard/smallkeyboard.h | 26 - keyboards/snampad/info.json | 47 +- keyboards/snampad/snampad.h | 43 -- keyboards/soy20/info.json | 44 +- keyboards/soy20/soy20.h | 33 - keyboards/spaceholdings/nebula12/info.json | 24 +- keyboards/spaceholdings/nebula12/nebula12.h | 16 - keyboards/spaceman/pancake/rev1/info.json | 198 ++--- keyboards/spaceman/pancake/rev1/rev1.h | 44 -- keyboards/spaceman/pancake/rev2/info.json | 99 +-- keyboards/spaceman/pancake/rev2/rev2.c | 2 +- keyboards/spaceman/pancake/rev2/rev2.h | 31 - keyboards/sporewoh/banime40/banime40.h | 33 - keyboards/sporewoh/banime40/info.json | 84 +-- keyboards/subatomic/info.json | 426 +++++------ keyboards/subatomic/subatomic.h | 89 --- keyboards/teleport/numpad/info.json | 38 +- keyboards/teleport/numpad/numpad.h | 33 - keyboards/telophase/info.json | 103 ++- keyboards/telophase/telophase.h | 17 - keyboards/tenki/info.json | 27 +- keyboards/tenki/tenki.h | 18 - keyboards/terrazzo/info.json | 219 +++++- keyboards/terrazzo/terrazzo.h | 76 -- keyboards/tgr/tris/info.json | 61 +- keyboards/tgr/tris/tris.h | 63 -- keyboards/themadnoodle/ncc1701kb/v2/info.json | 20 +- keyboards/themadnoodle/ncc1701kb/v2/v2.h | 32 - keyboards/themadnoodle/noodlepad/info.json | 20 +- keyboards/themadnoodle/noodlepad/noodlepad.h | 31 - keyboards/thepanduuh/degenpad/degenpad.c | 2 +- keyboards/thepanduuh/degenpad/degenpad.h | 136 ---- keyboards/thepanduuh/degenpad/info.json | 384 +++++----- keyboards/thevankeyboards/roadkit/info.json | 41 +- keyboards/thevankeyboards/roadkit/roadkit.h | 30 - keyboards/touchpad/info.json | 47 +- keyboards/touchpad/touchpad.h | 19 - keyboards/treasure/type9s2/info.json | 20 +- keyboards/treasure/type9s2/type9s2.h | 29 - keyboards/ungodly/launch_pad/info.json | 40 +- keyboards/ungodly/launch_pad/launch_pad.c | 2 +- keyboards/ungodly/launch_pad/launch_pad.h | 70 -- keyboards/unikeyboard/felix/felix.h | 19 - keyboards/unikeyboard/felix/info.json | 47 +- keyboards/vitamins_included/info.json | 59 +- keyboards/vitamins_included/vitamins_included.c | 2 +- keyboards/vitamins_included/vitamins_included.h | 22 - keyboards/wekey/we27/info.json | 79 +- keyboards/wekey/we27/we27.c | 2 +- keyboards/wekey/we27/we27.h | 53 -- keyboards/woodkeys/meira/info.json | 96 +-- keyboards/woodkeys/meira/meira.h | 16 - keyboards/x16/info.json | 32 +- keyboards/x16/x16.h | 39 - keyboards/xiudi/xd75/info.json | 153 ++-- keyboards/xiudi/xd75/xd75.h | 24 - keyboards/ymdk/np21/info.json | 141 ++-- keyboards/ymdk/np21/np21.h | 64 -- keyboards/ymdk/np24/u4rgb6/info.json | 218 +++--- keyboards/ymdk/np24/u4rgb6/u4rgb6.h | 81 --- keyboards/ymdk/ymd21/v2/info.json | 48 +- keyboards/ymdk/ymd21/v2/v2.h | 58 -- keyboards/ymdk/ymd40/air40/air40.c | 2 +- keyboards/ymdk/ymd40/air40/air40.h | 79 -- keyboards/ymdk/ymd40/air40/info.json | 470 ++++++------ keyboards/ymdk/ymd40/v2/info.json | 470 ++++++------ keyboards/ymdk/ymd40/v2/v2.h | 79 -- keyboards/yncognito/batpad/batpad.c | 2 +- keyboards/yncognito/batpad/batpad.h | 26 - keyboards/yncognito/batpad/info.json | 17 +- keyboards/zlant/info.json | 110 ++- keyboards/zlant/zlant.h | 29 - keyboards/zvecr/split_blackpill/info.json | 54 +- keyboards/zvecr/split_blackpill/split_blackpill.c | 2 +- keyboards/zvecr/split_blackpill/split_blackpill.h | 35 - keyboards/zvecr/zv48/info.json | 54 +- keyboards/zvecr/zv48/zv48.c | 2 +- keyboards/zvecr/zv48/zv48.h | 35 - 589 files changed, 19132 insertions(+), 25498 deletions(-) delete mode 100644 keyboards/0_sixty/0_sixty.h delete mode 100644 keyboards/1upkeyboards/super16/super16.h delete mode 100644 keyboards/1upkeyboards/super16v2/super16v2.h delete mode 100644 keyboards/1upkeyboards/sweet16/sweet16.h delete mode 100644 keyboards/1upkeyboards/sweet16/v1/v1.c delete mode 100644 keyboards/1upkeyboards/sweet16/v1/v1.h delete mode 100644 keyboards/25keys/zinc/rev1/rev1.h delete mode 100644 keyboards/25keys/zinc/reva/reva.h delete mode 100644 keyboards/40percentclub/5x5/5x5.h delete mode 100644 keyboards/40percentclub/gherkin/gherkin.h delete mode 100644 keyboards/40percentclub/i75/promicro/promicro.h delete mode 100644 keyboards/40percentclub/i75/teensy2/teensy2.h delete mode 100644 keyboards/40percentclub/nori/nori.h delete mode 100644 keyboards/40percentclub/polyandry/promicro/promicro.h delete mode 100644 keyboards/40percentclub/polyandry/teensy2/teensy2.h delete mode 100644 keyboards/40percentclub/tomato/tomato.h delete mode 100644 keyboards/acheron/shark/alpha/alpha.h delete mode 100644 keyboards/acheron/shark/beta/beta.h delete mode 100644 keyboards/adkb96/rev1/rev1.h delete mode 100644 keyboards/ai03/soyuz/soyuz.h delete mode 100755 keyboards/amjkeyboard/amj40/amj40.h delete mode 100644 keyboards/amjkeyboard/amjpad/amjpad.h delete mode 100644 keyboards/atomic/atomic.h delete mode 100644 keyboards/barracuda/barracuda.h delete mode 100644 keyboards/boardwalk/boardwalk.h delete mode 100644 keyboards/bobpad/bobpad.h delete mode 100644 keyboards/bpiphany/four_banger/four_banger.h delete mode 100644 keyboards/cannonkeys/atlas/atlas.h delete mode 100644 keyboards/cannonkeys/atlas_alps/atlas_alps.h delete mode 100644 keyboards/cannonkeys/ortho48/ortho48.h delete mode 100644 keyboards/cannonkeys/ortho60/ortho60.h delete mode 100644 keyboards/cannonkeys/ortho75/ortho75.h delete mode 100644 keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h delete mode 100644 keyboards/checkerboards/quark/quark.h delete mode 100644 keyboards/checkerboards/quark_lp/quark_lp.h delete mode 100755 keyboards/ckeys/handwire_101/handwire_101.h delete mode 100644 keyboards/ckeys/nakey/nakey.h delete mode 100644 keyboards/ckeys/obelus/obelus.h delete mode 100644 keyboards/clawsome/numeros/numeros.h delete mode 100644 keyboards/coseyfannitutti/discipad/discipad.h delete mode 100644 keyboards/coseyfannitutti/mulletpad/mulletpad.h delete mode 100755 keyboards/crawlpad/crawlpad.h delete mode 100644 keyboards/crbn/crbn.h delete mode 100644 keyboards/custommk/genesis/rev1/rev1.h delete mode 100644 keyboards/custommk/genesis/rev2/rev2.h delete mode 100755 keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h delete mode 100644 keyboards/cybergear/macro25/macro25.h delete mode 100644 keyboards/dc01/numpad/numpad.h delete mode 100644 keyboards/delikeeb/flatbread60/flatbread60.h delete mode 100644 keyboards/delikeeb/vaneela/vaneela.h delete mode 100644 keyboards/delikeeb/waaffle/rev3/rev3.h delete mode 100644 keyboards/deltapad/deltapad.h delete mode 100644 keyboards/deng/thirty/thirty.h delete mode 100644 keyboards/draytronics/scarlet/scarlet.h create mode 100644 keyboards/drhigsby/ogurec/left_pm/info.json delete mode 100644 keyboards/drhigsby/ogurec/left_pm/left_pm.h create mode 100644 keyboards/drhigsby/ogurec/right_pm/info.json delete mode 100644 keyboards/drhigsby/ogurec/right_pm/right_pm.h delete mode 100644 keyboards/ealdin/quadrant/quadrant.h delete mode 100644 keyboards/edi/hardlight/mk1/mk1.h delete mode 100644 keyboards/edi/hardlight/mk2/mk2.h delete mode 100644 keyboards/edi/standaside/standaside.h delete mode 100644 keyboards/efreet/efreet.h delete mode 100644 keyboards/emi20/emi20.h delete mode 100644 keyboards/evancookaudio/tenpad/tenpad.h delete mode 100644 keyboards/evyd13/eon40/eon40.h delete mode 100644 keyboards/evyd13/gh80_3700/gh80_3700.h delete mode 100644 keyboards/evyd13/pockettype/pockettype.h delete mode 100644 keyboards/flehrad/snagpad/snagpad.h delete mode 100644 keyboards/flehrad/tradestation/tradestation.h delete mode 100644 keyboards/fleuron/fleuron.h delete mode 100755 keyboards/fractal/fractal.h delete mode 100755 keyboards/gizmo_engineering/gk6/gk6.h delete mode 100644 keyboards/gkeyboard/gkb_m16/gkb_m16.h delete mode 100644 keyboards/gowla/gowla.h delete mode 100644 keyboards/handwired/412_64/412_64.h delete mode 100644 keyboards/handwired/cans12er/cans12er.h delete mode 100644 keyboards/handwired/floorboard/floorboard.h delete mode 100644 keyboards/handwired/jot50/jot50.h delete mode 100644 keyboards/handwired/jotanck/jotanck.h delete mode 100644 keyboards/handwired/jotpad16/jotpad16.h delete mode 100644 keyboards/handwired/k_numpad17/k_numpad17.h delete mode 100644 keyboards/handwired/m40/5x5_macropad/5x5_macropad.h delete mode 100644 keyboards/handwired/macroboard/macroboard.h delete mode 100644 keyboards/handwired/ortho_brass/ortho_brass.h delete mode 100644 keyboards/handwired/reclined/reclined.h delete mode 100644 keyboards/handwired/riblee_f401/riblee_f401.h delete mode 100644 keyboards/handwired/riblee_f411/riblee_f411.h delete mode 100644 keyboards/handwired/rs60/rs60.h delete mode 100644 keyboards/handwired/sick_pad/sick_pad.h delete mode 100644 keyboards/handwired/swiftrax/joypad/joypad.h delete mode 100644 keyboards/handwired/symmetry60/symmetry60.h delete mode 100644 keyboards/handwired/tritium_numpad/tritium_numpad.h delete mode 100644 keyboards/handwired/wulkan/wulkan.h delete mode 100644 keyboards/hineybush/h10/h10.h delete mode 100644 keyboards/idobao/id75/v1/v1.h delete mode 100644 keyboards/idobao/id75/v2/v2.h delete mode 100644 keyboards/idobao/montex/v1/v1.h delete mode 100755 keyboards/idobao/montex/v1rgb/v1rgb.h delete mode 100644 keyboards/kakunpc/angel17/alpha/alpha.h delete mode 100644 keyboards/kakunpc/angel17/rev1/rev1.h delete mode 100644 keyboards/kapcave/paladinpad/paladinpad.h delete mode 100644 keyboards/kb_elmo/elmopad/elmopad.h delete mode 100644 keyboards/kb_elmo/twelvekey/twelvekey.h delete mode 100644 keyboards/kbdfans/bounce/pad/pad.h delete mode 100644 keyboards/kbdfans/kbd4x/kbd4x.h delete mode 100644 keyboards/kbdfans/kbdpad/mk1/mk1.h delete mode 100644 keyboards/kbdfans/kbdpad/mk2/mk2.h delete mode 100644 keyboards/kbdfans/niu_mini/niu_mini.h delete mode 100644 keyboards/keebformom/keebformom.h delete mode 100644 keyboards/keebio/chocopad/chocopad.h delete mode 100644 keyboards/keebio/dilly/dilly.h delete mode 100644 keyboards/keebio/dsp40/rev1/rev1.h delete mode 100644 keyboards/keebio/levinson/rev3/rev3.h delete mode 100644 keyboards/keebio/nyquist/rev3/rev3.h delete mode 100644 keyboards/keebio/viterbi/rev2/rev2.h delete mode 100644 keyboards/keebio/wavelet/wavelet.h delete mode 100644 keyboards/keebsforall/freebirdnp/lite/lite.h delete mode 100644 keyboards/keebsforall/freebirdnp/pro/pro.h delete mode 100644 keyboards/keycapsss/o4l_5x12/o4l_5x12.h delete mode 100644 keyboards/keycapsss/plaid_pad/plaid_pad.h delete mode 100644 keyboards/keyhive/maypad/maypad.h delete mode 100644 keyboards/keyprez/rhino/rhino.h delete mode 100644 keyboards/keyten/kt3700/kt3700.h delete mode 100644 keyboards/kingly_keys/ave/ortho/ortho.h delete mode 100644 keyboards/kiwikey/kawii9/kawii9.h delete mode 100755 keyboards/kprepublic/bm16s/bm16s.h delete mode 100644 keyboards/kprepublic/jj40/jj40.h delete mode 100644 keyboards/kprepublic/jj4x4/jj4x4.h delete mode 100644 keyboards/kprepublic/jj50/jj50.h delete mode 100644 keyboards/latincompass/latin17rgb/latin17rgb.h delete mode 100644 keyboards/latincompass/latin6rgb/latin6rgb.h delete mode 100644 keyboards/lazydesigners/dimple/ortho/ortho.h delete mode 100644 keyboards/lazydesigners/the30/the30.h delete mode 100644 keyboards/lets_split/rev1/rev1.h delete mode 100644 keyboards/lfkeyboards/lfkpad/lfkpad.h delete mode 100644 keyboards/manyboard/macro/macro.h delete mode 100755 keyboards/maple_computing/c39/c39.h delete mode 100644 keyboards/maple_computing/jnao/jnao.h delete mode 100644 keyboards/maple_computing/lets_split_eh/eh/eh.h delete mode 100644 keyboards/matchstickworks/southpad/southpad.h delete mode 100644 keyboards/maxipad/maxipad.h delete mode 100644 keyboards/mechlovin/delphine/delphine.h delete mode 100644 keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h delete mode 100644 keyboards/minimon/index_tab/index_tab.h delete mode 100644 keyboards/miuni32/miuni32.h delete mode 100644 keyboards/montsinger/rebound/rev1/rev1.h delete mode 100644 keyboards/montsinger/rebound/rev2/rev2.h delete mode 100644 keyboards/montsinger/rebound/rev3/rev3.h delete mode 100644 keyboards/montsinger/rebound/rev4/rev4.h delete mode 100644 keyboards/montsinger/rewind/rewind.h delete mode 100644 keyboards/mountainblocks/mb17/mb17.h delete mode 100644 keyboards/nack/nack.h delete mode 100644 keyboards/newgame40/newgame40.h delete mode 100644 keyboards/nibiria/stream15/stream15.h delete mode 100644 keyboards/nightly_boards/n40_o/n40_o.h delete mode 100644 keyboards/nimrod/nimrod.h delete mode 100755 keyboards/novelkeys/novelpad/novelpad.h delete mode 100644 keyboards/noxary/220/220.h delete mode 100644 keyboards/ocean/sus/sus.h delete mode 100644 keyboards/ortho5by12/ortho5by12.h delete mode 100644 keyboards/pabile/p20/ver1/ver1.h delete mode 100644 keyboards/pabile/p20/ver2/ver2.h delete mode 100644 keyboards/pabile/p40/p40.h delete mode 100644 keyboards/pabile/p40_ortho/p40_ortho.h delete mode 100644 keyboards/peej/rosaline/ortho/ortho.h create mode 100644 keyboards/peej/tripel/left/info.json delete mode 100644 keyboards/peej/tripel/left/left.h create mode 100644 keyboards/peej/tripel/middle/info.json delete mode 100644 keyboards/peej/tripel/middle/middle.h create mode 100644 keyboards/peej/tripel/right/info.json delete mode 100644 keyboards/peej/tripel/right/right.h delete mode 100644 keyboards/percent/booster/booster.h delete mode 100644 keyboards/planck/light/light.h delete mode 100644 keyboards/planck/planck.h delete mode 100644 keyboards/planck/rev1/rev1.h delete mode 100644 keyboards/planck/rev2/rev2.h delete mode 100644 keyboards/planck/rev3/rev3.h delete mode 100644 keyboards/planck/rev4/rev4.h delete mode 100644 keyboards/planck/rev5/rev5.h delete mode 100644 keyboards/planck/rev6/rev6.h delete mode 100644 keyboards/planck/rev6_drop/rev6_drop.h delete mode 100644 keyboards/planck/thk/thk.h delete mode 100644 keyboards/polycarbdiet/s20/s20.h delete mode 100644 keyboards/pos78/pos78.h delete mode 100644 keyboards/preonic/preonic.h delete mode 100644 keyboards/preonic/rev1/rev1.h delete mode 100644 keyboards/preonic/rev2/rev2.h delete mode 100644 keyboards/preonic/rev3/rev3.h delete mode 100644 keyboards/preonic/rev3_drop/rev3_drop.h delete mode 100644 keyboards/primekb/prime_m/prime_m.h delete mode 100644 keyboards/program_yoink/ortho/ortho.h delete mode 100644 keyboards/prototypist/allison_numpad/allison_numpad.h delete mode 100644 keyboards/punk75/punk75.h delete mode 100644 keyboards/rart/rart4x4/rart4x4.h delete mode 100644 keyboards/rart/rartpad/rartpad.h delete mode 100644 keyboards/redscarf_i/redscarf_i.h delete mode 100644 keyboards/reversestudio/decadepad/decadepad.h delete mode 100644 keyboards/rgbkb/zygomorph/rev1/rev1.h delete mode 100644 keyboards/rmkeebs/rm_numpad/rm_numpad.h delete mode 100644 keyboards/ryanbaekr/rb18/rb18.h delete mode 100644 keyboards/salicylic_acid3/setta21/rev1/rev1.h delete mode 100644 keyboards/sendyyeah/75pixels/75pixels.h delete mode 100644 keyboards/sentraq/number_pad/number_pad.h delete mode 100644 keyboards/shk9/shk9.h delete mode 100644 keyboards/signum/3_0/3_0.h delete mode 100644 keyboards/sixkeyboard/sixkeyboard.h delete mode 100644 keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h delete mode 100644 keyboards/smallkeyboard/smallkeyboard.h delete mode 100644 keyboards/snampad/snampad.h delete mode 100644 keyboards/soy20/soy20.h delete mode 100644 keyboards/spaceman/pancake/rev1/rev1.h delete mode 100644 keyboards/spaceman/pancake/rev2/rev2.h delete mode 100644 keyboards/sporewoh/banime40/banime40.h delete mode 100644 keyboards/subatomic/subatomic.h delete mode 100644 keyboards/teleport/numpad/numpad.h delete mode 100644 keyboards/tenki/tenki.h delete mode 100644 keyboards/tgr/tris/tris.h delete mode 100644 keyboards/themadnoodle/ncc1701kb/v2/v2.h delete mode 100644 keyboards/themadnoodle/noodlepad/noodlepad.h delete mode 100644 keyboards/thepanduuh/degenpad/degenpad.h delete mode 100644 keyboards/thevankeyboards/roadkit/roadkit.h delete mode 100644 keyboards/touchpad/touchpad.h delete mode 100644 keyboards/treasure/type9s2/type9s2.h delete mode 100644 keyboards/ungodly/launch_pad/launch_pad.h delete mode 100644 keyboards/unikeyboard/felix/felix.h delete mode 100644 keyboards/vitamins_included/vitamins_included.h delete mode 100644 keyboards/wekey/we27/we27.h delete mode 100644 keyboards/x16/x16.h delete mode 100644 keyboards/ymdk/np21/np21.h delete mode 100644 keyboards/ymdk/np24/u4rgb6/u4rgb6.h delete mode 100644 keyboards/ymdk/ymd21/v2/v2.h delete mode 100644 keyboards/ymdk/ymd40/air40/air40.h delete mode 100644 keyboards/ymdk/ymd40/v2/v2.h delete mode 100644 keyboards/yncognito/batpad/batpad.h delete mode 100755 keyboards/zlant/zlant.h delete mode 100644 keyboards/zvecr/split_blackpill/split_blackpill.h delete mode 100644 keyboards/zvecr/zv48/zv48.h (limited to 'keyboards/maple_computing') diff --git a/keyboards/0_sixty/0_sixty.h b/keyboards/0_sixty/0_sixty.h deleted file mode 100644 index 5152c246af..0000000000 --- a/keyboards/0_sixty/0_sixty.h +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright 2020 Vinam Arora - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_1x2uL( \ - 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, k45, k46, k47, 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, k45, k45, k46, k47, k48, k49, k4a, k4b } \ -} - -#define LAYOUT_1x2uC( \ - 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, k46, k47, 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, k46, k46, k47, k48, k49, k4a, k4b } \ -} - -#define LAYOUT_1x2uR( \ - 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, 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, k45, k46, k46, k48, k49, k4a, k4b } \ -} - -#define LAYOUT_2x2uC( \ - 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, k45, 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, k45, k45, k46, k46, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index 6097a2f349..c6925b6c16 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -23,337 +23,337 @@ "layouts": { "LAYOUT_1x2uC": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, 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} ] }, "LAYOUT_2x2uC": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"x": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 2}, + {"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} ] }, "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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} ] }, "LAYOUT_1x2uR": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, "w": 2}, + {"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} ] }, "LAYOUT_1x2uL": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"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": [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, 5], "x": 4, "y": 4, "w": 2}, + {"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/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json index 53648fbd02..bd8b19eff2 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/info.json @@ -18,10 +18,47 @@ "community_layouts": ["ortho_4x4", "numpad_4x4"], "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] }, "LAYOUT_numpad_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"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":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "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, "h": 2}, + + {"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": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] } } } diff --git a/keyboards/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c index eebb72c717..a9946c7525 100644 --- a/keyboards/1upkeyboards/super16/super16.c +++ b/keyboards/1upkeyboards/super16/super16.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 "super16.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/1upkeyboards/super16/super16.h b/keyboards/1upkeyboards/super16/super16.h deleted file mode 100644 index 0595af8dcd..0000000000 --- a/keyboards/1upkeyboards/super16/super16.h +++ /dev/null @@ -1,51 +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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index ee5ba391fb..f62f4ebb53 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -23,7 +23,27 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] } } } diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c index ff7ce33c84..56e5fe7e7f 100644 --- a/keyboards/1upkeyboards/super16v2/super16v2.c +++ b/keyboards/1upkeyboards/super16v2/super16v2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "super16v2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/1upkeyboards/super16v2/super16v2.h b/keyboards/1upkeyboards/super16v2/super16v2.h deleted file mode 100644 index 58fd26ed8a..0000000000 --- a/keyboards/1upkeyboards/super16v2/super16v2.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2022 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 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_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index 320c96bac8..178082212d 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -8,11 +8,48 @@ }, "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] }, "LAYOUT_numpad_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"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":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "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, "h": 2}, + + {"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": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] } } } diff --git a/keyboards/1upkeyboards/sweet16/sweet16.h b/keyboards/1upkeyboards/sweet16/sweet16.h deleted file mode 100644 index 7320ccd9e0..0000000000 --- a/keyboards/1upkeyboards/sweet16/sweet16.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Any changes to the layout names and/or definitions must also be made to info.json - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} - diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.c b/keyboards/1upkeyboards/sweet16/v1/v1.c deleted file mode 100644 index 0ff1041aac..0000000000 --- a/keyboards/1upkeyboards/sweet16/v1/v1.c +++ /dev/null @@ -1 +0,0 @@ -#include "v1.h" diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.h b/keyboards/1upkeyboards/sweet16/v1/v1.h deleted file mode 100644 index 7320ccd9e0..0000000000 --- a/keyboards/1upkeyboards/sweet16/v1/v1.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Any changes to the layout names and/or definitions must also be made to info.json - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} - diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json index d667ca186c..d8588e4182 100644 --- a/keyboards/25keys/zinc/info.json +++ b/keyboards/25keys/zinc/info.json @@ -8,10 +8,5 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "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":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":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] - } - } + "bootloader": "caterina" } diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index 5d9ec2d7d4..3669e7d87b 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -7,5 +7,65 @@ "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "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": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "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, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1}, + {"matrix": [5, 5], "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, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2}, + {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 4], "x": 13, "y": 3}, + {"matrix": [7, 5], "x": 14, "y": 3} + ] + } } } diff --git a/keyboards/25keys/zinc/rev1/rev1.h b/keyboards/25keys/zinc/rev1/rev1.h deleted file mode 100644 index 1bf2c565ae..0000000000 --- a/keyboards/25keys/zinc/rev1/rev1.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Standard Keymap -// (TRRS jack on both halves are to the left side) -#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 }, \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index 3bf44bfe8f..ff3b9c930a 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -7,5 +7,62 @@ "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "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": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "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, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1}, + {"matrix": [5, 5], "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, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2}, + {"matrix": [6, 5], "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": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 4], "x": 13, "y": 3}, + {"matrix": [7, 5], "x": 14, "y": 3} + ] + } } } diff --git a/keyboards/25keys/zinc/reva/reva.h b/keyboards/25keys/zinc/reva/reva.h deleted file mode 100644 index 1bf2c565ae..0000000000 --- a/keyboards/25keys/zinc/reva/reva.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Standard Keymap -// (TRRS jack on both halves are to the left side) -#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 }, \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/40percentclub/5x5/5x5.h b/keyboards/40percentclub/5x5/5x5.h deleted file mode 100644 index 182e9e8190..0000000000 --- a/keyboards/40percentclub/5x5/5x5.h +++ /dev/null @@ -1,53 +0,0 @@ -#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 -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_ortho_5x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, K44 \ -) \ -{ \ - { K00, K01, K02, K03, K04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \ - { K10, K11, K12, K13, K14, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \ - { K20, K21, K22, K23, K24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \ - { K30, K31, K32, K33, K34, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \ - { K40, K41, K42, K43, K44, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \ -} - -#define LAYOUT_ortho_5x10( \ - 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 \ -) \ -{ \ - { 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, ___, ___, ___, ___, ___} \ -} - -#define LAYOUT_ortho_5x15( \ - 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 \ -) \ -{ \ - { 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} \ -} diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json index b113485584..3ebc123c9b 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/info.json @@ -19,176 +19,176 @@ "layouts": { "LAYOUT_ortho_5x5": { "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":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":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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "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} ] }, "LAYOUT_ortho_5x10": { "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, "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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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} ] }, "LAYOUT_ortho_5x15": { "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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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/40percentclub/gherkin/gherkin.h b/keyboards/40percentclub/gherkin/gherkin.h deleted file mode 100644 index 70bffee302..0000000000 --- a/keyboards/40percentclub/gherkin/gherkin.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_3x10( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index 0f889aa04d..808a82d4ce 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -21,7 +21,40 @@ "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { - "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}] + "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": [1, 0], "x": 6, "y": 0}, + {"matrix": [1, 1], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + + {"matrix": [1, 4], "x": 0, "y": 1}, + {"matrix": [1, 5], "x": 1, "y": 1}, + {"matrix": [2, 0], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1}, + {"matrix": [2, 3], "x": 5, "y": 1}, + {"matrix": [2, 4], "x": 6, "y": 1}, + {"matrix": [2, 5], "x": 7, "y": 1}, + {"matrix": [3, 0], "x": 8, "y": 1}, + {"matrix": [3, 1], "x": 9, "y": 1}, + + {"matrix": [3, 2], "x": 0, "y": 2}, + {"matrix": [3, 3], "x": 1, "y": 2}, + {"matrix": [3, 4], "x": 2, "y": 2}, + {"matrix": [3, 5], "x": 3, "y": 2}, + {"matrix": [4, 0], "x": 4, "y": 2}, + {"matrix": [4, 1], "x": 5, "y": 2}, + {"matrix": [4, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [4, 5], "x": 9, "y": 2} + ] } } } diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json index 3e9d42c28d..8661257d6b 100644 --- a/keyboards/40percentclub/i75/info.json +++ b/keyboards/40percentclub/i75/info.json @@ -7,11 +7,5 @@ "vid": "0x4025", "pid": "0x0A0C", "device_version": "1.7.5" - }, - "community_layouts": ["ortho_5x15"], - "layouts": { - "LAYOUT_ortho_5x15": { - "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}, {"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":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":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":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}] - } } } diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json index 933c4f8616..4c3f44469c 100644 --- a/keyboards/40percentclub/i75/promicro/info.json +++ b/keyboards/40percentclub/i75/promicro/info.json @@ -5,5 +5,91 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "community_layouts": ["ortho_5x15"], + "layouts": { + "LAYOUT_ortho_5x15": { + "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": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1}, + {"matrix": [2, 1], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [2, 4], "x": 7, "y": 1}, + {"matrix": [2, 5], "x": 8, "y": 1}, + {"matrix": [2, 6], "x": 9, "y": 1}, + {"matrix": [2, 7], "x": 10, "y": 1}, + {"matrix": [2, 8], "x": 11, "y": 1}, + {"matrix": [3, 0], "x": 12, "y": 1}, + {"matrix": [3, 1], "x": 13, "y": 1}, + {"matrix": [3, 2], "x": 14, "y": 1}, + + {"matrix": [3, 3], "x": 0, "y": 2}, + {"matrix": [3, 4], "x": 1, "y": 2}, + {"matrix": [3, 5], "x": 2, "y": 2}, + {"matrix": [3, 6], "x": 3, "y": 2}, + {"matrix": [3, 7], "x": 4, "y": 2}, + {"matrix": [3, 8], "x": 5, "y": 2}, + {"matrix": [4, 0], "x": 6, "y": 2}, + {"matrix": [4, 1], "x": 7, "y": 2}, + {"matrix": [4, 2], "x": 8, "y": 2}, + {"matrix": [4, 3], "x": 9, "y": 2}, + {"matrix": [4, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [4, 7], "x": 13, "y": 2}, + {"matrix": [4, 8], "x": 14, "y": 2}, + + {"matrix": [5, 0], "x": 0, "y": 3}, + {"matrix": [5, 1], "x": 1, "y": 3}, + {"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": [5, 8], "x": 8, "y": 3}, + {"matrix": [6, 0], "x": 9, "y": 3}, + {"matrix": [6, 1], "x": 10, "y": 3}, + {"matrix": [6, 2], "x": 11, "y": 3}, + {"matrix": [6, 3], "x": 12, "y": 3}, + {"matrix": [6, 4], "x": 13, "y": 3}, + {"matrix": [6, 5], "x": 14, "y": 3}, + + {"matrix": [6, 6], "x": 0, "y": 4}, + {"matrix": [6, 7], "x": 1, "y": 4}, + {"matrix": [6, 8], "x": 2, "y": 4}, + {"matrix": [7, 0], "x": 3, "y": 4}, + {"matrix": [7, 1], "x": 4, "y": 4}, + {"matrix": [7, 2], "x": 5, "y": 4}, + {"matrix": [7, 3], "x": 6, "y": 4}, + {"matrix": [7, 4], "x": 7, "y": 4}, + {"matrix": [7, 5], "x": 8, "y": 4}, + {"matrix": [7, 6], "x": 9, "y": 4}, + {"matrix": [7, 7], "x": 10, "y": 4}, + {"matrix": [7, 8], "x": 11, "y": 4}, + {"matrix": [8, 0], "x": 12, "y": 4}, + {"matrix": [8, 1], "x": 13, "y": 4}, + {"matrix": [8, 2], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/40percentclub/i75/promicro/promicro.h b/keyboards/40percentclub/i75/promicro/promicro.h deleted file mode 100644 index 0a617ac36c..0000000000 --- a/keyboards/40percentclub/i75/promicro/promicro.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_5x15( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json index 2296a57828..cc441a1096 100644 --- a/keyboards/40percentclub/i75/teensy2/info.json +++ b/keyboards/40percentclub/i75/teensy2/info.json @@ -5,5 +5,91 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "community_layouts": ["ortho_5x15"], + "layouts": { + "LAYOUT_ortho_5x15": { + "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": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1}, + {"matrix": [2, 1], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [2, 4], "x": 7, "y": 1}, + {"matrix": [2, 5], "x": 8, "y": 1}, + {"matrix": [2, 6], "x": 9, "y": 1}, + {"matrix": [2, 7], "x": 10, "y": 1}, + {"matrix": [2, 8], "x": 11, "y": 1}, + {"matrix": [3, 0], "x": 12, "y": 1}, + {"matrix": [3, 1], "x": 13, "y": 1}, + {"matrix": [3, 2], "x": 14, "y": 1}, + + {"matrix": [3, 3], "x": 0, "y": 2}, + {"matrix": [3, 4], "x": 1, "y": 2}, + {"matrix": [3, 5], "x": 2, "y": 2}, + {"matrix": [3, 6], "x": 3, "y": 2}, + {"matrix": [3, 7], "x": 4, "y": 2}, + {"matrix": [3, 8], "x": 5, "y": 2}, + {"matrix": [4, 0], "x": 6, "y": 2}, + {"matrix": [4, 1], "x": 7, "y": 2}, + {"matrix": [4, 2], "x": 8, "y": 2}, + {"matrix": [4, 3], "x": 9, "y": 2}, + {"matrix": [4, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [4, 7], "x": 13, "y": 2}, + {"matrix": [4, 8], "x": 14, "y": 2}, + + {"matrix": [5, 0], "x": 0, "y": 3}, + {"matrix": [5, 1], "x": 1, "y": 3}, + {"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": [5, 8], "x": 8, "y": 3}, + {"matrix": [6, 0], "x": 9, "y": 3}, + {"matrix": [6, 1], "x": 10, "y": 3}, + {"matrix": [6, 2], "x": 11, "y": 3}, + {"matrix": [6, 3], "x": 12, "y": 3}, + {"matrix": [6, 4], "x": 13, "y": 3}, + {"matrix": [6, 5], "x": 14, "y": 3}, + + {"matrix": [6, 6], "x": 0, "y": 4}, + {"matrix": [6, 7], "x": 1, "y": 4}, + {"matrix": [6, 8], "x": 2, "y": 4}, + {"matrix": [7, 0], "x": 3, "y": 4}, + {"matrix": [7, 1], "x": 4, "y": 4}, + {"matrix": [7, 2], "x": 5, "y": 4}, + {"matrix": [7, 3], "x": 6, "y": 4}, + {"matrix": [7, 4], "x": 7, "y": 4}, + {"matrix": [7, 5], "x": 8, "y": 4}, + {"matrix": [7, 6], "x": 9, "y": 4}, + {"matrix": [7, 7], "x": 10, "y": 4}, + {"matrix": [7, 8], "x": 11, "y": 4}, + {"matrix": [8, 0], "x": 12, "y": 4}, + {"matrix": [8, 1], "x": 13, "y": 4}, + {"matrix": [8, 2], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.h b/keyboards/40percentclub/i75/teensy2/teensy2.h deleted file mode 100644 index 0a617ac36c..0000000000 --- a/keyboards/40percentclub/i75/teensy2/teensy2.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_5x15( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index 97c793b069..b0d2a0083d 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -22,108 +22,120 @@ "layouts": { "LAYOUT_ortho_4x4": { "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 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "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": [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}, + + {"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} + ] }, "LAYOUT_ortho_4x8": { "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 }, - { "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": 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 } ] + {"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}, + {"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": [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} + ] }, "LAYOUT_ortho_4x12": { "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/40percentclub/nori/nori.h b/keyboards/40percentclub/nori/nori.h deleted file mode 100644 index 768598b7f8..0000000000 --- a/keyboards/40percentclub/nori/nori.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2018 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) \ -{ \ - { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___ } \ -} -#define LAYOUT_ortho_4x8( \ - 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\ -) \ -{ \ - { 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, ___, ___, ___, ___ } \ -} -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json index f5f33e3d97..63420adf86 100644 --- a/keyboards/40percentclub/polyandry/info.json +++ b/keyboards/40percentclub/polyandry/info.json @@ -7,27 +7,5 @@ "vid": "0x4025", "pid": "0x6060", "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT_ortho_4x3": { - "layout": [ - {"label": "k000", "x": 0, "y": 0}, - {"label": "k001", "x": 1, "y": 0}, - {"label": "k002", "x": 2, "y": 0}, - - {"label": "k003", "x": 0, "y": 1}, - {"label": "k004", "x": 1, "y": 1}, - {"label": "k005", "x": 2, "y": 1}, - - {"label": "k006", "x": 0, "y": 2}, - {"label": "k007", "x": 1, "y": 2}, - {"label": "k008", "x": 2, "y": 2}, - - {"label": "k009", "x": 0, "y": 3}, - {"label": "k010", "x": 1, "y": 3}, - {"label": "k011", "x": 2, "y": 3} - - ] - } } } diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json index a8169c93dd..8a8cd98794 100644 --- a/keyboards/40percentclub/polyandry/promicro/info.json +++ b/keyboards/40percentclub/polyandry/promicro/info.json @@ -5,5 +5,26 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT_ortho_4x3": { + "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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 0, "y": 3}, + {"matrix": [0, 10], "x": 1, "y": 3}, + {"matrix": [0, 11], "x": 2, "y": 3} + ] + } + } } diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h deleted file mode 100644 index e2a9dbcf35..0000000000 --- a/keyboards/40percentclub/polyandry/promicro/promicro.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x3( \ - K000, K001, K002, \ - K003, K004, K005, \ - K006, K007, K008, \ - K009, K010, K011 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \ -} diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json index 0a870332b2..33fd1d71df 100644 --- a/keyboards/40percentclub/polyandry/teensy2/info.json +++ b/keyboards/40percentclub/polyandry/teensy2/info.json @@ -5,5 +5,26 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "layouts": { + "LAYOUT_ortho_4x3": { + "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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 0, "y": 3}, + {"matrix": [0, 10], "x": 1, "y": 3}, + {"matrix": [0, 11], "x": 2, "y": 3} + ] + } + } } diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h deleted file mode 100644 index dd6ef3f6bb..0000000000 --- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -//NOTE TO FUTURE FROM RYJELSUM (original contributor): -//This has been unchanged from the promicro.h file. -//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH. -//I believe this should still work - but it's not a sure thing. - -#include "quantum.h" - -#define LAYOUT_ortho_4x3( \ - K000, K001, K002, \ - K003, K004, K005, \ - K006, K007, K008, \ - K009, K010, K011 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \ -} diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json index 8877c31429..e3c11a0290 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/info.json @@ -18,7 +18,40 @@ "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { - "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}] + "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": [1, 0], "x": 6, "y": 0}, + {"matrix": [1, 1], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + + {"matrix": [1, 4], "x": 0, "y": 1}, + {"matrix": [1, 5], "x": 1, "y": 1}, + {"matrix": [2, 0], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1}, + {"matrix": [2, 3], "x": 5, "y": 1}, + {"matrix": [2, 4], "x": 6, "y": 1}, + {"matrix": [2, 5], "x": 7, "y": 1}, + {"matrix": [3, 0], "x": 8, "y": 1}, + {"matrix": [3, 1], "x": 9, "y": 1}, + + {"matrix": [3, 2], "x": 0, "y": 2}, + {"matrix": [3, 3], "x": 1, "y": 2}, + {"matrix": [3, 4], "x": 2, "y": 2}, + {"matrix": [3, 5], "x": 3, "y": 2}, + {"matrix": [4, 0], "x": 4, "y": 2}, + {"matrix": [4, 1], "x": 5, "y": 2}, + {"matrix": [4, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [4, 5], "x": 9, "y": 2} + ] } } } diff --git a/keyboards/40percentclub/tomato/tomato.h b/keyboards/40percentclub/tomato/tomato.h deleted file mode 100644 index 70bffee302..0000000000 --- a/keyboards/40percentclub/tomato/tomato.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_3x10( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/7c8/framework/framework.h b/keyboards/7c8/framework/framework.h index 8de2837519..e35ac6e7fc 100644 --- a/keyboards/7c8/framework/framework.h +++ b/keyboards/7c8/framework/framework.h @@ -17,65 +17,6 @@ #pragma once #include "quantum.h" -#define ___ KC_NO - -#define LAYOUT_ortho_5x12( \ - 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 \ - ) { \ - { 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 } \ - } - -#define LAYOUT_ortho_5x12_1x2uC( \ - 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, K47, 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, K45 }, \ - { ___, K47, K48, K49, K4a, K4b } \ - } - -#define LAYOUT_preonic_2x2u( \ - 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, K45, 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, ___, K45 }, \ - { K46, ___, K48, K49, K4a, K4b } \ - } - #define framework_via( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \ diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json index 862acea115..18c0289c9a 100644 --- a/keyboards/7c8/framework/info.json +++ b/keyboards/7c8/framework/info.json @@ -23,203 +23,203 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [1, 0], "x": 6, "y": 0}, + {"matrix": [1, 1], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [1, 4], "x": 10, "y": 0}, + {"matrix": [1, 5], "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}, + {"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}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 0], "x": 6, "y": 1}, + {"matrix": [3, 1], "x": 7, "y": 1}, + {"matrix": [3, 2], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [3, 5], "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}, + {"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": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 0], "x": 6, "y": 2}, + {"matrix": [5, 1], "x": 7, "y": 2}, + {"matrix": [5, 2], "x": 8, "y": 2}, + {"matrix": [5, 3], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 5], "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": [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}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 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}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4} ] }, "LAYOUT_ortho_5x12_1x2uC": { "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": [1, 0], "x": 6, "y": 0}, + {"matrix": [1, 1], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [1, 4], "x": 10, "y": 0}, + {"matrix": [1, 5], "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}, + {"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}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 0], "x": 6, "y": 1}, + {"matrix": [3, 1], "x": 7, "y": 1}, + {"matrix": [3, 2], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [3, 5], "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}, + {"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": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 0], "x": 6, "y": 2}, + {"matrix": [5, 1], "x": 7, "y": 2}, + {"matrix": [5, 2], "x": 8, "y": 2}, + {"matrix": [5, 3], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 5], "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": [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}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 4], "x": 4, "y": 4}, + {"matrix": [8, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_2x2u": { "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": [1, 0], "x": 6, "y": 0}, + {"matrix": [1, 1], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [1, 4], "x": 10, "y": 0}, + {"matrix": [1, 5], "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}, + {"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}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [3, 0], "x": 6, "y": 1}, + {"matrix": [3, 1], "x": 7, "y": 1}, + {"matrix": [3, 2], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [3, 5], "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}, + {"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": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2}, + {"matrix": [4, 5], "x": 5, "y": 2}, + {"matrix": [5, 0], "x": 6, "y": 2}, + {"matrix": [5, 1], "x": 7, "y": 2}, + {"matrix": [5, 2], "x": 8, "y": 2}, + {"matrix": [5, 3], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 5], "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": [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}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [8, 3], "x": 3, "y": 4}, + {"matrix": [8, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 0], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4} ] } } diff --git a/keyboards/acheron/shark/alpha/alpha.h b/keyboards/acheron/shark/alpha/alpha.h deleted file mode 100644 index d58b72548a..0000000000 --- a/keyboards/acheron/shark/alpha/alpha.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 Á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" - -/* 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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 07c6550cb8..5250da4727 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -26,54 +26,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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/acheron/shark/beta/beta.c b/keyboards/acheron/shark/beta/beta.c index 597dc78548..06fd36f797 100644 --- a/keyboards/acheron/shark/beta/beta.c +++ b/keyboards/acheron/shark/beta/beta.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "beta.h" +#include "quantum.h" + void board_init(void) { setPinInput(B6); setPinInput(B7); diff --git a/keyboards/acheron/shark/beta/beta.h b/keyboards/acheron/shark/beta/beta.h deleted file mode 100644 index 1002659d3d..0000000000 --- a/keyboards/acheron/shark/beta/beta.h +++ /dev/null @@ -1,31 +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" - -#define LAYOUT_ortho_4x12( \ - 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 \ -)\ -{\ - { 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 } \ -} diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 313e877c8e..62d4e568f8 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -25,54 +25,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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/adkb96/info.json b/keyboards/adkb96/info.json index 1a9a95cec3..b293e03f73 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/info.json @@ -18,489 +18,113 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_6x16" + }, "layouts": { "LAYOUT_ortho_6x16": { "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": "L07", - "x": 7, - "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": "R07", - "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": "L15", - "x": 5, - "y": 1 - }, - { - "label": "L16", - "x": 6, - "y": 1 - }, - { - "label": "L17", - "x": 7, - "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": "R17", - "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": "L25", - "x": 5, - "y": 2 - }, - { - "label": "L26", - "x": 6, - "y": 2 - }, - { - "label": "L27", - "x": 7, - "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": "R27", - "x": 15, - "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": "L37", - "x": 7, - "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": "R37", - "x": 15, - "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": "L47", - "x": 7, - "y": 4 - }, - { - "label": "R40", - "x": 8, - "y": 4 - }, - { - "label": "R41", - "x": 9, - "y": 4 - }, - { - "label": "R42", - "x": 10, - "y": 4 - }, - { - "label": "R43", - "x": 11, - "y": 4 - }, - { - "label": "R44", - "x": 12, - "y": 4 - }, - { - "label": "R45", - "x": 13, - "y": 4 - }, - { - "label": "R46", - "x": 14, - "y": 4 - }, - { - "label": "R47", - "x": 15, - "y": 4 - }, - { - "label": "L50", - "x": 0, - "y": 5 - }, - { - "label": "L51", - "x": 1, - "y": 5 - }, - { - "label": "L52", - "x": 2, - "y": 5 - }, - { - "label": "L53", - "x": 3, - "y": 5 - }, - { - "label": "L54", - "x": 4, - "y": 5 - }, - { - "label": "L55", - "x": 5, - "y": 5 - }, - { - "label": "L56", - "x": 6, - "y": 5 - }, - { - "label": "L57", - "x": 7, - "y": 5 - }, - { - "label": "R50", - "x": 8, - "y": 5 - }, - { - "label": "R51", - "x": 9, - "y": 5 - }, - { - "label": "R52", - "x": 10, - "y": 5 - }, - { - "label": "R53", - "x": 11, - "y": 5 - }, - { - "label": "R54", - "x": 12, - "y": 5 - }, - { - "label": "R55", - "x": 13, - "y": 5 - }, - { - "label": "R56", - "x": 14, - "y": 5 - }, - { - "label": "R57", - "x": 15, - "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": [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}, + {"matrix": [6, 7], "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": [7, 0], "x": 8, "y": 1}, + {"matrix": [7, 1], "x": 9, "y": 1}, + {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1}, + {"matrix": [7, 5], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 7], "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": [2, 7], "x": 7, "y": 2}, + {"matrix": [8, 0], "x": 8, "y": 2}, + {"matrix": [8, 1], "x": 9, "y": 2}, + {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2}, + {"matrix": [8, 5], "x": 13, "y": 2}, + {"matrix": [8, 6], "x": 14, "y": 2}, + {"matrix": [8, 7], "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [9, 0], "x": 8, "y": 3}, + {"matrix": [9, 1], "x": 9, "y": 3}, + {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3}, + {"matrix": [9, 5], "x": 13, "y": 3}, + {"matrix": [9, 6], "x": 14, "y": 3}, + {"matrix": [9, 7], "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, 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": [10, 0], "x": 8, "y": 4}, + {"matrix": [10, 1], "x": 9, "y": 4}, + {"matrix": [10, 2], "x": 10, "y": 4}, + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4}, + {"matrix": [10, 5], "x": 13, "y": 4}, + {"matrix": [10, 6], "x": 14, "y": 4}, + {"matrix": [10, 7], "x": 15, "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": [11, 0], "x": 8, "y": 5}, + {"matrix": [11, 1], "x": 9, "y": 5}, + {"matrix": [11, 2], "x": 10, "y": 5}, + {"matrix": [11, 3], "x": 11, "y": 5}, + {"matrix": [11, 4], "x": 12, "y": 5}, + {"matrix": [11, 5], "x": 13, "y": 5}, + {"matrix": [11, 6], "x": 14, "y": 5}, + {"matrix": [11, 7], "x": 15, "y": 5} ] } } diff --git a/keyboards/adkb96/rev1/rev1.h b/keyboards/adkb96/rev1/rev1.h deleted file mode 100644 index 03a9211bb9..0000000000 --- a/keyboards/adkb96/rev1/rev1.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Keymap with right side flipped -// (TRRS jack on both halves are to the right) -#define LAYOUT_ortho_6x16( \ - 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, \ - L50, L51, L52, L53, L54, L55, L56, L57, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { 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 }, \ - { L50, L51, L52, L53, L54, L55, L56, L57 }, \ - { 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 } \ - } - -#define LAYOUT LAYOUT_ortho_6x16 - diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index f10a5d4000..873b974f39 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -19,51 +19,55 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} - ] - }, - "LAYOUT_numpad_5x4": { + {"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}, + + {"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": [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} + ] + }, + "LAYOUT_numpad_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/ai03/soyuz/soyuz.h b/keyboards/ai03/soyuz/soyuz.h deleted file mode 100644 index c7f15866e1..0000000000 --- a/keyboards/ai03/soyuz/soyuz.h +++ /dev/null @@ -1,69 +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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} - -/* - * ┌───┬───┬───┬───┐ - * │00 │01 │02 │03 │ - * ├───┼───┼───┼───┤ - * │10 │11 │12 │ │ - * ├───┼───┼───┤23 │ - * │20 │21 │22 │ │ - * ├───┼───┼───┼───┤ - * │30 │31 │32 │ │ - * ├───┴───┼───┤43 │ - * │41 │42 │ │ - * └───────┴───┴───┘ - */ - -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { KC_NO, k41, k42, k43 } \ -} diff --git a/keyboards/amjkeyboard/amj40/amj40.h b/keyboards/amjkeyboard/amj40/amj40.h deleted file mode 100755 index 14ea383811..0000000000 --- a/keyboards/amjkeyboard/amj40/amj40.h +++ /dev/null @@ -1,109 +0,0 @@ -/* Copyright 2017 Fabian Topfstedt - * Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 - -/* AMJ40 ver2.0 staggered layouts - * ,-----------------------------------------------. - * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b | - * |-----------------------------------------------| - * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1b | - * |-----------------------------------------------| - * |20 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b | - * |-----------------------------------------------| - * |30 |31 |32 | 34 |35 |39 |3a |3b | Layout 1 Bottom Row - * `-----------------------------------------------' - * ,-----------------------------------------------. - * |30 |31 |32 | 35 |3a |3b | Layout 2 - * `-----------------------------------------------' - * ,-----------------------------------------------. - * |30 |31 |32 | 34 | 35 |39 |3a |3b | Layout 3 - * `-----------------------------------------------' - * ,-----------------------------------------------. - * |30 |31 |32 | 35 |3a |3b | Layout 4 - * `-----------------------------------------------' - */ - -// a.k.a. Layout 1 or Layout 3 (matrix is the same for both) -#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, k35, 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, k35, XXX, XXX, XXX, k39, k3a, k3b} \ -} - -// a.k.a. Layout 2 or Layout 4 (matrix is the same for both) -#define LAYOUT_625u_space( \ - 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, k35, 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, XXX, k35, XXX, XXX, XXX, XXX, k3a, k3b } \ -} - -/* AMJ40 ver2.0 ortholinear layouts - * ,-----------------------------------------------. - * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b | - * |-----------------------------------------------| - * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1a |1b | - * |-----------------------------------------------| - * |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b | - * |-----------------------------------------------| - * |30 |31 |32 |33 |34 | 35 |38 |39 |3a |3b | 2.75u Spacebar - * `-----------------------------------------------' - * ,-----------------------------------------------. - * |30 |31 |32 | 35 |39 |3a |3b | 6u Spacebar - * `-----------------------------------------------' - */ - -// equivalent to LAYOUT_all -#define LAYOUT_ortho_275u_space( \ - 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, 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, k34, k35, XXX, XXX, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_600u_space( \ - 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, k35, 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, XXX, XXX, k35, XXX, XXX, XXX, k39, k3a, k3b } \ -} diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index 60eeb456f4..c92c50d7fd 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -26,201 +26,201 @@ "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "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":1.25}, - {"x":11, "y":2}, + {"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}, - {"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.25}, - {"x":5.75, "y":3, "w":2.75}, - {"x":8.5, "y":3, "w":1.25}, - {"x":9.75, "y":3}, - {"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}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "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} ] }, "LAYOUT_625u_space": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "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":1.25}, - {"x":11, "y":2}, + {"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}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3, "w":6.25}, - {"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}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25} ] }, "LAYOUT_ortho_600u_space": { "layout": [ - {"label":"K00 (F4,F1)", "x":0, "y":0}, - {"label":"K01 (F4,F0)", "x":1, "y":0}, - {"label":"K02 (F4,E6)", "x":2, "y":0}, - {"label":"K03 (F4,C7)", "x":3, "y":0}, - {"label":"K04 (F4,C6)", "x":4, "y":0}, - {"label":"K05 (F4,B0)", "x":5, "y":0}, - {"label":"K06 (F4,D4)", "x":6, "y":0}, - {"label":"K07 (F4,B1)", "x":7, "y":0}, - {"label":"K08 (F4,B7)", "x":8, "y":0}, - {"label":"K09 (F4,B5)", "x":9, "y":0}, - {"label":"K0A (F4,B4)", "x":10, "y":0}, - {"label":"K0B (F4,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (F5,F1)", "x":0, "y":1}, - {"label":"K11 (F5,F0)", "x":1, "y":1}, - {"label":"K12 (F5,E6)", "x":2, "y":1}, - {"label":"K13 (F5,C7)", "x":3, "y":1}, - {"label":"K14 (F5,C6)", "x":4, "y":1}, - {"label":"K15 (F5,B0)", "x":5, "y":1}, - {"label":"K16 (F5,D4)", "x":6, "y":1}, - {"label":"K17 (F5,B1)", "x":7, "y":1}, - {"label":"K18 (F5,B7)", "x":8, "y":1}, - {"label":"K19 (F5,B5)", "x":9, "y":1}, - {"label":"K1A (F5,B4)", "x":10, "y":1}, - {"label":"K1B (F5,D7)", "x":11, "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}, - {"label":"K20 (F6,F1)", "x":0, "y":2}, - {"label":"K21 (F6,F0)", "x":1, "y":2}, - {"label":"K22 (F6,E6)", "x":2, "y":2}, - {"label":"K23 (F6,C7)", "x":3, "y":2}, - {"label":"K24 (F6,C6)", "x":4, "y":2}, - {"label":"K25 (F6,B0)", "x":5, "y":2}, - {"label":"K26 (F6,D4)", "x":6, "y":2}, - {"label":"K27 (F6,B1)", "x":7, "y":2}, - {"label":"K28 (F6,B7)", "x":8, "y":2}, - {"label":"K29 (F6,B5)", "x":9, "y":2}, - {"label":"K2A (F6,B4)", "x":10, "y":2}, - {"label":"K2B (F6,D7)", "x":11, "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}, - {"label":"K30 (F7,F1)", "x":0, "y":3}, - {"label":"K31 (F7,F0)", "x":1, "y":3}, - {"label":"K32 (F7,E6)", "x":2, "y":3}, - {"label":"K35 (F7,B0)", "x":3, "y":3, "w":6}, - {"label":"K39 (F7,B5)", "x":9, "y":3}, - {"label":"K3A (F7,B4)", "x":10, "y":3}, - {"label":"K3B (F7,D7)", "x":11, "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, 5], "x": 3, "y": 3, "w": 6}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] }, "LAYOUT_ortho_275u_space": { "layout": [ - {"label":"K00 (F4,F1)", "x":0, "y":0}, - {"label":"K01 (F4,F0)", "x":1, "y":0}, - {"label":"K02 (F4,E6)", "x":2, "y":0}, - {"label":"K03 (F4,C7)", "x":3, "y":0}, - {"label":"K04 (F4,C6)", "x":4, "y":0}, - {"label":"K05 (F4,B0)", "x":5, "y":0}, - {"label":"K06 (F4,D4)", "x":6, "y":0}, - {"label":"K07 (F4,B1)", "x":7, "y":0}, - {"label":"K08 (F4,B7)", "x":8, "y":0}, - {"label":"K09 (F4,B5)", "x":9, "y":0}, - {"label":"K0A (F4,B4)", "x":10, "y":0}, - {"label":"K0B (F4,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (F5,F1)", "x":0, "y":1}, - {"label":"K11 (F5,F0)", "x":1, "y":1}, - {"label":"K12 (F5,E6)", "x":2, "y":1}, - {"label":"K13 (F5,C7)", "x":3, "y":1}, - {"label":"K14 (F5,C6)", "x":4, "y":1}, - {"label":"K15 (F5,B0)", "x":5, "y":1}, - {"label":"K16 (F5,D4)", "x":6, "y":1}, - {"label":"K17 (F5,B1)", "x":7, "y":1}, - {"label":"K18 (F5,B7)", "x":8, "y":1}, - {"label":"K19 (F5,B5)", "x":9, "y":1}, - {"label":"K1A (F5,B4)", "x":10, "y":1}, - {"label":"K1B (F5,D7)", "x":11, "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}, - {"label":"K20 (F6,F1)", "x":0, "y":2}, - {"label":"K21 (F6,F0)", "x":1, "y":2}, - {"label":"K22 (F6,E6)", "x":2, "y":2}, - {"label":"K23 (F6,C7)", "x":3, "y":2}, - {"label":"K24 (F6,C6)", "x":4, "y":2}, - {"label":"K25 (F6,B0)", "x":5, "y":2}, - {"label":"K26 (F6,D4)", "x":6, "y":2}, - {"label":"K27 (F6,B1)", "x":7, "y":2}, - {"label":"K28 (F6,B7)", "x":8, "y":2}, - {"label":"K29 (F6,B5)", "x":9, "y":2}, - {"label":"K2A (F6,B4)", "x":10, "y":2}, - {"label":"K2B (F6,D7)", "x":11, "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}, - {"label":"K30 (F7,F1)", "x":0, "y":3}, - {"label":"K31 (F7,F0)", "x":1, "y":3}, - {"label":"K32 (F7,E6)", "x":2, "y":3}, - {"label":"K33 (F7,C7)", "x":3, "y":3}, - {"label":"K34 (F7,C6)", "x":4, "y":3}, - {"label":"K35 (F7,B0)", "x":5, "y":3, "w":2.75}, - {"label":"K38 (F7,B7)", "x":7.75, "y":3, "w":1.25}, - {"label":"K39 (F7,B5)", "x":9, "y":3}, - {"label":"K3A (F7,B4)", "x":10, "y":3}, - {"label":"K3B (F7,D7)", "x":11, "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, "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/amjkeyboard/amjpad/amjpad.h b/keyboards/amjkeyboard/amjpad/amjpad.h deleted file mode 100644 index 976a7ab041..0000000000 --- a/keyboards/amjkeyboard/amjpad/amjpad.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define XXX KC_NO - -/* AMJPAD matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 52 | | - * `-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, XXX }, \ - { k40, k41, k42, k43 }, \ - { k50, XXX, k52, XXX } \ -} - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -void matrix_init_user(void); -void matrix_scan_user(void); diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 3bd3a7f24c..05292cc53d 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -26,10 +26,67 @@ "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} + ] }, "LAYOUT_ortho_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "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":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "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":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}, {"label":"k53", "x":3, "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": [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}, + + {"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": [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": [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} + ] } } } diff --git a/keyboards/atomic/atomic.c b/keyboards/atomic/atomic.c index 1bd663c514..68f3ce9764 100644 --- a/keyboards/atomic/atomic.c +++ b/keyboards/atomic/atomic.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "atomic.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/atomic/atomic.h b/keyboards/atomic/atomic.h deleted file mode 100644 index 7579f49e33..0000000000 --- a/keyboards/atomic/atomic.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2015 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" - -// 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_semi_standard( \ - 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, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, 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, 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, KC_NO, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, K3E }, \ - { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ -} - -#define LAYOUT_ortho_5x15( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json index 0324d8533e..8635648ea0 100644 --- a/keyboards/atomic/info.json +++ b/keyboards/atomic/info.json @@ -24,159 +24,159 @@ "layouts": { "LAYOUT_semi_standard": { "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, 14], "x": 13, "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, "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": [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}, - {"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, "w":2}, - {"x":14, "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, 13], "x": 12, "y": 2, "w": 2}, + {"matrix": [2, 14], "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":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3, "w":2}, - {"x":13, "y":3}, - {"x":14, "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, 12], "x": 11, "y": 3, "w": 2}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "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, 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}, + {"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} ] }, "LAYOUT_ortho_5x15": { "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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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/barracuda/barracuda.h b/keyboards/barracuda/barracuda.h deleted file mode 100644 index c6389d778b..0000000000 --- a/keyboards/barracuda/barracuda.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 knaruo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_3x11( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, R00, R01, R02, R03, R04 }, \ - { KC_NO, R10, R11, R12, R13, R14 }, \ - { KC_NO, R20, R21, R22, R23, R24 } \ -} diff --git a/keyboards/barracuda/info.json b/keyboards/barracuda/info.json index 7f50d959f5..3b68e6e3f3 100644 --- a/keyboards/barracuda/info.json +++ b/keyboards/barracuda/info.json @@ -18,41 +18,41 @@ "layouts": { "LAYOUT_ortho_3x11": { "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}, + {"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, 1], "x": 9, "y": 0}, + {"matrix": [3, 2], "x": 10, "y": 0}, + {"matrix": [3, 3], "x": 11, "y": 0}, + {"matrix": [3, 4], "x": 12, "y": 0}, + {"matrix": [3, 5], "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": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"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": [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}, - {"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} + {"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, 1], "x": 9, "y": 2}, + {"matrix": [5, 2], "x": 10, "y": 2}, + {"matrix": [5, 3], "x": 11, "y": 2}, + {"matrix": [5, 4], "x": 12, "y": 2}, + {"matrix": [5, 5], "x": 13, "y": 2} ] } } diff --git a/keyboards/boardwalk/boardwalk.h b/keyboards/boardwalk/boardwalk.h deleted file mode 100644 index 8a613ce49d..0000000000 --- a/keyboards/boardwalk/boardwalk.h +++ /dev/null @@ -1,93 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x14( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_2x2u( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k40, k41, k42, k43, k44, k45, k47, 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, k49, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_hhkb( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k41, k42, k43, k44, k45, k47, k49, k410, k411, k412 \ -) \ -{ \ - { 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { KC_NO, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, k49, k410, k411, k412, KC_NO } \ -} - -#define LAYOUT_ortho_7u( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k41, k42, k46, k411, k412 \ -) \ -{ \ - { 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { KC_NO, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, KC_NO } \ -} - -#define LAYOUT_2u_arrow( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k40, k41, k42, k43, k44, k46, k48, 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { k40, k41, k42, k43, k44, KC_NO, k46, KC_NO, k48, k49, k410, k411, k412, k413 } \ -} - -#define LAYOUT_625u_arrow( \ - 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, k213, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, \ - k40, k41, k42, k45, 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, k213 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313 }, \ - { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49, k410, k411, k412, k413 } \ -} diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json index 9960a7760f..c226f34a13 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/info.json @@ -19,448 +19,448 @@ "layouts": { "LAYOUT_ortho_5x14": { "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.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.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}, + {"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}, - {"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}, + {"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}, - {"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": 5.5, "y": 4}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 4}, - {"x": 8.5, "y": 4}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"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}, + {"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, "w": 1.5} ] }, "LAYOUT_ortho_hhkb": { "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.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.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}, + {"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}, - {"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}, + {"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}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4}, - {"x": 3.5, "y": 4}, - {"x": 4.5, "y": 4}, - {"x": 5.5, "y": 4, "w": 2}, - {"x": 7.5, "y": 4, "w": 2}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"x": 12.5, "y": 4} + {"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, "w": 2}, + {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2}, + {"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} ] }, "LAYOUT_ortho_7u": { "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.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.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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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": 12.5, "y": 4} ] }, "LAYOUT_2u_arrow": { "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.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.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, "w": 1.5}, - {"x": 14, "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, "w": 1.5}, + {"matrix": [2, 13], "x": 14, "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, "w": 1.5}, - {"x": 13, "y": 3}, - {"x": 14, "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.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, "w": 1.5}, + {"matrix": [3, 12], "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}, - {"x": 3.5, "y": 4}, - {"x": 4.5, "y": 4, "w": 2}, - {"x": 6.5, "y": 4, "w": 2}, - {"x": 8.5, "y": 4}, - {"x": 9.5, "y": 4, "w": 1.25}, - {"x": 10.75, "y": 4, "w": 1.25}, - {"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}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"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} ] }, "LAYOUT_625u_arrow": { "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.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.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, "w": 1.5}, - {"x": 14, "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, "w": 1.5}, + {"matrix": [2, 13], "x": 14, "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, "w": 1.5}, - {"x": 13, "y": 3}, - {"x": 14, "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.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, "w": 1.5}, + {"matrix": [3, 12], "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}, - {"x": 3.5, "y": 4, "w": 6.25}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 4, "w": 1.25}, - {"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}, + {"matrix": [4, 5], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4}, + {"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} ] }, "LAYOUT_ortho_2x2u": { "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.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.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}, + {"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}, - {"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}, + {"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}, - {"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": 5.5, "y": 4, "w": 2}, - {"x": 7.5, "y": 4, "w": 2}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"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}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2}, + {"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, "w": 1.5} ] } } diff --git a/keyboards/bobpad/bobpad.c b/keyboards/bobpad/bobpad.c index 59507d7d8c..67b124ace2 100644 --- a/keyboards/bobpad/bobpad.c +++ b/keyboards/bobpad/bobpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "bobpad.h" +#include "quantum.h" bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) { return false; } diff --git a/keyboards/bobpad/bobpad.h b/keyboards/bobpad/bobpad.h deleted file mode 100644 index da9c0fa025..0000000000 --- a/keyboards/bobpad/bobpad.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 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_ortho_2x3( \ - K00, K01, K02, \ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ -} diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json index b813424f65..eb6a25104b 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/info.json @@ -31,12 +31,13 @@ "layouts": { "LAYOUT_ortho_2x3": { "layout": [ - {"label":"K00 (B0,B2)", "x":0, "y":0}, - {"label":"K01 (B0,B3)", "x":1, "y":0}, - {"label":"K02 (B0,B4)", "x":2, "y":0}, - {"label":"K10 (B1,B2)", "x":0, "y":1}, - {"label":"K11 (B1,B3)", "x":1, "y":1}, - {"label":"K12 (B1,B4)", "x":2, "y":1} + {"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/bpiphany/four_banger/four_banger.h b/keyboards/bpiphany/four_banger/four_banger.h deleted file mode 100644 index 1d735a1f0f..0000000000 --- a/keyboards/bpiphany/four_banger/four_banger.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x2( \ - k00, k01, \ - k10, k11 \ -) { \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json index 57e8b04dc7..b958936ce3 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/info.json @@ -18,11 +18,11 @@ "layouts": { "LAYOUT_ortho_2x2": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1} ] } } diff --git a/keyboards/cannonkeys/atlas/atlas.h b/keyboards/cannonkeys/atlas/atlas.h deleted file mode 100644 index 2a6bf7d88a..0000000000 --- a/keyboards/cannonkeys/atlas/atlas.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x12_1x2uC( \ - 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 , k47, 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, k45, KC_NO, k47, k48, k49, k4a, k4b }, \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 }, \ -} - -#define LAYOUT_ortho_5x12_2x2uC( \ - 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, k45, k47, 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, KC_NO, k45, KC_NO, k47, k48, k49, k4a, k4b }, \ -} diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json index 235e7bf42c..6cd7fa15a0 100644 --- a/keyboards/cannonkeys/atlas/info.json +++ b/keyboards/cannonkeys/atlas/info.json @@ -21,191 +21,203 @@ "layouts": { "LAYOUT_ortho_5x12": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 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} ] }, "LAYOUT_ortho_5x12_1x2uC": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "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":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 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} ] }, "LAYOUT_ortho_5x12_2x2uC": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Space1", "x":4, "y":4, "w":2}, - {"label":"Space2", "x":6, "y":4, "w":2}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 6, "y": 4, "w": 2}, + {"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/cannonkeys/atlas_alps/atlas_alps.h b/keyboards/cannonkeys/atlas_alps/atlas_alps.h deleted file mode 100644 index 5cdb15a603..0000000000 --- a/keyboards/cannonkeys/atlas_alps/atlas_alps.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_5x12( \ - 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 \ - ) { \ - { 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 } \ - } diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json index ee7c94c0ad..c5f6141fb9 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/info.json @@ -18,7 +18,72 @@ "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "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":"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":"Back Space", "x":11, "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, "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":"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":"Return", "x":11, "y":3}, {"label":"Caps Lock", "x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"⇓", "x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"label":"⇑", "x":7, "y":4}, {"label":"←", "x":8, "y":4}, {"label":"↓", "x":9, "y":4}, {"label":"↑", "x":10, "y":4}, {"label":"→", "x":11, "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": [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, 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/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json index fd7d4c0725..e4832540d4 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/info.json @@ -27,105 +27,111 @@ "layouts": { "LAYOUT_ortho_4x12": { "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":"Delete", "x":11, "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, "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":"Enter", "x":11, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Ctrl", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3}, - {"label":"Meta", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"Raise", "x":7, "y":3}, - {"label":"Left", "x":8, "y":3}, - {"label":"Down", "x":9, "y":3}, - {"label":"Up", "x":10, "y":3}, - {"label":"Right", "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} ] }, "LAYOUT_1x2uC": { "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":"Delete", "x":11, "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, "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":"Enter", "x":11, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Ctrl", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3}, - {"label":"Meta", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3, "w":2}, - {"label":"Raise", "x":7, "y":3}, - {"label":"Left", "x":8, "y":3}, - {"label":"Down", "x":9, "y":3}, - {"label":"Up", "x":10, "y":3}, - {"label":"Right", "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} ] } } diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h deleted file mode 100644 index 1e51c37af7..0000000000 --- a/keyboards/cannonkeys/ortho48/ortho48.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_1x2uC( \ - 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 , 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, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 80d58dbe21..bf5b56c57f 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -27,129 +27,137 @@ "layouts": { "LAYOUT_ortho_5x12": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 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} ] }, "LAYOUT_1x2uC": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "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":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 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} ] } } diff --git a/keyboards/cannonkeys/ortho60/ortho60.h b/keyboards/cannonkeys/ortho60/ortho60.h deleted file mode 100644 index 0f3ae127aa..0000000000 --- a/keyboards/cannonkeys/ortho60/ortho60.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_1x2uC( \ - 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 , k47, 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, k45, KC_NO, k47, k48, k49, k4a, k4b }, \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 }, \ -} diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json index 456a095e5a..b9e0526ed8 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/info.json @@ -32,81 +32,85 @@ "layouts": { "LAYOUT_ortho_5x15": { "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":"Backspace", "x":11, "y":0}, - {"label":"0", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"0", "x":14, "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":"Delete", "x":11, "y":1}, - {"label":"0", "x":12, "y":1}, - {"label":"0", "x":13, "y":1}, - {"label":"0", "x":14, "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, "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":"0", "x":12, "y":2}, - {"label":"0", "x":13, "y":2}, - {"label":"0", "x":14, "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":"0", "x":12, "y":3}, - {"label":"0", "x":13, "y":3}, - {"label":"0", "x":14, "y":3}, - {"label":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "x":11, "y":4}, - {"label":"0", "x":12, "y":4}, - {"label":"0", "x":13, "y":4}, - {"label":"0", "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}, + {"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/cannonkeys/ortho75/ortho75.c b/keyboards/cannonkeys/ortho75/ortho75.c index 58b7396a1b..366f4e7767 100644 --- a/keyboards/cannonkeys/ortho75/ortho75.c +++ b/keyboards/cannonkeys/ortho75/ortho75.c @@ -1,5 +1,5 @@ -#include "ortho75.h" +#include "quantum.h" #define MEDIA_KEY_DELAY 10 diff --git a/keyboards/cannonkeys/ortho75/ortho75.h b/keyboards/cannonkeys/ortho75/ortho75.h deleted file mode 100644 index d23e064296..0000000000 --- a/keyboards/cannonkeys/ortho75/ortho75.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x15( \ - 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 \ -) \ -{ \ - { 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 }, \ -} diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 41922cb584..1e77fae0e8 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -22,13 +22,166 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2x225u": { - "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}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "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, "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}, {"x":11, "y":1}, {"label":"'", "x":12, "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}, {"x":11, "y":2}, {"label":"Return", "x":12, "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.5}, {"x":3.75, "y":3, "w":2.25}, {"label":"Fn", "x":6, "y":3}, {"x":7, "y":3, "w":2.25}, {"label":"Meta", "x":9.25, "y":3, "w":1.5}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.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": [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, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.5}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 8], "x": 7, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.5}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25} + ] }, "LAYOUT_ortho_2x3u": { - "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}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "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, "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}, {"x":11, "y":1}, {"label":"'", "x":12, "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}, {"x":11, "y":2}, {"label":"Return", "x":12, "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}, {"x":3.5, "y":3, "w":3}, {"x":6.5, "y":3, "w":3}, {"label":"Meta", "x":9.5, "y":3, "w":1.25}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.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": [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, "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": 3}, + {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25} + ] }, -"LAYOUT_ortho_6u": { - "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}, {"x":11, "y":0}, {"label":"Back Space", "x":12, "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, "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}, {"x":11, "y":1}, {"label":"'", "x":12, "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}, {"x":11, "y":2}, {"label":"Return", "x":12, "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":"", "x":3.5, "y":3, "w":6}, {"label":"Meta", "x":9.5, "y":3, "w":1.25}, {"label":"Super", "x":10.75, "y":3}, {"label":"Hyper", "x":11.75, "y":3, "w":1.25}] + "LAYOUT_ortho_6u": { + "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": [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, "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}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25} + ] } } } \ No newline at end of file diff --git a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c index 89ce3f5ce9..cb1615aef0 100644 --- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c +++ b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "phoenix45_ortho.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/checkerboards/phoenix45_ortho/phoenix45_ortho.h b/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h deleted file mode 100644 index bbf1bc5ca8..0000000000 --- a/keyboards/checkerboards/phoenix45_ortho/phoenix45_ortho.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_2x225u( \ - 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, k34, k36, k38, k39, 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, XXX, k34, XXX, k36, XXX, k38, k39, XXX, k3B, k3C } \ -} - -#define LAYOUT_ortho_2x3u( \ - 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, k34, k38, k39, 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, XXX, k34, XXX, XXX, XXX, k38, k39, XXX, k3B, k3C } \ -} - -#define LAYOUT_ortho_6u( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC, \ - 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, k36, k39, k3B, k3C \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, kOC }, \ - { 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, XXX, XXX, XXX, k36, XXX, XXX, k39, XXX, k3B, k3C } \ -} diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index ba624b4009..8e73147b64 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -24,376 +24,400 @@ "layouts": { "LAYOUT_ortho_5x12_2x225u": { "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}, - {"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.25}, - {"x": 6, "y": 4, "w": 2.25}, - {"x": 8.25, "y": 4, "w": 1.25}, - {"x": 9.5, "y": 4, "w": 1.25}, - {"x": 10.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": [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, "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, 7], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25} ] }, "LAYOUT_ortho_5x12_2x3u": { "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}, - {"x": 0, "y": 4, "w": 1.5}, - {"x": 1.5, "y": 4, "w": 1.5}, - {"x": 3, "y": 4, "w": 3}, - {"x": 6, "y": 4, "w": 3}, - {"x": 9, "y": 4, "w": 1.5}, - {"x": 10.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": [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, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"matrix": [4, 7], "x": 6, "y": 4, "w": 3}, + {"matrix": [4, 10], "x": 9, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 10.5, "y": 4, "w": 1.5} ] }, "LAYOUT_ortho_5x12_7u": { "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}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":7}, - {"x":9.5, "y":4, "w":1.25}, - {"x":10.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": [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, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 2.5, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.25} ] }, "LAYOUT_ortho_4x12": { "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} ] }, "LAYOUT_planck_mit": { "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} ] }, "LAYOUT_ortho_4x12_2x225u": { "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, "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.25}, - {"x": 8.25, "y": 3, "w": 1.25}, - {"x": 9.5, "y": 3, "w": 1.25}, - {"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": [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, "w": 1.25}, + {"matrix": [3, 1], "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, 8], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25} ] }, "LAYOUT_ortho_4x12_2x3u": { "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, "w": 3}, - {"x": 6, "y": 3, "w": 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, 4], "x": 3, "y": 3, "w": 3}, + {"matrix": [3, 7], "x": 6, "y": 3, "w": 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/checkerboards/quark/quark.c b/keyboards/checkerboards/quark/quark.c index 736b955424..22769b51c1 100644 --- a/keyboards/checkerboards/quark/quark.c +++ b/keyboards/checkerboards/quark/quark.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quark.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/checkerboards/quark/quark.h b/keyboards/checkerboards/quark/quark.h deleted file mode 100644 index be2cc3f932..0000000000 --- a/keyboards/checkerboards/quark/quark.h +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright 2020 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_5x12_2x225u( \ - 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, k43, k44, k47, k48, 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, XXX, k43, k44, XXX, XXX, k47, k48, XXX, k4A, k4B } \ -} - -#define LAYOUT_ortho_5x12_2x3u( \ - 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, k44, k47, 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, XXX, XXX, k44, XXX, XXX, k47, XXX, XXX, k4A, k4B } \ -} - -#define LAYOUT_ortho_5x12_7u( \ - 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, k44, 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, XXX, XXX, k44, XXX, XXX, XXX, XXX, XXX, k4A, k4B } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) { \ - { 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, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -#define LAYOUT_planck_mit( \ - 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 }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -#define LAYOUT_ortho_4x12_2x225u( \ - 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, k33, k34, k37, k38, 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, XXX, k33, k34, XXX, XXX, k37, k38, XXX, k3A, k3B }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -#define LAYOUT_ortho_4x12_2x3u( \ - 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, 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, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json index d449a5a46b..94568a6c38 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/info.json @@ -17,13 +17,166 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x12": { - "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}, {"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, "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":"Return", "x":11, "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, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "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}, + {"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} + ] }, "LAYOUT_ortho_4x12_1x2uC": { - "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}, {"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, "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":"Return", "x":11, "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, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "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}, + {"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} + ] }, "LAYOUT_ortho_4x12_2x2u": { - "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}, {"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, "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":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "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}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 6], "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/checkerboards/quark_lp/quark_lp.c b/keyboards/checkerboards/quark_lp/quark_lp.c index a46110e8b9..89c685f2b5 100644 --- a/keyboards/checkerboards/quark_lp/quark_lp.c +++ b/keyboards/checkerboards/quark_lp/quark_lp.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quark_lp.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/checkerboards/quark_lp/quark_lp.h b/keyboards/checkerboards/quark_lp/quark_lp.h deleted file mode 100644 index a7bb3fda8b..0000000000 --- a/keyboards/checkerboards/quark_lp/quark_lp.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 Nathan Spears - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT_ortho_4x12_1x2uC( \ - 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, 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, k34, k35, XXX, k37, k38, k39, k3A, k3B } \ -} - -#define LAYOUT_ortho_4x12_2x2u( \ - 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, 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, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3A, k3B } \ -} diff --git a/keyboards/ckeys/handwire_101/handwire_101.h b/keyboards/ckeys/handwire_101/handwire_101.h deleted file mode 100755 index 5d6ef6ff09..0000000000 --- a/keyboards/ckeys/handwire_101/handwire_101.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Branden Byers - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/info.json index 970a052385..27e43a6512 100644 --- a/keyboards/ckeys/handwire_101/info.json +++ b/keyboards/ckeys/handwire_101/info.json @@ -21,25 +21,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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} ] } } diff --git a/keyboards/ckeys/nakey/info.json b/keyboards/ckeys/nakey/info.json index 9fbcc7635e..5971c432d0 100644 --- a/keyboards/ckeys/nakey/info.json +++ b/keyboards/ckeys/nakey/info.json @@ -18,7 +18,29 @@ "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"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":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} + ] } } } diff --git a/keyboards/ckeys/nakey/nakey.h b/keyboards/ckeys/nakey/nakey.h deleted file mode 100644 index bdb26afa26..0000000000 --- a/keyboards/ckeys/nakey/nakey.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2018 James Underwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k33 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, XXX }, \ - { k30, k31, k32, k33 }, \ - { k40, XXX, k41, XXX } \ -} diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json index 33c7a23471..78ef0227c5 100644 --- a/keyboards/ckeys/obelus/info.json +++ b/keyboards/ckeys/obelus/info.json @@ -21,7 +21,27 @@ "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] } } } diff --git a/keyboards/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c index fc6b961f2a..123d93f0f4 100644 --- a/keyboards/ckeys/obelus/obelus.c +++ b/keyboards/ckeys/obelus/obelus.c @@ -1,4 +1,4 @@ -#include "obelus.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/ckeys/obelus/obelus.h b/keyboards/ckeys/obelus/obelus.h deleted file mode 100644 index 76ff4f1a9f..0000000000 --- a/keyboards/ckeys/obelus/obelus.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_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} diff --git a/keyboards/clawsome/numeros/info.json b/keyboards/clawsome/numeros/info.json index f51ea9fa56..c1b3565b63 100644 --- a/keyboards/clawsome/numeros/info.json +++ b/keyboards/clawsome/numeros/info.json @@ -19,27 +19,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/clawsome/numeros/numeros.h b/keyboards/clawsome/numeros/numeros.h deleted file mode 100644 index a7a8ee1e09..0000000000 --- a/keyboards/clawsome/numeros/numeros.h +++ /dev/null @@ -1,32 +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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO }, \ -} diff --git a/keyboards/coseyfannitutti/discipad/discipad.h b/keyboards/coseyfannitutti/discipad/discipad.h deleted file mode 100644 index 5ce8b46342..0000000000 --- a/keyboards/coseyfannitutti/discipad/discipad.h +++ /dev/null @@ -1,43 +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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K43 \ -) { \ -{ K00, K01, K02, K03, }, \ -{ K10, K11, K12, _x_, }, \ -{ K20, K21, K22, K23, }, \ -{ K30, K31, K32, _x_, }, \ -{ K40, _x_, K42, K43, }, \ -} - diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json index 86a6836466..d7291698b3 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/info.json @@ -17,7 +17,29 @@ "bootloader": "usbasploader", "layouts": { "LAYOUT_numpad_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"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":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] } } } diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/info.json index 48b3df3c83..454e2d2bec 100644 --- a/keyboards/coseyfannitutti/mulletpad/info.json +++ b/keyboards/coseyfannitutti/mulletpad/info.json @@ -18,7 +18,29 @@ "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"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":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] } } } diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.h b/keyboards/coseyfannitutti/mulletpad/mulletpad.h deleted file mode 100644 index 41c5c014a9..0000000000 --- a/keyboards/coseyfannitutti/mulletpad/mulletpad.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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K43 \ -) { \ -{ K00, K01, K02, K03, }, \ -{ K10, K11, K12, _x_, }, \ -{ K20, K21, K22, K23, }, \ -{ K30, K31, K32, _x_, }, \ -{ K40, _x_, K42, K43, }, \ -} diff --git a/keyboards/crawlpad/crawlpad.h b/keyboards/crawlpad/crawlpad.h deleted file mode 100755 index 572907c256..0000000000 --- a/keyboards/crawlpad/crawlpad.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json index 11582d861f..45a65c6278 100644 --- a/keyboards/crawlpad/info.json +++ b/keyboards/crawlpad/info.json @@ -19,22 +19,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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":"4", "x":0, "y":1}, - {"label":"5", "x":1, "y":1}, - {"label":"6", "x":2, "y":1}, - {"label":"-", "x":3, "y":1}, - {"label":"1", "x":0, "y":2}, - {"label":"2", "x":1, "y":2}, - {"label":"3", "x":2, "y":2}, - {"label":"*", "x":3, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"0", "x":1, "y":3}, - {"label":".", "x":2, "y":3}, - {"label":"Enter", "x":3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/crbn/crbn.c b/keyboards/crbn/crbn.c index 866f2d4265..91787f9c1c 100644 --- a/keyboards/crbn/crbn.c +++ b/keyboards/crbn/crbn.c @@ -13,7 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "crbn.h" +#include "quantum.h" + /* Encoder setting. only one encoder despite 4 possible spots */ bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) return false; diff --git a/keyboards/crbn/crbn.h b/keyboards/crbn/crbn.h deleted file mode 100644 index 26a186473b..0000000000 --- a/keyboards/crbn/crbn.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 Harry Herring - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 } \ -} - -#define LAYOUT_planck_mit( \ - 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, 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, KC_NO, K307, K308, K309, K310, K311 } \ -} - -#define LAYOUT_2x2u( \ - 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, 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, KC_NO, KC_NO, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index 63d2d92a67..752b389d90 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -28,153 +28,165 @@ "layouts": { "LAYOUT_ortho_4x12": { "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} + ] }, "LAYOUT_planck_mit": { "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 }, - { "w": 2, "x": 5, "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, "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} + ] }, "LAYOUT_2x2u": { "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 }, - { "w": 2, "x": 4, "y": 3 }, - { "w": 2, "x": 6, "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, "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/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index d957e4c604..7d045d078e 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -23,10 +23,57 @@ "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "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}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} + ] }, "LAYOUT_numpad_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "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":"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}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1, "h": 2}, + + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "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}, + {"matrix": [4, 0], "x": 3, "y": 3, "h": 2}, + + {"matrix": [4, 2], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 2, "y": 4} + ] } } diff --git a/keyboards/custommk/genesis/rev1/rev1.c b/keyboards/custommk/genesis/rev1/rev1.c index ac40eedbf2..f81c6943b3 100644 --- a/keyboards/custommk/genesis/rev1/rev1.c +++ b/keyboards/custommk/genesis/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.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/custommk/genesis/rev1/rev1.h b/keyboards/custommk/genesis/rev1/rev1.h deleted file mode 100644 index 0516b41ad8..0000000000 --- a/keyboards/custommk/genesis/rev1/rev1.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { K40, KC_NO, K42, K43 } \ -} - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} - diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index 901376fb3b..44d65fcd8b 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -23,71 +23,90 @@ "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"Mute", "x":3, "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}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"Pg Up", "x":3, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"Pg Dn", "x":3, "y":3}, - {"label":"0", "x":0, "y":4}, - {"label":"Spc", "x":1, "y":4}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} + ] }, "LAYOUT_numpad_5x4": { - "layout": [{"label":"MO(1)", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "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":"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}, - {"label":"Enter", "x":3, "y":3, "h":2}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [2, 0], "x": 3, "y": 1, "h": 2}, + + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "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}, + {"matrix": [4, 0], "x": 3, "y": 3, "h": 2}, + + {"matrix": [4, 2], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 2, "y": 4} + ] }, "LAYOUT_via_6x4": { - "layout": [{"label":"Vol-", "x":0, "y":0}, - {"label":"Vol+", "x":1, "y":0}, - {"label":"Vol-", "x":3, "y":0}, - {"label":"Vol+", "x":4, "y":0}, - {"label":"MO(1)", "x":0.5, "y":1.1}, - {"label":"/", "x":1.5, "y":1.1}, - {"label":"*", "x":2.5, "y":1.1}, - {"label":"Mute", "x":3.5, "y":1.1}, - {"label":"7", "x":0.5, "y":2.1}, - {"label":"8", "x":1.5, "y":2.1}, - {"label":"9", "x":2.5, "y":2.1}, - {"label":"+", "x":3.5, "y":2.1}, - {"label":"4", "x":0.5, "y":3.1}, - {"label":"5", "x":1.5, "y":3.1}, - {"label":"6", "x":2.5, "y":3.1}, - {"label":"Pg Up", "x":3.5, "y":3.1}, - {"label":"1", "x":0.5, "y":4.1}, - {"label":"2", "x":1.5, "y":4.1}, - {"label":"3", "x":2.5, "y":4.1}, - {"label":"Pg Dn", "x":3.5, "y":4.1}, - {"label":"0", "x":0.5, "y":5.1}, - {"label":"Spc", "x":1.5, "y":5.1}, - {"label":".", "x":2.5, "y":5.1}, - {"label":"Enter", "x":3.5, "y":5.1}] + "layout": [ + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 3, "y": 0}, + {"matrix": [5, 3], "x": 4, "y": 0}, + + {"matrix": [0, 0], "x": 0.5, "y": 1.1}, + {"matrix": [0, 1], "x": 1.5, "y": 1.1}, + {"matrix": [0, 2], "x": 2.5, "y": 1.1}, + {"matrix": [0, 3], "x": 3.5, "y": 1.1}, + + {"matrix": [1, 0], "x": 0.5, "y": 2.1}, + {"matrix": [1, 1], "x": 1.5, "y": 2.1}, + {"matrix": [1, 2], "x": 2.5, "y": 2.1}, + {"matrix": [1, 3], "x": 3.5, "y": 2.1}, + + {"matrix": [2, 0], "x": 0.5, "y": 3.1}, + {"matrix": [2, 1], "x": 1.5, "y": 3.1}, + {"matrix": [2, 2], "x": 2.5, "y": 3.1}, + {"matrix": [2, 3], "x": 3.5, "y": 3.1}, + + {"matrix": [3, 0], "x": 0.5, "y": 4.1}, + {"matrix": [3, 1], "x": 1.5, "y": 4.1}, + {"matrix": [3, 2], "x": 2.5, "y": 4.1}, + {"matrix": [3, 3], "x": 3.5, "y": 4.1}, + + {"matrix": [4, 0], "x": 0.5, "y": 5.1}, + {"matrix": [4, 1], "x": 1.5, "y": 5.1}, + {"matrix": [4, 2], "x": 2.5, "y": 5.1}, + {"matrix": [4, 3], "x": 3.5, "y": 5.1} + ] } } } diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c index bfa4cb0558..5993ebb8c6 100644 --- a/keyboards/custommk/genesis/rev2/rev2.c +++ b/keyboards/custommk/genesis/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev2.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/custommk/genesis/rev2/rev2.h b/keyboards/custommk/genesis/rev2/rev2.h deleted file mode 100644 index e978e706c3..0000000000 --- a/keyboards/custommk/genesis/rev2/rev2.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2020 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { K40, KC_NO, K42, K43 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO} \ -} - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO} \ -} - - -#define LAYOUT_via_6x4( \ - E00A, E00B, E01A, E01B, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { E00A, E00B, E01A, E01B } \ -} diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h deleted file mode 100755 index 478846e3c2..0000000000 --- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright 2021 Cutie Club - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_20x20( \ - k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \ - k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \ - k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \ - k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19, \ - k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19, \ - k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19, \ - k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19, \ - k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19, \ - k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19, \ - k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19, \ - k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19, \ - k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19, \ - k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19, \ - k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19, \ - k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19, \ - k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19, \ - k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19, \ - k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19, \ - k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19, \ - k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 \ -) \ -{ \ - { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19 }, \ - { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19 }, \ - { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19 }, \ - { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, k03_14, k03_15, k03_16, k03_17, k03_18, k03_19 }, \ - { k04_00, k04_01, k04_02, k04_03, k04_04, k04_05, k04_06, k04_07, k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, k04_14, k04_15, k04_16, k04_17, k04_18, k04_19 }, \ - { k05_00, k05_01, k05_02, k05_03, k05_04, k05_05, k05_06, k05_07, k05_08, k05_09, k05_10, k05_11, k05_12, k05_13, k05_14, k05_15, k05_16, k05_17, k05_18, k05_19 }, \ - { k06_00, k06_01, k06_02, k06_03, k06_04, k06_05, k06_06, k06_07, k06_08, k06_09, k06_10, k06_11, k06_12, k06_13, k06_14, k06_15, k06_16, k06_17, k06_18, k06_19 }, \ - { k07_00, k07_01, k07_02, k07_03, k07_04, k07_05, k07_06, k07_07, k07_08, k07_09, k07_10, k07_11, k07_12, k07_13, k07_14, k07_15, k07_16, k07_17, k07_18, k07_19 }, \ - { k08_00, k08_01, k08_02, k08_03, k08_04, k08_05, k08_06, k08_07, k08_08, k08_09, k08_10, k08_11, k08_12, k08_13, k08_14, k08_15, k08_16, k08_17, k08_18, k08_19 }, \ - { k09_00, k09_01, k09_02, k09_03, k09_04, k09_05, k09_06, k09_07, k09_08, k09_09, k09_10, k09_11, k09_12, k09_13, k09_14, k09_15, k09_16, k09_17, k09_18, k09_19 }, \ - { k10_00, k10_01, k10_02, k10_03, k10_04, k10_05, k10_06, k10_07, k10_08, k10_09, k10_10, k10_11, k10_12, k10_13, k10_14, k10_15, k10_16, k10_17, k10_18, k10_19 }, \ - { k11_00, k11_01, k11_02, k11_03, k11_04, k11_05, k11_06, k11_07, k11_08, k11_09, k11_10, k11_11, k11_12, k11_13, k11_14, k11_15, k11_16, k11_17, k11_18, k11_19 }, \ - { k12_00, k12_01, k12_02, k12_03, k12_04, k12_05, k12_06, k12_07, k12_08, k12_09, k12_10, k12_11, k12_12, k12_13, k12_14, k12_15, k12_16, k12_17, k12_18, k12_19 }, \ - { k13_00, k13_01, k13_02, k13_03, k13_04, k13_05, k13_06, k13_07, k13_08, k13_09, k13_10, k13_11, k13_12, k13_13, k13_14, k13_15, k13_16, k13_17, k13_18, k13_19 }, \ - { k14_00, k14_01, k14_02, k14_03, k14_04, k14_05, k14_06, k14_07, k14_08, k14_09, k14_10, k14_11, k14_12, k14_13, k14_14, k14_15, k14_16, k14_17, k14_18, k14_19 }, \ - { k15_00, k15_01, k15_02, k15_03, k15_04, k15_05, k15_06, k15_07, k15_08, k15_09, k15_10, k15_11, k15_12, k15_13, k15_14, k15_15, k15_16, k15_17, k15_18, k15_19 }, \ - { k16_00, k16_01, k16_02, k16_03, k16_04, k16_05, k16_06, k16_07, k16_08, k16_09, k16_10, k16_11, k16_12, k16_13, k16_14, k16_15, k16_16, k16_17, k16_18, k16_19 }, \ - { k17_00, k17_01, k17_02, k17_03, k17_04, k17_05, k17_06, k17_07, k17_08, k17_09, k17_10, k17_11, k17_12, k17_13, k17_14, k17_15, k17_16, k17_17, k17_18, k17_19 }, \ - { k18_00, k18_01, k18_02, k18_03, k18_04, k18_05, k18_06, k18_07, k18_08, k18_09, k18_10, k18_11, k18_12, k18_13, k18_14, k18_15, k18_16, k18_17, k18_18, k18_19 }, \ - { k19_00, k19_01, k19_02, k19_03, k19_04, k19_05, k19_06, k19_07, k19_08, k19_09, k19_10, k19_11, k19_12, k19_13, k19_14, k19_15, k19_16, k19_17, k19_18, k19_19 } \ -} diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json index 0ee63b2221..8132fa62a5 100644 --- a/keyboards/cutie_club/giant_macro_pad/info.json +++ b/keyboards/cutie_club/giant_macro_pad/info.json @@ -21,425 +21,425 @@ "layouts": { "LAYOUT_ortho_20x20": { "layout": [ - {"label":"k00_00", "x":0, "y":0}, - {"label":"k00_01", "x":1, "y":0}, - {"label":"k00_02", "x":2, "y":0}, - {"label":"k00_03", "x":3, "y":0}, - {"label":"k00_04", "x":4, "y":0}, - {"label":"k00_05", "x":5, "y":0}, - {"label":"k00_06", "x":6, "y":0}, - {"label":"k00_07", "x":7, "y":0}, - {"label":"k00_08", "x":8, "y":0}, - {"label":"k00_09", "x":9, "y":0}, - {"label":"k00_10", "x":10, "y":0}, - {"label":"k00_11", "x":11, "y":0}, - {"label":"k00_12", "x":12, "y":0}, - {"label":"k00_13", "x":13, "y":0}, - {"label":"k00_14", "x":14, "y":0}, - {"label":"k00_15", "x":15, "y":0}, - {"label":"k00_16", "x":16, "y":0}, - {"label":"k00_17", "x":17, "y":0}, - {"label":"k00_18", "x":18, "y":0}, - {"label":"k00_19", "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}, - {"label":"k01_00", "x":0, "y":1}, - {"label":"k01_01", "x":1, "y":1}, - {"label":"k01_02", "x":2, "y":1}, - {"label":"k01_03", "x":3, "y":1}, - {"label":"k01_04", "x":4, "y":1}, - {"label":"k01_05", "x":5, "y":1}, - {"label":"k01_06", "x":6, "y":1}, - {"label":"k01_07", "x":7, "y":1}, - {"label":"k01_08", "x":8, "y":1}, - {"label":"k01_09", "x":9, "y":1}, - {"label":"k01_10", "x":10, "y":1}, - {"label":"k01_11", "x":11, "y":1}, - {"label":"k01_12", "x":12, "y":1}, - {"label":"k01_13", "x":13, "y":1}, - {"label":"k01_14", "x":14, "y":1}, - {"label":"k01_15", "x":15, "y":1}, - {"label":"k01_16", "x":16, "y":1}, - {"label":"k01_17", "x":17, "y":1}, - {"label":"k01_18", "x":18, "y":1}, - {"label":"k01_19", "x":19, "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}, + {"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}, - {"label":"k02_00", "x":0, "y":2}, - {"label":"k02_01", "x":1, "y":2}, - {"label":"k02_02", "x":2, "y":2}, - {"label":"k02_03", "x":3, "y":2}, - {"label":"k02_04", "x":4, "y":2}, - {"label":"k02_05", "x":5, "y":2}, - {"label":"k02_06", "x":6, "y":2}, - {"label":"k02_07", "x":7, "y":2}, - {"label":"k02_08", "x":8, "y":2}, - {"label":"k02_09", "x":9, "y":2}, - {"label":"k02_10", "x":10, "y":2}, - {"label":"k02_11", "x":11, "y":2}, - {"label":"k02_12", "x":12, "y":2}, - {"label":"k02_13", "x":13, "y":2}, - {"label":"k02_14", "x":14, "y":2}, - {"label":"k02_15", "x":15, "y":2}, - {"label":"k02_16", "x":16, "y":2}, - {"label":"k02_17", "x":17, "y":2}, - {"label":"k02_18", "x":18, "y":2}, - {"label":"k02_19", "x":19, "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": [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}, - {"label":"k03_00", "x":0, "y":3}, - {"label":"k03_01", "x":1, "y":3}, - {"label":"k03_02", "x":2, "y":3}, - {"label":"k03_03", "x":3, "y":3}, - {"label":"k03_04", "x":4, "y":3}, - {"label":"k03_05", "x":5, "y":3}, - {"label":"k03_06", "x":6, "y":3}, - {"label":"k03_07", "x":7, "y":3}, - {"label":"k03_08", "x":8, "y":3}, - {"label":"k03_09", "x":9, "y":3}, - {"label":"k03_10", "x":10, "y":3}, - {"label":"k03_11", "x":11, "y":3}, - {"label":"k03_12", "x":12, "y":3}, - {"label":"k03_13", "x":13, "y":3}, - {"label":"k03_14", "x":14, "y":3}, - {"label":"k03_15", "x":15, "y":3}, - {"label":"k03_16", "x":16, "y":3}, - {"label":"k03_17", "x":17, "y":3}, - {"label":"k03_18", "x":18, "y":3}, - {"label":"k03_19", "x":19, "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}, + {"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}, - {"label":"k04_00", "x":0, "y":4}, - {"label":"k04_01", "x":1, "y":4}, - {"label":"k04_02", "x":2, "y":4}, - {"label":"k04_03", "x":3, "y":4}, - {"label":"k04_04", "x":4, "y":4}, - {"label":"k04_05", "x":5, "y":4}, - {"label":"k04_06", "x":6, "y":4}, - {"label":"k04_07", "x":7, "y":4}, - {"label":"k04_08", "x":8, "y":4}, - {"label":"k04_09", "x":9, "y":4}, - {"label":"k04_10", "x":10, "y":4}, - {"label":"k04_11", "x":11, "y":4}, - {"label":"k04_12", "x":12, "y":4}, - {"label":"k04_13", "x":13, "y":4}, - {"label":"k04_14", "x":14, "y":4}, - {"label":"k04_15", "x":15, "y":4}, - {"label":"k04_16", "x":16, "y":4}, - {"label":"k04_17", "x":17, "y":4}, - {"label":"k04_18", "x":18, "y":4}, - {"label":"k04_19", "x":19, "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}, + {"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}, - {"label":"k05_00", "x":0, "y":5}, - {"label":"k05_01", "x":1, "y":5}, - {"label":"k05_02", "x":2, "y":5}, - {"label":"k05_03", "x":3, "y":5}, - {"label":"k05_04", "x":4, "y":5}, - {"label":"k05_05", "x":5, "y":5}, - {"label":"k05_06", "x":6, "y":5}, - {"label":"k05_07", "x":7, "y":5}, - {"label":"k05_08", "x":8, "y":5}, - {"label":"k05_09", "x":9, "y":5}, - {"label":"k05_10", "x":10, "y":5}, - {"label":"k05_11", "x":11, "y":5}, - {"label":"k05_12", "x":12, "y":5}, - {"label":"k05_13", "x":13, "y":5}, - {"label":"k05_14", "x":14, "y":5}, - {"label":"k05_15", "x":15, "y":5}, - {"label":"k05_16", "x":16, "y":5}, - {"label":"k05_17", "x":17, "y":5}, - {"label":"k05_18", "x":18, "y":5}, - {"label":"k05_19", "x":19, "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": [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}, - {"label":"k06_00", "x":0, "y":6}, - {"label":"k06_01", "x":1, "y":6}, - {"label":"k06_02", "x":2, "y":6}, - {"label":"k06_03", "x":3, "y":6}, - {"label":"k06_04", "x":4, "y":6}, - {"label":"k06_05", "x":5, "y":6}, - {"label":"k06_06", "x":6, "y":6}, - {"label":"k06_07", "x":7, "y":6}, - {"label":"k06_08", "x":8, "y":6}, - {"label":"k06_09", "x":9, "y":6}, - {"label":"k06_10", "x":10, "y":6}, - {"label":"k06_11", "x":11, "y":6}, - {"label":"k06_12", "x":12, "y":6}, - {"label":"k06_13", "x":13, "y":6}, - {"label":"k06_14", "x":14, "y":6}, - {"label":"k06_15", "x":15, "y":6}, - {"label":"k06_16", "x":16, "y":6}, - {"label":"k06_17", "x":17, "y":6}, - {"label":"k06_18", "x":18, "y":6}, - {"label":"k06_19", "x":19, "y":6}, + {"matrix": [6, 0], "x": 0, "y": 6}, + {"matrix": [6, 1], "x": 1, "y": 6}, + {"matrix": [6, 2], "x": 2, "y": 6}, + {"matrix": [6, 3], "x": 3, "y": 6}, + {"matrix": [6, 4], "x": 4, "y": 6}, + {"matrix": [6, 5], "x": 5, "y": 6}, + {"matrix": [6, 6], "x": 6, "y": 6}, + {"matrix": [6, 7], "x": 7, "y": 6}, + {"matrix": [6, 8], "x": 8, "y": 6}, + {"matrix": [6, 9], "x": 9, "y": 6}, + {"matrix": [6, 10], "x": 10, "y": 6}, + {"matrix": [6, 11], "x": 11, "y": 6}, + {"matrix": [6, 12], "x": 12, "y": 6}, + {"matrix": [6, 13], "x": 13, "y": 6}, + {"matrix": [6, 14], "x": 14, "y": 6}, + {"matrix": [6, 15], "x": 15, "y": 6}, + {"matrix": [6, 16], "x": 16, "y": 6}, + {"matrix": [6, 17], "x": 17, "y": 6}, + {"matrix": [6, 18], "x": 18, "y": 6}, + {"matrix": [6, 19], "x": 19, "y": 6}, - {"label":"k07_00", "x":0, "y":7}, - {"label":"k07_01", "x":1, "y":7}, - {"label":"k07_02", "x":2, "y":7}, - {"label":"k07_03", "x":3, "y":7}, - {"label":"k07_04", "x":4, "y":7}, - {"label":"k07_05", "x":5, "y":7}, - {"label":"k07_06", "x":6, "y":7}, - {"label":"k07_07", "x":7, "y":7}, - {"label":"k07_08", "x":8, "y":7}, - {"label":"k07_09", "x":9, "y":7}, - {"label":"k07_10", "x":10, "y":7}, - {"label":"k07_11", "x":11, "y":7}, - {"label":"k07_12", "x":12, "y":7}, - {"label":"k07_13", "x":13, "y":7}, - {"label":"k07_14", "x":14, "y":7}, - {"label":"k07_15", "x":15, "y":7}, - {"label":"k07_16", "x":16, "y":7}, - {"label":"k07_17", "x":17, "y":7}, - {"label":"k07_18", "x":18, "y":7}, - {"label":"k07_19", "x":19, "y":7}, + {"matrix": [7, 0], "x": 0, "y": 7}, + {"matrix": [7, 1], "x": 1, "y": 7}, + {"matrix": [7, 2], "x": 2, "y": 7}, + {"matrix": [7, 3], "x": 3, "y": 7}, + {"matrix": [7, 4], "x": 4, "y": 7}, + {"matrix": [7, 5], "x": 5, "y": 7}, + {"matrix": [7, 6], "x": 6, "y": 7}, + {"matrix": [7, 7], "x": 7, "y": 7}, + {"matrix": [7, 8], "x": 8, "y": 7}, + {"matrix": [7, 9], "x": 9, "y": 7}, + {"matrix": [7, 10], "x": 10, "y": 7}, + {"matrix": [7, 11], "x": 11, "y": 7}, + {"matrix": [7, 12], "x": 12, "y": 7}, + {"matrix": [7, 13], "x": 13, "y": 7}, + {"matrix": [7, 14], "x": 14, "y": 7}, + {"matrix": [7, 15], "x": 15, "y": 7}, + {"matrix": [7, 16], "x": 16, "y": 7}, + {"matrix": [7, 17], "x": 17, "y": 7}, + {"matrix": [7, 18], "x": 18, "y": 7}, + {"matrix": [7, 19], "x": 19, "y": 7}, - {"label":"k08_00", "x":0, "y":8}, - {"label":"k08_01", "x":1, "y":8}, - {"label":"k08_02", "x":2, "y":8}, - {"label":"k08_03", "x":3, "y":8}, - {"label":"k08_04", "x":4, "y":8}, - {"label":"k08_05", "x":5, "y":8}, - {"label":"k08_06", "x":6, "y":8}, - {"label":"k08_07", "x":7, "y":8}, - {"label":"k08_08", "x":8, "y":8}, - {"label":"k08_09", "x":9, "y":8}, - {"label":"k08_10", "x":10, "y":8}, - {"label":"k08_11", "x":11, "y":8}, - {"label":"k08_12", "x":12, "y":8}, - {"label":"k08_13", "x":13, "y":8}, - {"label":"k08_14", "x":14, "y":8}, - {"label":"k08_15", "x":15, "y":8}, - {"label":"k08_16", "x":16, "y":8}, - {"label":"k08_17", "x":17, "y":8}, - {"label":"k08_18", "x":18, "y":8}, - {"label":"k08_19", "x":19, "y":8}, + {"matrix": [8, 0], "x": 0, "y": 8}, + {"matrix": [8, 1], "x": 1, "y": 8}, + {"matrix": [8, 2], "x": 2, "y": 8}, + {"matrix": [8, 3], "x": 3, "y": 8}, + {"matrix": [8, 4], "x": 4, "y": 8}, + {"matrix": [8, 5], "x": 5, "y": 8}, + {"matrix": [8, 6], "x": 6, "y": 8}, + {"matrix": [8, 7], "x": 7, "y": 8}, + {"matrix": [8, 8], "x": 8, "y": 8}, + {"matrix": [8, 9], "x": 9, "y": 8}, + {"matrix": [8, 10], "x": 10, "y": 8}, + {"matrix": [8, 11], "x": 11, "y": 8}, + {"matrix": [8, 12], "x": 12, "y": 8}, + {"matrix": [8, 13], "x": 13, "y": 8}, + {"matrix": [8, 14], "x": 14, "y": 8}, + {"matrix": [8, 15], "x": 15, "y": 8}, + {"matrix": [8, 16], "x": 16, "y": 8}, + {"matrix": [8, 17], "x": 17, "y": 8}, + {"matrix": [8, 18], "x": 18, "y": 8}, + {"matrix": [8, 19], "x": 19, "y": 8}, - {"label":"k09_00", "x":0, "y":9}, - {"label":"k09_01", "x":1, "y":9}, - {"label":"k09_02", "x":2, "y":9}, - {"label":"k09_03", "x":3, "y":9}, - {"label":"k09_04", "x":4, "y":9}, - {"label":"k09_05", "x":5, "y":9}, - {"label":"k09_06", "x":6, "y":9}, - {"label":"k09_07", "x":7, "y":9}, - {"label":"k09_08", "x":8, "y":9}, - {"label":"k09_09", "x":9, "y":9}, - {"label":"k09_10", "x":10, "y":9}, - {"label":"k09_11", "x":11, "y":9}, - {"label":"k09_12", "x":12, "y":9}, - {"label":"k09_13", "x":13, "y":9}, - {"label":"k09_14", "x":14, "y":9}, - {"label":"k09_15", "x":15, "y":9}, - {"label":"k09_16", "x":16, "y":9}, - {"label":"k09_17", "x":17, "y":9}, - {"label":"k09_18", "x":18, "y":9}, - {"label":"k09_19", "x":19, "y":9}, + {"matrix": [9, 0], "x": 0, "y": 9}, + {"matrix": [9, 1], "x": 1, "y": 9}, + {"matrix": [9, 2], "x": 2, "y": 9}, + {"matrix": [9, 3], "x": 3, "y": 9}, + {"matrix": [9, 4], "x": 4, "y": 9}, + {"matrix": [9, 5], "x": 5, "y": 9}, + {"matrix": [9, 6], "x": 6, "y": 9}, + {"matrix": [9, 7], "x": 7, "y": 9}, + {"matrix": [9, 8], "x": 8, "y": 9}, + {"matrix": [9, 9], "x": 9, "y": 9}, + {"matrix": [9, 10], "x": 10, "y": 9}, + {"matrix": [9, 11], "x": 11, "y": 9}, + {"matrix": [9, 12], "x": 12, "y": 9}, + {"matrix": [9, 13], "x": 13, "y": 9}, + {"matrix": [9, 14], "x": 14, "y": 9}, + {"matrix": [9, 15], "x": 15, "y": 9}, + {"matrix": [9, 16], "x": 16, "y": 9}, + {"matrix": [9, 17], "x": 17, "y": 9}, + {"matrix": [9, 18], "x": 18, "y": 9}, + {"matrix": [9, 19], "x": 19, "y": 9}, - {"label":"k10_00", "x":0, "y":10}, - {"label":"k10_01", "x":1, "y":10}, - {"label":"k10_02", "x":2, "y":10}, - {"label":"k10_03", "x":3, "y":10}, - {"label":"k10_04", "x":4, "y":10}, - {"label":"k10_05", "x":5, "y":10}, - {"label":"k10_06", "x":6, "y":10}, - {"label":"k10_07", "x":7, "y":10}, - {"label":"k10_08", "x":8, "y":10}, - {"label":"k10_09", "x":9, "y":10}, - {"label":"k10_10", "x":10, "y":10}, - {"label":"k10_11", "x":11, "y":10}, - {"label":"k10_12", "x":12, "y":10}, - {"label":"k10_13", "x":13, "y":10}, - {"label":"k10_14", "x":14, "y":10}, - {"label":"k10_15", "x":15, "y":10}, - {"label":"k10_16", "x":16, "y":10}, - {"label":"k10_17", "x":17, "y":10}, - {"label":"k10_18", "x":18, "y":10}, - {"label":"k10_19", "x":19, "y":10}, + {"matrix": [10, 0], "x": 0, "y": 10}, + {"matrix": [10, 1], "x": 1, "y": 10}, + {"matrix": [10, 2], "x": 2, "y": 10}, + {"matrix": [10, 3], "x": 3, "y": 10}, + {"matrix": [10, 4], "x": 4, "y": 10}, + {"matrix": [10, 5], "x": 5, "y": 10}, + {"matrix": [10, 6], "x": 6, "y": 10}, + {"matrix": [10, 7], "x": 7, "y": 10}, + {"matrix": [10, 8], "x": 8, "y": 10}, + {"matrix": [10, 9], "x": 9, "y": 10}, + {"matrix": [10, 10], "x": 10, "y": 10}, + {"matrix": [10, 11], "x": 11, "y": 10}, + {"matrix": [10, 12], "x": 12, "y": 10}, + {"matrix": [10, 13], "x": 13, "y": 10}, + {"matrix": [10, 14], "x": 14, "y": 10}, + {"matrix": [10, 15], "x": 15, "y": 10}, + {"matrix": [10, 16], "x": 16, "y": 10}, + {"matrix": [10, 17], "x": 17, "y": 10}, + {"matrix": [10, 18], "x": 18, "y": 10}, + {"matrix": [10, 19], "x": 19, "y": 10}, - {"label":"k11_00", "x":0, "y":11}, - {"label":"k11_01", "x":1, "y":11}, - {"label":"k11_02", "x":2, "y":11}, - {"label":"k11_03", "x":3, "y":11}, - {"label":"k11_04", "x":4, "y":11}, - {"label":"k11_05", "x":5, "y":11}, - {"label":"k11_06", "x":6, "y":11}, - {"label":"k11_07", "x":7, "y":11}, - {"label":"k11_08", "x":8, "y":11}, - {"label":"k11_09", "x":9, "y":11}, - {"label":"k11_10", "x":10, "y":11}, - {"label":"k11_11", "x":11, "y":11}, - {"label":"k11_12", "x":12, "y":11}, - {"label":"k11_13", "x":13, "y":11}, - {"label":"k11_14", "x":14, "y":11}, - {"label":"k11_15", "x":15, "y":11}, - {"label":"k11_16", "x":16, "y":11}, - {"label":"k11_17", "x":17, "y":11}, - {"label":"k11_18", "x":18, "y":11}, - {"label":"k11_19", "x":19, "y":11}, + {"matrix": [11, 0], "x": 0, "y": 11}, + {"matrix": [11, 1], "x": 1, "y": 11}, + {"matrix": [11, 2], "x": 2, "y": 11}, + {"matrix": [11, 3], "x": 3, "y": 11}, + {"matrix": [11, 4], "x": 4, "y": 11}, + {"matrix": [11, 5], "x": 5, "y": 11}, + {"matrix": [11, 6], "x": 6, "y": 11}, + {"matrix": [11, 7], "x": 7, "y": 11}, + {"matrix": [11, 8], "x": 8, "y": 11}, + {"matrix": [11, 9], "x": 9, "y": 11}, + {"matrix": [11, 10], "x": 10, "y": 11}, + {"matrix": [11, 11], "x": 11, "y": 11}, + {"matrix": [11, 12], "x": 12, "y": 11}, + {"matrix": [11, 13], "x": 13, "y": 11}, + {"matrix": [11, 14], "x": 14, "y": 11}, + {"matrix": [11, 15], "x": 15, "y": 11}, + {"matrix": [11, 16], "x": 16, "y": 11}, + {"matrix": [11, 17], "x": 17, "y": 11}, + {"matrix": [11, 18], "x": 18, "y": 11}, + {"matrix": [11, 19], "x": 19, "y": 11}, - {"label":"k12_00", "x":0, "y":12}, - {"label":"k12_01", "x":1, "y":12}, - {"label":"k12_02", "x":2, "y":12}, - {"label":"k12_03", "x":3, "y":12}, - {"label":"k12_04", "x":4, "y":12}, - {"label":"k12_05", "x":5, "y":12}, - {"label":"k12_06", "x":6, "y":12}, - {"label":"k12_07", "x":7, "y":12}, - {"label":"k12_08", "x":8, "y":12}, - {"label":"k12_09", "x":9, "y":12}, - {"label":"k12_10", "x":10, "y":12}, - {"label":"k12_11", "x":11, "y":12}, - {"label":"k12_12", "x":12, "y":12}, - {"label":"k12_13", "x":13, "y":12}, - {"label":"k12_14", "x":14, "y":12}, - {"label":"k12_15", "x":15, "y":12}, - {"label":"k12_16", "x":16, "y":12}, - {"label":"k12_17", "x":17, "y":12}, - {"label":"k12_18", "x":18, "y":12}, - {"label":"k12_19", "x":19, "y":12}, + {"matrix": [12, 0], "x": 0, "y": 12}, + {"matrix": [12, 1], "x": 1, "y": 12}, + {"matrix": [12, 2], "x": 2, "y": 12}, + {"matrix": [12, 3], "x": 3, "y": 12}, + {"matrix": [12, 4], "x": 4, "y": 12}, + {"matrix": [12, 5], "x": 5, "y": 12}, + {"matrix": [12, 6], "x": 6, "y": 12}, + {"matrix": [12, 7], "x": 7, "y": 12}, + {"matrix": [12, 8], "x": 8, "y": 12}, + {"matrix": [12, 9], "x": 9, "y": 12}, + {"matrix": [12, 10], "x": 10, "y": 12}, + {"matrix": [12, 11], "x": 11, "y": 12}, + {"matrix": [12, 12], "x": 12, "y": 12}, + {"matrix": [12, 13], "x": 13, "y": 12}, + {"matrix": [12, 14], "x": 14, "y": 12}, + {"matrix": [12, 15], "x": 15, "y": 12}, + {"matrix": [12, 16], "x": 16, "y": 12}, + {"matrix": [12, 17], "x": 17, "y": 12}, + {"matrix": [12, 18], "x": 18, "y": 12}, + {"matrix": [12, 19], "x": 19, "y": 12}, - {"label":"k13_00", "x":0, "y":13}, - {"label":"k13_01", "x":1, "y":13}, - {"label":"k13_02", "x":2, "y":13}, - {"label":"k13_03", "x":3, "y":13}, - {"label":"k13_04", "x":4, "y":13}, - {"label":"k13_05", "x":5, "y":13}, - {"label":"k13_06", "x":6, "y":13}, - {"label":"k13_07", "x":7, "y":13}, - {"label":"k13_08", "x":8, "y":13}, - {"label":"k13_09", "x":9, "y":13}, - {"label":"k13_10", "x":10, "y":13}, - {"label":"k13_11", "x":11, "y":13}, - {"label":"k13_12", "x":12, "y":13}, - {"label":"k13_13", "x":13, "y":13}, - {"label":"k13_14", "x":14, "y":13}, - {"label":"k13_15", "x":15, "y":13}, - {"label":"k13_16", "x":16, "y":13}, - {"label":"k13_17", "x":17, "y":13}, - {"label":"k13_18", "x":18, "y":13}, - {"label":"k13_19", "x":19, "y":13}, + {"matrix": [13, 0], "x": 0, "y": 13}, + {"matrix": [13, 1], "x": 1, "y": 13}, + {"matrix": [13, 2], "x": 2, "y": 13}, + {"matrix": [13, 3], "x": 3, "y": 13}, + {"matrix": [13, 4], "x": 4, "y": 13}, + {"matrix": [13, 5], "x": 5, "y": 13}, + {"matrix": [13, 6], "x": 6, "y": 13}, + {"matrix": [13, 7], "x": 7, "y": 13}, + {"matrix": [13, 8], "x": 8, "y": 13}, + {"matrix": [13, 9], "x": 9, "y": 13}, + {"matrix": [13, 10], "x": 10, "y": 13}, + {"matrix": [13, 11], "x": 11, "y": 13}, + {"matrix": [13, 12], "x": 12, "y": 13}, + {"matrix": [13, 13], "x": 13, "y": 13}, + {"matrix": [13, 14], "x": 14, "y": 13}, + {"matrix": [13, 15], "x": 15, "y": 13}, + {"matrix": [13, 16], "x": 16, "y": 13}, + {"matrix": [13, 17], "x": 17, "y": 13}, + {"matrix": [13, 18], "x": 18, "y": 13}, + {"matrix": [13, 19], "x": 19, "y": 13}, - {"label":"k14_00", "x":0, "y":14}, - {"label":"k14_01", "x":1, "y":14}, - {"label":"k14_02", "x":2, "y":14}, - {"label":"k14_03", "x":3, "y":14}, - {"label":"k14_04", "x":4, "y":14}, - {"label":"k14_05", "x":5, "y":14}, - {"label":"k14_06", "x":6, "y":14}, - {"label":"k14_07", "x":7, "y":14}, - {"label":"k14_08", "x":8, "y":14}, - {"label":"k14_09", "x":9, "y":14}, - {"label":"k14_10", "x":10, "y":14}, - {"label":"k14_11", "x":11, "y":14}, - {"label":"k14_12", "x":12, "y":14}, - {"label":"k14_13", "x":13, "y":14}, - {"label":"k14_14", "x":14, "y":14}, - {"label":"k14_15", "x":15, "y":14}, - {"label":"k14_16", "x":16, "y":14}, - {"label":"k14_17", "x":17, "y":14}, - {"label":"k14_18", "x":18, "y":14}, - {"label":"k14_19", "x":19, "y":14}, + {"matrix": [14, 0], "x": 0, "y": 14}, + {"matrix": [14, 1], "x": 1, "y": 14}, + {"matrix": [14, 2], "x": 2, "y": 14}, + {"matrix": [14, 3], "x": 3, "y": 14}, + {"matrix": [14, 4], "x": 4, "y": 14}, + {"matrix": [14, 5], "x": 5, "y": 14}, + {"matrix": [14, 6], "x": 6, "y": 14}, + {"matrix": [14, 7], "x": 7, "y": 14}, + {"matrix": [14, 8], "x": 8, "y": 14}, + {"matrix": [14, 9], "x": 9, "y": 14}, + {"matrix": [14, 10], "x": 10, "y": 14}, + {"matrix": [14, 11], "x": 11, "y": 14}, + {"matrix": [14, 12], "x": 12, "y": 14}, + {"matrix": [14, 13], "x": 13, "y": 14}, + {"matrix": [14, 14], "x": 14, "y": 14}, + {"matrix": [14, 15], "x": 15, "y": 14}, + {"matrix": [14, 16], "x": 16, "y": 14}, + {"matrix": [14, 17], "x": 17, "y": 14}, + {"matrix": [14, 18], "x": 18, "y": 14}, + {"matrix": [14, 19], "x": 19, "y": 14}, - {"label":"k15_00", "x":0, "y":15}, - {"label":"k15_01", "x":1, "y":15}, - {"label":"k15_02", "x":2, "y":15}, - {"label":"k15_03", "x":3, "y":15}, - {"label":"k15_04", "x":4, "y":15}, - {"label":"k15_05", "x":5, "y":15}, - {"label":"k15_06", "x":6, "y":15}, - {"label":"k15_07", "x":7, "y":15}, - {"label":"k15_08", "x":8, "y":15}, - {"label":"k15_09", "x":9, "y":15}, - {"label":"k15_10", "x":10, "y":15}, - {"label":"k15_11", "x":11, "y":15}, - {"label":"k15_12", "x":12, "y":15}, - {"label":"k15_13", "x":13, "y":15}, - {"label":"k15_14", "x":14, "y":15}, - {"label":"k15_15", "x":15, "y":15}, - {"label":"k15_16", "x":16, "y":15}, - {"label":"k15_17", "x":17, "y":15}, - {"label":"k15_18", "x":18, "y":15}, - {"label":"k15_19", "x":19, "y":15}, + {"matrix": [15, 0], "x": 0, "y": 15}, + {"matrix": [15, 1], "x": 1, "y": 15}, + {"matrix": [15, 2], "x": 2, "y": 15}, + {"matrix": [15, 3], "x": 3, "y": 15}, + {"matrix": [15, 4], "x": 4, "y": 15}, + {"matrix": [15, 5], "x": 5, "y": 15}, + {"matrix": [15, 6], "x": 6, "y": 15}, + {"matrix": [15, 7], "x": 7, "y": 15}, + {"matrix": [15, 8], "x": 8, "y": 15}, + {"matrix": [15, 9], "x": 9, "y": 15}, + {"matrix": [15, 10], "x": 10, "y": 15}, + {"matrix": [15, 11], "x": 11, "y": 15}, + {"matrix": [15, 12], "x": 12, "y": 15}, + {"matrix": [15, 13], "x": 13, "y": 15}, + {"matrix": [15, 14], "x": 14, "y": 15}, + {"matrix": [15, 15], "x": 15, "y": 15}, + {"matrix": [15, 16], "x": 16, "y": 15}, + {"matrix": [15, 17], "x": 17, "y": 15}, + {"matrix": [15, 18], "x": 18, "y": 15}, + {"matrix": [15, 19], "x": 19, "y": 15}, - {"label":"k16_00", "x":0, "y":16}, - {"label":"k16_01", "x":1, "y":16}, - {"label":"k16_02", "x":2, "y":16}, - {"label":"k16_03", "x":3, "y":16}, - {"label":"k16_04", "x":4, "y":16}, - {"label":"k16_05", "x":5, "y":16}, - {"label":"k16_06", "x":6, "y":16}, - {"label":"k16_07", "x":7, "y":16}, - {"label":"k16_08", "x":8, "y":16}, - {"label":"k16_09", "x":9, "y":16}, - {"label":"k16_10", "x":10, "y":16}, - {"label":"k16_11", "x":11, "y":16}, - {"label":"k16_12", "x":12, "y":16}, - {"label":"k16_13", "x":13, "y":16}, - {"label":"k16_14", "x":14, "y":16}, - {"label":"k16_15", "x":15, "y":16}, - {"label":"k16_16", "x":16, "y":16}, - {"label":"k16_17", "x":17, "y":16}, - {"label":"k16_18", "x":18, "y":16}, - {"label":"k16_19", "x":19, "y":16}, + {"matrix": [16, 0], "x": 0, "y": 16}, + {"matrix": [16, 1], "x": 1, "y": 16}, + {"matrix": [16, 2], "x": 2, "y": 16}, + {"matrix": [16, 3], "x": 3, "y": 16}, + {"matrix": [16, 4], "x": 4, "y": 16}, + {"matrix": [16, 5], "x": 5, "y": 16}, + {"matrix": [16, 6], "x": 6, "y": 16}, + {"matrix": [16, 7], "x": 7, "y": 16}, + {"matrix": [16, 8], "x": 8, "y": 16}, + {"matrix": [16, 9], "x": 9, "y": 16}, + {"matrix": [16, 10], "x": 10, "y": 16}, + {"matrix": [16, 11], "x": 11, "y": 16}, + {"matrix": [16, 12], "x": 12, "y": 16}, + {"matrix": [16, 13], "x": 13, "y": 16}, + {"matrix": [16, 14], "x": 14, "y": 16}, + {"matrix": [16, 15], "x": 15, "y": 16}, + {"matrix": [16, 16], "x": 16, "y": 16}, + {"matrix": [16, 17], "x": 17, "y": 16}, + {"matrix": [16, 18], "x": 18, "y": 16}, + {"matrix": [16, 19], "x": 19, "y": 16}, - {"label":"k17_00", "x":0, "y":17}, - {"label":"k17_01", "x":1, "y":17}, - {"label":"k17_02", "x":2, "y":17}, - {"label":"k17_03", "x":3, "y":17}, - {"label":"k17_04", "x":4, "y":17}, - {"label":"k17_05", "x":5, "y":17}, - {"label":"k17_06", "x":6, "y":17}, - {"label":"k17_07", "x":7, "y":17}, - {"label":"k17_08", "x":8, "y":17}, - {"label":"k17_09", "x":9, "y":17}, - {"label":"k17_10", "x":10, "y":17}, - {"label":"k17_11", "x":11, "y":17}, - {"label":"k17_12", "x":12, "y":17}, - {"label":"k17_13", "x":13, "y":17}, - {"label":"k17_14", "x":14, "y":17}, - {"label":"k17_15", "x":15, "y":17}, - {"label":"k17_16", "x":16, "y":17}, - {"label":"k17_17", "x":17, "y":17}, - {"label":"k17_18", "x":18, "y":17}, - {"label":"k17_19", "x":19, "y":17}, + {"matrix": [17, 0], "x": 0, "y": 17}, + {"matrix": [17, 1], "x": 1, "y": 17}, + {"matrix": [17, 2], "x": 2, "y": 17}, + {"matrix": [17, 3], "x": 3, "y": 17}, + {"matrix": [17, 4], "x": 4, "y": 17}, + {"matrix": [17, 5], "x": 5, "y": 17}, + {"matrix": [17, 6], "x": 6, "y": 17}, + {"matrix": [17, 7], "x": 7, "y": 17}, + {"matrix": [17, 8], "x": 8, "y": 17}, + {"matrix": [17, 9], "x": 9, "y": 17}, + {"matrix": [17, 10], "x": 10, "y": 17}, + {"matrix": [17, 11], "x": 11, "y": 17}, + {"matrix": [17, 12], "x": 12, "y": 17}, + {"matrix": [17, 13], "x": 13, "y": 17}, + {"matrix": [17, 14], "x": 14, "y": 17}, + {"matrix": [17, 15], "x": 15, "y": 17}, + {"matrix": [17, 16], "x": 16, "y": 17}, + {"matrix": [17, 17], "x": 17, "y": 17}, + {"matrix": [17, 18], "x": 18, "y": 17}, + {"matrix": [17, 19], "x": 19, "y": 17}, - {"label":"k18_00", "x":0, "y":18}, - {"label":"k18_01", "x":1, "y":18}, - {"label":"k18_02", "x":2, "y":18}, - {"label":"k18_03", "x":3, "y":18}, - {"label":"k18_04", "x":4, "y":18}, - {"label":"k18_05", "x":5, "y":18}, - {"label":"k18_06", "x":6, "y":18}, - {"label":"k18_07", "x":7, "y":18}, - {"label":"k18_08", "x":8, "y":18}, - {"label":"k18_09", "x":9, "y":18}, - {"label":"k18_10", "x":10, "y":18}, - {"label":"k18_11", "x":11, "y":18}, - {"label":"k18_12", "x":12, "y":18}, - {"label":"k18_13", "x":13, "y":18}, - {"label":"k18_14", "x":14, "y":18}, - {"label":"k18_15", "x":15, "y":18}, - {"label":"k18_16", "x":16, "y":18}, - {"label":"k18_17", "x":17, "y":18}, - {"label":"k18_18", "x":18, "y":18}, - {"label":"k18_19", "x":19, "y":18}, + {"matrix": [18, 0], "x": 0, "y": 18}, + {"matrix": [18, 1], "x": 1, "y": 18}, + {"matrix": [18, 2], "x": 2, "y": 18}, + {"matrix": [18, 3], "x": 3, "y": 18}, + {"matrix": [18, 4], "x": 4, "y": 18}, + {"matrix": [18, 5], "x": 5, "y": 18}, + {"matrix": [18, 6], "x": 6, "y": 18}, + {"matrix": [18, 7], "x": 7, "y": 18}, + {"matrix": [18, 8], "x": 8, "y": 18}, + {"matrix": [18, 9], "x": 9, "y": 18}, + {"matrix": [18, 10], "x": 10, "y": 18}, + {"matrix": [18, 11], "x": 11, "y": 18}, + {"matrix": [18, 12], "x": 12, "y": 18}, + {"matrix": [18, 13], "x": 13, "y": 18}, + {"matrix": [18, 14], "x": 14, "y": 18}, + {"matrix": [18, 15], "x": 15, "y": 18}, + {"matrix": [18, 16], "x": 16, "y": 18}, + {"matrix": [18, 17], "x": 17, "y": 18}, + {"matrix": [18, 18], "x": 18, "y": 18}, + {"matrix": [18, 19], "x": 19, "y": 18}, - {"label":"k19_00", "x":0, "y":19}, - {"label":"k19_01", "x":1, "y":19}, - {"label":"k19_02", "x":2, "y":19}, - {"label":"k19_03", "x":3, "y":19}, - {"label":"k19_04", "x":4, "y":19}, - {"label":"k19_05", "x":5, "y":19}, - {"label":"k19_06", "x":6, "y":19}, - {"label":"k19_07", "x":7, "y":19}, - {"label":"k19_08", "x":8, "y":19}, - {"label":"k19_09", "x":9, "y":19}, - {"label":"k19_10", "x":10, "y":19}, - {"label":"k19_11", "x":11, "y":19}, - {"label":"k19_12", "x":12, "y":19}, - {"label":"k19_13", "x":13, "y":19}, - {"label":"k19_14", "x":14, "y":19}, - {"label":"k19_15", "x":15, "y":19}, - {"label":"k19_16", "x":16, "y":19}, - {"label":"k19_17", "x":17, "y":19}, - {"label":"k19_18", "x":18, "y":19}, - {"label":"k19_19", "x":19, "y":19} + {"matrix": [19, 0], "x": 0, "y": 19}, + {"matrix": [19, 1], "x": 1, "y": 19}, + {"matrix": [19, 2], "x": 2, "y": 19}, + {"matrix": [19, 3], "x": 3, "y": 19}, + {"matrix": [19, 4], "x": 4, "y": 19}, + {"matrix": [19, 5], "x": 5, "y": 19}, + {"matrix": [19, 6], "x": 6, "y": 19}, + {"matrix": [19, 7], "x": 7, "y": 19}, + {"matrix": [19, 8], "x": 8, "y": 19}, + {"matrix": [19, 9], "x": 9, "y": 19}, + {"matrix": [19, 10], "x": 10, "y": 19}, + {"matrix": [19, 11], "x": 11, "y": 19}, + {"matrix": [19, 12], "x": 12, "y": 19}, + {"matrix": [19, 13], "x": 13, "y": 19}, + {"matrix": [19, 14], "x": 14, "y": 19}, + {"matrix": [19, 15], "x": 15, "y": 19}, + {"matrix": [19, 16], "x": 16, "y": 19}, + {"matrix": [19, 17], "x": 17, "y": 19}, + {"matrix": [19, 18], "x": 18, "y": 19}, + {"matrix": [19, 19], "x": 19, "y": 19} ] } } diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/info.json index 8d0701104c..1737c5f8fd 100644 --- a/keyboards/cybergear/macro25/info.json +++ b/keyboards/cybergear/macro25/info.json @@ -14,8 +14,17 @@ "layouts": { "LAYOUT_ortho_2x5": { "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} + {"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": [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} ] } }, diff --git a/keyboards/cybergear/macro25/macro25.h b/keyboards/cybergear/macro25/macro25.h deleted file mode 100644 index 22b814a97b..0000000000 --- a/keyboards/cybergear/macro25/macro25.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 CyberGear Marius Kavoliunas - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_2x5( \ - K00, K01, K02, K03, K04, \ - K05, K06, K07, K08, K09 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K05, K06, K07, K08, K09 }, \ -} diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json index ab48b9a09c..eab2d0c33f 100644 --- a/keyboards/dc01/numpad/info.json +++ b/keyboards/dc01/numpad/info.json @@ -13,10 +13,57 @@ "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"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":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] }, "LAYOUT_ortho_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "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}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "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}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} + ] } } } diff --git a/keyboards/dc01/numpad/numpad.h b/keyboards/dc01/numpad/numpad.h deleted file mode 100644 index 110f893b47..0000000000 --- a/keyboards/dc01/numpad/numpad.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2018 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" - -#define XXX KC_NO - -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, XXX }, \ - { K30, K31, K32, XXX }, \ - { K40, XXX, K42, K43 } \ -} - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/delikeeb/flatbread60/flatbread60.h b/keyboards/delikeeb/flatbread60/flatbread60.h deleted file mode 100644 index 3fb8d7a6f1..0000000000 --- a/keyboards/delikeeb/flatbread60/flatbread60.h +++ /dev/null @@ -1,42 +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_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json index e409060f74..466168e311 100644 --- a/keyboards/delikeeb/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/info.json @@ -18,246 +18,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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 - }, - { - "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": [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, 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/delikeeb/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json index 218fcaefdc..0ddbf2f162 100644 --- a/keyboards/delikeeb/vaneela/info.json +++ b/keyboards/delikeeb/vaneela/info.json @@ -18,70 +18,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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, "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, "w": 1.5}, - {"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":"BS", "x":11, "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, "w": 1.5}, - {"label":"ESC", "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":";", "x":10.25, "y":2}, - {"label":"ENTER", "x":11.25, "y":2, "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": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, - {"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":"SHIFT", "x":11.5, "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.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}, - {"label":"CTRL", "x":0, "y":4}, - {"label":"CTRL", "x":1, "y":4}, - {"label":"GUI", "x":2, "y":4}, - {"label":"ALT", "x":3, "y":4}, - {"label":"LOWER", "x":4, "y":4, "w":1.25}, - {"label":"SPACE", "x":5.25, "y":4}, - {"label":"SPACE", "x":6.25, "y":4}, - {"label":"RAISE", "x":7.25, "y":4, "w":1.25}, - {"label":"LEFT", "x":8.5, "y":4}, - {"label":"DOWN", "x":9.5, "y":4}, - {"label":"UP", "x":10.5, "y":4}, - {"label":"RIGHT", "x":11.5, "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, "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, "w": 1.25}, + {"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} ] } } diff --git a/keyboards/delikeeb/vaneela/vaneela.h b/keyboards/delikeeb/vaneela/vaneela.h deleted file mode 100644 index 3fb8d7a6f1..0000000000 --- a/keyboards/delikeeb/vaneela/vaneela.h +++ /dev/null @@ -1,42 +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_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 794647015f..83690d1352 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -24,13 +24,96 @@ }, "layouts": { "LAYOUT_ortho_5x16": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "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}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "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":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "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}, {"x":13.25, "y":4}, {"x":14.25, "y":4}, {"x":15.25, "y":4} + "layout": [ + {"matrix": [7, 5], "x": 0, "y": 0}, + {"matrix": [6, 5], "x": 1, "y": 0}, + {"matrix": [5, 5], "x": 2, "y": 0}, + {"matrix": [7, 0], "x": 3, "y": 0}, + + {"matrix": [6, 0], "x": 4.25, "y": 0}, + {"matrix": [5, 0], "x": 5.25, "y": 0}, + {"matrix": [0, 0], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0}, + {"matrix": [0, 2], "x": 8.25, "y": 0}, + {"matrix": [0, 3], "x": 9.25, "y": 0}, + {"matrix": [0, 4], "x": 10.25, "y": 0}, + {"matrix": [0, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [0, 7], "x": 13.25, "y": 0}, + {"matrix": [0, 8], "x": 14.25, "y": 0}, + {"matrix": [0, 9], "x": 15.25, "y": 0}, + + {"matrix": [7, 6], "x": 0, "y": 1}, + {"matrix": [6, 6], "x": 1, "y": 1}, + {"matrix": [5, 6], "x": 2, "y": 1}, + {"matrix": [7, 1], "x": 3, "y": 1}, + + {"matrix": [6, 1], "x": 4.25, "y": 1}, + {"matrix": [5, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 0], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1}, + {"matrix": [1, 2], "x": 8.25, "y": 1}, + {"matrix": [1, 3], "x": 9.25, "y": 1}, + {"matrix": [1, 4], "x": 10.25, "y": 1}, + {"matrix": [1, 5], "x": 11.25, "y": 1}, + {"matrix": [1, 6], "x": 12.25, "y": 1}, + {"matrix": [1, 7], "x": 13.25, "y": 1}, + {"matrix": [1, 8], "x": 14.25, "y": 1}, + {"matrix": [1, 9], "x": 15.25, "y": 1}, + + {"matrix": [7, 7], "x": 0, "y": 2}, + {"matrix": [6, 7], "x": 1, "y": 2}, + {"matrix": [5, 7], "x": 2, "y": 2}, + {"matrix": [7, 2], "x": 3, "y": 2}, + + {"matrix": [6, 2], "x": 4.25, "y": 2}, + {"matrix": [5, 2], "x": 5.25, "y": 2}, + {"matrix": [2, 0], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2}, + {"matrix": [2, 2], "x": 8.25, "y": 2}, + {"matrix": [2, 3], "x": 9.25, "y": 2}, + {"matrix": [2, 4], "x": 10.25, "y": 2}, + {"matrix": [2, 5], "x": 11.25, "y": 2}, + {"matrix": [2, 6], "x": 12.25, "y": 2}, + {"matrix": [2, 7], "x": 13.25, "y": 2}, + {"matrix": [2, 8], "x": 14.25, "y": 2}, + {"matrix": [2, 9], "x": 15.25, "y": 2}, + + {"matrix": [7, 8], "x": 0, "y": 3}, + {"matrix": [6, 8], "x": 1, "y": 3}, + {"matrix": [5, 8], "x": 2, "y": 3}, + {"matrix": [7, 3], "x": 3, "y": 3}, + + {"matrix": [6, 3], "x": 4.25, "y": 3}, + {"matrix": [5, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 0], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3}, + {"matrix": [3, 2], "x": 8.25, "y": 3}, + {"matrix": [3, 3], "x": 9.25, "y": 3}, + {"matrix": [3, 4], "x": 10.25, "y": 3}, + {"matrix": [3, 5], "x": 11.25, "y": 3}, + {"matrix": [3, 6], "x": 12.25, "y": 3}, + {"matrix": [3, 7], "x": 13.25, "y": 3}, + {"matrix": [3, 8], "x": 14.25, "y": 3}, + {"matrix": [3, 9], "x": 15.25, "y": 3}, + + {"matrix": [7, 9], "x": 0, "y": 4}, + {"matrix": [6, 9], "x": 1, "y": 4}, + {"matrix": [5, 9], "x": 2, "y": 4}, + {"matrix": [7, 4], "x": 3, "y": 4}, + + {"matrix": [6, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 0], "x": 6.25, "y": 4}, + {"matrix": [4, 1], "x": 7.25, "y": 4}, + {"matrix": [4, 2], "x": 8.25, "y": 4}, + {"matrix": [4, 3], "x": 9.25, "y": 4}, + {"matrix": [4, 4], "x": 10.25, "y": 4}, + {"matrix": [4, 5], "x": 11.25, "y": 4}, + {"matrix": [4, 6], "x": 12.25, "y": 4}, + {"matrix": [4, 7], "x": 13.25, "y": 4}, + {"matrix": [4, 8], "x": 14.25, "y": 4}, + {"matrix": [4, 9], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/delikeeb/waaffle/rev3/rev3.h b/keyboards/delikeeb/waaffle/rev3/rev3.h deleted file mode 100644 index 8ca245d845..0000000000 --- a/keyboards/delikeeb/waaffle/rev3/rev3.h +++ /dev/null @@ -1,44 +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_ortho_5x16( \ - k76, k66, k56, k71, k61, k51, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k77, k67, k57, k72, k62, k52, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \ - k78, k68, k58, k73, k63, k53, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \ - k79, k69, k59, k74, k64, k54, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, \ - k80, k70, k60, k75, k65, k55, 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 }, \ - { k61, k62, k63, k64, k65, k66, k67, k68, k69, k70 }, \ - { k71, k72, k73, k74, k75, k76, k77, k78, k79, k80 } \ -} diff --git a/keyboards/deltapad/deltapad.h b/keyboards/deltapad/deltapad.h deleted file mode 100644 index 8e09c1fc84..0000000000 --- a/keyboards/deltapad/deltapad.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2021 Richard Snijder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} diff --git a/keyboards/deltapad/info.json b/keyboards/deltapad/info.json index 608c8712c9..1b79bf47a3 100644 --- a/keyboards/deltapad/info.json +++ b/keyboards/deltapad/info.json @@ -17,10 +17,47 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] }, "LAYOUT_numpad_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"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":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "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, "h": 2}, + + {"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": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] } } } diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 454577c1eb..21254557d4 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -24,36 +24,38 @@ "layouts": { "LAYOUT_ortho_3x10": { "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, 4], "x": 5, "y": 0 }, - { "matrix": [3, 3], "x": 6, "y": 0 }, - { "matrix": [3, 2], "x": 7, "y": 0 }, - { "matrix": [3, 1], "x": 8, "y": 0 }, - { "matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1 }, - { "matrix": [4, 3], "x": 6, "y": 1 }, - { "matrix": [4, 2], "x": 7, "y": 1 }, - { "matrix": [4, 1], "x": 8, "y": 1 }, - { "matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2 }, - { "matrix": [5, 3], "x": 6, "y": 2 }, - { "matrix": [5, 2], "x": 7, "y": 2 }, - { "matrix": [5, 1], "x": 8, "y": 2 }, - { "matrix": [5, 0], "x": 9, "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": [3, 4], "x": 5, "y": 0}, + {"matrix": [3, 3], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1}, + {"matrix": [4, 3], "x": 6, "y": 1}, + {"matrix": [4, 2], "x": 7, "y": 1}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [5, 2], "x": 7, "y": 2}, + {"matrix": [5, 1], "x": 8, "y": 2}, + {"matrix": [5, 0], "x": 9, "y": 2} ] } } diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c index 4f4a5c566d..2e582d6833 100644 --- a/keyboards/deng/thirty/thirty.c +++ b/keyboards/deng/thirty/thirty.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 "thirty.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/deng/thirty/thirty.h b/keyboards/deng/thirty/thirty.h deleted file mode 100644 index 49af4b3424..0000000000 --- a/keyboards/deng/thirty/thirty.h +++ /dev/null @@ -1,31 +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_ortho_3x10( \ - K00, K01, K02, K03, K04, K34, K33, K32, K31, K30, \ - K10, K11, K12, K13, K14, K44, K43, K42, K41, K40, \ - K20, K21, K22, K23, K24, K54, K53, K52, K51, K50 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 }, \ - { K50, K51, K52, K53, K54 } \ -} diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index d495b69365..cedf1fae5d 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -16,107 +16,120 @@ "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12", + "LAYOUT_plaid_mit": "LAYOUT_planck_mit" + }, "layouts": { "LAYOUT_planck_mit": { "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 }, - { "w": 2, "x": 5, "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, "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} + ] }, "LAYOUT_ortho_4x12": { "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/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h index 2969967884..6687db5522 100644 --- a/keyboards/dm9records/plaid/plaid.h +++ b/keyboards/dm9records/plaid/plaid.h @@ -18,35 +18,5 @@ #include "quantum.h" -#define LAYOUT_planck_mit( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_plaid_grid LAYOUT_ortho_4x12 -#define LAYOUT_plaid_mit LAYOUT_planck_mit - #define LED_RED C5 #define LED_GREEN C4 diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json index e929c7656d..cb84baca06 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/info.json @@ -19,27 +19,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "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}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"+", "x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h deleted file mode 100644 index d96f198db3..0000000000 --- a/keyboards/draytronics/scarlet/scarlet.h +++ /dev/null @@ -1,35 +0,0 @@ -/*Copyright 2020 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ -{ K00, K01, K02, K03, }, \ -{ K10, K11, K12, K13, }, \ -{ K20, K21, K22, KC_NO, }, \ -{ K30, K31, K32, K33, }, \ -{ K40, KC_NO, K42, KC_NO, }, \ -} diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index 965ef6d815..3f28e87826 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -14,86 +14,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_ortho_3x12": { - "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}, - {"x":5, "y":0}, - {"x":6, "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":"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}, - {"x":5, "y":1}, - {"x":6, "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":"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}, - {"x":5, "y":2}, - {"x":6, "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}] - }, - - "LAYOUT_ortho_3x12_1x2uC": { - "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}, - {"x":5, "y":0}, - {"x":6, "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":"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}, - {"x":5, "y":1}, - {"x":6, "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":"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}, - {"x":5, "y":2, "w":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}] - } - - } + "bootloader": "caterina" } diff --git a/keyboards/drhigsby/ogurec/left_pm/info.json b/keyboards/drhigsby/ogurec/left_pm/info.json new file mode 100644 index 0000000000..4563c99b1c --- /dev/null +++ b/keyboards/drhigsby/ogurec/left_pm/info.json @@ -0,0 +1,87 @@ +{ + "layouts": { + "LAYOUT_ortho_3x12": { + "layout": [ + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [0, 8], "x": 3, "y": 0}, + {"matrix": [0, 7], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 2], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [0, 0], "x": 11, "y": 0}, + + {"matrix": [1, 11], "x": 0, "y": 1}, + {"matrix": [1, 10], "x": 1, "y": 1}, + {"matrix": [1, 9], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [1, 7], "x": 4, "y": 1}, + {"matrix": [1, 6], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [1, 2], "x": 9, "y": 1}, + {"matrix": [1, 1], "x": 10, "y": 1}, + {"matrix": [1, 0], "x": 11, "y": 1}, + + {"matrix": [2, 11], "x": 0, "y": 2}, + {"matrix": [2, 10], "x": 1, "y": 2}, + {"matrix": [2, 9], "x": 2, "y": 2}, + {"matrix": [2, 8], "x": 3, "y": 2}, + {"matrix": [2, 7], "x": 4, "y": 2}, + {"matrix": [2, 6], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 2], "x": 9, "y": 2}, + {"matrix": [2, 1], "x": 10, "y": 2}, + {"matrix": [2, 0], "x": 11, "y": 2} + ] + }, + "LAYOUT_ortho_3x12_1x2uC": { + "layout": [ + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [0, 8], "x": 3, "y": 0}, + {"matrix": [0, 7], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 2], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [0, 0], "x": 11, "y": 0}, + + {"matrix": [1, 11], "x": 0, "y": 1}, + {"matrix": [1, 10], "x": 1, "y": 1}, + {"matrix": [1, 9], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [1, 7], "x": 4, "y": 1}, + {"matrix": [1, 6], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [1, 2], "x": 9, "y": 1}, + {"matrix": [1, 1], "x": 10, "y": 1}, + {"matrix": [1, 0], "x": 11, "y": 1}, + + {"matrix": [2, 11], "x": 0, "y": 2}, + {"matrix": [2, 10], "x": 1, "y": 2}, + {"matrix": [2, 9], "x": 2, "y": 2}, + {"matrix": [2, 8], "x": 3, "y": 2}, + {"matrix": [2, 7], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2, "w": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 2], "x": 9, "y": 2}, + {"matrix": [2, 1], "x": 10, "y": 2}, + {"matrix": [2, 0], "x": 11, "y": 2} + ] + } + } +} diff --git a/keyboards/drhigsby/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h deleted file mode 100644 index 3a397dda5f..0000000000 --- a/keyboards/drhigsby/ogurec/left_pm/left_pm.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 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" - -/* 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_ortho_3x12( \ - k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \ - k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100, \ - k211, k210, k209, k208, k207, k206, k205, k204, k203, k202, k201, k200 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_ortho_3x12_1x2uC( \ - k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \ - k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100, \ - k211, k210, k209, k208, k207, k205, k204, k203, k202, k201, k200 \ -) \ -{ \ - { 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, KC_NO, k207, k208, k209, k210, k211 } \ -} diff --git a/keyboards/drhigsby/ogurec/right_pm/info.json b/keyboards/drhigsby/ogurec/right_pm/info.json new file mode 100644 index 0000000000..8006014ea0 --- /dev/null +++ b/keyboards/drhigsby/ogurec/right_pm/info.json @@ -0,0 +1,87 @@ +{ + "layouts": { + "LAYOUT_ortho_3x12": { + "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} + ] + }, + "LAYOUT_ortho_3x12_1x2uC": { + "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, "w": 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} + ] + } + } +} diff --git a/keyboards/drhigsby/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h deleted file mode 100644 index 2ad2fe32c9..0000000000 --- a/keyboards/drhigsby/ogurec/right_pm/right_pm.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 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" - -/* 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_ortho_3x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_ortho_3x12_1x2uC( \ - 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, k207, k208, k209, k210, k211 \ -) \ -{ \ - { 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, KC_NO, k207, k208, k209, k210, k211 } \ -} diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json index df4bd4751c..1e180f8328 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/info.json @@ -23,19 +23,389 @@ "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT_ortho_5x14": { - "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":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":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}] - }, + "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": [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": [3, 0], "x": 0, "y": 1}, + {"matrix": [3, 1], "x": 1, "y": 1}, + {"matrix": [3, 2], "x": 2, "y": 1}, + {"matrix": [3, 3], "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + {"matrix": [3, 6], "x": 6, "y": 1}, + {"matrix": [3, 7], "x": 7, "y": 1}, + {"matrix": [3, 8], "x": 8, "y": 1}, + {"matrix": [3, 9], "x": 9, "y": 1}, + {"matrix": [3, 10], "x": 10, "y": 1}, + {"matrix": [3, 11], "x": 11, "y": 1}, + {"matrix": [3, 12], "x": 12, "y": 1}, + {"matrix": [3, 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": [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": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4}, + {"matrix": [0, 2], "x": 2, "y": 4}, + {"matrix": [0, 3], "x": 3, "y": 4}, + {"matrix": [0, 4], "x": 4, "y": 4}, + {"matrix": [0, 5], "x": 5, "y": 4}, + {"matrix": [0, 6], "x": 6, "y": 4}, + {"matrix": [0, 7], "x": 7, "y": 4}, + {"matrix": [0, 8], "x": 8, "y": 4}, + {"matrix": [0, 9], "x": 9, "y": 4}, + {"matrix": [0, 10], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [0, 13], "x": 13, "y": 4} + ] + }, "LAYOUT_ortho_5x14_1x2uC": { - "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":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":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, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "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": [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": [3, 0], "x": 0, "y": 1}, + {"matrix": [3, 1], "x": 1, "y": 1}, + {"matrix": [3, 2], "x": 2, "y": 1}, + {"matrix": [3, 3], "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + {"matrix": [3, 6], "x": 6, "y": 1}, + {"matrix": [3, 7], "x": 7, "y": 1}, + {"matrix": [3, 8], "x": 8, "y": 1}, + {"matrix": [3, 9], "x": 9, "y": 1}, + {"matrix": [3, 10], "x": 10, "y": 1}, + {"matrix": [3, 11], "x": 11, "y": 1}, + {"matrix": [3, 12], "x": 12, "y": 1}, + {"matrix": [3, 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": [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": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4}, + {"matrix": [0, 2], "x": 2, "y": 4}, + {"matrix": [0, 3], "x": 3, "y": 4}, + {"matrix": [0, 4], "x": 4, "y": 4}, + {"matrix": [0, 5], "x": 5, "y": 4}, + {"matrix": [0, 7], "x": 6, "y": 4, "w": 2}, + {"matrix": [0, 8], "x": 8, "y": 4}, + {"matrix": [0, 9], "x": 9, "y": 4}, + {"matrix": [0, 10], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [0, 13], "x": 13, "y": 4} + ] + }, "LAYOUT_ortho_5x14_1x2uL": { - "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":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":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, "w":2}, {"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}] - }, + "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": [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": [3, 0], "x": 0, "y": 1}, + {"matrix": [3, 1], "x": 1, "y": 1}, + {"matrix": [3, 2], "x": 2, "y": 1}, + {"matrix": [3, 3], "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + {"matrix": [3, 6], "x": 6, "y": 1}, + {"matrix": [3, 7], "x": 7, "y": 1}, + {"matrix": [3, 8], "x": 8, "y": 1}, + {"matrix": [3, 9], "x": 9, "y": 1}, + {"matrix": [3, 10], "x": 10, "y": 1}, + {"matrix": [3, 11], "x": 11, "y": 1}, + {"matrix": [3, 12], "x": 12, "y": 1}, + {"matrix": [3, 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": [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": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4}, + {"matrix": [0, 2], "x": 2, "y": 4}, + {"matrix": [0, 3], "x": 3, "y": 4}, + {"matrix": [0, 4], "x": 4, "y": 4}, + {"matrix": [0, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [0, 7], "x": 7, "y": 4}, + {"matrix": [0, 8], "x": 8, "y": 4}, + {"matrix": [0, 9], "x": 9, "y": 4}, + {"matrix": [0, 10], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [0, 13], "x": 13, "y": 4} + ] + }, "LAYOUT_ortho_5x14_1x2uR": { - "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":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":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, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "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": [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": [3, 0], "x": 0, "y": 1}, + {"matrix": [3, 1], "x": 1, "y": 1}, + {"matrix": [3, 2], "x": 2, "y": 1}, + {"matrix": [3, 3], "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + {"matrix": [3, 6], "x": 6, "y": 1}, + {"matrix": [3, 7], "x": 7, "y": 1}, + {"matrix": [3, 8], "x": 8, "y": 1}, + {"matrix": [3, 9], "x": 9, "y": 1}, + {"matrix": [3, 10], "x": 10, "y": 1}, + {"matrix": [3, 11], "x": 11, "y": 1}, + {"matrix": [3, 12], "x": 12, "y": 1}, + {"matrix": [3, 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": [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": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4}, + {"matrix": [0, 2], "x": 2, "y": 4}, + {"matrix": [0, 3], "x": 3, "y": 4}, + {"matrix": [0, 4], "x": 4, "y": 4}, + {"matrix": [0, 5], "x": 5, "y": 4}, + {"matrix": [0, 6], "x": 6, "y": 4}, + {"matrix": [0, 8], "x": 7, "y": 4, "w": 2}, + {"matrix": [0, 9], "x": 9, "y": 4}, + {"matrix": [0, 10], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [0, 13], "x": 13, "y": 4} + ] + }, "LAYOUT_ortho_5x14_2x2u": { - "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":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":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, "w":2}, {"x":7, "y":4, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "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": [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": [3, 0], "x": 0, "y": 1}, + {"matrix": [3, 1], "x": 1, "y": 1}, + {"matrix": [3, 2], "x": 2, "y": 1}, + {"matrix": [3, 3], "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + {"matrix": [3, 6], "x": 6, "y": 1}, + {"matrix": [3, 7], "x": 7, "y": 1}, + {"matrix": [3, 8], "x": 8, "y": 1}, + {"matrix": [3, 9], "x": 9, "y": 1}, + {"matrix": [3, 10], "x": 10, "y": 1}, + {"matrix": [3, 11], "x": 11, "y": 1}, + {"matrix": [3, 12], "x": 12, "y": 1}, + {"matrix": [3, 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": [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": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4}, + {"matrix": [0, 2], "x": 2, "y": 4}, + {"matrix": [0, 3], "x": 3, "y": 4}, + {"matrix": [0, 4], "x": 4, "y": 4}, + {"matrix": [0, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [0, 8], "x": 7, "y": 4, "w": 2}, + {"matrix": [0, 9], "x": 9, "y": 4}, + {"matrix": [0, 10], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [0, 13], "x": 13, "y": 4} + ] + } } } diff --git a/keyboards/ealdin/quadrant/quadrant.c b/keyboards/ealdin/quadrant/quadrant.c index a5aff62dae..f98cafd750 100644 --- a/keyboards/ealdin/quadrant/quadrant.c +++ b/keyboards/ealdin/quadrant/quadrant.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 "quadrant.h" +#include "quantum.h" // Rotary encoder functions: diff --git a/keyboards/ealdin/quadrant/quadrant.h b/keyboards/ealdin/quadrant/quadrant.h deleted file mode 100644 index 8c6f5215e8..0000000000 --- a/keyboards/ealdin/quadrant/quadrant.h +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright 2020 Ealdin Keyboards - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 ___ KC_NO -#define LAYOUT_ortho_5x14( \ - 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 \ -) \ -{ \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \ - { 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 }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \ -} - -#define LAYOUT_ortho_5x14_1x2uC( \ - 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, k47, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k40, k41, k42, k43, k44, k45, ___, k47, k48, k49, k4a, k4b, k4c, k4d }, \ - { 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 }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \ -} - -#define LAYOUT_ortho_5x14_1x2uL( \ - 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, k46, k47, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k40, k41, k42, k43, k44, __, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \ - { 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 }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \ -} - -#define LAYOUT_ortho_5x14_1x2uR( \ - 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, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k40, k41, k42, k43, k44, k45, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \ - { 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 }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \ -} - -#define LAYOUT_ortho_5x14_2x2u( \ - 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, k46, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \ - { 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 }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \ -} diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json index ee4d27aa19..9df49db14c 100644 --- a/keyboards/edi/hardlight/mk1/info.json +++ b/keyboards/edi/hardlight/mk1/info.json @@ -16,70 +16,73 @@ "layouts": { "LAYOUT_ortho_4x16": { "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 } + {"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}, + {"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, "y": 2}, + {"matrix": [4, 3], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [5, 4], "x": 9, "y": 2}, + {"matrix": [4, 5], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [5, 6], "x": 13, "y": 2}, + {"matrix": [4, 7], "x": 14, "y": 2}, + {"matrix": [5, 7], "x": 15, "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}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [7, 7], "x": 15, "y": 3} ] } } diff --git a/keyboards/edi/hardlight/mk1/mk1.h b/keyboards/edi/hardlight/mk1/mk1.h deleted file mode 100644 index e8ef9777a4..0000000000 --- a/keyboards/edi/hardlight/mk1/mk1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -This program is free software: you can 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 -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_ortho_4x16( \ - 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, K02, K04, K06, K08, K10, K12, K14 }, \ - { K01, K03, K05, K07, K09, K11, K13, K15 }, \ - { K16, K18, K20, K22, K24, K26, K28, K30 }, \ - { K17, K19, K21, K23, K25, K27, K29, K31 }, \ - { K32, K34, K36, K38, K40, K42, K44, K46 }, \ - { K33, K35, K37, K39, K41, K43, K45, K47 }, \ - { K48, K50, K52, K54, K56, K58, K60, K62 }, \ - { K49, K51, K53, K55, K57, K59, K61, K63 } \ -} diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index 239d0aa55e..d200bb0863 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -20,70 +20,73 @@ "layouts": { "LAYOUT_ortho_4x16": { "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 } + {"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}, + {"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, "y": 2}, + {"matrix": [4, 3], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [5, 4], "x": 9, "y": 2}, + {"matrix": [4, 5], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [5, 6], "x": 13, "y": 2}, + {"matrix": [4, 7], "x": 14, "y": 2}, + {"matrix": [5, 7], "x": 15, "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}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [7, 7], "x": 15, "y": 3} ] } } diff --git a/keyboards/edi/hardlight/mk2/mk2.h b/keyboards/edi/hardlight/mk2/mk2.h deleted file mode 100644 index 5065582d65..0000000000 --- a/keyboards/edi/hardlight/mk2/mk2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -This program is free software: you can 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_ortho_4x16( \ - 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, K02, K04, K06, K08, K10, K12, K14 }, \ - { K01, K03, K05, K07, K09, K11, K13, K15 }, \ - { K16, K18, K20, K22, K24, K26, K28, K30 }, \ - { K17, K19, K21, K23, K25, K27, K29, K31 }, \ - { K32, K34, K36, K38, K40, K42, K44, K46 }, \ - { K33, K35, K37, K39, K41, K43, K45, K47 }, \ - { K48, K50, K52, K54, K56, K58, K60, K62 }, \ - { K49, K51, K53, K55, K57, K59, K61, K63 } \ -} diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json index 2310db8948..b418f9b202 100644 --- a/keyboards/edi/standaside/info.json +++ b/keyboards/edi/standaside/info.json @@ -18,73 +18,73 @@ "layouts": { "LAYOUT_ortho_4x16": { "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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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, "y": 2}, + {"matrix": [4, 3], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [5, 4], "x": 9, "y": 2}, + {"matrix": [4, 5], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [5, 6], "x": 13, "y": 2}, + {"matrix": [4, 7], "x": 14, "y": 2}, + {"matrix": [5, 7], "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} + {"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}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [7, 7], "x": 15, "y": 3} ] } } diff --git a/keyboards/edi/standaside/standaside.h b/keyboards/edi/standaside/standaside.h deleted file mode 100644 index 9601f1257c..0000000000 --- a/keyboards/edi/standaside/standaside.h +++ /dev/null @@ -1,23 +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 -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_ortho_4x16( \ - 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, k56, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, 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/efreet/efreet.h b/keyboards/efreet/efreet.h deleted file mode 100644 index 4b0c9f552e..0000000000 --- a/keyboards/efreet/efreet.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2019 Amber Holly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75 \ -) { \ - { k10, k11, k12, k13, k14, k15 }, \ - { k00, k01, k02, k03, k04, k05 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k60, k61, k62, k63, k64, k65 } \ -} - -#define LAYOUT_planck_mit( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ - k60, k70, k61, k71, k62, k72, k73, k64, k74, k65, k75 \ -) { \ - { k10, k11, k12, k13, k14, k15 }, \ - { k00, k01, k02, k03, k04, k05 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k60, k61, k62, XXX, k64, k65 } \ -} diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index 664010de25..ea2a48be25 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -23,111 +23,111 @@ "layouts": { "LAYOUT_planck_mit": { "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": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 4], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 5], "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}, + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [2, 0], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [3, 2], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [3, 3], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 4], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 5], "x": 10, "y": 1}, + {"matrix": [2, 5], "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}, + {"matrix": [5, 0], "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 1], "x": 2, "y": 2}, + {"matrix": [4, 1], "x": 3, "y": 2}, + {"matrix": [5, 2], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [4, 5], "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": [7, 0], "x": 0, "y": 3}, + {"matrix": [6, 0], "x": 1, "y": 3}, + {"matrix": [7, 1], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3}, + {"matrix": [7, 2], "x": 4, "y": 3}, + {"matrix": [6, 2], "x": 5, "y": 3, "w": 2}, + {"matrix": [6, 3], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [6, 4], "x": 9, "y": 3}, + {"matrix": [7, 5], "x": 10, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3} ] }, "LAYOUT_ortho_4x12": { "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": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 4], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 5], "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}, + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [2, 0], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [3, 2], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [3, 3], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 4], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 5], "x": 10, "y": 1}, + {"matrix": [2, 5], "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}, + {"matrix": [5, 0], "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 1], "x": 2, "y": 2}, + {"matrix": [4, 1], "x": 3, "y": 2}, + {"matrix": [5, 2], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [4, 5], "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": [7, 0], "x": 0, "y": 3}, + {"matrix": [6, 0], "x": 1, "y": 3}, + {"matrix": [7, 1], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3}, + {"matrix": [7, 2], "x": 4, "y": 3}, + {"matrix": [6, 2], "x": 5, "y": 3}, + {"matrix": [7, 3], "x": 6, "y": 3}, + {"matrix": [6, 3], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [6, 4], "x": 9, "y": 3}, + {"matrix": [7, 5], "x": 10, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3} ] } } diff --git a/keyboards/emi20/emi20.h b/keyboards/emi20/emi20.h deleted file mode 100644 index 30d5750e49..0000000000 --- a/keyboards/emi20/emi20.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index dff7a57bc1..5e0f694135 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -18,30 +18,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"label":"K11 (F7,C7)", "x":0, "y":0}, - {"label":"K21 (F1,C7)", "x":1, "y":0}, - {"label":"K31 (B2,C7)", "x":2, "y":0}, - {"label":"K41 (B2,F0)", "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}, - {"label":"K12 (F1,F0)", "x":0, "y":1}, - {"label":"K22 (B2,B6)", "x":1, "y":1}, - {"label":"K32 (F1,B6)", "x":2, "y":1}, - {"label":"K42 (B2,B3)", "x":3, "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}, - {"label":"K13 (F1,B3)", "x":0, "y":2}, - {"label":"K23 (B2,C6)", "x":1, "y":2}, - {"label":"K33 (F1,C6)", "x":2, "y":2}, - {"label":"K43 (B2,E6)", "x":3, "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}, - {"label":"K14 (F1,E6)", "x":0, "y":3}, - {"label":"K24 (B2,D5)", "x":1, "y":3}, - {"label":"K34 (F1,D5)", "x":2, "y":3}, - {"label":"K44 (D0,B1)", "x":3, "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}, - {"label":"K15 (D0,F4)", "x":0, "y":4}, - {"label":"K25 (F7,D1)", "x":1, "y":4}, - {"label":"K35 (F7,B3)", "x":2, "y":4}, - {"label":"K45 (B5,C7)", "x":3, "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} ] } } diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json index 240e6a4b0a..0a62863488 100644 --- a/keyboards/evancookaudio/tenpad/info.json +++ b/keyboards/evancookaudio/tenpad/info.json @@ -16,22 +16,20 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { + "LAYOUT_ortho_2x5": { + "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}, - "LAYOUT_ortho_2x5": { - "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": 0, "y": 1 }, - { "label": "K07", "x": 1, "y": 1 }, - { "label": "K08", "x": 2, "y": 1 }, - { "label": "K09", "x": 3, "y": 1 }, - { "label": "K10", "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} ] - } + } } } diff --git a/keyboards/evancookaudio/tenpad/tenpad.h b/keyboards/evancookaudio/tenpad/tenpad.h deleted file mode 100644 index c9d6fa62c9..0000000000 --- a/keyboards/evancookaudio/tenpad/tenpad.h +++ /dev/null @@ -1,26 +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" - -#define LAYOUT_ortho_2x5(\ - k00, k01, k02, k03, k04, \ - k05, k06, k07, k08, k09 \ - ) { \ - {k00, k01, k02, k03, k04},\ - {k05, k06, k07, k08, k09},\ - } diff --git a/keyboards/evyd13/eon40/eon40.h b/keyboards/evyd13/eon40/eon40.h deleted file mode 100644 index 03e680d8bd..0000000000 --- a/keyboards/evyd13/eon40/eon40.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 2019 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 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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_planck_mit( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12_2x2u( \ - 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, 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, k34, XXX, XXX, k37, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index efed477015..fb577ebb29 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -29,13 +29,166 @@ "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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} + ] }, "LAYOUT_planck_mit": { - "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}] + "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}, + {"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} + ] }, "LAYOUT_ortho_4x12_2x2u": { - "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, "w":2}, {"x":6, "y":3, "w":2}, {"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}, + {"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, "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/evyd13/gh80_3700/gh80_3700.c b/keyboards/evyd13/gh80_3700/gh80_3700.c index 40093f1022..617de50d5d 100644 --- a/keyboards/evyd13/gh80_3700/gh80_3700.c +++ b/keyboards/evyd13/gh80_3700/gh80_3700.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 "gh80_3700.h" +#include "quantum.h" void led_init_ports(void) { setPinOutput(E6); diff --git a/keyboards/evyd13/gh80_3700/gh80_3700.h b/keyboards/evyd13/gh80_3700/gh80_3700.h deleted file mode 100644 index 4a350a9554..0000000000 --- a/keyboards/evyd13/gh80_3700/gh80_3700.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2020 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" - -/* 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_all LAYOUT_ortho_6x4 - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k52, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, KC_NO }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, KC_NO }, \ - { k50, KC_NO, k52, k53 } \ -} diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json index 91b8b5ee59..ac66909e59 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/info.json @@ -21,68 +21,71 @@ "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], + "layout_aliases": { + "LAYOUT_all": "LAYOUT_ortho_6x4" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "y":5}, - - {"x":0, "y":6}, - {"x":1, "y":6}, - {"x":2, "y":6}, - {"x":3, "y":6} + {"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": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 2}, + + {"matrix": [2, 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": [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": [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": [5, 0], "x": 0, "y": 6}, + {"matrix": [5, 1], "x": 1, "y": 6}, + {"matrix": [5, 2], "x": 2, "y": 6}, + {"matrix": [5, 3], "x": 3, "y": 6} ] }, "LAYOUT_numpad_6x4": { "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2}, + {"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": 3, "h": 2}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, + {"matrix": [4, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 2], "x": 2, "y": 5}, - {"x":0, "y":6, "w":2}, - {"x":2, "y":6}, - {"x":3, "y":5, "h":2} + {"matrix": [5, 0], "x": 0, "y": 6, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 6}, + {"matrix": [5, 3], "x": 3, "y": 5, "h": 2} ] } } diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index 0ea40b5ea2..30010ad30b 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -18,7 +18,59 @@ "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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/evyd13/pockettype/pockettype.c b/keyboards/evyd13/pockettype/pockettype.c index 06175edf5a..b9aee69496 100644 --- a/keyboards/evyd13/pockettype/pockettype.c +++ b/keyboards/evyd13/pockettype/pockettype.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 "pockettype.h" +#include "quantum.h" void led_init_ports(void) { // * Enable LED anodes (Vbus pin is replaced by B0 on some boards) diff --git a/keyboards/evyd13/pockettype/pockettype.h b/keyboards/evyd13/pockettype/pockettype.h deleted file mode 100644 index 8c103dcc8f..0000000000 --- a/keyboards/evyd13/pockettype/pockettype.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 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" - -/* 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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json index 439b1bba27..956482bbea 100644 --- a/keyboards/flehrad/snagpad/info.json +++ b/keyboards/flehrad/snagpad/info.json @@ -20,47 +20,55 @@ "LAYOUT_ortho_5x4": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "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}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"+", "x":3, "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}, - {"label":"0", "x":0, "y":4}, - {"label":"0", "x":1, "y":4}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} ] }, "LAYOUT_numpad_5x4": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"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":"+", "x":3, "y":1, "h":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":3, "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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/flehrad/snagpad/snagpad.h b/keyboards/flehrad/snagpad/snagpad.h deleted file mode 100644 index f1e5e34e62..0000000000 --- a/keyboards/flehrad/snagpad/snagpad.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO } \ -} diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json index e720f03c02..fff21fa7bc 100644 --- a/keyboards/flehrad/tradestation/info.json +++ b/keyboards/flehrad/tradestation/info.json @@ -19,44 +19,44 @@ "layouts": { "LAYOUT_tradestation": { "layout": [ - {"x":0, "y":0}, - {"x":1.125, "y":0}, - {"x":2.25, "y":0}, - {"x":3.375, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.125, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.375, "y": 0}, - {"x":0, "y":1.1}, - {"x":1.125, "y":1.1}, - {"x":2.25, "y":1.1}, - {"x":3.375, "y":1.1}, + {"matrix": [1, 0], "x": 0, "y": 1.1}, + {"matrix": [1, 1], "x": 1.125, "y": 1.1}, + {"matrix": [1, 2], "x": 2.25, "y": 1.1}, + {"matrix": [1, 3], "x": 3.375, "y": 1.1}, - {"x":0, "y":2.25, "w":2}, - {"x":2.25, "y":2.25, "w":2}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 2}, - {"x":0, "y":3.5, "w":2}, - {"x":2.25, "y":3.5, "w":2} + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2}, + {"matrix": [3, 2], "x": 2.25, "y": 3.5, "w": 2} ] }, "LAYOUT_ortho_4x4": { "layout": [ - {"x":0, "y":0}, - {"x":1.125, "y":0}, - {"x":2.25, "y":0}, - {"x":3.375, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.125, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.375, "y": 0}, - {"x":0, "y":1.1}, - {"x":1.125, "y":1.1}, - {"x":2.25, "y":1.1}, - {"x":3.375, "y":1.1}, + {"matrix": [1, 0], "x": 0, "y": 1.1}, + {"matrix": [1, 1], "x": 1.125, "y": 1.1}, + {"matrix": [1, 2], "x": 2.25, "y": 1.1}, + {"matrix": [1, 3], "x": 3.375, "y": 1.1}, - {"x":0, "y":2.25}, - {"x":1.125, "y":2.25}, - {"x":2.25, "y":2.25}, - {"x":3.375, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.125, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.375, "y": 2.25}, - {"x":0, "y":3.5}, - {"x":1.125, "y":3.5}, - {"x":2.25, "y":3.5}, - {"x":3.375, "y":3.5} + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1.125, "y": 3.5}, + {"matrix": [3, 2], "x": 2.25, "y": 3.5}, + {"matrix": [3, 3], "x": 3.375, "y": 3.5} ] } } diff --git a/keyboards/flehrad/tradestation/tradestation.h b/keyboards/flehrad/tradestation/tradestation.h deleted file mode 100644 index 8061432596..0000000000 --- a/keyboards/flehrad/tradestation/tradestation.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 flehrad - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_tradestation( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K22, \ - K30, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, KC_NO, K22, KC_NO }, \ - { K30, KC_NO, K32, KC_NO } \ -} diff --git a/keyboards/fleuron/fleuron.h b/keyboards/fleuron/fleuron.h deleted file mode 100644 index 38f6bb38bf..0000000000 --- a/keyboards/fleuron/fleuron.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 James Underwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_6x16( \ - 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, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, 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, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F } \ -} - -#define LAYOUT_fleuron_grid LAYOUT_ortho_6x16 diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 2459612958..d4bb44cd89 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -14,105 +14,114 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_fleuron_grid": "LAYOUT_ortho_6x16" + }, "layouts": { "LAYOUT_ortho_6x16": { "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":"Home", "x":13, "y":0}, - {"label":"PgUp", "x":14, "y":0}, - {"label":"Bksp", "x":15, "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":"Bksp", "x":11, "y":1}, - {"label":"Delete", "x":12, "y":1}, - {"label":"End", "x":13, "y":1}, - {"label":"PgDn", "x":14, "y":1}, - {"label":"", "x":15, "y":1}, - {"label":"Tab", "x":0, "y":2}, - {"label":"q", "x":1, "y":2}, - {"label":"w", "x":2, "y":2}, - {"label":"e", "x":3, "y":2}, - {"label":"r", "x":4, "y":2}, - {"label":"t", "x":5, "y":2}, - {"label":"y", "x":6, "y":2}, - {"label":"u", "x":7, "y":2}, - {"label":"i", "x":8, "y":2}, - {"label":"o", "x":9, "y":2}, - {"label":"p", "x":10, "y":2}, - {"label":"\\", "x":11, "y":2}, - {"label":"7", "x":12, "y":2}, - {"label":"8", "x":13, "y":2}, - {"label":"9", "x":14, "y":2}, - {"label":"*", "x":15, "y":2}, - {"label":"Caps Lock", "x":0, "y":3}, - {"label":"a", "x":1, "y":3}, - {"label":"s", "x":2, "y":3}, - {"label":"d", "x":3, "y":3}, - {"label":"f", "x":4, "y":3}, - {"label":"g", "x":5, "y":3}, - {"label":"h", "x":6, "y":3}, - {"label":"j", "x":7, "y":3}, - {"label":"k", "x":8, "y":3}, - {"label":"l", "x":9, "y":3}, - {"label":";", "x":10, "y":3}, - {"label":"'", "x":11, "y":3}, - {"label":"4", "x":12, "y":3}, - {"label":"5", "x":13, "y":3}, - {"label":"6", "x":14, "y":3}, - {"label":"-", "x":15, "y":3}, - {"label":"Shift", "x":0, "y":4}, - {"label":"z", "x":1, "y":4}, - {"label":"x", "x":2, "y":4}, - {"label":"c", "x":3, "y":4}, - {"label":"v", "x":4, "y":4}, - {"label":"b", "x":5, "y":4}, - {"label":"n", "x":6, "y":4}, - {"label":"m", "x":7, "y":4}, - {"label":",", "x":8, "y":4}, - {"label":".", "x":9, "y":4}, - {"label":"/", "x":10, "y":4}, - {"label":"Enter", "x":11, "y":4}, - {"label":"1", "x":12, "y":4}, - {"label":"2", "x":13, "y":4}, - {"label":"3", "x":14, "y":4}, - {"label":"+", "x":15, "y":4}, - {"label":"RGB", "x":0, "y":5}, - {"label":"Ctrl", "x":1, "y":5}, - {"label":"Win", "x":2, "y":5}, - {"label":"Alt", "x":3, "y":5}, - {"label":"Lower", "x":4, "y":5}, - {"label":"Space", "x":5, "y":5}, - {"label":"Space", "x":6, "y":5}, - {"label":"Raise", "x":7, "y":5}, - {"label":"\u2190", "x":8, "y":5}, - {"label":"\u2193", "x":9, "y":5}, - {"label":"\u2191", "x":10, "y":5}, - {"label":"\u2192", "x":11, "y":5}, - {"label":"0", "x":12, "y":5}, - {"label":"00", "x":13, "y":5}, - {"label":".", "x":14, "y":5}, - {"label":"Enter", "x":15, "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}, + {"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}, + {"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": [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}, + {"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": [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} + ] } } } diff --git a/keyboards/fractal/fractal.h b/keyboards/fractal/fractal.h deleted file mode 100755 index 0af7c22390..0000000000 --- a/keyboards/fractal/fractal.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x12( \ - 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, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 \ -) { \ - { 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 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 } \ -} - -#define LAYOUT_preonic_mit( \ - 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, \ - K400, K401, K402, K403, K404, K406, K407, K408, K409, K410, K411 \ -) { \ - { 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 }, \ - { K400, K401, K402, K403, K404, KC_NO, K406, K407, K408, K409, K410, K411 } \ -} diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json index a8d41c884a..0d2ce4aeca 100644 --- a/keyboards/fractal/info.json +++ b/keyboards/fractal/info.json @@ -18,10 +18,139 @@ "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "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}, {"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}] - }, - "LAYOUT_preonic_mit": { - "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}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "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": [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, 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} + ] + }, + "LAYOUT_preonic_mit": { + "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}, + {"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/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c index 390213ef26..e28f5d43c7 100755 --- a/keyboards/gizmo_engineering/gk6/gk6.c +++ b/keyboards/gizmo_engineering/gk6/gk6.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "gk6.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/gizmo_engineering/gk6/gk6.h b/keyboards/gizmo_engineering/gk6/gk6.h deleted file mode 100755 index c774124b62..0000000000 --- a/keyboards/gizmo_engineering/gk6/gk6.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright 2021 Gizmo Engineering - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_2x2u( \ - 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, k47, 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, KC_NO, k47, k48, k49, k4a, k4b }, \ -} - -#define LAYOUT_1x2u( \ - 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, k46, k47, 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, k47, k48, k49, k4a, k4b }, \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 }, \ -} diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json index f3169e3c0d..8c6ab64b26 100644 --- a/keyboards/gizmo_engineering/gk6/info.json +++ b/keyboards/gizmo_engineering/gk6/info.json @@ -22,203 +22,203 @@ "layouts": { "LAYOUT_2x2u": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"x": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, "w": 2}, + {"matrix": [4, 7], "x": 6, "y": 4, "w": 2}, + {"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} ] }, "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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} ] }, "LAYOUT_1x2u": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, 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/gkeyboard/gkb_m16/gkb_m16.h b/keyboards/gkeyboard/gkb_m16/gkb_m16.h deleted file mode 100644 index 8477f4cda3..0000000000 --- a/keyboards/gkeyboard/gkb_m16/gkb_m16.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 gkeyboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_4x4( \ - K01, K02, K03, K04, \ - K11, K12, K13, K14, \ - K21, K22, K23, K24, \ - K31, K32, K33, K34 \ -) \ -{ \ - { K01, K02, K03, K04 }, \ - { K11, K12, K13, K14 }, \ - { K21, K22, K23, K24 }, \ - { K31, K32, K33, K34 } \ -} diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index 4719f1ee94..c48e04ac11 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -18,22 +18,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/glenpickle/chimera_ls/chimera_ls.h b/keyboards/glenpickle/chimera_ls/chimera_ls.h index 7d67d573db..04ef56503f 100644 --- a/keyboards/glenpickle/chimera_ls/chimera_ls.h +++ b/keyboards/glenpickle/chimera_ls/chimera_ls.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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json index b56a6309fe..262a26afb6 100644 --- a/keyboards/handwired/floorboard/info.json +++ b/keyboards/handwired/floorboard/info.json @@ -20,57 +20,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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":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": [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":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": [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/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index f7cfe21d00..07a369a937 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -23,70 +23,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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":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": [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":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": [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}, - {"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": [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/jot50/jot50.h b/keyboards/handwired/jot50/jot50.h deleted file mode 100644 index b7e67ae61f..0000000000 --- a/keyboards/handwired/jot50/jot50.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - - -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json index 5aced7ca97..0e4966218a 100644 --- a/keyboards/handwired/jotanck/info.json +++ b/keyboards/handwired/jotanck/info.json @@ -19,57 +19,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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":10, "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": 10, "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":10, "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": 10, "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":10, "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": 10, "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":10, "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": 10, "y": 3} ] } } diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c index b20d3e1289..c0b54bb64d 100644 --- a/keyboards/handwired/jotanck/jotanck.c +++ b/keyboards/handwired/jotanck/jotanck.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "jotanck.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(JOTANCK_LED1); diff --git a/keyboards/handwired/jotanck/jotanck.h b/keyboards/handwired/jotanck/jotanck.h deleted file mode 100644 index 4fa7cd4993..0000000000 --- a/keyboards/handwired/jotanck/jotanck.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2023 jotix - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json index 2d01be7b48..289ef636b4 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/info.json @@ -20,25 +20,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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} ] } } diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c index 439cfc7b1e..02b4daafd6 100644 --- a/keyboards/handwired/jotpad16/jotpad16.c +++ b/keyboards/handwired/jotpad16/jotpad16.c @@ -1,4 +1,4 @@ -#include "jotpad16.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(JOTPAD16_LED1); diff --git a/keyboards/handwired/jotpad16/jotpad16.h b/keyboards/handwired/jotpad16/jotpad16.h deleted file mode 100644 index 012c9290dd..0000000000 --- a/keyboards/handwired/jotpad16/jotpad16.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Used to create a keymap using only KC_ prefixed keys -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} - diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json index ceac0277d0..e0cd79a9c0 100644 --- a/keyboards/handwired/k_numpad17/info.json +++ b/keyboards/handwired/k_numpad17/info.json @@ -19,27 +19,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 1, "h": 2}, + {"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": 1, "h": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x": 0, "y": 4, "w": 2}, - {"x": 2, "y": 4}, - {"x": 3, "y": 3, "h": 2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/k_numpad17/k_numpad17.h b/keyboards/handwired/k_numpad17/k_numpad17.h deleted file mode 100644 index 1fc99794df..0000000000 --- a/keyboards/handwired/k_numpad17/k_numpad17.h +++ /dev/null @@ -1,35 +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_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k33 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, KC_NO, k41, KC_NO} \ -} - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | | - * |----|----|----| 13 | - * | 20 | 21 | 22 | | - * |----|----|----|----| - * | 30 | 31 | 32 | | - * |----|----|----| 33 | - * | 40 | 41 | | - * `-------------------' - */ - - diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h deleted file mode 100644 index 78e485f00e..0000000000 --- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2022 Tomek (@m40-dev) -// 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_ortho_5x5( \ - K000, K001, K002, K003, K004, \ - K100, K101, K102, K103, K104, \ - K200, K201, K202, K203, K204, \ - K300, K301, K302, K303, K304, \ - K400, K401, K402, K403, K404 ) { \ - { K000, K001, K002, K003, K004 }, \ - { K100, K101, K102, K103, K104 }, \ - { K200, K201, K202, K203, K204 }, \ - { K300, K301, K302, K303, K304 }, \ - { K400, K401, K402, K403, K404 } \ -} diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index d5eeb65eb0..a6b2ee19de 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -18,37 +18,36 @@ "layouts": { "LAYOUT_ortho_5x5": { "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}, + {"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}, - {"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}, + {"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}, - {"label":"K200", "x":0, "y":2}, - {"label":"K201", "x":1, "y":2}, - {"label":"K202", "x":2, "y":2}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "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}, - {"label":"K300", "x":0, "y":3}, - {"label":"K301", "x":1, "y":3}, - {"label":"K302", "x":2, "y":3}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "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}, - {"label":"K400", "x":0, "y":4}, - {"label":"K401", "x":1, "y":4}, - {"label":"K402", "x":2, "y":4}, - {"label":"K403", "x":3, "y":4}, - {"label":"K404", "x":4, "y":4} - - ] - } - } - } \ No newline at end of file + {"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} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json index cb3645f358..5de694fbef 100644 --- a/keyboards/handwired/macroboard/info.json +++ b/keyboards/handwired/macroboard/info.json @@ -11,36 +11,40 @@ "layouts": { "LAYOUT_ortho_5x6": { "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": "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": "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": "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": "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} + {"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": [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": [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, 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, 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} ] } } diff --git a/keyboards/handwired/macroboard/macroboard.h b/keyboards/handwired/macroboard/macroboard.h deleted file mode 100644 index 9909e63afc..0000000000 --- a/keyboards/handwired/macroboard/macroboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Michał Szczepaniak - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_5x6( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index 860d0441a4..b2280b6204 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -16,114 +16,117 @@ "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { "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}, + {"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":"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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} ] }, "LAYOUT_ortho_4x12_1x2uC": { "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}, + {"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":"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}, + {"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}, - {"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}, + {"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}, - {"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, "w":2}, - {"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} + {"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} ] } } diff --git a/keyboards/handwired/ortho_brass/ortho_brass.c b/keyboards/handwired/ortho_brass/ortho_brass.c index d124bbfca2..d645306afa 100644 --- a/keyboards/handwired/ortho_brass/ortho_brass.c +++ b/keyboards/handwired/ortho_brass/ortho_brass.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ortho_brass.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/handwired/ortho_brass/ortho_brass.h b/keyboards/handwired/ortho_brass/ortho_brass.h deleted file mode 100644 index 0bcff0db51..0000000000 --- a/keyboards/handwired/ortho_brass/ortho_brass.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 Christoph Jabs (BifbofII) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index 9440cda961..993bcf407e 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -26,54 +26,57 @@ "c_macro": true, "filename": "keyboards/handwired/reclined/reclined.h", "layout": [ - { "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": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "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/handwired/reclined/reclined.h b/keyboards/handwired/reclined/reclined.h deleted file mode 100644 index 9a665f3a9b..0000000000 --- a/keyboards/handwired/reclined/reclined.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2018 Daniel Perrett - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 60cfdb9d3b..7b9b320b98 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -25,70 +25,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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/riblee_f401/riblee_f401.h b/keyboards/handwired/riblee_f401/riblee_f401.h deleted file mode 100644 index a1b326aae4..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 QMK Community, Janos Daniel Reibl @riblee - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json index 3a4c78b948..d13dfb2291 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/info.json @@ -20,70 +20,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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/riblee_f411/riblee_f411.h b/keyboards/handwired/riblee_f411/riblee_f411.h deleted file mode 100644 index b06173aafd..0000000000 --- a/keyboards/handwired/riblee_f411/riblee_f411.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 QMK Community, Janos Daniel Reibl - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index 4269af4173..214eb64dfc 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -24,70 +24,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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/rs60/rs60.h b/keyboards/handwired/rs60/rs60.h deleted file mode 100644 index 294149729e..0000000000 --- a/keyboards/handwired/rs60/rs60.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2018 QMK Community - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_5x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json index 8ba6353c99..fc1e39eb33 100644 --- a/keyboards/handwired/sick_pad/info.json +++ b/keyboards/handwired/sick_pad/info.json @@ -20,27 +20,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/sick_pad/sick_pad.h b/keyboards/handwired/sick_pad/sick_pad.h deleted file mode 100644 index 2fe82388de..0000000000 --- a/keyboards/handwired/sick_pad/sick_pad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { KC_NO, K41, K42, K43 } \ -} diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json index 4ff90591d1..9506e088f9 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/info.json @@ -22,7 +22,37 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "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": [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": [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.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.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": [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} + ] } } } diff --git a/keyboards/handwired/swiftrax/joypad/joypad.h b/keyboards/handwired/swiftrax/joypad/joypad.h deleted file mode 100644 index f2ba34525e..0000000000 --- a/keyboards/handwired/swiftrax/joypad/joypad.h +++ /dev/null @@ -1,33 +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 LAYOUT_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - {K00, K01, K02, K03}, \ - {K10, K11, K12, K13}, \ - {K20, K21, K22, K23}, \ - {K30, K31, K32, K33}, \ - {K40, K41, K42, K43}, \ - {K50, K51, K52, K53} \ -} diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json index 6b6019821a..5841b607da 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/info.json @@ -19,77 +19,81 @@ "layouts": { "LAYOUT_ortho_5x14": { "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, "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, "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, "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, "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":5.5, "y":4}, - {"label":"K46", "x":6.5, "y":4}, - {"label":"K47", "x":7.5, "y":4}, - {"label":"K48", "x":8.5, "y":4}, - {"label":"K49", "x":9.5, "y":4}, - {"label":"K4A", "x":10.5, "y":4}, - {"label":"K4B", "x":11.5, "y":4}, - {"label":"K4C", "x":12.5, "y":4}, - {"label":"K4D", "x":13.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, "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}, + + {"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": [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": [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, "w": 1.5} + ] + } } } diff --git a/keyboards/handwired/symmetry60/symmetry60.h b/keyboards/handwired/symmetry60/symmetry60.h deleted file mode 100644 index 138e5bb234..0000000000 --- a/keyboards/handwired/symmetry60/symmetry60.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_ortho_5x14( \ - 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/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index f152b8bb5b..ccbeae4d2a 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -26,13 +26,98 @@ "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} + ] }, "LAYOUT_nontra_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "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, "h":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "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, "h":2}, {"label":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "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": [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": [3, 0], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [5, 0], "x": 3, "y": 4, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 5}, + {"matrix": [5, 2], "x": 1, "y": 5}, + {"matrix": [4, 3], "x": 2, "y": 5} + ] }, "LAYOUT_ortho_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "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":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "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":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}, {"label":"k53", "x":3, "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": [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}, + + {"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": [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": [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} + ] } } } diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.h b/keyboards/handwired/tritium_numpad/tritium_numpad.h deleted file mode 100644 index 8d2e783296..0000000000 --- a/keyboards/handwired/tritium_numpad/tritium_numpad.h +++ /dev/null @@ -1,95 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define XXX KC_NO - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 52 | | - * `-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, XXX}, \ - {k40, k41, k42, k43}, \ - {k50, XXX, k52, XXX} \ -} - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 51 | 52 | | - * `-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_nontra_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k51, k52, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, xxx}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, xxx} \ -} - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, k53} \ -} - -void keyboard_pre_init_user(void); -void matrix_scan_user(void); - diff --git a/keyboards/handwired/woodpad/info.json b/keyboards/handwired/woodpad/info.json index de084c3c1f..f3394897fc 100644 --- a/keyboards/handwired/woodpad/info.json +++ b/keyboards/handwired/woodpad/info.json @@ -19,30 +19,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "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} ] } } diff --git a/keyboards/handwired/woodpad/woodpad.h b/keyboards/handwired/woodpad/woodpad.h index 078e56cdfb..152c6c3b2b 100644 --- a/keyboards/handwired/woodpad/woodpad.h +++ b/keyboards/handwired/woodpad/woodpad.h @@ -20,25 +20,3 @@ extern void numlock_led_on(void); extern void numlock_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_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index fcfaa31914..02c7ef1d5c 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -17,9 +17,64 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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/handwired/wulkan/wulkan.h b/keyboards/handwired/wulkan/wulkan.h deleted file mode 100644 index cb4882ac95..0000000000 --- a/keyboards/handwired/wulkan/wulkan.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/hineybush/h10/h10.c b/keyboards/hineybush/h10/h10.c index 8c149c1451..81f5bdfbf2 100644 --- a/keyboards/hineybush/h10/h10.c +++ b/keyboards/hineybush/h10/h10.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "h10.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/hineybush/h10/h10.h b/keyboards/hineybush/h10/h10.h deleted file mode 100644 index 33010cb368..0000000000 --- a/keyboards/hineybush/h10/h10.h +++ /dev/null @@ -1,146 +0,0 @@ -/* Copyright 2020 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, k53} \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_zero( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {k50, k51, k52, k53} \ -} - -#define LAYOUT_split_enter( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_enter_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_zero_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {k50, k51, k52, k53} \ -} diff --git a/keyboards/hineybush/h10/info.json b/keyboards/hineybush/h10/info.json index d63c6da200..295b34da10 100644 --- a/keyboards/hineybush/h10/info.json +++ b/keyboards/hineybush/h10/info.json @@ -23,222 +23,222 @@ "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [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.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.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": [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} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_split_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [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.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.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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_split_zero": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [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": 4.25, "h": 2} ] }, "LAYOUT_split_enter": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} ] }, "LAYOUT_split_enter_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [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.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.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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} ] }, "LAYOUT_split_zero_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [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.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.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": [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": 4.25, "h": 2} ] } } diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index b0d2c6f712..3777bf03e0 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -22,7 +22,87 @@ "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { - "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}, {"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":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":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":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}] + "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}, + {"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/idobao/id75/v1/v1.h b/keyboards/idobao/id75/v1/v1.h deleted file mode 100644 index 9643a1efd3..0000000000 --- a/keyboards/idobao/id75/v1/v1.h +++ /dev/null @@ -1,41 +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" - -/* 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_ortho_5x15( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 599e02ab59..540ecc006a 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -19,85 +19,85 @@ "layouts": { "LAYOUT_ortho_5x15": { "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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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/idobao/id75/v2/v2.c b/keyboards/idobao/id75/v2/v2.c index f65a9e3362..55d58d92e1 100644 --- a/keyboards/idobao/id75/v2/v2.c +++ b/keyboards/idobao/id75/v2/v2.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 "v2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/idobao/id75/v2/v2.h b/keyboards/idobao/id75/v2/v2.h deleted file mode 100644 index 9643a1efd3..0000000000 --- a/keyboards/idobao/id75/v2/v2.h +++ /dev/null @@ -1,41 +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" - -/* 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_ortho_5x15( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index e5c423e527..7d437655bb 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -21,38 +21,38 @@ "layouts": { "LAYOUT_numpad_6x5": { "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}, + {"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}, - { "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}, + {"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}, - { "label": "2,0", "x": 0, "y": 2.25}, - { "label": "2,1", "x": 1, "y": 2.25}, - { "label": "2,2", "x": 2, "y": 2.25}, - { "label": "2,3", "x": 3, "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}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, - { "label": "3,0", "x": 0, "y": 3.25}, - { "label": "3,1", "x": 1, "y": 3.25}, - { "label": "3,2", "x": 2, "y": 3.25}, - { "label": "3,3", "x": 3, "y": 3.25}, - { "label": "3,4", "x": 4, "y": 2.25, "h": 2}, + {"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.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2}, - { "label": "4,0", "x": 0, "y": 4.25}, - { "label": "4,1", "x": 1, "y": 4.25}, - { "label": "4,2", "x": 2, "y": 4.25}, - { "label": "4,3", "x": 3, "y": 4.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}, - { "label": "5,0", "x": 0, "y": 5.25}, - { "label": "5,1", "x": 1, "y": 5.25, "w": 2}, - { "label": "5,2", "x": 3, "y": 5.25}, - { "label": "5,3", "x": 4, "y": 4.25, "h": 2} + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5.25}, + {"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/idobao/montex/v1/v1.h b/keyboards/idobao/montex/v1/v1.h deleted file mode 100644 index d57097fa88..0000000000 --- a/keyboards/idobao/montex/v1/v1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General 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_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K34 }, \ - { K30, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, KC_NO }, \ - { K50, K51, K52, K53, KC_NO } \ -} diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index f77698554d..08f427d967 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -17,33 +17,38 @@ "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - { "label": "K00 (D4,D5)", "x": 0, "y": 0 }, - { "label": "K01 (D4,D3)", "x": 1, "y": 0 }, - { "label": "K02 (D4,D2)", "x": 2, "y": 0 }, - { "label": "K03 (D4,D1)", "x": 3, "y": 0 }, - { "label": "K04 (D4,D0)", "x": 4, "y": 0 }, - { "label": "K10 (D6,D5)", "x": 0, "y": 1 }, - { "label": "K11 (D6,D3)", "x": 1, "y": 1 }, - { "label": "K12 (D6,D2)", "x": 2, "y": 1 }, - { "label": "K13 (D6,D1)", "x": 3, "y": 1 }, - { "label": "K14 (D6,D0)", "x": 4, "y": 1 }, - { "label": "K20 (D7,D5)", "x": 0, "y": 2 }, - { "label": "K21 (D7,D3)", "x": 1, "y": 2 }, - { "label": "K22 (D7,D2)", "x": 2, "y": 2 }, - { "label": "K23 (D7,D1)", "x": 3, "y": 2 }, - { "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 }, - { "label": "K30 (B4,D5)", "x": 0, "y": 3 }, - { "label": "K31 (B4,D3)", "x": 1, "y": 3 }, - { "label": "K32 (B4,D2)", "x": 2, "y": 3 }, - { "label": "K33 (B4,D1)", "x": 3, "y": 3 }, - { "label": "K40 (B5,D5)", "x": 0, "y": 4 }, - { "label": "K41 (B5,D3)", "x": 1, "y": 4 }, - { "label": "K42 (B5,D2)", "x": 2, "y": 4 }, - { "label": "K43 (B5,D1)", "x": 3, "y": 4 }, - { "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 }, - { "label": "K50 (C6,D5)", "x": 0, "y": 5 }, - { "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 }, - { "label": "K52 (C6,D2)", "x": 3, "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": [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": [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, "h": 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": [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": [5, 3], "x": 4, "y": 4, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5} ] } } diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c index 3d2a847c00..b70067cfcf 100755 --- a/keyboards/idobao/montex/v1rgb/v1rgb.c +++ b/keyboards/idobao/montex/v1rgb/v1rgb.c @@ -1,7 +1,7 @@ // Copyright 2022 peepeetee (@peepeetee) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v1rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h deleted file mode 100755 index e069771c6f..0000000000 --- a/keyboards/idobao/montex/v1rgb/v1rgb.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, K53, \ - K50, K51, K52 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, ___ }, \ - { K40, K41, K42, K43, ___ }, \ - { K50, K51, K52, K53, ___ }, \ -} diff --git a/keyboards/kakunpc/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h deleted file mode 100644 index 5b8600a206..0000000000 --- a/keyboards/kakunpc/angel17/alpha/alpha.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 keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k33 \ -) \ -{ \ - { k00, k10, k20, k31, k41 }, \ - { k02, k12, k22, k33, KC_NO }, \ - { k01, k11, k21, k32, KC_NO }, \ - { k03, k13, k30, k40, KC_NO }, \ -} diff --git a/keyboards/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/info.json index 7e8e85f520..8e0df61513 100644 --- a/keyboards/kakunpc/angel17/alpha/info.json +++ b/keyboards/kakunpc/angel17/alpha/info.json @@ -3,5 +3,32 @@ "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT_numpad_5x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [2, 0], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [3, 1], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 2], "x": 0, "y": 3}, + {"matrix": [0, 3], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3}, + + {"matrix": [3, 3], "x": 0, "y": 4, "w": 2}, + {"matrix": [0, 4], "x": 2, "y": 4}, + {"matrix": [1, 3], "x": 3, "y": 3, "h": 2} + ] + } + } } diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json index da7b1d688e..a8a4f2c148 100644 --- a/keyboards/kakunpc/angel17/info.json +++ b/keyboards/kakunpc/angel17/info.json @@ -10,32 +10,5 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": ["numpad_5x4"], - "layouts": { - "LAYOUT_numpad_5x4": { - "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - - {"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":"+", "x":3, "y":1, "h":2}, - - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":3, "h":2} - ] - } - } + "community_layouts": ["numpad_5x4"] } diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json index 7e8e85f520..8e0df61513 100644 --- a/keyboards/kakunpc/angel17/rev1/info.json +++ b/keyboards/kakunpc/angel17/rev1/info.json @@ -3,5 +3,32 @@ "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT_numpad_5x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [2, 0], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [3, 1], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 2], "x": 0, "y": 3}, + {"matrix": [0, 3], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3}, + + {"matrix": [3, 3], "x": 0, "y": 4, "w": 2}, + {"matrix": [0, 4], "x": 2, "y": 4}, + {"matrix": [1, 3], "x": 3, "y": 3, "h": 2} + ] + } + } } diff --git a/keyboards/kakunpc/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h deleted file mode 100644 index 5b8600a206..0000000000 --- a/keyboards/kakunpc/angel17/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 keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k33 \ -) \ -{ \ - { k00, k10, k20, k31, k41 }, \ - { k02, k12, k22, k33, KC_NO }, \ - { k01, k11, k21, k32, KC_NO }, \ - { k03, k13, k30, k40, KC_NO }, \ -} diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index fcc6ba4941..245ef7066a 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -13,77 +13,81 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "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": [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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 2], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_aek": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_numpad_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/kapcave/paladinpad/paladinpad.h b/keyboards/kapcave/paladinpad/paladinpad.h deleted file mode 100644 index 54b320c424..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#pragma once - -#include "quantum.h" - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │ │ - * ├─────┼─────┼─────┤Plus │ - * │ 4 │ 5 │ 6 │ │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┴─────┼─────┤ Ent │ - * │ 0 │ . │ │ - * └───────────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_5x4( \ - K_NUM1, K_SLSH, K_STAR, K_MINUS, \ - K_7, K_8, K_9, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT, K_ENT \ -) { \ - { K_NUM1, K_SLSH, K_STAR, K_MINUS }, \ - { K_7, K_8, K_9, KC_NO }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │Eql │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┼─────┼─────┤ Ent │ - * │ 0 │ 10 │ . │ │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_aek( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ 11 │ - * ├─────┼─────┼─────┼─────┤ - * │ 0 │ 10 │ . │ Ent │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_ortho_5x4( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, K_11, \ - K_0, K_10, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, K_10, K_11 } \ -} diff --git a/keyboards/kb_elmo/elmopad/elmopad.h b/keyboards/kb_elmo/elmopad/elmopad.h deleted file mode 100644 index 413910a9d4..0000000000 --- a/keyboards/kb_elmo/elmopad/elmopad.h +++ /dev/null @@ -1,43 +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_numpad_6x4( \ - k00, k01, k02, k03, \ - k04, k05, k06, k07, \ - k08, k09, k10, \ - k12, k13, k14, k15, \ - k16, k17, k18, \ - k20, k22, k23 \ -) { \ - {k00, k01, k02, k03 }, \ - {k04, k05, k06, k07 }, \ - {k08, k09, k10, KC_NO }, \ - {k12, k13, k14, k15 }, \ - {k16, k17, k18, KC_NO }, \ - {k20, KC_NO, k22, k23 } \ -} diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json index 8da14ea006..600daf3099 100644 --- a/keyboards/kb_elmo/elmopad/info.json +++ b/keyboards/kb_elmo/elmopad/info.json @@ -19,27 +19,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "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": [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": [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": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index 5e87b29cf6..94e94ab874 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -22,18 +22,21 @@ "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_3x4": { - "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} + "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": [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} ] } } diff --git a/keyboards/kb_elmo/twelvekey/twelvekey.h b/keyboards/kb_elmo/twelvekey/twelvekey.h deleted file mode 100644 index 3c4d884269..0000000000 --- a/keyboards/kb_elmo/twelvekey/twelvekey.h +++ /dev/null @@ -1,37 +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" - -/* 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_ortho_3x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 } \ -} diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json index 8e0105c073..e75747f2ea 100644 --- a/keyboards/kbdfans/bounce/pad/info.json +++ b/keyboards/kbdfans/bounce/pad/info.json @@ -21,32 +21,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Ctrl", "x":1, "y":0}, - {"label":"Alt", "x":2, "y":0}, - {"label":"Backspace", "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}, - {"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}, + {"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}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "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}, - {"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}, + {"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": 2.25, "h": 2}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.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}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2} + {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/kbdfans/bounce/pad/pad.h b/keyboards/kbdfans/bounce/pad/pad.h deleted file mode 100644 index a4bf9af55b..0000000000 --- a/keyboards/kbdfans/bounce/pad/pad.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 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_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K51, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO }, \ - { KC_NO,K51, K52, K53 } \ -} diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index bd57aee969..07ec04645d 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -23,105 +23,111 @@ "layouts": { "LAYOUT_planck_mit": { "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":"BKSP", "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":"UP", "x":10, "y":2}, - {"label":"ENTER", "x":11, "y":2}, - {"label":"LCTRL", "x":0, "y":3}, - {"label":"LGUI", "x":1, "y":3}, - {"label":"1", "x":2, "y":3}, - {"label":"2", "x":3, "y":3}, - {"label":"3", "x":4, "y":3}, - {"label":"SPACE", "x":5, "y":3, "w":2}, - {"label":"MO(1)", "x":7, "y":3}, - {"label":"/", "x":8, "y":3}, - {"label":"LEFT", "x":9, "y":3}, - {"label":"DOWN", "x":10, "y":3}, - {"label":"RIGHT", "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} ] }, "LAYOUT_ortho_4x12": { "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":"BKSP", "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":"UP", "x":10, "y":2}, - {"label":"ENTER", "x":11, "y":2}, - {"label":"LCTRL", "x":0, "y":3}, - {"label":"LGUI", "x":1, "y":3}, - {"label":"1", "x":2, "y":3}, - {"label":"2", "x":3, "y":3}, - {"label":"3", "x":4, "y":3}, - {"label":"SPACE", "x":5, "y":3}, - {"label":"MO(2)", "x":6, "y":3}, - {"label":"MO(1)", "x":7, "y":3}, - {"label":"/", "x":8, "y":3}, - {"label":"LEFT", "x":9, "y":3}, - {"label":"DOWN", "x":10, "y":3}, - {"label":"RIGHT", "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/kbdfans/kbd4x/kbd4x.h b/keyboards/kbdfans/kbd4x/kbd4x.h deleted file mode 100644 index 9e7e2ba220..0000000000 --- a/keyboards/kbdfans/kbd4x/kbd4x.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2018 sevenseacat - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_planck_mit( \ - 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, 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, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \ -} - -// The PCB does support a grid layout, but the case does not. -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index a8fbafa348..3527370e4c 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -29,93 +29,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":2.25, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":3, "y":4.25, "h":2} + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "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}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":2.25, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":3, "y":4.25, "h":2} + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "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}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, + {"matrix": [3, 3], "x": 3, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 3.25}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, + {"matrix": [1, 3], "x": 3, "y": 4.25}, - {"x":0, "y":5.25}, - {"x":1, "y":5.25}, - {"x":2, "y":5.25}, - {"x":3, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 5.25}, + {"matrix": [0, 1], "x": 1, "y": 5.25}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 5.25} ] } } diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.h b/keyboards/kbdfans/kbdpad/mk1/mk1.h deleted file mode 100644 index 36b0287278..0000000000 --- a/keyboards/kbdfans/kbdpad/mk1/mk1.h +++ /dev/null @@ -1,71 +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 is a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array - -#define LAYOUT( \ - k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, \ - k20, k21, k22, k23, \ - k10, k11, k12, \ - k00, k02, k03 \ -) { \ - { k00, KC_NO, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { k40, k41, k42, k43 }, \ - { KC_NO, KC_NO, k52, k53 } \ -} - -#define LAYOUT_numpad_6x4( \ - k50, k51, k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, \ - k20, k21, k22, k23, \ - k10, k11, k12, \ - k00, k02, k03 \ -) { \ - { k00, KC_NO, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -#define LAYOUT_ortho_6x4( \ - k50, k51, k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, k33, \ - k20, k21, k22, k23, \ - k10, k11, k12, k13, \ - k00, k01, k02, k03 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 1472e876d0..424771ae3d 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -26,33 +26,68 @@ "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], "layouts": { + "LAYOUT_numpad_6x4": { + "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": [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, "h": 2}, + + {"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": [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.25, "h": 2}, + + {"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": [5, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} + ] + }, "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":3.25}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25}, - {"x":0, "y":5.25}, - {"x":1, "y":5.25}, - {"x":2, "y":5.25}, - {"x":3, "y":5.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": [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": [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.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.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": [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} + ] } } } diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h deleted file mode 100644 index 0dfa995fe2..0000000000 --- a/keyboards/kbdfans/kbdpad/mk2/mk2.h +++ /dev/null @@ -1,60 +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_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} - -#define LAYOUT_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K50, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO }, \ - { K50, KC_NO, K52, K53 } \ -} diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 82bbf786dd..f866a95c9f 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -20,109 +20,118 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { "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} ] }, "LAYOUT_planck_mit": { "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} ] } } diff --git a/keyboards/kbdfans/niu_mini/niu_mini.c b/keyboards/kbdfans/niu_mini/niu_mini.c index cd9c0cdfed..02b2ca6590 100644 --- a/keyboards/kbdfans/niu_mini/niu_mini.c +++ b/keyboards/kbdfans/niu_mini/niu_mini.c @@ -1,4 +1,4 @@ -#include "niu_mini.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/kbdfans/niu_mini/niu_mini.h b/keyboards/kbdfans/niu_mini/niu_mini.h deleted file mode 100644 index b815219123..0000000000 --- a/keyboards/kbdfans/niu_mini/niu_mini.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_planck_mit( \ - 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, 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, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json index 17f3bd9858..a6dfb384d6 100644 --- a/keyboards/keebformom/info.json +++ b/keyboards/keebformom/info.json @@ -18,47 +18,49 @@ "layouts": { "LAYOUT_ortho_4x10": { "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} - + {"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/keebformom/keebformom.h b/keyboards/keebformom/keebformom.h deleted file mode 100644 index 88830e8aef..0000000000 --- a/keyboards/keebformom/keebformom.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Sandipratama - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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_ortho_4x10( \ - 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/keebio/chocopad/chocopad.c b/keyboards/keebio/chocopad/chocopad.c index 523e0626a9..b52c8608ca 100644 --- a/keyboards/keebio/chocopad/chocopad.c +++ b/keyboards/keebio/chocopad/chocopad.c @@ -1,4 +1,4 @@ -#include "chocopad.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/chocopad/chocopad.h b/keyboards/keebio/chocopad/chocopad.h deleted file mode 100644 index 43e94a093d..0000000000 --- a/keyboards/keebio/chocopad/chocopad.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x4( \ - A1, A2, A3, A4, \ - B1, B2, B3, B4, \ - C1, C2, C3, C4, \ - D1, D2, D3, D4 \ -) { \ - { A1, A2, A3, A4 }, \ - { B1, B2, B3, B4 }, \ - { C1, C2, C3, C4 }, \ - { D1, D2, D3, D4 } \ -} diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json index 473452a984..7befd0a0d7 100644 --- a/keyboards/keebio/chocopad/info.json +++ b/keyboards/keebio/chocopad/info.json @@ -22,7 +22,27 @@ "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] } } } diff --git a/keyboards/keebio/dilly/dilly.c b/keyboards/keebio/dilly/dilly.c index 558968542f..231a828f07 100644 --- a/keyboards/keebio/dilly/dilly.c +++ b/keyboards/keebio/dilly/dilly.c @@ -1,4 +1,4 @@ -#include "dilly.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h deleted file mode 100644 index e0f13bae5e..0000000000 --- a/keyboards/keebio/dilly/dilly.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_3x10( \ - k00, k01, k02, k03, k04, k34, k33, k32, k31, k30, \ - k10, k11, k12, k13, k14, k44, k43, k42, k41, k40, \ - k20, k21, k22, k23, k24, k54, k53, k52, k51, k50 \ -) { \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 } \ -} diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json index 898096aef4..8f68587770 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/info.json @@ -21,7 +21,40 @@ "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { - "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}] + "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, 4], "x": 5, "y": 0}, + {"matrix": [3, 3], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 0], "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": [4, 4], "x": 5, "y": 1}, + {"matrix": [4, 3], "x": 6, "y": 1}, + {"matrix": [4, 2], "x": 7, "y": 1}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 0], "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": [5, 4], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [5, 2], "x": 7, "y": 2}, + {"matrix": [5, 1], "x": 8, "y": 2}, + {"matrix": [5, 0], "x": 9, "y": 2} + ] } } } diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json index b262561abf..524bb51372 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/info.json @@ -24,103 +24,112 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "layout_aliases": { + "LAYOUT_40_staggered": "LAYOUT" + }, "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": 0, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 1.25, "y": 3 }, - { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 }, - { "x": 3.5, "y": 3, "w": 2.25 }, - { "x": 5.75, "y": 3, "w": 2.75 }, - { "label": "Super", "x": 8.5, "y": 3, "w": 1.25 }, - { "label": "Meta", "x": 9.75, "y": 3 }, - { "label": "Super", "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": [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, 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, "w": 1.25}, + {"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}, + {"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} ] }, "LAYOUT_ortho_4x12": { "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 }, - { "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, "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": "Enter", "x": 11, "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": "Lower", "x": 4, "y": 3 }, - { "label": "Space", "x": 5, "y": 3 }, - { "label": "Space", "x": 6, "y": 3 }, - { "label": "Raise", "x": 7, "y": 3 }, - { "label": "Left", "x": 8, "y": 3 }, - { "label": "Down", "x": 9, "y": 3 }, - { "label": "Up", "x": 10, "y": 3 }, - { "label": "Right", "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/keebio/dsp40/rev1/rev1.c b/keyboards/keebio/dsp40/rev1/rev1.c index 41187b90b6..dbaea8d4cc 100644 --- a/keyboards/keebio/dsp40/rev1/rev1.c +++ b/keyboards/keebio/dsp40/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/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h deleted file mode 100644 index bc0a86d302..0000000000 --- a/keyboards/keebio/dsp40/rev1/rev1.h +++ /dev/null @@ -1,46 +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_ortho_4x12( \ - KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \ - KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12, \ - KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \ - KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 \ -) \ -{ \ - { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \ - { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12 }, \ - { KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \ - { KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 } \ -} - -#define LAYOUT( \ - KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \ - KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB12, \ - KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \ - KD1, KD2, KD3, KD5, KD8, KD10, KD11, KD12 \ -) \ -{ \ - { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \ - { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KC_NO, KB12 }, \ - { KC_NO, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \ - { KD1, KD2, KD3, KC_NO, KD5, KC_NO, KC_NO, KD8, KC_NO, KD10, KD11, KD12 } \ -} - -#define LAYOUT_40_staggered LAYOUT diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index 2bf92724bb..d7cbab9f45 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -8,10 +8,5 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": ["ortho_4x12"], - "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}] - } - } + "community_layouts": ["ortho_4x12"] } diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json index 5a280a3549..faad88b20e 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/info.json @@ -15,5 +15,10 @@ "backlight": { "pin": "C6", "levels": 7 + }, + "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}] } + } } diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json index f73f9ee1a7..984b06c946 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/info.json @@ -15,5 +15,10 @@ "backlight": { "pin": "B5", "levels": 7 + }, + "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}] } + } } diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json index af854a93d5..b31f71533d 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/info.json @@ -21,5 +21,69 @@ "backlight": { "pin": "B6", "levels": 7 + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "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, 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}, + + {"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}, + + {"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/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c index c464270517..76fb136c03 100644 --- a/keyboards/keebio/levinson/rev3/rev3.c +++ b/keyboards/keebio/levinson/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "rev3.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h deleted file mode 100644 index d6a0ef4227..0000000000 --- a/keyboards/keebio/levinson/rev3/rev3.h +++ /dev/null @@ -1,22 +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 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json index 8d872e8e0c..9a544f3382 100644 --- a/keyboards/keebio/nyquist/info.json +++ b/keyboards/keebio/nyquist/info.json @@ -4,13 +4,5 @@ "usb": { "vid": "0xCB10" }, - "community_layouts": ["ortho_5x12", "ortho_4x12"], - "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}, {"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}] - }, - "LAYOUT_ortho_4x12": { - "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}] - } - } + "community_layouts": ["ortho_5x12", "ortho_4x12"] } diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json index b5718457aa..869d3d9780 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/info.json @@ -13,5 +13,13 @@ "soft_serial_pin": "D0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "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":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}, {"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}] + }, + "LAYOUT_ortho_4x12": { + "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}] + } + } } diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json index 7e409611b1..0810473ac7 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -17,5 +17,13 @@ "soft_serial_pin": "D0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "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":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}, {"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}] + }, + "LAYOUT_ortho_4x12": { + "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}] + } + } } diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json index a948868f33..fceda141b1 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -17,5 +17,142 @@ "soft_serial_pin": "D0" }, "processor": "atmega32u4", - "bootloader": "qmk-dfu" + "bootloader": "qmk-dfu", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x12" + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "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": [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}, + {"matrix": [4, 5], "x": 5, "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} + ] + }, + "LAYOUT_ortho_4x12": { + "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": [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} + ] + } + } } diff --git a/keyboards/keebio/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c index c464270517..76fb136c03 100644 --- a/keyboards/keebio/nyquist/rev3/rev3.c +++ b/keyboards/keebio/nyquist/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "rev3.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/nyquist/rev3/rev3.h b/keyboards/keebio/nyquist/rev3/rev3.h deleted file mode 100644 index 648c774730..0000000000 --- a/keyboards/keebio/nyquist/rev3/rev3.h +++ /dev/null @@ -1,44 +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 }, \ - { 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 } \ - } - -#define LAYOUT_ortho_4x12( \ - 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ - } - -#define LAYOUT_ortho_5x12 LAYOUT diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index 0b6d002758..1fadcce126 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -7,85 +7,5 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": ["ortho_5x14"], - "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}, - - {"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}, - - {"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}, - - {"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} - ] - } - } + "community_layouts": ["ortho_5x14"] } diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json index 001886d11e..b1a35d2886 100644 --- a/keyboards/keebio/viterbi/rev1/info.json +++ b/keyboards/keebio/viterbi/rev1/info.json @@ -11,5 +11,85 @@ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] }, - "diode_direction": "COL2ROW" + "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, "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":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}, + + {"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}, + + {"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} + ] + } + } } diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json index dd20a662e6..92206ebc41 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/info.json @@ -15,5 +15,93 @@ "backlight": { "pin": "B6", "levels": 7 + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x14" + }, + "layouts": { + "LAYOUT_ortho_5x14": { + "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, 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, 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": [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, 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/keebio/viterbi/rev2/rev2.c b/keyboards/keebio/viterbi/rev2/rev2.c index 6158903e22..f00bb726e9 100644 --- a/keyboards/keebio/viterbi/rev2/rev2.c +++ b/keyboards/keebio/viterbi/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/viterbi/rev2/rev2.h b/keyboards/keebio/viterbi/rev2/rev2.h deleted file mode 100644 index a48c13d46b..0000000000 --- a/keyboards/keebio/viterbi/rev2/rev2.h +++ /dev/null @@ -1,25 +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 } \ - } - -#define LAYOUT_ortho_5x14 LAYOUT diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index f09cc3593a..57532fb7ad 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -20,13 +20,67 @@ "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT_ortho_4x12": "LAYOUT" + }, "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": [4, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "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": [5, 5], "x": 6, "y": 1}, + {"matrix": [5, 4], "x": 7, "y": 1}, + {"matrix": [5, 3], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 0], "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": [6, 5], "x": 6, "y": 2}, + {"matrix": [6, 4], "x": 7, "y": 2}, + {"matrix": [6, 3], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 0], "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": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} ] } } diff --git a/keyboards/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c index 466b4fe72e..6f1a050e80 100644 --- a/keyboards/keebio/wavelet/wavelet.c +++ b/keyboards/keebio/wavelet/wavelet.c @@ -1,4 +1,4 @@ -#include "wavelet.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/wavelet/wavelet.h b/keyboards/keebio/wavelet/wavelet.h deleted file mode 100644 index d6a0ef4227..0000000000 --- a/keyboards/keebio/wavelet/wavelet.h +++ /dev/null @@ -1,22 +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 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json index e2c2c93808..91d43ffef8 100644 --- a/keyboards/keebsforall/freebirdnp/lite/info.json +++ b/keyboards/keebsforall/freebirdnp/lite/info.json @@ -19,198 +19,55 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - { - "label": "Num Lock", - "x": 0, - "y": 0 - }, - { - "label": "/", - "x": 1, - "y": 0 - }, - { - "label": "*", - "x": 2, - "y": 0 - }, - { - "label": "-", - "x": 3, - "y": 0 - }, - { - "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": "+", - "x": 3, - "y": 1, - "h": 2 - }, - { - "label": "1", - "x": 0, - "y": 3 - }, - { - "label": "2", - "x": 1, - "y": 3 - }, - { - "label": "3", - "x": 2, - "y": 3 - }, - { - "label": "0", - "x": 0, - "y": 4, - "w": 2 - }, - { - "label": ".", - "x": 2, - "y": 4 - }, - { - "label": "Enter", - "x": 3, - "y": 3, - "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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_ortho_5x4": { "layout": [ - { - "label": "Num Lock", - "x": 0, - "y": 0 - }, - { - "label": "/", - "x": 1, - "y": 0 - }, - { - "label": "*", - "x": 2, - "y": 0 - }, - { - "label": "-", - "x": 3, - "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 - }, - { - "label": "4", - "x": 0, - "y": 2 - }, - { - "label": "5", - "x": 1, - "y": 2 - }, - { - "label": "6", - "x": 2, - "y": 2 - }, - { - "label": "+", - "x": 3, - "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 - }, - { - "label": "0", - "x": 0, - "y": 4 - }, - { - "label": "00", - "x": 1, - "y": 4 - }, - { - "label": ".", - "x": 2, - "y": 4 - }, - { - "label": "Enter", - "x": 3, - "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": [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}, + + {"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": [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} ] } } diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.h b/keyboards/keebsforall/freebirdnp/lite/lite.h deleted file mode 100644 index 7f8cbdeeb0..0000000000 --- a/keyboards/keebsforall/freebirdnp/lite/lite.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 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 - -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, XXX }, \ - { K30, K31, K32, K33 }, \ - { K40, XXX, K42, XXX } \ -} - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json index a11dabe388..f3c8307526 100644 --- a/keyboards/keebsforall/freebirdnp/pro/info.json +++ b/keyboards/keebsforall/freebirdnp/pro/info.json @@ -24,65 +24,65 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"F1", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"F3", "x":2, "y":0}, - {"label":"MUTE", "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}, - {"label":"Num Lock", "x":0, "y":1}, - {"label":"/", "x":1, "y":1}, - {"label":"*", "x":2, "y":1}, - {"label":"-", "x":3, "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}, - {"label":"7", "x":0, "y":2}, - {"label":"8", "x":1, "y":2}, - {"label":"9", "x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"label":"4", "x":0, "y":3}, - {"label":"5", "x":1, "y":3}, - {"label":"6", "x":2, "y":3}, - {"label":"+", "x":3, "y":2, "h":2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, - {"label":"1", "x":0, "y":4}, - {"label":"2", "x":1, "y":4}, - {"label":"3", "x":2, "y":4}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, - {"label":"0", "x":0, "y":5, "w":2}, - {"label":".", "x":2, "y":5}, - {"label":"Enter", "x":3, "y":4, "h":2} + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] }, "LAYOUT_ortho_6x4": { "layout": [ - {"label":"F1", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"F3", "x":2, "y":0}, - {"label":"MUTE", "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}, - {"label":"Num Lock", "x":0, "y":1}, - {"label":"/", "x":1, "y":1}, - {"label":"*", "x":2, "y":1}, - {"label":"-", "x":3, "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}, - {"label":"7", "x":0, "y":2}, - {"label":"8", "x":1, "y":2}, - {"label":"9", "x":2, "y":2}, - {"label":"+", "x":3, "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}, - {"label":"4", "x":0, "y":3}, - {"label":"5", "x":1, "y":3}, - {"label":"6", "x":2, "y":3}, - {"label":"+", "x":3, "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}, - {"label":"1", "x":0, "y":4}, - {"label":"2", "x":1, "y":4}, - {"label":"3", "x":2, "y":4}, - {"label":"Enter", "x":3, "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}, - {"label":"0", "x":0, "y":5}, - {"label":"00", "x":1, "y":5}, - {"label":".", "x":2, "y":5}, - {"label":"Enter", "x":3, "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} ] } } diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.c b/keyboards/keebsforall/freebirdnp/pro/pro.c index dcc72d39b4..b98dfd6082 100644 --- a/keyboards/keebsforall/freebirdnp/pro/pro.c +++ b/keyboards/keebsforall/freebirdnp/pro/pro.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 "pro.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/keebsforall/freebirdnp/pro/pro.h b/keyboards/keebsforall/freebirdnp/pro/pro.h deleted file mode 100644 index 41b241bee1..0000000000 --- a/keyboards/keebsforall/freebirdnp/pro/pro.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 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 - -#define LAYOUT_numpad_6x4( \ - KF0, KF1, KF2, KF3, \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { KF0, KF1, KF2, KF3 }, \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, XXX }, \ - { K30, K31, K32, K33 }, \ - { K40, XXX, K42, XXX } \ -} - -#define LAYOUT_ortho_6x4( \ - KF0, KF1, KF2, KF3, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { KF0, KF1, KF2, KF3 }, \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 1797eb41f3..81afec7334 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -19,203 +19,203 @@ "layouts": { "LAYOUT_ortho_5x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"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": [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} ] }, "LAYOUT_ortho_5x12_1x2uC": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, 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} ] }, "LAYOUT_ortho_5x12_2x2u": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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": 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": [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": 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": [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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"x": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "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, "w": 2}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 2}, + {"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/keycapsss/o4l_5x12/o4l_5x12.h b/keyboards/keycapsss/o4l_5x12/o4l_5x12.h deleted file mode 100644 index a5f775ef13..0000000000 --- a/keyboards/keycapsss/o4l_5x12/o4l_5x12.h +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_ortho_5x12( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT_ortho_5x12_1x2uC( \ - 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, k47, 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, k45, XXX, k47, k48, k49, k4A, k4B } \ -} - -#define LAYOUT_ortho_5x12_2x2u( \ - 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, 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, XXX, k46, XXX, k48, k49, k4A, k4B } \ -} diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index b384789e47..6ff2d2cea2 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -17,22 +17,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x": 0,"y": 3}, - {"x": 1,"y": 3}, - {"x": 2,"y": 3}, - {"x": 3,"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": [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}, + + {"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} ] } } diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.h b/keyboards/keycapsss/plaid_pad/plaid_pad.h deleted file mode 100644 index 3115392163..0000000000 --- a/keyboards/keycapsss/plaid_pad/plaid_pad.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Ben Roesner (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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index f34f6398f6..ea0ffb80ae 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -18,13 +18,83 @@ "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"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":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] }, "LAYOUT_numpad_5x4_split_plus": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"=", "x":3, "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}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"-", "x":3, "y":1}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":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": [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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] }, "LAYOUT_ortho_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "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}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "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}, {"label":"0", "x":0, "y":4}, {"label":"00", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} + ] } } diff --git a/keyboards/keyhive/maypad/maypad.h b/keyboards/keyhive/maypad/maypad.h deleted file mode 100644 index ac576f99ea..0000000000 --- a/keyboards/keyhive/maypad/maypad.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright 2019 codybender - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -/* maypad numpad layout - * .-------------------. - * |NLCK| /| *| -| - * |-------------------| - * | 7| 8| 9| | - * |--------------| | - * | 4| 5| 6| +| - * |-------------------| - * | 1| 2| 3| | - * |--------------| | - * | 0| .| Ent| - * '-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { KC_NO, k41, k42, k43 } \ -} - -#define LAYOUT_numpad_5x4_split_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { KC_NO, k41, k42, k43 } \ -} - -#define LAYOUT_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json index 4abcf1e3ad..7681489520 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/info.json @@ -24,180 +24,180 @@ "layouts": { "LAYOUT_ortho_2x2u": { "layout": [ - {"x": 12.5, "y": 0}, + {"matrix": [7, 6], "x": 12.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}, + {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [4, 0], "x": 7.5, "y": 1}, + {"matrix": [4, 1], "x": 8.5, "y": 1}, + {"matrix": [4, 2], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1}, + {"matrix": [4, 4], "x": 11.5, "y": 1}, + {"matrix": [4, 5], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.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.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}, + {"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": [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}, + {"matrix": [5, 6], "x": 13.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.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}, + {"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": [6, 0], "x": 7.5, "y": 3}, + {"matrix": [6, 1], "x": 8.5, "y": 3}, + {"matrix": [6, 2], "x": 9.5, "y": 3}, + {"matrix": [6, 3], "x": 10.5, "y": 3}, + {"matrix": [6, 4], "x": 11.5, "y": 3}, + {"matrix": [6, 5], "x": 12.5, "y": 3}, + {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4}, - {"x": 3.5, "y": 4}, - {"x": 4.5, "y": 4}, - {"x": 5.5, "y": 4, "w": 2}, - {"x": 7.5, "y": 4, "w": 2}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"x": 12.5, "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, 6], "x": 5.5, "y": 4, "w": 2}, + {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 4}, + {"matrix": [7, 3], "x": 10.5, "y": 4}, + {"matrix": [7, 4], "x": 11.5, "y": 4}, + {"matrix": [7, 5], "x": 12.5, "y": 4} ] }, "LAYOUT_ergo_2x2u": { "layout": [ - {"x": 12.5, "y": 0}, + {"matrix": [7, 6], "x": 12.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, "h": 1.5}, - {"x": 7.5, "y": 1, "h": 1.5}, - {"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": [0, 0], "x": 0, "y": 1, "w": 1.5}, + {"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, "h": 1.5}, + {"matrix": [4, 0], "x": 7.5, "y": 1, "h": 1.5}, + {"matrix": [4, 1], "x": 8.5, "y": 1}, + {"matrix": [4, 2], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1}, + {"matrix": [4, 4], "x": 11.5, "y": 1}, + {"matrix": [4, 5], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.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.5, "y": 2.5, "h": 1.5}, - {"x": 7.5, "y": 2.5, "h": 1.5}, - {"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}, + {"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": [2, 6], "x": 6.5, "y": 2.5, "h": 1.5}, + {"matrix": [6, 0], "x": 7.5, "y": 2.5, "h": 1.5}, + {"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}, + {"matrix": [5, 6], "x": 13.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": 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}, + {"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": [6, 1], "x": 8.5, "y": 3}, + {"matrix": [6, 2], "x": 9.5, "y": 3}, + {"matrix": [6, 3], "x": 10.5, "y": 3}, + {"matrix": [6, 4], "x": 11.5, "y": 3}, + {"matrix": [6, 5], "x": 12.5, "y": 3}, + {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4}, - {"x": 3.5, "y": 4}, - {"x": 4.5, "y": 4}, - {"x": 5.5, "y": 4, "w": 2}, - {"x": 7.5, "y": 4, "w": 2}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"x": 12.5, "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, 6], "x": 5.5, "y": 4, "w": 2}, + {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 4}, + {"matrix": [7, 3], "x": 10.5, "y": 4}, + {"matrix": [7, 4], "x": 11.5, "y": 4}, + {"matrix": [7, 5], "x": 12.5, "y": 4} ] }, "LAYOUT_ortho_7u": { "layout": [ - {"x": 12.5, "y": 0}, + {"matrix": [7, 6], "x": 12.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}, + {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [4, 0], "x": 7.5, "y": 1}, + {"matrix": [4, 1], "x": 8.5, "y": 1}, + {"matrix": [4, 2], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1}, + {"matrix": [4, 4], "x": 11.5, "y": 1}, + {"matrix": [4, 5], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.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.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": 14, "y": 2}, + {"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": [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, "w": 1.5}, + {"matrix": [5, 6], "x": 14, "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, "w": 1.5}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"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": [6, 0], "x": 7.5, "y": 3}, + {"matrix": [6, 1], "x": 8.5, "y": 3}, + {"matrix": [6, 2], "x": 9.5, "y": 3}, + {"matrix": [6, 3], "x": 10.5, "y": 3}, + {"matrix": [6, 4], "x": 11.5, "y": 3, "w": 1.5}, + {"matrix": [6, 5], "x": 13, "y": 3}, + {"matrix": [6, 6], "x": 14, "y": 3}, - {"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} + {"matrix": [3, 1], "x": 1.5, "y": 4}, + {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [7, 4], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [7, 5], "x": 12.5, "y": 4} ] } } diff --git a/keyboards/keyprez/rhino/rhino.c b/keyboards/keyprez/rhino/rhino.c index 31302eff5b..fa0ae901c9 100644 --- a/keyboards/keyprez/rhino/rhino.c +++ b/keyboards/keyprez/rhino/rhino.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "rhino.h" +#include "quantum.h" +#include QMK_KEYBOARD_H bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/keyprez/rhino/rhino.h b/keyboards/keyprez/rhino/rhino.h deleted file mode 100644 index 1547717a87..0000000000 --- a/keyboards/keyprez/rhino/rhino.h +++ /dev/null @@ -1,80 +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_ortho_2x2u( \ - k70, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \ - k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \ - { k07, k08, k09, k10, k11, k12, k13 }, \ - { k27, k28, k29, k30, k31, k32, k33 }, \ - { k47, k48, k49, k50, k51, k52, k53 }, \ - { k65, KC_NO, k66, k67, k68, k69, k70 } \ -} - -#define LAYOUT_ergo_2x2u( \ - k70, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \ - k40, k41, k42, k43, k44, k45, k48, k49, k50, k51, k52, k53, \ - k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k20, k21, k22, k23, k24, k25, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k26 }, \ - { KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \ - { k07, k08, k09, k10, k11, k12, k13 }, \ - { KC_NO, k28, k29, k30, k31, k32, k33 }, \ - { k27, k48, k49, k50, k51, k52, k53 }, \ - { k65, KC_NO, k66, k67, k68, k69, k70 } \ -} - -#define LAYOUT_ortho_7u( \ - k65, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \ - k60, k61, k62, k63, k64 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { KC_NO, k60, k61, KC_NO, KC_NO, KC_NO, k62 }, \ - { k07, k08, k09, k10, k11, k12, k13 }, \ - { k27, k28, k29, k30, k31, k32, k33 }, \ - { k47, k48, k49, k50, k51, k52, k53 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, k63, k64, k65 } \ -} - diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index 6f83e36c16..011ce2332e 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -23,67 +23,68 @@ }, "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { - "LAYOUT_numpad_6x4": { + "LAYOUT_numpad_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - - {"x":0, "y":6, "w":2}, - {"x":2, "y":6}, - {"x":3, "y":5, "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": [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": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "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": 3, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 2], "x": 2, "y": 5}, + + {"matrix": [5, 1], "x": 0, "y": 6, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 6}, + {"matrix": [5, 3], "x": 3, "y": 5, "h": 2} ] }, - "LAYOUT_ortho_6x4": { + "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "y":5}, - - {"x":0, "y":6}, - {"x":1, "y":6}, - {"x":2, "y":6}, - {"x":3, "y":6} - ] + {"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": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 2}, + + {"matrix": [2, 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": [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": [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": [5, 0], "x": 0, "y": 6}, + {"matrix": [5, 1], "x": 1, "y": 6}, + {"matrix": [5, 2], "x": 2, "y": 6}, + {"matrix": [5, 3], "x": 3, "y": 6} + ] } } } diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h deleted file mode 100644 index 7b65d4ba71..0000000000 --- a/keyboards/keyten/kt3700/kt3700.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright 2022 Ivan Gromov (@key10iq) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 - -/* LAYOUT_numpad_6x4 - * ┌───┬───┬───┬───┐ - * │00 │01 │02 │03 │ - * ├───┴───┴───┴───┤ - * │ │ - * ├───┬───┬───┬───┤ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ - * │20 │21 │22 │ │ - * ├───┼───┼───┤33 │ - * │30 │31 │32 │ │ - * ├───┼───┼───┼───┤ - * │40 │41 │42 │ │ - * ├───┴───┼───┤53 │ - * │ 51 │52 │ │ - * └───────┴───┴───┘ - */ -#define LAYOUT_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, XXX }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, XXX }, \ - { XXX, K51, K52, K53 } \ -} - -/* LAYOUT_ortho_6x4 - * ┌───┬───┬───┬───┐ - * │00 │01 │02 │03 │ - * ├───┴───┴───┴───┤ - * │ │ - * ├───┬───┬───┬───┤ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ - * │20 │21 │22 │23 │ - * ├───┼───┼───┼───┤ - * │30 │31 │32 │33 │ - * ├───┼───┼───┼───┤ - * │40 │41 │42 │43 │ - * ├───┼───┼───┼───┤ - * │50 │51 │52 │53 │ - * └───┴───┴───┴───┘ - */ -#define LAYOUT_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index e9cf7171e2..6950a84a44 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -23,176 +23,188 @@ "layouts": { "LAYOUT_ortho_all": { "layout": [ - {"label":"k001", "x":0, "y":0}, - {"label":"k002", "x":1.5, "y":0}, - {"label":"k011", "x":10.5, "y":0}, - {"label":"k012", "x":11.5, "y":0}, - {"label":"k013", "x":12.5, "y":0}, - {"label":"k101", "x":0, "y":1.5}, - {"label":"k102", "x":1.5, "y":1.5}, - {"label":"k103", "x":2.5, "y":1.5}, - {"label":"k104", "x":3.5, "y":1.5}, - {"label":"k105", "x":4.5, "y":1.5}, - {"label":"k106", "x":5.5, "y":1.5}, - {"label":"k107", "x":6.5, "y":1.5}, - {"label":"k108", "x":7.5, "y":1.5}, - {"label":"k109", "x":8.5, "y":1.5}, - {"label":"k110", "x":9.5, "y":1.5}, - {"label":"k111", "x":10.5, "y":1.5}, - {"label":"k112", "x":11.5, "y":1.5}, - {"label":"k113", "x":12.5, "y":1.5}, - {"label":"k201", "x":0, "y":2.5}, - {"label":"k202", "x":1.5, "y":2.5}, - {"label":"k203", "x":2.5, "y":2.5}, - {"label":"k204", "x":3.5, "y":2.5}, - {"label":"k205", "x":4.5, "y":2.5}, - {"label":"k206", "x":5.5, "y":2.5}, - {"label":"k207", "x":6.5, "y":2.5}, - {"label":"k208", "x":7.5, "y":2.5}, - {"label":"k209", "x":8.5, "y":2.5}, - {"label":"k210", "x":9.5, "y":2.5}, - {"label":"k211", "x":10.5, "y":2.5}, - {"label":"k212", "x":11.5, "y":2.5}, - {"label":"k213", "x":12.5, "y":2.5}, - {"label":"k301", "x":0, "y":3.5}, - {"label":"k302", "x":1.5, "y":3.5}, - {"label":"k303", "x":2.5, "y":3.5}, - {"label":"k304", "x":3.5, "y":3.5}, - {"label":"k305", "x":4.5, "y":3.5}, - {"label":"k306", "x":5.5, "y":3.5}, - {"label":"k307", "x":6.5, "y":3.5}, - {"label":"k308", "x":7.5, "y":3.5}, - {"label":"k309", "x":8.5, "y":3.5}, - {"label":"k310", "x":9.5, "y":3.5}, - {"label":"k311", "x":10.5, "y":3.5}, - {"label":"k312", "x":11.5, "y":3.5}, - {"label":"k313", "x":12.5, "y":3.5}, - {"label":"k401", "x":0, "y":4.5}, - {"label":"k402", "x":1.5, "y":4.5}, - {"label":"k403", "x":2.5, "y":4.5}, - {"label":"k404", "x":3.5, "y":4.5}, - {"label":"k405", "x":4.5, "y":4.5}, - {"label":"k406", "x":5.5, "y":4.5}, - {"label":"k407", "x":6.5, "y":4.5}, - {"label":"k408", "x":7.5, "y":4.5}, - {"label":"k409", "x":8.5, "y":4.5}, - {"label":"k410", "x":9.5, "y":4.5}, - {"label":"k411", "x":10.5, "y":4.5}, - {"label":"k412", "x":11.5, "y":4.5}, - {"label":"k413", "x":12.5, "y":4.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.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.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": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "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, 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": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5}, + {"matrix": [4, 3], "x": 3.5, "y": 4.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.5}, + {"matrix": [4, 6], "x": 6.5, "y": 4.5}, + {"matrix": [4, 7], "x": 7.5, "y": 4.5}, + {"matrix": [4, 8], "x": 8.5, "y": 4.5}, + {"matrix": [4, 9], "x": 9.5, "y": 4.5}, + {"matrix": [4, 10], "x": 10.5, "y": 4.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] }, "LAYOUT_ortho_2x2u": { "layout": [ - {"label":"k001", "x":0, "y":0}, - {"label":"k002", "x":1.5, "y":0}, - {"label":"k011", "x":10.5, "y":0}, - {"label":"k012", "x":11.5, "y":0}, - {"label":"k013", "x":12.5, "y":0}, - {"label":"k101", "x":0, "y":1.5}, - {"label":"k102", "x":1.5, "y":1.5}, - {"label":"k103", "x":2.5, "y":1.5}, - {"label":"k104", "x":3.5, "y":1.5}, - {"label":"k105", "x":4.5, "y":1.5}, - {"label":"k106", "x":5.5, "y":1.5}, - {"label":"k107", "x":6.5, "y":1.5}, - {"label":"k108", "x":7.5, "y":1.5}, - {"label":"k109", "x":8.5, "y":1.5}, - {"label":"k110", "x":9.5, "y":1.5}, - {"label":"k111", "x":10.5, "y":1.5}, - {"label":"k112", "x":11.5, "y":1.5}, - {"label":"k113", "x":12.5, "y":1.5}, - {"label":"k201", "x":0, "y":2.5}, - {"label":"k202", "x":1.5, "y":2.5}, - {"label":"k203", "x":2.5, "y":2.5}, - {"label":"k204", "x":3.5, "y":2.5}, - {"label":"k205", "x":4.5, "y":2.5}, - {"label":"k206", "x":5.5, "y":2.5}, - {"label":"k207", "x":6.5, "y":2.5}, - {"label":"k208", "x":7.5, "y":2.5}, - {"label":"k209", "x":8.5, "y":2.5}, - {"label":"k210", "x":9.5, "y":2.5}, - {"label":"k211", "x":10.5, "y":2.5}, - {"label":"k212", "x":11.5, "y":2.5}, - {"label":"k213", "x":12.5, "y":2.5}, - {"label":"k301", "x":0, "y":3.5}, - {"label":"k302", "x":1.5, "y":3.5}, - {"label":"k303", "x":2.5, "y":3.5}, - {"label":"k304", "x":3.5, "y":3.5}, - {"label":"k305", "x":4.5, "y":3.5}, - {"label":"k306", "x":5.5, "y":3.5}, - {"label":"k307", "x":6.5, "y":3.5}, - {"label":"k308", "x":7.5, "y":3.5}, - {"label":"k309", "x":8.5, "y":3.5}, - {"label":"k310", "x":9.5, "y":3.5}, - {"label":"k311", "x":10.5, "y":3.5}, - {"label":"k312", "x":11.5, "y":3.5}, - {"label":"k313", "x":12.5, "y":3.5}, - {"label":"k401", "x":0, "y":4.5}, - {"label":"k402", "x":1.5, "y":4.5}, - {"label":"k403", "x":2.5, "y":4.5}, - {"label":"k404", "x":3.5, "y":4.5}, - {"label":"k405", "x":4.5, "y":4.5}, - {"label":"k406", "x":5.5, "y":4.5, "w":2}, - {"label":"k409", "x":7.5, "y":4.5, "w":2}, - {"label":"k410", "x":9.5, "y":4.5}, - {"label":"k411", "x":10.5, "y":4.5}, - {"label":"k412", "x":11.5, "y":4.5}, - {"label":"k413", "x":12.5, "y":4.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.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.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": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "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, 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": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5}, + {"matrix": [4, 3], "x": 3.5, "y": 4.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.5, "w": 2}, + {"matrix": [4, 8], "x": 7.5, "y": 4.5, "w": 2}, + {"matrix": [4, 9], "x": 9.5, "y": 4.5}, + {"matrix": [4, 10], "x": 10.5, "y": 4.5}, + {"matrix": [4, 11], "x": 11.5, "y": 4.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] }, "LAYOUT_ortho_big_boy": { "layout": [ - {"label":"k001", "x":0, "y":0}, - {"label":"k002", "x":1.5, "y":0}, - {"label":"k011", "x":10.5, "y":0}, - {"label":"k012", "x":11.5, "y":0}, - {"label":"k013", "x":12.5, "y":0}, - {"label":"k101", "x":0, "y":1.5}, - {"label":"k102", "x":1.5, "y":1.5}, - {"label":"k103", "x":2.5, "y":1.5}, - {"label":"k104", "x":3.5, "y":1.5}, - {"label":"k105", "x":4.5, "y":1.5}, - {"label":"k106", "x":5.5, "y":1.5}, - {"label":"k107", "x":6.5, "y":1.5}, - {"label":"k108", "x":7.5, "y":1.5}, - {"label":"k109", "x":8.5, "y":1.5}, - {"label":"k110", "x":9.5, "y":1.5}, - {"label":"k111", "x":10.5, "y":1.5}, - {"label":"k112", "x":11.5, "y":1.5}, - {"label":"k113", "x":12.5, "y":1.5}, - {"label":"k201", "x":0, "y":2.5}, - {"label":"k202", "x":1.5, "y":2.5}, - {"label":"k203", "x":2.5, "y":2.5}, - {"label":"k204", "x":3.5, "y":2.5}, - {"label":"k205", "x":4.5, "y":2.5}, - {"label":"k206", "x":5.5, "y":2.5}, - {"label":"k207", "x":6.5, "y":2.5}, - {"label":"k208", "x":7.5, "y":2.5}, - {"label":"k209", "x":8.5, "y":2.5}, - {"label":"k210", "x":9.5, "y":2.5}, - {"label":"k211", "x":10.5, "y":2.5}, - {"label":"k212", "x":11.5, "y":2.5}, - {"label":"k213", "x":12.5, "y":2.5}, - {"label":"k301", "x":0, "y":3.5}, - {"label":"k302", "x":1.5, "y":3.5}, - {"label":"k303", "x":2.5, "y":3.5}, - {"label":"k304", "x":3.5, "y":3.5}, - {"label":"k305", "x":4.5, "y":3.5}, - {"label":"k306", "x":5.5, "y":3.5}, - {"label":"k307", "x":6.5, "y":3.5}, - {"label":"k308", "x":7.5, "y":3.5}, - {"label":"k309", "x":8.5, "y":3.5}, - {"label":"k310", "x":9.5, "y":3.5}, - {"label":"k311", "x":10.5, "y":3.5}, - {"label":"k312", "x":11.5, "y":3.5}, - {"label":"k313", "x":12.5, "y":3.5}, - {"label":"k401", "x":0, "y":4.5}, - {"label":"k402", "x":1.5, "y":4.5}, - {"label":"k403", "x":2.5, "y":4.5, "w":1.5}, - {"label":"k404", "x":4, "y":4.5, "w":7}, - {"label":"k405", "x":11, "y":4.5, "w":1.5}, - {"label":"k413", "x":12.5, "y":4.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.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.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": [2, 0], "x": 0, "y": 2.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": [3, 0], "x": 0, "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, 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": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4.5, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4.5, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4.5} ] } } diff --git a/keyboards/kingly_keys/ave/ortho/ortho.h b/keyboards/kingly_keys/ave/ortho/ortho.h deleted file mode 100644 index 12cdede536..0000000000 --- a/keyboards/kingly_keys/ave/ortho/ortho.h +++ /dev/null @@ -1,67 +0,0 @@ - /* - Copyright 2020 Garret Gartner - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You 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_ortho_all( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_2x2u( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k404, k405, k406, k409, k410, k411, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, k404, k405, k406, XXXX, XXXX, k409, k410, k411, k412, k413 } \ -} - -#define LAYOUT_ortho_big_boy( \ - k001, k002, k011, k012, k013, \ - k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \ - k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k407, k412, k413 \ -) \ -{ \ - { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \ - { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \ - { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \ - { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \ - { k401, k402, k403, XXXX, XXXX, XXXX, k407, XXXX, XXXX, XXXX, XXXX, k412, k413 } \ -} diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json index a71e963a05..4844dd9701 100644 --- a/keyboards/kiwikey/kawii9/info.json +++ b/keyboards/kiwikey/kawii9/info.json @@ -18,15 +18,17 @@ "layouts": { "LAYOUT_ortho_3x3": { "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} + {"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/kiwikey/kawii9/kawii9.h b/keyboards/kiwikey/kawii9/kawii9.h deleted file mode 100644 index b6fc36a575..0000000000 --- a/keyboards/kiwikey/kawii9/kawii9.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 KiwiKey - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_3x3( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/kprepublic/bm16s/bm16s.h b/keyboards/kprepublic/bm16s/bm16s.h deleted file mode 100755 index 9aca8c0e37..0000000000 --- a/keyboards/kprepublic/bm16s/bm16s.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json index 38cbe62e68..40d24a05d8 100644 --- a/keyboards/kprepublic/bm16s/info.json +++ b/keyboards/kprepublic/bm16s/info.json @@ -19,22 +19,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/kprepublic/cospad/cospad.h b/keyboards/kprepublic/cospad/cospad.h index 1e3b6c4276..4838c7f237 100644 --- a/keyboards/kprepublic/cospad/cospad.h +++ b/keyboards/kprepublic/cospad/cospad.h @@ -18,208 +18,6 @@ #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. - */ - -/* 6x4 ortholinear layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | 23 | - * |----|----|----|----| - * | 30 | 31 | 32 | 33 | - * |----|----|----|----| - * | 40 | 41 | 42 | 43 | - * |----|----|----|----| - * | 50 | 51 | 52 | 53 | - * `-------------------' - */ -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -/* 6x4 gamepad layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | 43 | - * |----|----|----|----| - * | 50 | 51 | 52 | 53 | - * `-------------------' - */ -#define LAYOUT_gamepad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, ___ }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -/* 6x4 numpad layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 52 | | - * `-------------------' - */ -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, ___ }, \ - { k40, k41, k42, k43 }, \ - { k50, ___, k52, ___ } \ -} - -/* 6x4 numpad layout with split Plus - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | 23 | - * |----|----|----|----| - * | 30 | 31 | 32 | 33 | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 52 | | - * `-------------------' - */ -#define LAYOUT_numpad_6x4_split_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, ___, k52, ___ } \ -} - -/* 6x4 numpad with split Plus and 0 keys - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | 23 | - * |----|----|----|----| - * | 30 | 31 | 32 | 33 | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 51 | 52 | | - * `-------------------' - */ -#define LAYOUT_numpad_6x4_split_plus_zero( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k51, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, ___ } \ -} - -/* 6x4 numpad with split 0 key - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 51 | 52 | | - * `-------------------' - */ -#define LAYOUT_numpad_6x4_split_zero( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k51, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, ___ }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, ___ } \ -} // Add backwards compatibility for existing keymaps #define cospad_bl_led_on backlight_enable #define cospad_bl_led_off backlight_disable diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json index a422152962..1e93359aac 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/info.json @@ -27,191 +27,191 @@ "layouts": { "LAYOUT_ortho_6x4": { "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}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "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": [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}, + + {"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": [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": [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} ] }, "LAYOUT_gamepad_6x4": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"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": [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} ] }, "LAYOUT_numpad_6x4": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] }, "LAYOUT_numpad_6x4_split_plus": { "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}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "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": [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}, + + {"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": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] }, "LAYOUT_numpad_6x4_split_plus_zero": { "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}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "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": [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}, + + {"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": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] }, "LAYOUT_numpad_6x4_split_zero": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index c236b2034a..c41c139606 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -24,17 +24,174 @@ "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_planck_mit" + }, "layouts": { "LAYOUT_planck_mit": { - "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}] + "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}, + {"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} + ] }, "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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} + ] }, "LAYOUT_planck_1x2uR": { - "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, "w":2}, {"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}, + {"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, "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/kprepublic/jj40/jj40.h b/keyboards/kprepublic/jj40/jj40.h deleted file mode 100644 index a77f35af23..0000000000 --- a/keyboards/kprepublic/jj40/jj40.h +++ /dev/null @@ -1,66 +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 ___ KC_NO - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - - -#define LAYOUT_planck_mit( \ - 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, K3X, 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, K34, K3X, ___, K37, K38, K39, K3A, K3B } \ -} - - -#define LAYOUT_planck_1x2uR( \ - 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, K3X, 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, K34, K35, K3X, ___, K38, K39, K3A, K3B } \ -} - - -#define LAYOUT LAYOUT_planck_mit diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json index 049aef8237..337b532f97 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/info.json @@ -27,22 +27,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/kprepublic/jj4x4/jj4x4.h b/keyboards/kprepublic/jj4x4/jj4x4.h deleted file mode 100644 index ee17e896dd..0000000000 --- a/keyboards/kprepublic/jj4x4/jj4x4.h +++ /dev/null @@ -1,40 +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" - -/* 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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json index 81541075fa..a83d42ab6a 100644 --- a/keyboards/kprepublic/jj50/info.json +++ b/keyboards/kprepublic/jj50/info.json @@ -30,70 +30,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"label":"K2B", "x":0, "y":0}, - {"label":"K2A", "x":1, "y":0}, - {"label":"K29", "x":2, "y":0}, - {"label":"K28", "x":3, "y":0}, - {"label":"K24", "x":4, "y":0}, - {"label":"K25", "x":5, "y":0}, - {"label":"K26", "x":6, "y":0}, - {"label":"K27", "x":7, "y":0}, - {"label":"K23", "x":8, "y":0}, - {"label":"K22", "x":9, "y":0}, - {"label":"K21", "x":10, "y":0}, - {"label":"K20", "x":11, "y":0}, + {"matrix": [2, 11], "x": 0, "y": 0}, + {"matrix": [2, 10], "x": 1, "y": 0}, + {"matrix": [2, 9], "x": 2, "y": 0}, + {"matrix": [2, 8], "x": 3, "y": 0}, + {"matrix": [2, 4], "x": 4, "y": 0}, + {"matrix": [2, 5], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [2, 7], "x": 7, "y": 0}, + {"matrix": [2, 3], "x": 8, "y": 0}, + {"matrix": [2, 2], "x": 9, "y": 0}, + {"matrix": [2, 1], "x": 10, "y": 0}, + {"matrix": [2, 0], "x": 11, "y": 0}, - {"label":"K0B", "x":0, "y":1}, - {"label":"K0A", "x":1, "y":1}, - {"label":"K09", "x":2, "y":1}, - {"label":"K08", "x":3, "y":1}, - {"label":"K04", "x":4, "y":1}, - {"label":"K05", "x":5, "y":1}, - {"label":"K06", "x":6, "y":1}, - {"label":"K07", "x":7, "y":1}, - {"label":"K03", "x":8, "y":1}, - {"label":"K02", "x":9, "y":1}, - {"label":"K01", "x":10, "y":1}, - {"label":"K00", "x":11, "y":1}, + {"matrix": [0, 11], "x": 0, "y": 1}, + {"matrix": [0, 10], "x": 1, "y": 1}, + {"matrix": [0, 9], "x": 2, "y": 1}, + {"matrix": [0, 8], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 3], "x": 8, "y": 1}, + {"matrix": [0, 2], "x": 9, "y": 1}, + {"matrix": [0, 1], "x": 10, "y": 1}, + {"matrix": [0, 0], "x": 11, "y": 1}, - {"label":"K1B", "x":0, "y":2}, - {"label":"K1A", "x":1, "y":2}, - {"label":"K19", "x":2, "y":2}, - {"label":"K18", "x":3, "y":2}, - {"label":"K14", "x":4, "y":2}, - {"label":"K15", "x":5, "y":2}, - {"label":"K16", "x":6, "y":2}, - {"label":"K17", "x":7, "y":2}, - {"label":"K13", "x":8, "y":2}, - {"label":"K12", "x":9, "y":2}, - {"label":"K11", "x":10, "y":2}, - {"label":"K10", "x":11, "y":2}, + {"matrix": [1, 11], "x": 0, "y": 2}, + {"matrix": [1, 10], "x": 1, "y": 2}, + {"matrix": [1, 9], "x": 2, "y": 2}, + {"matrix": [1, 8], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [1, 6], "x": 6, "y": 2}, + {"matrix": [1, 7], "x": 7, "y": 2}, + {"matrix": [1, 3], "x": 8, "y": 2}, + {"matrix": [1, 2], "x": 9, "y": 2}, + {"matrix": [1, 1], "x": 10, "y": 2}, + {"matrix": [1, 0], "x": 11, "y": 2}, - {"label":"K3B", "x":0, "y":3}, - {"label":"K3A", "x":1, "y":3}, - {"label":"K39", "x":2, "y":3}, - {"label":"K38", "x":3, "y":3}, - {"label":"K34", "x":4, "y":3}, - {"label":"K35", "x":5, "y":3}, - {"label":"K36", "x":6, "y":3}, - {"label":"K37", "x":7, "y":3}, - {"label":"K33", "x":8, "y":3}, - {"label":"K32", "x":9, "y":3}, - {"label":"K31", "x":10, "y":3}, - {"label":"K30", "x":11, "y":3}, + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 3], "x": 8, "y": 3}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3}, + {"matrix": [3, 0], "x": 11, "y": 3}, - {"label":"K4B", "x":0, "y":4}, - {"label":"K4A", "x":1, "y":4}, - {"label":"K49", "x":2, "y":4}, - {"label":"K48", "x":3, "y":4}, - {"label":"K44", "x":4, "y":4}, - {"label":"K45", "x":5, "y":4}, - {"label":"K46", "x":6, "y":4}, - {"label":"K47", "x":7, "y":4}, - {"label":"K43", "x":8, "y":4}, - {"label":"K42", "x":9, "y":4}, - {"label":"K41", "x":10, "y":4}, - {"label":"K40", "x":11, "y":4} + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 3], "x": 8, "y": 4}, + {"matrix": [4, 2], "x": 9, "y": 4}, + {"matrix": [4, 1], "x": 10, "y": 4}, + {"matrix": [4, 0], "x": 11, "y": 4} ] } } diff --git a/keyboards/kprepublic/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h deleted file mode 100644 index a3d42856c8..0000000000 --- a/keyboards/kprepublic/jj50/jj50.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro -Modified 2017 Andrew Novak -Modified 2018 Wayne Jones (WarmCatUK) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_5x12( \ - K2B, K2A, K29, K28, K24, K25, K26, K27, K23, K22, K21, K20, \ - K0B, K0A, K09, K08, K04, K05, K06, K07, K03, K02, K01, K00, \ - K1B, K1A, K19, K18, K14, K15, K16, K17, K13, K12, K11, K10, \ - K3B, K3A, K39, K38, K34, K35, K36, K37, K33, K32, K31, K30, \ - K4B, K4A, K49, K48, K44, K45, K46, K47, K43, K42, K41, K40 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B } \ -} diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json index e103ff8017..d4caabc507 100644 --- a/keyboards/latincompass/latin17rgb/info.json +++ b/keyboards/latincompass/latin17rgb/info.json @@ -17,30 +17,33 @@ "bootloader": "atmel-dfu", "debounce": 3, "community_layouts": ["numpad_5x4"], + "layout_aliases": { + "LAYOUT_pad": "LAYOUT_numpad_5x4" + }, "layouts": { "LAYOUT_numpad_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c index e165c5b76d..c758e8eb35 100644 --- a/keyboards/latincompass/latin17rgb/latin17rgb.c +++ b/keyboards/latincompass/latin17rgb/latin17rgb.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 "latin17rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/latincompass/latin17rgb/latin17rgb.h b/keyboards/latincompass/latin17rgb/latin17rgb.h deleted file mode 100644 index f4ed4bf0c8..0000000000 --- a/keyboards/latincompass/latin17rgb/latin17rgb.h +++ /dev/null @@ -1,36 +0,0 @@ - /* Copyright 2021 18438880 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K41, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41 } \ -} - -#define LAYOUT_pad LAYOUT_numpad_5x4 diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json index 8dcc401b98..cecbce638a 100644 --- a/keyboards/latincompass/latin6rgb/info.json +++ b/keyboards/latincompass/latin6rgb/info.json @@ -19,12 +19,13 @@ "layouts": { "LAYOUT_numpad_2x3": { "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} + {"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/latincompass/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c index cc10a7b334..b7c05dd4ad 100644 --- a/keyboards/latincompass/latin6rgb/latin6rgb.c +++ b/keyboards/latincompass/latin6rgb/latin6rgb.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 "latin6rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/latincompass/latin6rgb/latin6rgb.h b/keyboards/latincompass/latin6rgb/latin6rgb.h deleted file mode 100644 index 6feae9493a..0000000000 --- a/keyboards/latincompass/latin6rgb/latin6rgb.h +++ /dev/null @@ -1,30 +0,0 @@ - /* Copyright 2021 18438880 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_numpad_2x3( \ - K00, K01, K02,\ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 } \ -} - -#define LAYOUT_pad numpad_2x3 diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index 4bad513fe6..886f86ef2d 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -18,146 +18,155 @@ "layouts": { "LAYOUT_ortho_2u": { "layout": [ - {"label":"Esc", "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":"BackSpace", "x":11.25, "y":0, "w":1.25}, - {"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.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Alt", "x":2.75, "y":3}, - {"label":"Space", "x":3.75, "y":3, "w":2}, - {"label":"FN", "x":5.75, "y":3}, - {"label":"Space", "x":6.75, "y":3, "w":2}, - {"label":"Left", "x":8.75, "y":3}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "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, "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, "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": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "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, "w": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] }, "LAYOUT_ortho_3u": { "layout": [ - {"label":"Esc", "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":"BackSpace", "x":11.25, "y":0, "w":1.25}, - {"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.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Alt", "x":2.75, "y":3}, - {"label":"Raise", "x":3.75, "y":3}, - {"label":"FN", "x":4.75, "y":3,"w":3}, - {"label":"Lower", "x":7.75, "y":3}, - {"label":"Left", "x":8.75, "y":3}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "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, "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, "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": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "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, "w": 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} + ] }, "LAYOUT_ortho_7u": { "layout": [ - {"label":"Esc", "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":"Back
Space", "x":11.25, "y":0, "w":1.25}, - {"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.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Space", "x":2.75, "y":3, "w":7}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "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, "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, "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": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 7}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] } } } diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.h b/keyboards/lazydesigners/dimple/ortho/ortho.h deleted file mode 100644 index 592cf47de3..0000000000 --- a/keyboards/lazydesigners/dimple/ortho/ortho.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - Copyright 2021 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" - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | 2U | | 2U | | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_2u( \ - 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, 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, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | 3U | | | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_3u( \ - 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, 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, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | 7U | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_7u( \ - 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, K302, K305, 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, KC_NO, K302, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, K309, KC_NO, KC_NO } \ -} - - diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/info.json index 264ae2b18a..fab36b7f9c 100644 --- a/keyboards/lazydesigners/the30/info.json +++ b/keyboards/lazydesigners/the30/info.json @@ -22,36 +22,38 @@ "layouts": { "LAYOUT_ortho_3x10": { "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":"ENTER", "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} + {"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} ] } } diff --git a/keyboards/lazydesigners/the30/the30.h b/keyboards/lazydesigners/the30/the30.h deleted file mode 100644 index 82a6bf8ba5..0000000000 --- a/keyboards/lazydesigners/the30/the30.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Erovia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_3x10( \ - 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 \ -) { \ - { 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 }, \ -} diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json index 81a0625726..a92a948abd 100644 --- a/keyboards/lets_split/info.json +++ b/keyboards/lets_split/info.json @@ -3,10 +3,5 @@ "maintainer": "qmk", "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": ["ortho_4x12"], - "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}] - } - } + "community_layouts": ["ortho_4x12"] } diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json index 08ea058ee7..62f23348ef 100644 --- a/keyboards/lets_split/rev1/info.json +++ b/keyboards/lets_split/rev1/info.json @@ -13,5 +13,69 @@ "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "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, "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}, + {"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": 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}, + + {"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": 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}, + + {"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": 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} + ] + } } } diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h deleted file mode 100644 index da7bb4ff92..0000000000 --- a/keyboards/lets_split/rev1/rev1.h +++ /dev/null @@ -1,22 +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 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json index 5617b8bc36..98f0b50965 100644 --- a/keyboards/lets_split/rev2/info.json +++ b/keyboards/lets_split/rev2/info.json @@ -13,5 +13,10 @@ "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" + }, + "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}] + } } } diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json index c68beff0d1..3a80767886 100644 --- a/keyboards/lets_split/sockets/info.json +++ b/keyboards/lets_split/sockets/info.json @@ -13,5 +13,10 @@ "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" + }, + "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}] + } } } diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json index 421ddd9d3f..0a41696cdc 100644 --- a/keyboards/lfkeyboards/lfkpad/info.json +++ b/keyboards/lfkeyboards/lfkpad/info.json @@ -19,27 +19,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.c b/keyboards/lfkeyboards/lfkpad/lfkpad.c index fffa26ca3a..7d8dd865fb 100644 --- a/keyboards/lfkeyboards/lfkpad/lfkpad.c +++ b/keyboards/lfkeyboards/lfkpad/lfkpad.c @@ -1,5 +1,3 @@ -#include "lfkpad.h" - #include "quantum.h" #include diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.h b/keyboards/lfkeyboards/lfkpad/lfkpad.h deleted file mode 100644 index 5ca8a3c50d..0000000000 --- a/keyboards/lfkeyboards/lfkpad/lfkpad.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, ___ }, \ - { k40, k41, k42, k43 }, \ - { k50, ___, k52, ___ } \ -} diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index 6d82466ac8..e0ed26f010 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -23,22 +23,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/manyboard/macro/macro.h b/keyboards/manyboard/macro/macro.h deleted file mode 100644 index 0dccdbebfb..0000000000 --- a/keyboards/manyboard/macro/macro.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 WillEhman - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} diff --git a/keyboards/maple_computing/c39/c39.h b/keyboards/maple_computing/c39/c39.h deleted file mode 100755 index 797dd1ef77..0000000000 --- a/keyboards/maple_computing/c39/c39.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ 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 \ - ) { \ - { 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 } \ -} - -#define LAYOUT_ortho_3x13 LAYOUT diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json index 7cb73383a7..4b673c575a 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/info.json @@ -15,9 +15,54 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_3x13" + }, "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":"Back", "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":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "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":"Enter", "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":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "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":"Fn", "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":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}] + "LAYOUT_ortho_3x13": { + "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.25, "y": 0}, + {"matrix": [0, 12], "x": 12.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.25, "y": 1}, + {"matrix": [1, 12], "x": 12.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, "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.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2} + ] } } } diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json index cfc198c02e..f1e753017f 100644 --- a/keyboards/maple_computing/jnao/info.json +++ b/keyboards/maple_computing/jnao/info.json @@ -22,118 +22,125 @@ "layouts": { "LAYOUT_ortho_5x12": { "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":"Backspace", "x":11, "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":"Delete", "x":11, "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, "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":"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":"Fn", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Meta", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Left", "x":8, "y":4}, - {"label":"Down", "x":9, "y":4}, - {"label":"Up", "x":10, "y":4}, - {"label":"Right", "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, 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} ] }, "LAYOUT_ortho_4x12": { "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":"Delete", "x":11, "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, "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":"Enter", "x":11, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Ctrl", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3}, - {"label":"Meta", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3}, - {"label":"Space", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"Raise", "x":7, "y":3}, - {"label":"Left", "x":8, "y":3}, - {"label":"Down", "x":9, "y":3}, - {"label":"Up", "x":10, "y":3}, - {"label":"Right", "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/maple_computing/jnao/jnao.h b/keyboards/maple_computing/jnao/jnao.h deleted file mode 100644 index 357a025f91..0000000000 --- a/keyboards/maple_computing/jnao/jnao.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x12( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212 }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 }, \ - { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412 } \ -} - -#define LAYOUT_ortho_4x12( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312 \ -) \ -{ \ - {k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012}, \ - {k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112}, \ - {k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212}, \ - {k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312}, \ - {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/maple_computing/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h deleted file mode 100644 index 4b97256c1e..0000000000 --- a/keyboards/maple_computing/lets_split_eh/eh/eh.h +++ /dev/null @@ -1,22 +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 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 4d2ee20c0b..73a0f5651f 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -22,60 +22,67 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_4x12": { "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, 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}, + {"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": 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}, + + {"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":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": [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":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": [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":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": [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} ] } } diff --git a/keyboards/matchstickworks/southpad/info.json b/keyboards/matchstickworks/southpad/info.json index 6715c441a0..887c0484cb 100644 --- a/keyboards/matchstickworks/southpad/info.json +++ b/keyboards/matchstickworks/southpad/info.json @@ -18,32 +18,32 @@ "layouts": { "LAYOUT_numpad_6x4_southpaw": { "layout": [ - {"label":"Bksp", "x":0, "y":0}, - {"label":"=", "x":1, "y":0}, - {"label":"(", "x":2, "y":0}, - {"label":")", "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}, - {"label":"-", "x":0, "y":1}, - {"label":"*", "x":1, "y":1}, - {"label":"/", "x":2, "y":1}, - {"label":"Num Lock", "x":3, "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}, - {"label":"9", "x":1, "y":2}, - {"label":"8", "x":2, "y":2}, - {"label":"7", "x":3, "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, 0], "x": 0, "y": 2, "h": 2}, - {"label":"+", "x":0, "y":2, "h":2}, - {"label":"6", "x":1, "y":3}, - {"label":"5", "x":2, "y":3}, - {"label":"4", "x":3, "y":3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"label":"3", "x":1, "y":4}, - {"label":"2", "x":2, "y":4}, - {"label":"1", "x":3, "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, 0], "x": 0, "y": 4, "h": 2}, - {"label":"Enter", "x":0, "y":4, "h":2}, - {"label":".", "x":1, "y":5}, - {"label":"0", "x":2, "y":5, "w":2} + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 3], "x": 2, "y": 5, "w": 2} ] } } diff --git a/keyboards/matchstickworks/southpad/southpad.h b/keyboards/matchstickworks/southpad/southpad.h deleted file mode 100644 index bdfb11bdd0..0000000000 --- a/keyboards/matchstickworks/southpad/southpad.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 Logan Butler - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_numpad_6x4_southpaw( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k21, k22, k23, \ - k20, k31, k32, k33, \ - k41, k42, k43, \ - k40, k51, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { KC_NO, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { KC_NO, k51, KC_NO, k53 } \ -} - diff --git a/keyboards/maxipad/info.json b/keyboards/maxipad/info.json index 5670d8d361..4b8e3fa0a0 100644 --- a/keyboards/maxipad/info.json +++ b/keyboards/maxipad/info.json @@ -8,12 +8,85 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x6", + "LAYOUT_grid": "LAYOUT_ortho_5x6" + }, "layouts": { - "LAYOUT_grid": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "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}] + "LAYOUT_ortho_5x6": { + "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": [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": [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, 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, 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} + ] }, "LAYOUT_1x2uC": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"w": 2, "x":4, "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": [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": [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, 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, 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, 5], "x": 4, "y": 4, "w": 2} + ] } } } diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h deleted file mode 100644 index 0442643dd0..0000000000 --- a/keyboards/maxipad/maxipad.h +++ /dev/null @@ -1,61 +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 ___ 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_grid( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_1x2uC( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_grid -#define LAYOUT_ortho_5x6 LAYOUT_grid diff --git a/keyboards/mechlovin/delphine/delphine.h b/keyboards/mechlovin/delphine/delphine.h deleted file mode 100644 index da0254eeb4..0000000000 --- a/keyboards/mechlovin/delphine/delphine.h +++ /dev/null @@ -1,73 +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 XXX KC_NO - -/* - * ┌───┬───┬───┬───┐ - * │00 │01 │02 │03 │ - * └───┴───┴───┴───┘ - * ┌───┬───┬───┬───┐ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ ┌───┐ - * │20 │21 │22 │23 │ │ │ - * ├───┼───┼───┼───┤ │23 │ 2u Plus - * │30 │31 │32 │33 │ │ │ - * ├───┼───┼───┼───┤ ├───┤ - * │40 │41 │42 │43 │ │ │ - * ├───┼───┼───┼───┤ │43 │ 2u Enter - * │50 │51 │52 │53 │ │ │ - * └───┴───┴───┴───┘ └───┘ - * ┌───────┐ - * │51 │ 2u 0/Ins - * └───────┘ - */ - -#define LAYOUT_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 }, \ -} - -#define LAYOUT_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K23, \ - K40, K41, K42, \ - K51, K52, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, XXX }, \ - { K40, K41, K42, K43 }, \ - { XXX, K51, K52, XXX }, \ -} diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 7e53ebf464..baeeab6f18 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -20,60 +20,65 @@ "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"label":"K00 (F0,F7)", "x":0, "y":0}, - {"label":"K01 (F0,D7)", "x":1, "y":0}, - {"label":"K02 (F0,D6)", "x":2, "y":0}, - {"label":"K03 (F0,D2)", "x":3, "y":0}, - {"label":"K10 (F1,F7)", "x":0, "y":1.25}, - {"label":"K11 (F1,D7)", "x":1, "y":1.25}, - {"label":"K12 (F1,D6)", "x":2, "y":1.25}, - {"label":"K13 (F1,D2)", "x":3, "y":1.25}, - {"label":"K20 (F4,F7)", "x":0, "y":2.25}, - {"label":"K21 (F4,D7)", "x":1, "y":2.25}, - {"label":"K22 (F4,D6)", "x":2, "y":2.25}, - {"label":"K23 (F4,D2)", "x":3, "y":2.25}, - {"label":"K30 (F5,F7)", "x":0, "y":3.25}, - {"label":"K31 (F5,D7)", "x":1, "y":3.25}, - {"label":"K32 (F5,D6)", "x":2, "y":3.25}, - {"label":"K33 (F5,D2)", "x":3, "y":3.25}, - {"label":"K40 (F6,F7)", "x":0, "y":4.25}, - {"label":"K41 (F6,D7)", "x":1, "y":4.25}, - {"label":"K42 (F6,D6)", "x":2, "y":4.25}, - {"label":"K43 (F6,D2)", "x":3, "y":4.25}, - {"label":"K50 (D3,F7)", "x":0, "y":5.25}, - {"label":"K51 (D3,D7)", "x":1, "y":5.25}, - {"label":"K52 (D3,D6)", "x":2, "y":5.25}, - {"label":"K53 (D3,D2)", "x":3, "y":5.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": [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": [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.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.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": [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} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"label":"K00 (F0,F7)", "x":0, "y":0}, - {"label":"K01 (F0,D7)", "x":1, "y":0}, - {"label":"K02 (F0,D6)", "x":2, "y":0}, - {"label":"K03 (F0,D2)", "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}, - {"label":"K10 (F1,F7)", "x":0, "y":1.25}, - {"label":"K11 (F1,D7)", "x":1, "y":1.25}, - {"label":"K12 (F1,D6)", "x":2, "y":1.25}, - {"label":"K13 (F1,D2)", "x":3, "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}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"label":"K20 (F4,F7)", "x":0, "y":2.25}, - {"label":"K21 (F4,D7)", "x":1, "y":2.25}, - {"label":"K22 (F4,D6)", "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}, - {"label":"K30 (F5,F7)", "x":0, "y":3.25}, - {"label":"K31 (F5,D7)", "x":1, "y":3.25}, - {"label":"K32 (F5,D6)", "x":2, "y":3.25}, - {"label":"K23 (F4,D2)", "x":3, "y":2.25, "h":2}, + {"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": [2, 3], "x": 3, "y": 2.25, "h": 2}, - {"label":"K40 (F6,F7)", "x":0, "y":4.25}, - {"label":"K41 (F6,D7)", "x":1, "y":4.25}, - {"label":"K42 (F6,D6)", "x":2, "y":4.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}, - {"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2}, - {"label":"K52 (D3,D6)", "x":2, "y":5.25}, - {"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2} + {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index e5f367653d..f3193fec27 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -22,7 +22,59 @@ "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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/mechstudio/ud_40_ortho/ud_40_ortho.h b/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h deleted file mode 100644 index 6e0b608e7b..0000000000 --- a/keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 David 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" - -/* 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_ortho_4x12( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h deleted file mode 100644 index e1419379ba..0000000000 --- a/keyboards/minimon/index_tab/index_tab.h +++ /dev/null @@ -1,94 +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 - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │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 │2c │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b │4c │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │50 │51 │52 │53 │54 │55 │56 │57 │58 │59 │5a │5b │5c │ - * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ - * ┌───┬───┬───┬───┬───────┬───────┬───┬───┬───┬───┬───┐ - * │50 │51 │52 │53 │54 │56 │58 │59 │5a │5b │5c │ 2x2u - * └───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴───┘ - * ┌───┬───┬───┬───────────────────────────┬───┬───┬───┐ - * │50 │51 │52 │ 56 │5a │5b │5c │ 7u_space - * └───┴───┴───┴───────────────────────────┴───┴───┴───┘ - */ - -#define LAYOUT_ortho_6x13( \ - 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, K5b, K5c \ -) \ - { \ - { 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, K5b, K5c } \ - } - -#define LAYOUT_2x2u( \ - 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, K56, K58, K59, K5a, K5b, K5c \ -) \ - { \ - { 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, XXX, K56, XXX, K58, K59, K5a, K5b, K5c } \ - } - -#define LAYOUT_7u_space( \ - 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, K56, K5a, K5b, K5c \ -) \ - { \ - { 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, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5a, K5b, K5c } \ - } diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 8655546ea5..e4ce639e24 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -19,255 +19,255 @@ "layouts": { "LAYOUT_ortho_6x13": { "layout": [ - {"label":"CAPS", "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}, + {"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}, - {"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\u00a4", "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}, + {"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}, - {"label":"TAB", "x":0, "y":2}, - {"label":"Q", "x":1, "y":2}, - {"label":"W", "x":2, "y":2}, - {"label":"E", "x":3, "y":2}, - {"label":"R", "x":4, "y":2}, - {"label":"T", "x":5, "y":2}, - {"label":"Y", "x":6, "y":2}, - {"label":"U", "x":7, "y":2}, - {"label":"I", "x":8, "y":2}, - {"label":"O", "x":9, "y":2}, - {"label":"P", "x":10, "y":2}, - {"label":"\u00c5", "x":11, "y":2}, - {"label":"BKSP", "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}, - {"label":"CTRL", "x":0, "y":3}, - {"label":"A", "x":1, "y":3}, - {"label":"S", "x":2, "y":3}, - {"label":"D", "x":3, "y":3}, - {"label":"F", "x":4, "y":3}, - {"label":"G", "x":5, "y":3}, - {"label":"H", "x":6, "y":3}, - {"label":"J", "x":7, "y":3}, - {"label":"K", "x":8, "y":3}, - {"label":"L", "x":9, "y":3}, - {"label":"\u00d8", "x":10, "y":3}, - {"label":"\u00c6", "x":11, "y":3}, - {"label":"\u00a8^", "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}, - {"label":"SHIFT", "x":0, "y":4}, - {"label":"Z", "x":1, "y":4}, - {"label":"X", "x":2, "y":4}, - {"label":"C", "x":3, "y":4}, - {"label":"V", "x":4, "y":4}, - {"label":"B", "x":5, "y":4}, - {"label":"N", "x":6, "y":4}, - {"label":"M", "x":7, "y":4}, - {"label":",;", "x":8, "y":4}, - {"label":".:", "x":9, "y":4}, - {"label":"-_", "x":10, "y":4}, - {"label":"\u2191", "x":11, "y":4}, - {"label":"\u21b2", "x":12, "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}, - {"label":"ESC", "x":0, "y":5}, - {"label":"|\u00a7", "x":1, "y":5}, - {"label":"WIN", "x":2, "y":5}, - {"label":"LALT", "x":3, "y":5}, - {"label":"Space", "x":4, "y":5}, - {"label":"Space", "x":5, "y":5}, - {"label":"Space", "x":6, "y":5}, - {"label":"Space", "x":7, "y":5}, - {"label":"FN", "x":8, "y":5}, - {"label":"'*", "x":9, "y":5}, - {"label":"\u2190", "x":10, "y":5}, - {"label":"\u2193", "x":11, "y":5}, - {"label":"\u2192", "x":12, "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": [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} ] }, "LAYOUT_2x2u": { "layout": [ - {"label":"CAPS", "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}, + {"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}, - {"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\u00a4", "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}, + {"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}, - {"label":"TAB", "x":0, "y":2}, - {"label":"Q", "x":1, "y":2}, - {"label":"W", "x":2, "y":2}, - {"label":"E", "x":3, "y":2}, - {"label":"R", "x":4, "y":2}, - {"label":"T", "x":5, "y":2}, - {"label":"Y", "x":6, "y":2}, - {"label":"U", "x":7, "y":2}, - {"label":"I", "x":8, "y":2}, - {"label":"O", "x":9, "y":2}, - {"label":"P", "x":10, "y":2}, - {"label":"\u00c5", "x":11, "y":2}, - {"label":"BKSP", "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}, - {"label":"CTRL", "x":0, "y":3}, - {"label":"A", "x":1, "y":3}, - {"label":"S", "x":2, "y":3}, - {"label":"D", "x":3, "y":3}, - {"label":"F", "x":4, "y":3}, - {"label":"G", "x":5, "y":3}, - {"label":"H", "x":6, "y":3}, - {"label":"J", "x":7, "y":3}, - {"label":"K", "x":8, "y":3}, - {"label":"L", "x":9, "y":3}, - {"label":"\u00d8", "x":10, "y":3}, - {"label":"\u00c6", "x":11, "y":3}, - {"label":"\u00a8^", "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}, - {"label":"SHIFT", "x":0, "y":4}, - {"label":"Z", "x":1, "y":4}, - {"label":"X", "x":2, "y":4}, - {"label":"C", "x":3, "y":4}, - {"label":"V", "x":4, "y":4}, - {"label":"B", "x":5, "y":4}, - {"label":"N", "x":6, "y":4}, - {"label":"M", "x":7, "y":4}, - {"label":",;", "x":8, "y":4}, - {"label":".:", "x":9, "y":4}, - {"label":"-_", "x":10, "y":4}, - {"label":"\u2191", "x":11, "y":4}, - {"label":"\u21b2", "x":12, "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}, - {"label":"ESC", "x":0, "y":5}, - {"label":"|\u00a7", "x":1, "y":5}, - {"label":"WIN", "x":2, "y":5}, - {"label":"LALT", "x":3, "y":5}, - {"label":"Space", "x":4, "y":5, "w":2}, - {"label":"Space", "x":6, "y":5, "w":2}, - {"label":"FN", "x":8, "y":5}, - {"label":"'*", "x":9, "y":5}, - {"label":"\u2190", "x":10, "y":5}, - {"label":"\u2193", "x":11, "y":5}, - {"label":"\u2192", "x":12, "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, "w": 2}, + {"matrix": [5, 6], "x": 6, "y": 5, "w": 2}, + {"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} ] }, "LAYOUT_7u_space": { "layout": [ - {"label":"Fn/Caps", "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}, + {"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}, - {"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\u00a4", "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}, + {"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}, - {"label":"TAB", "x":0, "y":2}, - {"label":"Q", "x":1, "y":2}, - {"label":"W", "x":2, "y":2}, - {"label":"E", "x":3, "y":2}, - {"label":"R", "x":4, "y":2}, - {"label":"T", "x":5, "y":2}, - {"label":"Y", "x":6, "y":2}, - {"label":"U", "x":7, "y":2}, - {"label":"I", "x":8, "y":2}, - {"label":"O", "x":9, "y":2}, - {"label":"P", "x":10, "y":2}, - {"label":"\u00c5", "x":11, "y":2}, - {"label":"BKSP", "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}, - {"label":"CTRL", "x":0, "y":3}, - {"label":"A", "x":1, "y":3}, - {"label":"S", "x":2, "y":3}, - {"label":"D", "x":3, "y":3}, - {"label":"F", "x":4, "y":3}, - {"label":"G", "x":5, "y":3}, - {"label":"H", "x":6, "y":3}, - {"label":"J", "x":7, "y":3}, - {"label":"K", "x":8, "y":3}, - {"label":"L", "x":9, "y":3}, - {"label":"\u00d8", "x":10, "y":3}, - {"label":"\u00c6", "x":11, "y":3}, - {"label":"\u00a8^", "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}, - {"label":"SHIFT", "x":0, "y":4}, - {"label":"Z", "x":1, "y":4}, - {"label":"X", "x":2, "y":4}, - {"label":"C", "x":3, "y":4}, - {"label":"V", "x":4, "y":4}, - {"label":"B", "x":5, "y":4}, - {"label":"N", "x":6, "y":4}, - {"label":"M", "x":7, "y":4}, - {"label":",;", "x":8, "y":4}, - {"label":".:", "x":9, "y":4}, - {"label":"-_", "x":10, "y":4}, - {"label":"\u2191", "x":11, "y":4}, - {"label":"\u21b2", "x":12, "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}, - {"label":"GESC", "x":0, "y":5}, - {"label":"WIN", "x":1, "y":5}, - {"label":"LALT", "x":2, "y":5}, - {"label":"Space", "x":3, "y":5, "w":7}, - {"label":"\u2190", "x":10, "y":5}, - {"label":"\u2193", "x":11, "y":5}, - {"label":"\u2192", "x":12, "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, 6], "x": 3, "y": 5, "w": 7}, + {"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/miuni32/info.json b/keyboards/miuni32/info.json index 6b217f74ab..d795c19592 100644 --- a/keyboards/miuni32/info.json +++ b/keyboards/miuni32/info.json @@ -15,12 +15,86 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_ortho_3x11" + }, "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":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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":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}] + "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, "w": 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} + ] }, "LAYOUT_ortho_3x11": { - "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":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":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}] + "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} + ] } } } diff --git a/keyboards/miuni32/miuni32.h b/keyboards/miuni32/miuni32.h deleted file mode 100644 index c95a37e2e8..0000000000 --- a/keyboards/miuni32/miuni32.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - 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, k25, k26, k27, k28, k29, k2A \ -) { \ - { 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, XXX, k25, k26, k27, k28, k29, k2A } \ -} - -#define LAYOUT_ortho_3x11( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT_all LAYOUT_ortho_3x11 diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json index 0a9d879ad4..2411fc1d5b 100644 --- a/keyboards/mlego/m48/info.json +++ b/keyboards/mlego/m48/info.json @@ -9,7 +9,59 @@ "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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}, + {"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/mlego/m48/m48.h b/keyboards/mlego/m48/m48.h index f9ef8aee39..5acc5c4590 100644 --- a/keyboards/mlego/m48/m48.h +++ b/keyboards/mlego/m48/m48.h @@ -19,18 +19,6 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_ortho_4x12( \ - 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 } \ -} - static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN writePin(LED_NUM_LOCK_PIN, on); diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json index 61b720a843..ba06e10872 100644 --- a/keyboards/mlego/m60/info.json +++ b/keyboards/mlego/m60/info.json @@ -9,7 +9,72 @@ "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "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}, {"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}] + "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}, + {"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/mlego/m60/m60.h b/keyboards/mlego/m60/m60.h index 70cdbef69a..13a56f3ff0 100644 --- a/keyboards/mlego/m60/m60.h +++ b/keyboards/mlego/m60/m60.h @@ -19,20 +19,6 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_ortho_5x12( \ - 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, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 \ -) { \ - {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}, \ - {K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411} \ -} - static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN writePin(LED_NUM_LOCK_PIN, on); diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json index de8a558eb1..9a332e2c33 100644 --- a/keyboards/mlego/m60_split/info.json +++ b/keyboards/mlego/m60_split/info.json @@ -9,7 +9,77 @@ "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "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}, {"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}] + "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": 6, "y": 0}, + {"matrix": [5, 4], "x": 7, "y": 0}, + {"matrix": [5, 3], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 0], "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": [6, 5], "x": 6, "y": 1}, + {"matrix": [6, 4], "x": 7, "y": 1}, + {"matrix": [6, 3], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 0], "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": [7, 5], "x": 6, "y": 2}, + {"matrix": [7, 4], "x": 7, "y": 2}, + {"matrix": [7, 3], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 0], "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": [8, 5], "x": 6, "y": 3}, + {"matrix": [8, 4], "x": 7, "y": 3}, + {"matrix": [8, 3], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 0], "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": [9, 5], "x": 6, "y": 4}, + {"matrix": [9, 4], "x": 7, "y": 4}, + {"matrix": [9, 3], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4} + ] } } } diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h index 11cbd5be60..10be6662c4 100644 --- a/keyboards/mlego/m60_split/m60_split.h +++ b/keyboards/mlego/m60_split/m60_split.h @@ -17,26 +17,6 @@ #include "quantum.h" -#define LAYOUT_ortho_5x12( \ - 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 } \ -} - - static inline void led_lwr(const bool on) { #ifdef LED_NUM_LOCK_PIN writePin(LED_NUM_LOCK_PIN, on); diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json index 3c7d816d62..c032cda3fe 100644 --- a/keyboards/mlego/m65/info.json +++ b/keyboards/mlego/m65/info.json @@ -9,75 +9,75 @@ "layouts": { "LAYOUT_ortho_5x13": { "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}, - {"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} + {"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} ] } } diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h index 9564b3d529..0c3f3b5ba6 100644 --- a/keyboards/mlego/m65/m65.h +++ b/keyboards/mlego/m65/m65.h @@ -19,20 +19,6 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_ortho_5x13( \ - 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, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ - 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, K412 \ -) { \ - { 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 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ - { 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, K412 } \ -} - enum unicode_names { la = 0, lA, diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json index d65fb21767..be323b6f65 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/info.json @@ -19,54 +19,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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} + {"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": [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": [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": [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} ] } } diff --git a/keyboards/montsinger/rebound/rev1/rev1.h b/keyboards/montsinger/rebound/rev1/rev1.h deleted file mode 100644 index a4e180e2ec..0000000000 --- a/keyboards/montsinger/rebound/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * 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_ortho_4x12( \ - 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\ - ) { \ - { 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 } \ -} diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json index e463402970..4a98f62a2f 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/info.json @@ -24,121 +24,120 @@ "layouts": { "LAYOUT_all": { "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":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, 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}, - {"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":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, 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}, - {"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":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, 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}, - {"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": [4, 0], "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} ] }, "LAYOUT_ortho_4x12": { "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}, - {"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, 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}, - {"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": [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":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"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}, - {"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": [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":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, 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}, - {"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": [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":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, 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} ] } } diff --git a/keyboards/montsinger/rebound/rev2/rev2.h b/keyboards/montsinger/rebound/rev2/rev2.h deleted file mode 100644 index 16e0da23c9..0000000000 --- a/keyboards/montsinger/rebound/rev2/rev2.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * 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_ortho_4x12( \ - 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\ - ) { \ - { 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -#define LAYOUT_all( \ - 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, K40, K36, 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, K34, K35, K36, K37, K38, K39, K3A, K3B }, \ - { K40, 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/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json index 496b2e9dc6..8f4dee862e 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/info.json @@ -24,121 +24,120 @@ "layouts": { "LAYOUT_all": { "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":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, 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}, - {"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": [4, 2], "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}, - {"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": [4, 3], "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}, - {"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": [4, 4], "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} ] }, "LAYOUT_ortho_4x12": { "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}, - {"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, 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}, - {"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": [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":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"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}, - {"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": [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":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, 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}, - {"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": [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":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, 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} ] } } diff --git a/keyboards/montsinger/rebound/rev3/rev3.h b/keyboards/montsinger/rebound/rev3/rev3.h deleted file mode 100644 index b709a4cea0..0000000000 --- a/keyboards/montsinger/rebound/rev3/rev3.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * 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_ortho_4x12( \ - 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\ - ) { \ - { 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K42, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K43, K26, K27, K28, K29, K2A, K2B,\ - K30, K31, K32, K33, K34, K35, K44, K36, 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, K34, K35, K36, K37, K38, K39, K3A, K3B }, \ - { KC_NO, KC_NO, K42, K43, K44, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index dfd093eb84..4fa5b0b83b 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -24,121 +24,120 @@ "layouts": { "LAYOUT_all": { "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": [7, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [7, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [7, 2], "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, 4], "x": 7, "y": 0}, + {"matrix": [7, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [7, 5], "x": 10, "y": 0}, + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [7, 6], "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": [6, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [6, 5], "x": 10, "y": 1}, + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [6, 6], "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": [5, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [2, 5], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [5, 6], "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": [4, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [4, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [4, 2], "x": 5, "y": 3}, + {"matrix": [3, 3], "x": 6, "y": 3}, + {"matrix": [3, 4], "x": 7, "y": 3}, + {"matrix": [4, 4], "x": 8, "y": 3}, + {"matrix": [3, 5], "x": 9, "y": 3}, + {"matrix": [4, 5], "x": 10, "y": 3}, + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [4, 6], "x": 12, "y": 3} ] }, "LAYOUT_ortho_4x12": { "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [7, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [7, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [7, 2], "x": 5, "y": 0}, - {"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, 4], "x": 7, "y": 0}, + {"matrix": [7, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [7, 5], "x": 10, "y": 0}, + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [7, 6], "x": 12, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "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}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [6, 5], "x": 10, "y": 1}, + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [6, 6], "x": 12, "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": [2, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "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}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [2, 5], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [5, 6], "x": 12, "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": [3, 0], "x": 0, "y": 3}, + {"matrix": [4, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [4, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [4, 2], "x": 5, "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":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, 4], "x": 7, "y": 3}, + {"matrix": [4, 4], "x": 8, "y": 3}, + {"matrix": [3, 5], "x": 9, "y": 3}, + {"matrix": [4, 5], "x": 10, "y": 3}, + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [4, 6], "x": 12, "y": 3} ] } } diff --git a/keyboards/montsinger/rebound/rev4/rev4.h b/keyboards/montsinger/rebound/rev4/rev4.h deleted file mode 100644 index c0e5c9e68d..0000000000 --- a/keyboards/montsinger/rebound/rev4/rev4.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * 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_ortho_4x12( \ - K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \ - K10, K60, K11, K61, K12, K62, K14, K64, K15, K65, K16, K66, \ - K20, K50, K21, K51, K22, K52, K24, K54, K25, K55, K26, K56, \ - K30, K40, K31, K41, K32, K42, K34, K44, K35, K45, K36, K46 \ - ) { \ - { K00, K01, K02, KC_NO, K04, K05, K06}, \ - { K10, K11, K12, KC_NO, K14, K15, K16}, \ - { K20, K21, K22, KC_NO, K24, K25, K26}, \ - { K30, K31, K32, KC_NO, K34, K35, K36}, \ - { K40, K41, K42, KC_NO, K44, K45, K46}, \ - { K50, K51, K52, KC_NO, K54, K55, K56}, \ - { K60, K61, K62, KC_NO, K64, K65, K66}, \ - { K70, K71, K72, KC_NO, K74, K75, K76} \ -} - -#define LAYOUT_all( \ - K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \ - K10, K60, K11, K61, K12, K62, K13, K14, K64, K15, K65, K16, K66, \ - K20, K50, K21, K51, K22, K52, K23, K24, K54, K25, K55, K26, K56,\ - K30, K40, K31, K41, K32, K42, K33, K34, K44, K35, K45, K36, K46\ - ) { \ - { K00, K01, K02, KC_NO, 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, K44, K45, K46}, \ - { K50, K51, K52, KC_NO, K54, K55, K56}, \ - { K60, K61, K62, KC_NO, K64, K65, K66}, \ - { K70, K71, K72, KC_NO, K74, K75, K76} \ -} - diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json index 9878a204c7..d034f95b52 100644 --- a/keyboards/montsinger/rewind/info.json +++ b/keyboards/montsinger/rewind/info.json @@ -18,60 +18,60 @@ "layouts": { "LAYOUT_ortho_5x10": { "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, "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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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} ] } } diff --git a/keyboards/montsinger/rewind/rewind.h b/keyboards/montsinger/rewind/rewind.h deleted file mode 100644 index 3019c7c034..0000000000 --- a/keyboards/montsinger/rewind/rewind.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - * 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_ortho_5x10( \ - 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\ - ) { \ - { 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 } \ -} - diff --git a/keyboards/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/info.json index 516d307d2d..ea6840b365 100644 --- a/keyboards/mountainblocks/mb17/info.json +++ b/keyboards/mountainblocks/mb17/info.json @@ -17,7 +17,29 @@ "bootloader": "caterina", "layouts": { "LAYOUT_numpad_5x4": { - "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":1, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":3, "y":3, "h":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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] } } } diff --git a/keyboards/mountainblocks/mb17/mb17.h b/keyboards/mountainblocks/mb17/mb17.h deleted file mode 100644 index dbfb68a932..0000000000 --- a/keyboards/mountainblocks/mb17/mb17.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 ___ KC_NO - -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k41, k42, k43 \ -){ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, ___ }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, ___ }, \ - { ___, k41, k42, k43 } \ -} diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json index 05c02e7a61..bd1e027995 100644 --- a/keyboards/nack/info.json +++ b/keyboards/nack/info.json @@ -25,61 +25,61 @@ "layouts": { "LAYOUT_ortho_4x13": { "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}, + {"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}, - {"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, "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":"'", "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}, - {"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":"Up", "x":11, "y":2}, - {"label":"Backspace", "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}, - {"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}, - {"label":"NoOp", "x":5, "y":3}, - {"label":"Fn2", "x":6, "y":3}, - {"label":"Alt Gr", "x":7, "y":3}, - {"label":"<", "x":8, "y":3}, - {"label":"Enter", "x":9, "y":3}, - {"label":"Left", "x":10, "y":3}, - {"label":"Down", "x":11, "y":3}, - {"label":"Right", "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/nack/nack.h b/keyboards/nack/nack.h deleted file mode 100644 index b409d40df3..0000000000 --- a/keyboards/nack/nack.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 farfalleflickan - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x13( \ - 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\ -) \ -{ \ - { 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 },\ -} diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json index 2c5e1bb152..4cb38d7d94 100644 --- a/keyboards/newgame40/info.json +++ b/keyboards/newgame40/info.json @@ -18,7 +18,51 @@ "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { - "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/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h deleted file mode 100644 index e6146e4f14..0000000000 --- a/keyboards/newgame40/newgame40.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x10( \ - 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/nibiria/stream15/info.json b/keyboards/nibiria/stream15/info.json index cffe3da88f..0fe4b9ed23 100644 --- a/keyboards/nibiria/stream15/info.json +++ b/keyboards/nibiria/stream15/info.json @@ -17,27 +17,24 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ortho_3x5": { - "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}, + {"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}, - {"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":"10", "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}, - {"label":"11", "x":0, "y":2}, - {"label":"12", "x":1, "y":2}, - {"label":"13", "x":2, "y":2}, - {"label":"14", "x":3, "y":2}, - {"label":"15", "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} ] } } diff --git a/keyboards/nibiria/stream15/stream15.h b/keyboards/nibiria/stream15/stream15.h deleted file mode 100644 index 51ac60eb17..0000000000 --- a/keyboards/nibiria/stream15/stream15.h +++ /dev/null @@ -1,31 +0,0 @@ - /* Copyright 2021 Matt Clendaniel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_3x5( \ - K00, K01, K02, K03, K04, \ - K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14 } \ -} diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json index a6c63fdde2..4130601105 100644 --- a/keyboards/nightly_boards/n40_o/info.json +++ b/keyboards/nightly_boards/n40_o/info.json @@ -25,185 +25,185 @@ "layouts": { "LAYOUT_ortho_4x13_encoders": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2.25, "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, "y":1}, - {"x":1, "y":1}, - {"x":2.25, "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}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2.25, "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}, - {"x":14.5, "y":2}, - - {"x":2.25, "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} - ] + {"matrix": [4, 1], "x": 0, "y": 0}, + {"matrix": [4, 2], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 2.25, "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": 7.5, "y": 0}, + {"matrix": [0, 6], "x": 8.5, "y": 0}, + {"matrix": [0, 7], "x": 9.5, "y": 0}, + {"matrix": [0, 8], "x": 10.5, "y": 0}, + {"matrix": [0, 9], "x": 11.5, "y": 0}, + {"matrix": [0, 10], "x": 12.5, "y": 0}, + {"matrix": [0, 11], "x": 13.5, "y": 0}, + {"matrix": [0, 12], "x": 14.5, "y": 0}, + + {"matrix": [4, 3], "x": 0, "y": 1}, + {"matrix": [4, 4], "x": 1, "y": 1}, + {"matrix": [1, 0], "x": 2.25, "y": 1}, + {"matrix": [1, 1], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [1, 3], "x": 5.5, "y": 1}, + {"matrix": [1, 4], "x": 6.5, "y": 1}, + {"matrix": [1, 5], "x": 7.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": [4, 5], "x": 0, "y": 2}, + {"matrix": [4, 6], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 2.25, "y": 2}, + {"matrix": [2, 1], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2}, + {"matrix": [2, 3], "x": 5.5, "y": 2}, + {"matrix": [2, 4], "x": 6.5, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "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}, + + {"matrix": [3, 0], "x": 2.25, "y": 3}, + {"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": 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}, + {"matrix": [3, 12], "x": 14.5, "y": 3} + ] }, "LAYOUT_ortho_4x13": { "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}, - {"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} - ] + {"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} + ] }, "LAYOUT_ortho_4x13_1x2u_c": { "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} - ] + {"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/nightly_boards/n40_o/n40_o.c b/keyboards/nightly_boards/n40_o/n40_o.c index 060daaa4b2..643803f903 100644 --- a/keyboards/nightly_boards/n40_o/n40_o.c +++ b/keyboards/nightly_boards/n40_o/n40_o.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "n40_o.h" +#include "quantum.h" +#include "encoder_action.h" void matrix_scan_kb(void) { encoder_action_unregister(); diff --git a/keyboards/nightly_boards/n40_o/n40_o.h b/keyboards/nightly_boards/n40_o/n40_o.h deleted file mode 100644 index d7c44d9d88..0000000000 --- a/keyboards/nightly_boards/n40_o/n40_o.h +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "encoder_action.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_ortho_4x13( \ - 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 }, \ - { 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 }, \ -} - -#define LAYOUT_ortho_4x13_1x2u_c( \ - 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, KC_NO, K38, K39, K3A, K3B, K3C }, \ - { 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 }, \ -} - -#define LAYOUT_ortho_4x13_encoders( \ - E00A, E00B, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - E01A, E01B, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - E02A, E02B, 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 }, \ - { KC_NO, E00A, E00B, E01A, E01B, E02A, E02B, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/nimrod/info.json b/keyboards/nimrod/info.json index 666b069f89..4c14f8fd07 100644 --- a/keyboards/nimrod/info.json +++ b/keyboards/nimrod/info.json @@ -19,202 +19,217 @@ "layouts": { "LAYOUT_ortho_4x10": { "layout": [ - { "x": 0, "y": 0, "w": 1.25 }, - { "x": 1.25, "y": 0, "w": 1.25 }, - { "x": 2.5, "y": 0, "w": 1.25 }, - { "x": 3.75, "y": 0, "w": 1.25 }, - { "x": 5, "y": 0, "w": 1.25 }, - { "x": 6.25, "y": 0, "w": 1.25 }, - { "x": 7.5, "y": 0, "w": 1.25 }, - { "x": 8.75, "y": 0, "w": 1.25 }, - { "x": 10, "y": 0, "w": 1.25 }, - { "x": 11.25, "y": 0, "w": 1.25 }, - { "x": 0, "y": 1, "w": 1.25 }, - { "x": 1.25, "y": 1, "w": 1.25 }, - { "x": 2.5, "y": 1, "w": 1.25 }, - { "x": 3.75, "y": 1, "w": 1.25 }, - { "x": 5, "y": 1, "w": 1.25 }, - { "x": 6.25, "y": 1, "w": 1.25 }, - { "x": 7.5, "y": 1, "w": 1.25 }, - { "x": 8.75, "y": 1, "w": 1.25 }, - { "x": 10, "y": 1, "w": 1.25 }, - { "x": 11.25, "y": 1, "w": 1.25 }, - { "x": 0, "y": 2, "w": 1.25 }, - { "x": 1.25, "y": 2, "w": 1.25 }, - { "x": 2.5, "y": 2, "w": 1.25 }, - { "x": 3.75, "y": 2, "w": 1.25 }, - { "x": 5, "y": 2, "w": 1.25 }, - { "x": 6.25, "y": 2, "w": 1.25 }, - { "x": 7.5, "y": 2, "w": 1.25 }, - { "x": 8.75, "y": 2, "w": 1.25 }, - { "x": 10, "y": 2, "w": 1.25 }, - { "x": 11.25, "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": 1.25 }, - { "x": 6.25, "y": 3, "w": 1.25 }, - { "x": 7.5, "y": 3, "w": 1.25 }, - { "x": 8.75, "y": 3, "w": 1.25 }, - { "x": 10, "y": 3, "w": 1.25 }, - { "x": 11.25, "y": 3, "w": 1.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25}, + {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25}, + {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25}, + {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25}, + {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [2, 9], "x": 11.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": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25} ] }, "LAYOUT_left_space": { "layout": [ - { "x": 0, "y": 0, "w": 1.25 }, - { "x": 1.25, "y": 0, "w": 1.25 }, - { "x": 2.5, "y": 0, "w": 1.25 }, - { "x": 3.75, "y": 0, "w": 1.25 }, - { "x": 5, "y": 0, "w": 1.25 }, - { "x": 6.25, "y": 0, "w": 1.25 }, - { "x": 7.5, "y": 0, "w": 1.25 }, - { "x": 8.75, "y": 0, "w": 1.25 }, - { "x": 10, "y": 0, "w": 1.25 }, - { "x": 11.25, "y": 0, "w": 1.25 }, - { "x": 0, "y": 1, "w": 1.25 }, - { "x": 1.25, "y": 1, "w": 1.25 }, - { "x": 2.5, "y": 1, "w": 1.25 }, - { "x": 3.75, "y": 1, "w": 1.25 }, - { "x": 5, "y": 1, "w": 1.25 }, - { "x": 6.25, "y": 1, "w": 1.25 }, - { "x": 7.5, "y": 1, "w": 1.25 }, - { "x": 8.75, "y": 1, "w": 1.25 }, - { "x": 10, "y": 1, "w": 1.25 }, - { "x": 11.25, "y": 1, "w": 1.25 }, - { "x": 0, "y": 2, "w": 1.25 }, - { "x": 1.25, "y": 2, "w": 1.25 }, - { "x": 2.5, "y": 2, "w": 1.25 }, - { "x": 3.75, "y": 2, "w": 1.25 }, - { "x": 5, "y": 2, "w": 1.25 }, - { "x": 6.25, "y": 2, "w": 1.25 }, - { "x": 7.5, "y": 2, "w": 1.25 }, - { "x": 8.75, "y": 2, "w": 1.25 }, - { "x": 10, "y": 2, "w": 1.25 }, - { "x": 11.25, "y": 2, "w": 1.25 }, - { "x": 0, "y": 3, "w": 6.25 }, - { "x": 6.25, "y": 3, "w": 1.25 }, - { "x": 7.5, "y": 3, "w": 1.25 }, - { "x": 8.75, "y": 3, "w": 1.25 }, - { "x": 10, "y": 3, "w": 1.25 }, - { "x": 11.25, "y": 3, "w": 1.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25}, + {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25}, + {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25}, + {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25}, + {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25} ] }, "LAYOUT_center_space": { "layout": [ - { "x": 0, "y": 0, "w": 1.25 }, - { "x": 1.25, "y": 0, "w": 1.25 }, - { "x": 2.5, "y": 0, "w": 1.25 }, - { "x": 3.75, "y": 0, "w": 1.25 }, - { "x": 5, "y": 0, "w": 1.25 }, - { "x": 6.25, "y": 0, "w": 1.25 }, - { "x": 7.5, "y": 0, "w": 1.25 }, - { "x": 8.75, "y": 0, "w": 1.25 }, - { "x": 10, "y": 0, "w": 1.25 }, - { "x": 11.25, "y": 0, "w": 1.25 }, - { "x": 0, "y": 1, "w": 1.25 }, - { "x": 1.25, "y": 1, "w": 1.25 }, - { "x": 2.5, "y": 1, "w": 1.25 }, - { "x": 3.75, "y": 1, "w": 1.25 }, - { "x": 5, "y": 1, "w": 1.25 }, - { "x": 6.25, "y": 1, "w": 1.25 }, - { "x": 7.5, "y": 1, "w": 1.25 }, - { "x": 8.75, "y": 1, "w": 1.25 }, - { "x": 10, "y": 1, "w": 1.25 }, - { "x": 11.25, "y": 1, "w": 1.25 }, - { "x": 0, "y": 2, "w": 1.25 }, - { "x": 1.25, "y": 2, "w": 1.25 }, - { "x": 2.5, "y": 2, "w": 1.25 }, - { "x": 3.75, "y": 2, "w": 1.25 }, - { "x": 5, "y": 2, "w": 1.25 }, - { "x": 6.25, "y": 2, "w": 1.25 }, - { "x": 7.5, "y": 2, "w": 1.25 }, - { "x": 8.75, "y": 2, "w": 1.25 }, - { "x": 10, "y": 2, "w": 1.25 }, - { "x": 11.25, "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": 6.25 }, - { "x": 8.75, "y": 3, "w": 1.25 }, - { "x": 10, "y": 3, "w": 1.25 }, - { "x": 11.25, "y": 3, "w": 1.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25}, + {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25}, + {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25}, + {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25}, + {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [2, 9], "x": 11.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, 4], "x": 2.5, "y": 3, "w": 6.25}, + {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25} ] }, "LAYOUT_right_space": { "layout": [ - { "x": 0, "y": 0, "w": 1.25 }, - { "x": 1.25, "y": 0, "w": 1.25 }, - { "x": 2.5, "y": 0, "w": 1.25 }, - { "x": 3.75, "y": 0, "w": 1.25 }, - { "x": 5, "y": 0, "w": 1.25 }, - { "x": 6.25, "y": 0, "w": 1.25 }, - { "x": 7.5, "y": 0, "w": 1.25 }, - { "x": 8.75, "y": 0, "w": 1.25 }, - { "x": 10, "y": 0, "w": 1.25 }, - { "x": 11.25, "y": 0, "w": 1.25 }, - { "x": 0, "y": 1, "w": 1.25 }, - { "x": 1.25, "y": 1, "w": 1.25 }, - { "x": 2.5, "y": 1, "w": 1.25 }, - { "x": 3.75, "y": 1, "w": 1.25 }, - { "x": 5, "y": 1, "w": 1.25 }, - { "x": 6.25, "y": 1, "w": 1.25 }, - { "x": 7.5, "y": 1, "w": 1.25 }, - { "x": 8.75, "y": 1, "w": 1.25 }, - { "x": 10, "y": 1, "w": 1.25 }, - { "x": 11.25, "y": 1, "w": 1.25 }, - { "x": 0, "y": 2, "w": 1.25 }, - { "x": 1.25, "y": 2, "w": 1.25 }, - { "x": 2.5, "y": 2, "w": 1.25 }, - { "x": 3.75, "y": 2, "w": 1.25 }, - { "x": 5, "y": 2, "w": 1.25 }, - { "x": 6.25, "y": 2, "w": 1.25 }, - { "x": 7.5, "y": 2, "w": 1.25 }, - { "x": 8.75, "y": 2, "w": 1.25 }, - { "x": 10, "y": 2, "w": 1.25 }, - { "x": 11.25, "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": 1.25 }, - { "x": 6.25, "y": 3, "w": 6.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25}, + {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25}, + {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25}, + {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25}, + {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [2, 9], "x": 11.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": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25} ] }, "LAYOUT_split_space": { "layout": [ - { "x": 0, "y": 0, "w": 1.25 }, - { "x": 1.25, "y": 0, "w": 1.25 }, - { "x": 2.5, "y": 0, "w": 1.25 }, - { "x": 3.75, "y": 0, "w": 1.25 }, - { "x": 5, "y": 0, "w": 1.25 }, - { "x": 6.25, "y": 0, "w": 1.25 }, - { "x": 7.5, "y": 0, "w": 1.25 }, - { "x": 8.75, "y": 0, "w": 1.25 }, - { "x": 10, "y": 0, "w": 1.25 }, - { "x": 11.25, "y": 0, "w": 1.25 }, - { "x": 0, "y": 1, "w": 1.25 }, - { "x": 1.25, "y": 1, "w": 1.25 }, - { "x": 2.5, "y": 1, "w": 1.25 }, - { "x": 3.75, "y": 1, "w": 1.25 }, - { "x": 5, "y": 1, "w": 1.25 }, - { "x": 6.25, "y": 1, "w": 1.25 }, - { "x": 7.5, "y": 1, "w": 1.25 }, - { "x": 8.75, "y": 1, "w": 1.25 }, - { "x": 10, "y": 1, "w": 1.25 }, - { "x": 11.25, "y": 1, "w": 1.25 }, - { "x": 0, "y": 2, "w": 1.25 }, - { "x": 1.25, "y": 2, "w": 1.25 }, - { "x": 2.5, "y": 2, "w": 1.25 }, - { "x": 3.75, "y": 2, "w": 1.25 }, - { "x": 5, "y": 2, "w": 1.25 }, - { "x": 6.25, "y": 2, "w": 1.25 }, - { "x": 7.5, "y": 2, "w": 1.25 }, - { "x": 8.75, "y": 2, "w": 1.25 }, - { "x": 10, "y": 2, "w": 1.25 }, - { "x": 11.25, "y": 2, "w": 1.25 }, - { "x": 0, "y": 3, "w": 6.25 }, - { "x": 6.25, "y": 3, "w": 6.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25}, + {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25}, + {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25}, + {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25}, + {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25}, + {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25}, + {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25} ] } } diff --git a/keyboards/nimrod/nimrod.h b/keyboards/nimrod/nimrod.h deleted file mode 100644 index 253154905c..0000000000 --- a/keyboards/nimrod/nimrod.h +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright 2020 cjcodell1 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x10( \ - 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 } \ -} - -#define LAYOUT_left_space( \ - 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, 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 }, \ - { XXX, XXX, K32, XXX, XXX, K35, K36, K37, K38, K39 } \ -} - -#define LAYOUT_center_space( \ - 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, K34, 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, XXX, XXX, K34, XXX, XXX, K37, K38, K39 } \ -} - -#define LAYOUT_right_space( \ - 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, 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 }, \ - { K30, K31, K32, K33, K34, XXX, XXX, K37, XXX, XXX } \ -} - -#define LAYOUT_split_space( \ - 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, 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, XXX, XXX, XXX, K37, XXX, XXX } \ -} diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json index 8440e159b1..b663f16c38 100644 --- a/keyboards/novelkeys/novelpad/info.json +++ b/keyboards/novelkeys/novelpad/info.json @@ -20,33 +20,36 @@ "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x4" + }, "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "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} ] } } diff --git a/keyboards/novelkeys/novelpad/novelpad.h b/keyboards/novelkeys/novelpad/novelpad.h deleted file mode 100755 index 6650a67223..0000000000 --- a/keyboards/novelkeys/novelpad/novelpad.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} - -#define LAYOUT LAYOUT_ortho_5x4 diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c index 0af57ff36d..caeb13a799 100644 --- a/keyboards/noxary/220/220.c +++ b/keyboards/noxary/220/220.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 "220.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/noxary/220/220.h b/keyboards/noxary/220/220.h deleted file mode 100644 index 26419976c8..0000000000 --- a/keyboards/noxary/220/220.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 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" - -/* 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_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/info.json index b1cfb96cee..9b47d9c040 100644 --- a/keyboards/noxary/220/info.json +++ b/keyboards/noxary/220/info.json @@ -22,7 +22,37 @@ "community_layouts": ["ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":0, "y":2.5}, {"x":1, "y":2.5}, {"x":2, "y":2.5}, {"x":3, "y":2.5}, {"x":0, "y":3.5}, {"x":1, "y":3.5}, {"x":2, "y":3.5}, {"x":3, "y":3.5}, {"x":0, "y":4.5}, {"x":1, "y":4.5}, {"x":2, "y":4.5}, {"x":3, "y":4.5}, {"x":0, "y":5.5}, {"x":1, "y":5.5}, {"x":2, "y":5.5}, {"x":3, "y":5.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": [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": [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": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5}, + + {"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} + ] } } } diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json index ffc086aca3..b68848fbb2 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/info.json @@ -18,21 +18,21 @@ "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"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/ocean/sus/sus.h b/keyboards/ocean/sus/sus.h deleted file mode 100644 index cba5f3cbc8..0000000000 --- a/keyboards/ocean/sus/sus.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_ortho_4x3(\ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ -} diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json index 8e22d925b1..137a988c6d 100644 --- a/keyboards/opendeck/32/info.json +++ b/keyboards/opendeck/32/info.json @@ -5,46 +5,5 @@ "vid": "0x4345", "pid": "0x2EC0", "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT_ortho_4x8": { - "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 }, - { "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":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 } - ] - } } } diff --git a/keyboards/opendeck/32/rev1/info.json b/keyboards/opendeck/32/rev1/info.json index 06d5626fa9..df4d338fc0 100644 --- a/keyboards/opendeck/32/rev1/info.json +++ b/keyboards/opendeck/32/rev1/info.json @@ -5,5 +5,46 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_ortho_4x8": { + "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": [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}, + {"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": [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} + ] + } + } } diff --git a/keyboards/opendeck/32/rev1/rev1.h b/keyboards/opendeck/32/rev1/rev1.h index 9c208df8a8..69777d95ab 100644 --- a/keyboards/opendeck/32/rev1/rev1.h +++ b/keyboards/opendeck/32/rev1/rev1.h @@ -29,17 +29,3 @@ // Note: The default is to not wrap and to send F13-F24 with combinations of shift/control/alt as these // are immediately usable in most software (e.g. OBS and DCSB for streaming) without using AHK. //#define KC_WRAPPER_KEY KC_F24 - -// clang-format off -#define LAYOUT_ortho_4x8( \ - Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07, \ - Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17, \ - Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27, \ - Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37 \ -) { \ - {Q00, Q01, Q02, Q03, Q04, Q05, Q06, Q07}, \ - {Q10, Q11, Q12, Q13, Q14, Q15, Q16, Q17}, \ - {Q20, Q21, Q22, Q23, Q24, Q25, Q26, Q27}, \ - {Q30, Q31, Q32, Q33, Q34, Q35, Q36, Q37} \ -} -// clang-format on diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index 6b88be27d1..fda913aa32 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -21,128 +21,138 @@ "layouts": { "LAYOUT_ortho_5x12_1x2uC": { "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 }, - { "x": 0, "y": 4 }, - { "x": 1, "y": 4 }, - { "x": 2, "y": 4 }, - { "x": 3, "y": 4 }, - { "x": 4, "y": 4 }, - { "w": 2, "x": 5, "y": 4 }, - { "x": 7, "y": 4 }, - { "x": 8, "y": 4 }, - { "x": 9, "y": 4 }, - { "x": 10, "y": 4 }, - { "x": 11, "y": 4 } ] + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 4], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 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, "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": [5, 0], "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 1], "x": 2, "y": 2}, + {"matrix": [4, 1], "x": 3, "y": 2}, + {"matrix": [5, 2], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 5], "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, 1], "x": 3, "y": 3}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + + {"matrix": [9, 0], "x": 0, "y": 4}, + {"matrix": [8, 0], "x": 1, "y": 4}, + {"matrix": [9, 1], "x": 2, "y": 4}, + {"matrix": [8, 1], "x": 3, "y": 4}, + {"matrix": [9, 2], "x": 4, "y": 4}, + {"matrix": [8, 2], "x": 5, "y": 4, "w": 2}, + {"matrix": [8, 3], "x": 7, "y": 4}, + {"matrix": [9, 4], "x": 8, "y": 4}, + {"matrix": [8, 4], "x": 9, "y": 4}, + {"matrix": [9, 5], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} + ] }, "LAYOUT_ortho_5x12": { "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 }, - { "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": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 4], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 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, "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": [5, 0], "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 1], "x": 2, "y": 2}, + {"matrix": [4, 1], "x": 3, "y": 2}, + {"matrix": [5, 2], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 5], "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, 1], "x": 3, "y": 3}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + + {"matrix": [9, 0], "x": 0, "y": 4}, + {"matrix": [8, 0], "x": 1, "y": 4}, + {"matrix": [9, 1], "x": 2, "y": 4}, + {"matrix": [8, 1], "x": 3, "y": 4}, + {"matrix": [9, 2], "x": 4, "y": 4}, + {"matrix": [8, 2], "x": 5, "y": 4}, + {"matrix": [9, 3], "x": 6, "y": 4}, + {"matrix": [8, 3], "x": 7, "y": 4}, + {"matrix": [9, 4], "x": 8, "y": 4}, + {"matrix": [8, 4], "x": 9, "y": 4}, + {"matrix": [9, 5], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} + ] } } } diff --git a/keyboards/ortho5by12/ortho5by12.c b/keyboards/ortho5by12/ortho5by12.c index 615ab9d04e..29173749ae 100644 --- a/keyboards/ortho5by12/ortho5by12.c +++ b/keyboards/ortho5by12/ortho5by12.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 "ortho5by12.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(C4); diff --git a/keyboards/ortho5by12/ortho5by12.h b/keyboards/ortho5by12/ortho5by12.h deleted file mode 100644 index 84f59859d8..0000000000 --- a/keyboards/ortho5by12/ortho5by12.h +++ /dev/null @@ -1,57 +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 -#define XXX KC_NO -#include "quantum.h" - -#define LAYOUT_ortho_5x12( \ - 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, \ - K80, K81, K82, K83, K84, K85, K90, K91, K92, K93, K94, K95 \ -) { \ - { K01, K03, K05, K11, K13, K15 }, \ - { K00, K02, K04, K10, K12, K14 }, \ - { K20, K22, K24, K30, K32, K34 }, \ - { K21, K23, K25, K31, K33, K35 }, \ - { K41, K43, K45, K51, K53, K55 }, \ - { K40, K42, K44, K50, K52, K54 }, \ - { K60, K62, K64, K70, K72, K74 }, \ - { K61, K63, K65, K71, K73, K75 }, \ - { K81, K83, K85, K91, K93, K95 }, \ - { K80, K82, K84, K90, K92, K94 } \ -} - -#define LAYOUT_ortho_5x12_1x2uC( \ - 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, \ - K80, K81, K82, K83, K84, K85, K91, K92, K93, K94, K95 \ -) { \ - { K01, K03, K05, K11, K13, K15 }, \ - { K00, K02, K04, K10, K12, K14 }, \ - { K20, K22, K24, K30, K32, K34 }, \ - { K21, K23, K25, K31, K33, K35 }, \ - { K41, K43, K45, K51, K53, K55 }, \ - { K40, K42, K44, K50, K52, K54 }, \ - { K60, K62, K64, K70, K72, K74 }, \ - { K61, K63, K65, K71, K73, K75 }, \ - { K81, K83, K85, K91, K93, K95 }, \ - { K80, K82, K84, XXX, K92, K94 } \ -} diff --git a/keyboards/pabile/p20/info.json b/keyboards/pabile/p20/info.json index 08288d0c5d..2584130637 100644 --- a/keyboards/pabile/p20/info.json +++ b/keyboards/pabile/p20/info.json @@ -6,60 +6,5 @@ "vid": "0x6666", "pid": "0x6667" }, - "community_layouts": ["ortho_5x4", "numpad_5x4"], - "layouts": { - "LAYOUT_ortho_5x4": { - "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}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} - ] - }, - "LAYOUT_numpad_5x4": { - "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":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} - ] - } - } + "community_layouts": ["ortho_5x4", "numpad_5x4"] } diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json index afe3fb4853..07fce7c5f5 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/info.json @@ -15,5 +15,60 @@ ] }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT_numpad_5x4": { + "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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] + }, + "LAYOUT_ortho_5x4": { + "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": [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}, + + {"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": [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} + ] + } + } } diff --git a/keyboards/pabile/p20/ver1/ver1.h b/keyboards/pabile/p20/ver1/ver1.h deleted file mode 100644 index 36ec781fa1..0000000000 --- a/keyboards/pabile/p20/ver1/ver1.h +++ /dev/null @@ -1,50 +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_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43} \ -} - -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k40, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, KC_NO}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, KC_NO}, \ - {k40, KC_NO, k42, k43} \ -} diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json index 7d9951f4de..35a0dc8ec2 100644 --- a/keyboards/pabile/p20/ver2/info.json +++ b/keyboards/pabile/p20/ver2/info.json @@ -9,5 +9,60 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT_numpad_5x4": { + "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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} + ] + }, + "LAYOUT_ortho_5x4": { + "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": [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}, + + {"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": [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} + ] + } + } } diff --git a/keyboards/pabile/p20/ver2/ver2.h b/keyboards/pabile/p20/ver2/ver2.h deleted file mode 100644 index 36ec781fa1..0000000000 --- a/keyboards/pabile/p20/ver2/ver2.h +++ /dev/null @@ -1,50 +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_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43} \ -} - -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k31, k32, \ - k40, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, KC_NO}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, KC_NO}, \ - {k40, KC_NO, k42, k43} \ -} diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index e630b3f33f..7d0234e20e 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -19,46 +19,50 @@ "layouts": { "LAYOUT_ortho_4x10": { "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.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}, - {"x":9.25, "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}, - {"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":0.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}] + {"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.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}, + {"matrix": [1, 9], "x": 9.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": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.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": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3} + ] } } } diff --git a/keyboards/pabile/p40/p40.h b/keyboards/pabile/p40/p40.h deleted file mode 100644 index 4e1e08a6fc..0000000000 --- a/keyboards/pabile/p40/p40.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x10( \ - 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/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json index 3ece278ba9..890a08babe 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/info.json @@ -17,46 +17,97 @@ "layouts": { "LAYOUT_ortho_4x10": { "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":"Win", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3}, - {"label":"Shift", "x":3, "y":3}, - {"label":"←", "x":4, "y":3}, - {"x":5, "y":3}, - {"label":"Enter", "x":6, "y":3}, - {"label":"Alt", "x":7, "y":3}, - {"label":"Super", "x":8, "y":3}, - {"label":"Ctrl", "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} + ] + }, + "LAYOUT_ortho_4x10_1x2u_c": { + "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, "w": 2}, + {"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/pabile/p40_ortho/p40_ortho.h b/keyboards/pabile/p40_ortho/p40_ortho.h deleted file mode 100644 index dd2c899daa..0000000000 --- a/keyboards/pabile/p40_ortho/p40_ortho.h +++ /dev/null @@ -1,45 +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_ortho_4x10( \ - 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} \ -} -#define LAYOUT_ortho_4x10_1x2u_c( \ - 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, 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, KC_NO, k36, k37, k38, k39} \ -} diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json index 8c37a5bf74..c65c4bea47 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/info.json @@ -19,66 +19,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "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 }, - { "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": [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": [1, 4], "x": 5, "y": 0}, + {"matrix": [1, 9], "x": 6, "y": 0}, + {"matrix": [0, 9], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 5], "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": [2, 3], "x": 4, "y": 1}, + {"matrix": [2, 4], "x": 5, "y": 1}, + {"matrix": [2, 9], "x": 6, "y": 1}, + {"matrix": [2, 8], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 5], "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": [3, 2], "x": 3, "y": 2}, + {"matrix": [3, 3], "x": 4, "y": 2}, + {"matrix": [3, 4], "x": 5, "y": 2}, + {"matrix": [3, 9], "x": 6, "y": 2}, + {"matrix": [3, 8], "x": 7, "y": 2}, + {"matrix": [3, 7], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 6], "x": 10, "y": 2}, + {"matrix": [2, 5], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [4, 1], "x": 2, "y": 3}, + {"matrix": [4, 2], "x": 3, "y": 3}, + {"matrix": [4, 3], "x": 4, "y": 3}, + {"matrix": [4, 4], "x": 5, "y": 3}, + {"matrix": [4, 9], "x": 6, "y": 3}, + {"matrix": [4, 8], "x": 7, "y": 3}, + {"matrix": [4, 7], "x": 8, "y": 3}, + {"matrix": [4, 6], "x": 9, "y": 3}, + {"matrix": [3, 6], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [5, 0], "x": 1, "y": 4}, + {"matrix": [5, 1], "x": 2, "y": 4}, + {"matrix": [5, 2], "x": 3, "y": 4}, + {"matrix": [5, 3], "x": 4, "y": 4}, + {"matrix": [5, 4], "x": 5, "y": 4}, + {"matrix": [5, 9], "x": 6, "y": 4}, + {"matrix": [5, 8], "x": 7, "y": 4}, + {"matrix": [5, 7], "x": 8, "y": 4}, + {"matrix": [5, 6], "x": 9, "y": 4}, + {"matrix": [5, 5], "x": 10, "y": 4}, + {"matrix": [4, 5], "x": 11, "y": 4} ] } } diff --git a/keyboards/peej/lumberjack/lumberjack.h b/keyboards/peej/lumberjack/lumberjack.h index 785f13a903..b14f72d81e 100644 --- a/keyboards/peej/lumberjack/lumberjack.h +++ b/keyboards/peej/lumberjack/lumberjack.h @@ -18,21 +18,5 @@ #include "quantum.h" -#define LAYOUT_ortho_5x12( \ - 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 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k0b, k0a, k09, k08, k07 }, \ - { k10, k11, k12, k13, k05, k1b, k1a, k19, k18, k06 }, \ - { k20, k21, k22, k14, k15, k2b, k2a, k29, k17, k16 }, \ - { k30, k31, k23, k24, k25, k3b, k3a, k28, k27, k26 }, \ - { k40, k32, k33, k34, k35, k4b, k39, k38, k37, k36 }, \ - { k41, k42, k43, k44, k45, k4a, k49, k48, k47, k46 } \ -} - #define LED1 C5 #define LED2 C4 diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index fcd6fce1b4..c175aafb42 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -18,66 +18,69 @@ "layouts": { "LAYOUT_ortho_4x15": { "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 }, - { "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": 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": 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 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [4, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [4, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [4, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [4, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [5, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [5, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [5, 2], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [5, 3], "x": 7, "y": 1}, + {"matrix": [1, 4], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [1, 5], "x": 10, "y": 1}, + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [1, 6], "x": 12, "y": 1}, + {"matrix": [5, 6], "x": 13, "y": 1}, + {"matrix": [1, 7], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [6, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [6, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [6, 3], "x": 7, "y": 2}, + {"matrix": [2, 4], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [2, 6], "x": 12, "y": 2}, + {"matrix": [6, 6], "x": 13, "y": 2}, + {"matrix": [2, 7], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [3, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [3, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [3, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [3, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [3, 7], "x": 14, "y": 3} ] } } diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h deleted file mode 100644 index 30beb92831..0000000000 --- a/keyboards/peej/rosaline/ortho/ortho.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2021 Paul James - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 │40 │01 │41 │02 │42 │03 │43 │04 │44 │05 │45 │06 │46 │07 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │10 │50 │11 │51 │12 │52 │13 │53 │14 │54 │15 │55 │16 │56 │17 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │20 │60 │21 │61 │22 │62 │23 │63 │24 │64 │25 │65 │26 │66 │27 │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │30 │70 │31 │71 │32 │72 │33 │73 │34 │74 │35 │75 │36 │76 │37 │ - * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ - * ┌───────────────────────────┐ - * │73 │ 7u Space - * └───────────────────────────┘ - * ┌───────┐ ┌───────┐ - * 2u Left │32 │ │35 │ 2u Right - * └───────┘ └───────┘ - */ - -#define XXX KC_NO - -#define LAYOUT_ortho_4x15( \ - k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \ - k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \ - k20, k60, k21, k61, k22, k62, k23, k63, k24, k64, k25, k65, k26, k66, k27, \ - k30, k70, k31, k71, k32, k72, k33, k73, k34, k74, k35, k75, k36, k76, k37 \ -) \ -{ \ - { 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, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, XXX } \ -} diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json index c5aebfd106..15980f254a 100644 --- a/keyboards/peej/tripel/info.json +++ b/keyboards/peej/tripel/info.json @@ -14,80 +14,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_ortho_7u": { - "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 }, - { "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":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":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":0, "y":4 }, - { "x":1, "y":4 }, - { "x":2, "y":4 }, - { "x":3, "y":4 }, - { "x":7, "y":4, "w":7 }, - { "x":11, "y":4 }, - { "x":12, "y":4 }, - { "x":13, "y":4 }, - { "x":14, "y":4 } - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/peej/tripel/left/info.json b/keyboards/peej/tripel/left/info.json new file mode 100644 index 0000000000..b938ef9b9a --- /dev/null +++ b/keyboards/peej/tripel/left/info.json @@ -0,0 +1,81 @@ +{ + "layouts": { + "LAYOUT_ortho_7u": { + "layout": [ + {"matrix": [3, 0], "x": 0, "y": 0}, + {"matrix": [3, 1], "x": 1, "y": 0}, + {"matrix": [3, 2], "x": 2, "y": 0}, + {"matrix": [3, 3], "x": 3, "y": 0}, + {"matrix": [3, 4], "x": 4, "y": 0}, + {"matrix": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 1], "x": 6, "y": 0}, + {"matrix": [6, 2], "x": 7, "y": 0}, + {"matrix": [6, 3], "x": 8, "y": 0}, + {"matrix": [6, 4], "x": 9, "y": 0}, + {"matrix": [0, 0], "x": 10, "y": 0}, + {"matrix": [0, 1], "x": 11, "y": 0}, + {"matrix": [0, 2], "x": 12, "y": 0}, + {"matrix": [0, 3], "x": 13, "y": 0}, + {"matrix": [0, 4], "x": 14, "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": [3, 5], "x": 4, "y": 1}, + {"matrix": [7, 0], "x": 5, "y": 1}, + {"matrix": [7, 1], "x": 6, "y": 1}, + {"matrix": [7, 2], "x": 7, "y": 1}, + {"matrix": [7, 3], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [1, 0], "x": 10, "y": 1}, + {"matrix": [1, 1], "x": 11, "y": 1}, + {"matrix": [1, 2], "x": 12, "y": 1}, + {"matrix": [1, 3], "x": 13, "y": 1}, + {"matrix": [0, 5], "x": 14, "y": 1}, + + {"matrix": [5, 0], "x": 0, "y": 2}, + {"matrix": [5, 1], "x": 1, "y": 2}, + {"matrix": [5, 2], "x": 2, "y": 2}, + {"matrix": [4, 4], "x": 3, "y": 2}, + {"matrix": [3, 6], "x": 4, "y": 2}, + {"matrix": [8, 0], "x": 5, "y": 2}, + {"matrix": [8, 1], "x": 6, "y": 2}, + {"matrix": [8, 2], "x": 7, "y": 2}, + {"matrix": [7, 4], "x": 8, "y": 2}, + {"matrix": [6, 6], "x": 9, "y": 2}, + {"matrix": [2, 0], "x": 10, "y": 2}, + {"matrix": [2, 1], "x": 11, "y": 2}, + {"matrix": [2, 2], "x": 12, "y": 2}, + {"matrix": [1, 4], "x": 13, "y": 2}, + {"matrix": [0, 6], "x": 14, "y": 2}, + + {"matrix": [5, 5], "x": 0, "y": 3}, + {"matrix": [5, 4], "x": 1, "y": 3}, + {"matrix": [5, 3], "x": 2, "y": 3}, + {"matrix": [4, 5], "x": 3, "y": 3}, + {"matrix": [3, 7], "x": 4, "y": 3}, + {"matrix": [8, 5], "x": 5, "y": 3}, + {"matrix": [8, 4], "x": 6, "y": 3}, + {"matrix": [8, 3], "x": 7, "y": 3}, + {"matrix": [7, 5], "x": 8, "y": 3}, + {"matrix": [6, 7], "x": 9, "y": 3}, + {"matrix": [2, 5], "x": 10, "y": 3}, + {"matrix": [2, 4], "x": 11, "y": 3}, + {"matrix": [2, 3], "x": 12, "y": 3}, + {"matrix": [1, 5], "x": 13, "y": 3}, + {"matrix": [0, 7], "x": 14, "y": 3}, + + {"matrix": [5, 6], "x": 0, "y": 4}, + {"matrix": [5, 7], "x": 1, "y": 4}, + {"matrix": [4, 6], "x": 2, "y": 4}, + {"matrix": [4, 7], "x": 3, "y": 4}, + {"matrix": [7, 6], "x": 7, "y": 4, "w": 7}, + {"matrix": [2, 7], "x": 11, "y": 4}, + {"matrix": [1, 6], "x": 12, "y": 4}, + {"matrix": [1, 7], "x": 13, "y": 4}, + {"matrix": [2, 6], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/peej/tripel/left/left.h b/keyboards/peej/tripel/left/left.h deleted file mode 100644 index 852a503e60..0000000000 --- a/keyboards/peej/tripel/left/left.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Paul James - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_7u( \ - l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \ - l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \ - l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \ - l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \ - l51, l52, l53, l54, m53, r52, r53, r54, r51 \ -) \ -{ \ - { r11, r12, r13, r14, r15, r25, r35, r45 }, \ - { r21, r22, r23, r24, r34, r44, r53, r54 }, \ - { r31, r32, r33, r43, r42, r41, r51, r52 }, \ - { l11, l12, l13, l14, l15, l25, l35, l45 }, \ - { l21, l22, l23, l24, l34, l44, l53, l54 }, \ - { l31, l32, l33, l43, l42, l41, l51, l52 }, \ - { m11, m12, m13, m14, m15, m25, m35, m45 }, \ - { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \ - { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO } \ -} diff --git a/keyboards/peej/tripel/middle/info.json b/keyboards/peej/tripel/middle/info.json new file mode 100644 index 0000000000..b1bdf10f82 --- /dev/null +++ b/keyboards/peej/tripel/middle/info.json @@ -0,0 +1,81 @@ +{ + "layouts": { + "LAYOUT_ortho_7u": { + "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, 0], "x": 5, "y": 0}, + {"matrix": [3, 1], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 3], "x": 8, "y": 0}, + {"matrix": [3, 4], "x": 9, "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": [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": [0, 5], "x": 4, "y": 1}, + {"matrix": [4, 0], "x": 5, "y": 1}, + {"matrix": [4, 1], "x": 6, "y": 1}, + {"matrix": [4, 2], "x": 7, "y": 1}, + {"matrix": [4, 3], "x": 8, "y": 1}, + {"matrix": [3, 5], "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}, + {"matrix": [6, 5], "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": [1, 4], "x": 3, "y": 2}, + {"matrix": [0, 6], "x": 4, "y": 2}, + {"matrix": [5, 0], "x": 5, "y": 2}, + {"matrix": [5, 1], "x": 6, "y": 2}, + {"matrix": [5, 2], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [3, 6], "x": 9, "y": 2}, + {"matrix": [8, 0], "x": 10, "y": 2}, + {"matrix": [8, 1], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [6, 6], "x": 14, "y": 2}, + + {"matrix": [2, 5], "x": 0, "y": 3}, + {"matrix": [2, 4], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3}, + {"matrix": [1, 5], "x": 3, "y": 3}, + {"matrix": [0, 7], "x": 4, "y": 3}, + {"matrix": [5, 5], "x": 5, "y": 3}, + {"matrix": [5, 4], "x": 6, "y": 3}, + {"matrix": [5, 3], "x": 7, "y": 3}, + {"matrix": [4, 5], "x": 8, "y": 3}, + {"matrix": [3, 7], "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": [7, 5], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + + {"matrix": [2, 6], "x": 0, "y": 4}, + {"matrix": [2, 7], "x": 1, "y": 4}, + {"matrix": [1, 6], "x": 2, "y": 4}, + {"matrix": [1, 7], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 7, "y": 4, "w": 7}, + {"matrix": [8, 7], "x": 11, "y": 4}, + {"matrix": [7, 6], "x": 12, "y": 4}, + {"matrix": [7, 7], "x": 13, "y": 4}, + {"matrix": [8, 6], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/peej/tripel/middle/middle.h b/keyboards/peej/tripel/middle/middle.h deleted file mode 100644 index 450eb095c3..0000000000 --- a/keyboards/peej/tripel/middle/middle.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Paul James - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_7u( \ - l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \ - l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \ - l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \ - l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \ - l51, l52, l53, l54, m53, r52, r53, r54, r51 \ -) \ -{ \ - { l11, l12, l13, l14, l15, l25, l35, l45 }, \ - { l21, l22, l23, l24, l34, l44, l53, l54 }, \ - { l31, l32, l33, l43, l42, l41, l51, l52 }, \ - { m11, m12, m13, m14, m15, m25, m35, m45 }, \ - { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \ - { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \ - { r11, r12, r13, r14, r15, r25, r35, r45 }, \ - { r21, r22, r23, r24, r34, r44, r53, r54 }, \ - { r31, r32, r33, r43, r42, r41, r51, r52 } \ -} diff --git a/keyboards/peej/tripel/right/info.json b/keyboards/peej/tripel/right/info.json new file mode 100644 index 0000000000..9916d317f2 --- /dev/null +++ b/keyboards/peej/tripel/right/info.json @@ -0,0 +1,81 @@ +{ + "layouts": { + "LAYOUT_ortho_7u": { + "layout": [ + {"matrix": [6, 0], "x": 0, "y": 0}, + {"matrix": [6, 1], "x": 1, "y": 0}, + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [0, 0], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0}, + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [3, 0], "x": 10, "y": 0}, + {"matrix": [3, 1], "x": 11, "y": 0}, + {"matrix": [3, 2], "x": 12, "y": 0}, + {"matrix": [3, 3], "x": 13, "y": 0}, + {"matrix": [3, 4], "x": 14, "y": 0}, + + {"matrix": [7, 0], "x": 0, "y": 1}, + {"matrix": [7, 1], "x": 1, "y": 1}, + {"matrix": [7, 2], "x": 2, "y": 1}, + {"matrix": [7, 3], "x": 3, "y": 1}, + {"matrix": [6, 5], "x": 4, "y": 1}, + {"matrix": [1, 0], "x": 5, "y": 1}, + {"matrix": [1, 1], "x": 6, "y": 1}, + {"matrix": [1, 2], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [0, 5], "x": 9, "y": 1}, + {"matrix": [4, 0], "x": 10, "y": 1}, + {"matrix": [4, 1], "x": 11, "y": 1}, + {"matrix": [4, 2], "x": 12, "y": 1}, + {"matrix": [4, 3], "x": 13, "y": 1}, + {"matrix": [3, 5], "x": 14, "y": 1}, + + {"matrix": [8, 0], "x": 0, "y": 2}, + {"matrix": [8, 1], "x": 1, "y": 2}, + {"matrix": [8, 2], "x": 2, "y": 2}, + {"matrix": [7, 4], "x": 3, "y": 2}, + {"matrix": [6, 6], "x": 4, "y": 2}, + {"matrix": [2, 0], "x": 5, "y": 2}, + {"matrix": [2, 1], "x": 6, "y": 2}, + {"matrix": [2, 2], "x": 7, "y": 2}, + {"matrix": [1, 4], "x": 8, "y": 2}, + {"matrix": [0, 6], "x": 9, "y": 2}, + {"matrix": [5, 0], "x": 10, "y": 2}, + {"matrix": [5, 1], "x": 11, "y": 2}, + {"matrix": [5, 2], "x": 12, "y": 2}, + {"matrix": [4, 4], "x": 13, "y": 2}, + {"matrix": [3, 6], "x": 14, "y": 2}, + + {"matrix": [8, 5], "x": 0, "y": 3}, + {"matrix": [8, 4], "x": 1, "y": 3}, + {"matrix": [8, 3], "x": 2, "y": 3}, + {"matrix": [7, 5], "x": 3, "y": 3}, + {"matrix": [6, 7], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + {"matrix": [2, 4], "x": 6, "y": 3}, + {"matrix": [2, 3], "x": 7, "y": 3}, + {"matrix": [1, 5], "x": 8, "y": 3}, + {"matrix": [0, 7], "x": 9, "y": 3}, + {"matrix": [5, 5], "x": 10, "y": 3}, + {"matrix": [5, 4], "x": 11, "y": 3}, + {"matrix": [5, 3], "x": 12, "y": 3}, + {"matrix": [4, 5], "x": 13, "y": 3}, + {"matrix": [3, 7], "x": 14, "y": 3}, + + {"matrix": [8, 6], "x": 0, "y": 4}, + {"matrix": [8, 7], "x": 1, "y": 4}, + {"matrix": [7, 6], "x": 2, "y": 4}, + {"matrix": [7, 7], "x": 3, "y": 4}, + {"matrix": [1, 6], "x": 7, "y": 4, "w": 7}, + {"matrix": [5, 7], "x": 11, "y": 4}, + {"matrix": [4, 6], "x": 12, "y": 4}, + {"matrix": [4, 7], "x": 13, "y": 4}, + {"matrix": [5, 6], "x": 14, "y": 4} + ] + } + } +} diff --git a/keyboards/peej/tripel/right/right.h b/keyboards/peej/tripel/right/right.h deleted file mode 100644 index 5fa38270c9..0000000000 --- a/keyboards/peej/tripel/right/right.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Paul James - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_7u( \ - l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \ - l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \ - l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \ - l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \ - l51, l52, l53, l54, m53, r52, r53, r54, r51 \ -) \ -{ \ - { m11, m12, m13, m14, m15, m25, m35, m45 }, \ - { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \ - { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \ - { r11, r12, r13, r14, r15, r25, r35, r45 }, \ - { r21, r22, r23, r24, r34, r44, r53, r54 }, \ - { r31, r32, r33, r43, r42, r41, r51, r52 }, \ - { l11, l12, l13, l14, l15, l25, l35, l45 }, \ - { l21, l22, l23, l24, l34, l44, l53, l54 }, \ - { l31, l32, l33, l43, l42, l41, l51, l52 } \ -} diff --git a/keyboards/percent/booster/booster.h b/keyboards/percent/booster/booster.h deleted file mode 100644 index be2d2cb12b..0000000000 --- a/keyboards/percent/booster/booster.h +++ /dev/null @@ -1,32 +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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO }, \ -} diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index 89b0744ee0..79b9cb8026 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -22,23 +22,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"label":"K00 (D1,C7)", "x":0, "y":0}, - {"label":"K01 (D1,D4)", "x":1, "y":0}, - {"label":"K02 (D1,D2)", "x":2, "y":0}, - {"label":"K03 (D1,D0)", "x":3, "y":0}, - {"label":"K10 (D6,C7)", "x":0, "y":1}, - {"label":"K11 (D6,D4)", "x":1, "y":1}, - {"label":"K12 (D6,D2)", "x":2, "y":1}, - {"label":"K20 (D7,C7)", "x":0, "y":2}, - {"label":"K21 (D7,D4)", "x":1, "y":2}, - {"label":"K22 (D7,D2)", "x":2, "y":2}, - {"label":"K23 (D7,D0)", "x":3, "y":1, "h":2}, - {"label":"K30 (B4,C7)", "x":0, "y":3}, - {"label":"K31 (B4,D4)", "x":1, "y":3}, - {"label":"K32 (B4,D2)", "x":2, "y":3}, - {"label":"K40 (B5,C7)", "x":0, "y":4, "w":2}, - {"label":"K42 (B5,D2)", "x":2, "y":4}, - {"label":"K33 (B4,D0)", "x":3, "y":3, "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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/planck/ez/ez.h b/keyboards/planck/ez/ez.h index 2e3485e1f3..695b14d9ad 100644 --- a/keyboards/planck/ez/ez.h +++ b/keyboards/planck/ez/ez.h @@ -17,44 +17,7 @@ */ #pragma once -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k3a, k3b, KC_NO }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k37, k38, k39, k33, k34, k35 } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k3a, k3b, k36 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k37, k38, k39, k33, k34, k35 } \ -} - -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 +#include "quantum.h" void planck_ez_right_led_on(void); void planck_ez_right_led_off(void); diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 786814b987..43d7273976 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -19,108 +19,118 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [3, 3], "x": 10, "y": 3}, + {"matrix": [3, 4], "x": 11, "y": 3} ] }, "LAYOUT_ortho_4x12": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "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": [3, 3], "x": 10, "y": 3}, + {"matrix": [3, 4], "x": 11, "y": 3} ] } } diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json index a4911b999e..3f92fa168d 100644 --- a/keyboards/planck/info.json +++ b/keyboards/planck/info.json @@ -1,107 +1,4 @@ { "url": "https://olkb.com/planck", - "maintainer": "jackhumbert", - "layouts": { - "LAYOUT_planck_1x2uC": { - "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 }, - { "w": 2, "x": 5, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 } ] - }, - "LAYOUT_ortho_4x12": { - "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 } ] - } - } + "maintainer": "jackhumbert" } diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index 5958899759..e66674f2ef 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -19,108 +19,119 @@ "processor": "at90usb1286", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/light/light.c b/keyboards/planck/light/light.c index c2c241fab4..e9d2f7c3d8 100644 --- a/keyboards/planck/light/light.c +++ b/keyboards/planck/light/light.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "light.h" +#include "quantum.h" const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations diff --git a/keyboards/planck/light/light.h b/keyboards/planck/light/light.h deleted file mode 100644 index 623ffa707d..0000000000 --- a/keyboards/planck/light/light.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2017 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 "planck.h" -#include "rgb_matrix.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3A, k3B } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index 20db22055c..4be96986a7 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c @@ -1,4 +1,5 @@ -#include "planck.h" +#include "quantum.h" +#include QMK_KEYBOARD_H __attribute__ ((weak)) void matrix_init_kb(void) { diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h deleted file mode 100644 index 4b04dfec51..0000000000 --- a/keyboards/planck/planck.h +++ /dev/null @@ -1,41 +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" - -#if defined(KEYBOARD_planck_ez) -# include "ez.h" -#elif defined(KEYBOARD_planck_light) -# include "light.h" -#elif defined(KEYBOARD_planck_thk) -# include "thk.h" -#elif defined(KEYBOARD_planck_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_planck_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_planck_rev3) -# include "rev3.h" -#elif defined(KEYBOARD_planck_rev4) -# include "rev4.h" -#elif defined(KEYBOARD_planck_rev5) -# include "rev5.h" -#elif defined(KEYBOARD_planck_rev6) -# include "rev6.h" -#elif defined(KEYBOARD_planck_rev6_drop) -# include "rev6_drop.h" -#endif // Planck revisions diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index 649132c30c..72646ac6bf 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -19,108 +19,119 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/rev1/rev1.c b/keyboards/planck/rev1/rev1.c index e37e11cf98..ee8a6bf533 100644 --- a/keyboards/planck/rev1/rev1.c +++ b/keyboards/planck/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "planck.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/rev1/rev1.h b/keyboards/planck/rev1/rev1.h deleted file mode 100644 index db4c6b368d..0000000000 --- a/keyboards/planck/rev1/rev1.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index ac4c605313..2bbc5760c2 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -19,108 +19,119 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/rev2/rev2.c b/keyboards/planck/rev2/rev2.c index e37e11cf98..ee8a6bf533 100644 --- a/keyboards/planck/rev2/rev2.c +++ b/keyboards/planck/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "planck.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/rev2/rev2.h b/keyboards/planck/rev2/rev2.h deleted file mode 100644 index db4c6b368d..0000000000 --- a/keyboards/planck/rev2/rev2.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index c853b9230d..17f07d58f3 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -19,108 +19,119 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/rev3/rev3.c b/keyboards/planck/rev3/rev3.c index e37e11cf98..ee8a6bf533 100644 --- a/keyboards/planck/rev3/rev3.c +++ b/keyboards/planck/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "planck.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/rev3/rev3.h b/keyboards/planck/rev3/rev3.h deleted file mode 100644 index db4c6b368d..0000000000 --- a/keyboards/planck/rev3/rev3.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index c541e2dc4d..5eaf58e14c 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -19,108 +19,119 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/rev4/rev4.c b/keyboards/planck/rev4/rev4.c index e37e11cf98..ee8a6bf533 100644 --- a/keyboards/planck/rev4/rev4.c +++ b/keyboards/planck/rev4/rev4.c @@ -1,4 +1,4 @@ -#include "planck.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/rev4/rev4.h b/keyboards/planck/rev4/rev4.h deleted file mode 100644 index db4c6b368d..0000000000 --- a/keyboards/planck/rev4/rev4.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index 883572e8e1..f9265e1409 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -25,108 +25,119 @@ "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_planck_1x2uC": { "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} ] }, "LAYOUT_ortho_4x12": { "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/planck/rev5/rev5.c b/keyboards/planck/rev5/rev5.c index e37e11cf98..ee8a6bf533 100644 --- a/keyboards/planck/rev5/rev5.c +++ b/keyboards/planck/rev5/rev5.c @@ -1,4 +1,4 @@ -#include "planck.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/rev5/rev5.h b/keyboards/planck/rev5/rev5.h deleted file mode 100644 index db4c6b368d..0000000000 --- a/keyboards/planck/rev5/rev5.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index 484d63dace..505990904e 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -25,260 +25,280 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_ortho_4x12": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "x": 5, "y": 3}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uC": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 0], "x": 5, "y": 3, "w": 2}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uL": { "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, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uR": { "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, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "x": 5, "y": 3}, + {"matrix": [7, 1], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_2x2u": { "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, "w": 2 }, - { "x": 6, "y": 3, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 1], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] } } diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c index 59a6b7e279..30cb2cb9c7 100644 --- a/keyboards/planck/rev6/rev6.c +++ b/keyboards/planck/rev6/rev6.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 "rev6.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/planck/rev6/rev6.h b/keyboards/planck/rev6/rev6.h deleted file mode 100644 index 9bf3603ed7..0000000000 --- a/keyboards/planck/rev6/rev6.h +++ /dev/null @@ -1,104 +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 "planck.h" - -#define XXX KC_NO - -#define LAYOUT_planck_1x2uC( \ - 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, k73, k74, k70, k71, k72, k33, k34, k35 \ -) { \ - { 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, XXX } \ -} - -#define LAYOUT_planck_1x2uR( \ - 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, k73, k74, k75, k71, k72, k33, k34, k35 \ -) { \ - { 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 }, \ - { XXX, k71, k72, k73, k74, k75 } \ -} - -#define LAYOUT_planck_1x2uL( \ - 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, k73, k75, k70, k71, k72, k33, k34, k35 \ -) { \ - { 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, XXX, k75 } \ -} - -#define LAYOUT_planck_2x2u( \ - 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, k73, k75, k71, k72, k33, k34, k35 \ -) { \ - { 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 }, \ - { XXX, k71, k72, k73, XXX, k75 } \ -} - -#define LAYOUT_ortho_4x12( \ - 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, k73, k74, k75, k70, k71, k72, k33, k34, k35 \ -) { \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index ca44f17199..9581cb6b09 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -24,260 +24,280 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12", + "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", + "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" + }, "layouts": { "LAYOUT_ortho_4x12": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "x": 5, "y": 3}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uC": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 0], "x": 5, "y": 3, "w": 2}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uL": { "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, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 0], "x": 6, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_1x2uR": { "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, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 4], "x": 4, "y": 3}, + {"matrix": [7, 5], "x": 5, "y": 3}, + {"matrix": [7, 1], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] }, "LAYOUT_planck_2x2u": { "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, "w": 2 }, - { "x": 6, "y": 3, "w": 2 }, - { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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": [5, 0], "x": 6, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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": [6, 0], "x": 6, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [7, 3], "x": 3, "y": 3}, + {"matrix": [7, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [7, 1], "x": 6, "y": 3, "w": 2}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [3, 3], "x": 9, "y": 3}, + {"matrix": [3, 4], "x": 10, "y": 3}, + {"matrix": [3, 5], "x": 11, "y": 3} ] } } diff --git a/keyboards/planck/rev6_drop/rev6_drop.c b/keyboards/planck/rev6_drop/rev6_drop.c index e5d8ad9901..049db9cec0 100644 --- a/keyboards/planck/rev6_drop/rev6_drop.c +++ b/keyboards/planck/rev6_drop/rev6_drop.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 "rev6_drop.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/planck/rev6_drop/rev6_drop.h b/keyboards/planck/rev6_drop/rev6_drop.h deleted file mode 100644 index bc9434a026..0000000000 --- a/keyboards/planck/rev6_drop/rev6_drop.h +++ /dev/null @@ -1,108 +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 "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k39, k3a, k3b }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k33, k34, KC_NO } \ -} - -#define LAYOUT_planck_1x2uR( \ - 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, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k39, k3a, k3b }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { KC_NO, k37, k38, k33, k34, k35 } \ -} - -#define LAYOUT_planck_1x2uL( \ - 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, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k39, k3a, k3b }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k33, KC_NO, k35 } \ -} - -#define LAYOUT_planck_2x2u( \ - 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 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k39, k3a, k3b }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { KC_NO, k37, k38, k33, KC_NO, k35 } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k39, k3a, k3b }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k33, k34, k35 } \ -} - - -#define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index c99041be74..e7321ba697 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -29,105 +29,105 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - { "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": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "x": 5, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "x": 6, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "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} ] }, "LAYOUT_planck_1x2uC": { "layout": [ - { "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": "k10", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 6], "w": 2, "x": 5, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "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} ] } } diff --git a/keyboards/planck/thk/thk.c b/keyboards/planck/thk/thk.c index bd5e1a0342..42836f0f11 100644 --- a/keyboards/planck/thk/thk.c +++ b/keyboards/planck/thk/thk.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "thk.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/planck/thk/thk.h b/keyboards/planck/thk/thk.h deleted file mode 100644 index 6cbbf7262c..0000000000 --- a/keyboards/planck/thk/thk.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2018 Jack Humbert - * Copyright 2021 Erovia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "planck.h" - -#define LAYOUT_planck_1x2uC( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} - -#define LAYOUT_planck_mit LAYOUT_planck_1x2uC -#define LAYOUT_planck_grid LAYOUT_ortho_4x12 diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index 1398f34cab..6511d1305a 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -23,81 +23,82 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "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} ] }, "LAYOUT_numpad_5x4":{ "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"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": 1, "h": 2}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_enter": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3, "h":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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4} ] } } diff --git a/keyboards/polycarbdiet/s20/s20.h b/keyboards/polycarbdiet/s20/s20.h deleted file mode 100644 index 0e3eec12e0..0000000000 --- a/keyboards/polycarbdiet/s20/s20.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2020 Muhammad Galib (polycarbdiet) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} - -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO } \ -} - -#define LAYOUT_enter( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO } \ -} diff --git a/keyboards/pos78/info.json b/keyboards/pos78/info.json index 53b198ba81..f7f56a46de 100644 --- a/keyboards/pos78/info.json +++ b/keyboards/pos78/info.json @@ -22,12 +22,89 @@ "layouts": { "LAYOUT_ortho_6x13": { "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}, {"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":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, "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":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":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} + {"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}, + {"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/pos78/pos78.h b/keyboards/pos78/pos78.h deleted file mode 100644 index 2d5681addd..0000000000 --- a/keyboards/pos78/pos78.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 smssmssms - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_6x13( \ - 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 \ -) { \ - {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} \ -} diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json index 76571d7ce8..8b58bc260c 100644 --- a/keyboards/preonic/info.json +++ b/keyboards/preonic/info.json @@ -1,141 +1,4 @@ { "url": "https://olkb.com/preonic", - "maintainer": "jackhumbert", - "layouts": { - "LAYOUT_preonic_1x2uC": { - "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}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} - ] - }, - "LAYOUT_ortho_5x12": { - "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}, - - {"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} - ] - } - } + "maintainer": "jackhumbert" } diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c index 2b56805202..fd2fbd8c77 100644 --- a/keyboards/preonic/preonic.c +++ b/keyboards/preonic/preonic.c @@ -1,4 +1,5 @@ -#include "preonic.h" +#include "quantum.h" +#include QMK_KEYBOARD_H const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid( 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, diff --git a/keyboards/preonic/preonic.h b/keyboards/preonic/preonic.h deleted file mode 100644 index 6b10a425ab..0000000000 --- a/keyboards/preonic/preonic.h +++ /dev/null @@ -1,41 +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" - -/************************************************** -** Include headers specific to keyboard revision ** -**************************************************/ -#if defined(KEYBOARD_preonic_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_preonic_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_preonic_rev3) -# include "rev3.h" -#elif defined(KEYBOARD_preonic_rev3_drop) -# include "rev3_drop.h" -#endif - - -/************************************************** -** Layout macros aliases common to all revisions ** -** ** -** Name of Alias Matrix Name: ** -******* ----------------- ------------------- ****/ -#define LAYOUT_preonic_grid LAYOUT_ortho_5x12 diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json index b843510153..e25c41d9b0 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/info.json @@ -16,5 +16,145 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "community_layouts": ["ortho_5x12"] + "community_layouts": ["ortho_5x12"], + "layout_aliases": { + "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "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}, + {"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} + ] + }, + "LAYOUT_preonic_1x2uC": { + "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}, + {"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, "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/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c index bf83743605..2d56f037f4 100644 --- a/keyboards/preonic/rev1/rev1.c +++ b/keyboards/preonic/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" void matrix_init_kb(void) { diff --git a/keyboards/preonic/rev1/rev1.h b/keyboards/preonic/rev1/rev1.h deleted file mode 100644 index 003bb5cee0..0000000000 --- a/keyboards/preonic/rev1/rev1.h +++ /dev/null @@ -1,47 +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 "preonic.h" - -#define LAYOUT_preonic_1x2uC( \ - 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, k47, 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, k45, k45, k47, k48, k49, k4a, k4b } \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json index cf1708b061..8f644f8f6c 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/info.json @@ -22,5 +22,145 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", - "community_layouts": ["ortho_5x12"] + "community_layouts": ["ortho_5x12"], + "layout_aliases": { + "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" + }, + "layouts": { + "LAYOUT_ortho_5x12": { + "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}, + {"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} + ] + }, + "LAYOUT_preonic_1x2uC": { + "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}, + {"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, "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/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c index a3929249d0..2d56f037f4 100644 --- a/keyboards/preonic/rev2/rev2.c +++ b/keyboards/preonic/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" void matrix_init_kb(void) { diff --git a/keyboards/preonic/rev2/rev2.h b/keyboards/preonic/rev2/rev2.h deleted file mode 100644 index 003bb5cee0..0000000000 --- a/keyboards/preonic/rev2/rev2.h +++ /dev/null @@ -1,47 +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 "preonic.h" - -#define LAYOUT_preonic_1x2uC( \ - 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, k47, 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, k45, k45, k47, k48, k49, k4a, k4b } \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index 00460fd44c..253017bf9a 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -23,340 +23,343 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "community_layouts": ["ortho_5x12"], + "layout_aliases": { + "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_1x2uR": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 5], "x": 5, "y": 4}, + {"matrix": [9, 1], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_1x2uL": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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": 6, "y": 4}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 0], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_2x2u": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 0], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_ortho_5x12": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 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}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] } } diff --git a/keyboards/preonic/rev3/rev3.c b/keyboards/preonic/rev3/rev3.c index 4739a1d2d8..5cca62521c 100644 --- a/keyboards/preonic/rev3/rev3.c +++ b/keyboards/preonic/rev3/rev3.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 "rev3.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/preonic/rev3/rev3.h b/keyboards/preonic/rev3/rev3.h deleted file mode 100644 index e6462d5b75..0000000000 --- a/keyboards/preonic/rev3/rev3.h +++ /dev/null @@ -1,114 +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 "preonic.h" - -#define LAYOUT_preonic_1x2uC( \ - 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, k47, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k45, k47, k48, k43, k44, k45 } \ -} - -#define LAYOUT_preonic_1x2uR( \ - 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, k47, k48, k49, k4a, k4b \ - ) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k47, k47, k48, k43, k44, k45 } \ -} - -#define LAYOUT_preonic_1x2uL( \ - 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, k46, k47, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k47, k48, k43, k44, k44 } \ -} - -#define LAYOUT_preonic_2x2u( \ - 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, k46, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k46, k48, k43, k44, k44 } \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k47, k48, k43, k44, k45 } \ -} diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index 862f89bf44..a327c2cf40 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -22,340 +22,343 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["ortho_5x12"], + "layout_aliases": { + "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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, "w": 2}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_1x2uR": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 5], "x": 5, "y": 4}, + {"matrix": [9, 1], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_1x2uL": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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": 6, "y": 4}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 0], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_preonic_2x2u": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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": 6, "y": 4, "w": 2}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 5], "x": 4, "y": 4, "w": 2}, + {"matrix": [9, 0], "x": 6, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 8, "y": 4}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] }, "LAYOUT_ortho_5x12": { "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": [4, 0], "x": 6, "y": 0}, + {"matrix": [4, 1], "x": 7, "y": 0}, + {"matrix": [4, 2], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 5], "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}, + {"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, "y": 1}, + {"matrix": [5, 1], "x": 7, "y": 1}, + {"matrix": [5, 2], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 5], "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}, + {"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, "y": 2}, + {"matrix": [6, 1], "x": 7, "y": 2}, + {"matrix": [6, 2], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 5], "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": [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, "y": 3}, + {"matrix": [7, 1], "x": 7, "y": 3}, + {"matrix": [7, 2], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "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} + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [8, 1], "x": 1, "y": 4}, + {"matrix": [8, 2], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 4], "x": 4, "y": 4}, + {"matrix": [9, 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}, + {"matrix": [8, 3], "x": 9, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 5], "x": 11, "y": 4} ] } } diff --git a/keyboards/preonic/rev3_drop/rev3_drop.c b/keyboards/preonic/rev3_drop/rev3_drop.c index 279f367876..5cca62521c 100644 --- a/keyboards/preonic/rev3_drop/rev3_drop.c +++ b/keyboards/preonic/rev3_drop/rev3_drop.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 "rev3_drop.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/preonic/rev3_drop/rev3_drop.h b/keyboards/preonic/rev3_drop/rev3_drop.h deleted file mode 100644 index 3cb9368757..0000000000 --- a/keyboards/preonic/rev3_drop/rev3_drop.h +++ /dev/null @@ -1,115 +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 "preonic.h" - -// clang-format off -#define LAYOUT_preonic_1x2uC( \ - 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, k47, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k45, k47, k48, k43, k44, k45 } \ -} - -#define LAYOUT_preonic_1x2uR( \ - 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, k47, k48, k49, k4a, k4b \ - ) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k47, k47, k48, k43, k44, k45 } \ -} - -#define LAYOUT_preonic_1x2uL( \ - 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, k46, k47, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k47, k48, k43, k44, k44 } \ -} - -#define LAYOUT_preonic_2x2u( \ - 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, k46, k48, k49, k4a, k4b \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k46, k48, k43, k44, k44 } \ -} - -#define LAYOUT_ortho_5x12( \ - 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 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k06, k07, k08, k09, k0a, k0b }, \ - { k16, k17, k18, k19, k1a, k1b }, \ - { k26, k27, k28, k29, k2a, k2b }, \ - { k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k49, k4a, k4b }, \ - { k46, k47, k48, k43, k44, k45 } \ -} diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json index 238633ee3a..aa8e3e3668 100644 --- a/keyboards/primekb/prime_m/info.json +++ b/keyboards/primekb/prime_m/info.json @@ -22,41 +22,76 @@ "community_layouts": ["numpad_5x6"], "layouts": { "LAYOUT_ortho_5x6": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "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}] + "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": [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": [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, 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, 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} + ] }, "LAYOUT_numpad_5x6": { "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":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":5, "y":1, "h":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4, "w":2}, - {"x":4, "y":4}, - {"x":5, "y":3, "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": [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": [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": [1, 5], "x": 5, "y": 1, "h": 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": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 3, "h": 2} ] } } diff --git a/keyboards/primekb/prime_m/prime_m.h b/keyboards/primekb/prime_m/prime_m.h deleted file mode 100644 index 58d17eb6f6..0000000000 --- a/keyboards/primekb/prime_m/prime_m.h +++ /dev/null @@ -1,47 +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 ___ KC_NO - -#define LAYOUT_ortho_5x6( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT_numpad_5x6( \ - K00, K01, K02, K03, K04, K05, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, K15, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K44, K35 \ -) { \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, ___ }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, ___, K44, ___ } \ -} diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json index 6f2162b206..cd43c3f92a 100644 --- a/keyboards/program_yoink/ortho/info.json +++ b/keyboards/program_yoink/ortho/info.json @@ -23,111 +23,111 @@ "layouts": { "LAYOUT_ortho": { "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.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.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":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.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}, + {"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.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.25, "y":2.25}, - {"x":12.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}, + {"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.25, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3, "w":7}, - {"x":9, "y":3}, - {"x":10.25, "y":3.25}, - {"x":11.25, "y":3.25}, - {"x":12.25, "y":3.25} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 5], "x": 2, "y": 3, "w": 7}, + {"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} ] }, "LAYOUT_ortho_split": { "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.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.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":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.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}, + {"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.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.25, "y":2.25}, - {"x":12.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}, + {"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.25, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3, "w":2.75}, - {"x":5.75, "y":3, "w":2.25}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10.25, "y":3.25}, - {"x":11.25, "y":3.25}, - {"x":12.25, "y":3.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.75}, + {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"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} ] } } diff --git a/keyboards/program_yoink/ortho/ortho.h b/keyboards/program_yoink/ortho/ortho.h deleted file mode 100644 index e847f16edc..0000000000 --- a/keyboards/program_yoink/ortho/ortho.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2020 melonbred - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 XXX KC_NO - -#define LAYOUT_ortho( \ - 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, K35, 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, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B, K3C } \ -} - -#define LAYOUT_ortho_split( \ - 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, K34, 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, XXX, K34, XXX, XXX, K37, K38, K39, K3A, K3B, K3C } \ -} diff --git a/keyboards/prototypist/allison_numpad/allison_numpad.h b/keyboards/prototypist/allison_numpad/allison_numpad.h deleted file mode 100644 index 9295e68668..0000000000 --- a/keyboards/prototypist/allison_numpad/allison_numpad.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2020 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 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_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} - -#define LAYOUT_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K50, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO }, \ - { K50, KC_NO, K52, K53 } \ -} diff --git a/keyboards/prototypist/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json index 56ca74bb20..9e20788a12 100644 --- a/keyboards/prototypist/allison_numpad/info.json +++ b/keyboards/prototypist/allison_numpad/info.json @@ -24,65 +24,65 @@ "layouts": { "LAYOUT_ortho_6x4": { "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}, + {"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}, - {"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}, + {"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}, - {"label":"2,0", "x":0, "y":2.25}, - {"label":"2,1", "x":1, "y":2.25}, - {"label":"2,2", "x":2, "y":2.25}, - {"label":"2,3", "x":3, "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}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, - {"label":"3,0", "x":0, "y":3.25}, - {"label":"3,1", "x":1, "y":3.25}, - {"label":"3,2", "x":2, "y":3.25}, - {"label":"3,3", "x":3, "y":3.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.25}, - {"label":"4,0", "x":0, "y":4.25}, - {"label":"4,1", "x":1, "y":4.25}, - {"label":"4,2", "x":2, "y":4.25}, - {"label":"4,3", "x":3, "y":4.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}, - {"label":"5,0", "x":0, "y":5.25}, - {"label":"5,1", "x":1, "y":5.25}, - {"label":"5,2", "x":2, "y":5.25}, - {"label":"5,3", "x":3, "y":5.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} ] }, "LAYOUT_numpad_6x4": { "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}, + {"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}, - {"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}, + {"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}, - {"label":"2,0", "x":0, "y":2.25}, - {"label":"2,1", "x":1, "y":2.25}, - {"label":"2,2", "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}, - {"label":"3,0", "x":0, "y":3.25}, - {"label":"3,1", "x":1, "y":3.25}, - {"label":"3,2", "x":2, "y":3.25}, - {"label":"3,3", "x":3, "y":2.25, "h":2}, + {"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": 2.25, "h": 2}, - {"label":"4,0", "x":0, "y":4.25}, - {"label":"4,1", "x":1, "y":4.25}, - {"label":"4,2", "x":2, "y":4.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}, - {"label":"5,0", "x":0, "y":5.25, "w":2}, - {"label":"5,2", "x":2, "y":5.25}, - {"label":"5,3", "x":3, "y":4.25, "h":2} + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/punk75/info.json b/keyboards/punk75/info.json index cee5a88f61..81f2bcc818 100644 --- a/keyboards/punk75/info.json +++ b/keyboards/punk75/info.json @@ -25,85 +25,85 @@ "layouts": { "LAYOUT_ortho_5x15": { "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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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/punk75/punk75.c b/keyboards/punk75/punk75.c index 045e3c2669..aaabefb5aa 100644 --- a/keyboards/punk75/punk75.c +++ b/keyboards/punk75/punk75.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "punk75.h" +#include "quantum.h" void matrix_init_kb(void) { // Set our LED pin as output diff --git a/keyboards/punk75/punk75.h b/keyboards/punk75/punk75.h deleted file mode 100644 index 6e89e5d2a7..0000000000 --- a/keyboards/punk75/punk75.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 dsanchezseco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_5x15( \ - k01, k06, k11, k16, k21, k26, k31, k36, k41, k46, k51, k56, k61, k66, k71, \ - k02, k07, k12, k17, k22, k27, k32, k37, k42, k47, k52, k57, k62, k67, k72, \ - k03, k08, k13, k18, k23, k28, k33, k38, k43, k48, k53, k58, k63, k68, k73, \ - k04, k09, k14, k19, k24, k29, k34, k39, k44, k49, k54, k59, k64, k69, k74, \ - k05, k10, k15, k20, k25, k30, k35, k40, k45, k50, k55, k60, k65, k70, k75 \ -) { \ - { k01, k06, k11, k16, k21, k26, k31, k36, k41, k46, k51, k56, k61, k66, k71 }, \ - { k02, k07, k12, k17, k22, k27, k32, k37, k42, k47, k52, k57, k62, k67, k72 }, \ - { k03, k08, k13, k18, k23, k28, k33, k38, k43, k48, k53, k58, k63, k68, k73 }, \ - { k04, k09, k14, k19, k24, k29, k34, k39, k44, k49, k54, k59, k64, k69, k74 }, \ - { k05, k10, k15, k20, k25, k30, k35, k40, k45, k50, k55, k60, k65, k70, k75 } \ -} - -//TODO: other layouts with the 2u keys diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json index b6c0af83ac..090120c22d 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/info.json @@ -25,25 +25,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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} ] } } diff --git a/keyboards/rart/rart4x4/rart4x4.h b/keyboards/rart/rart4x4/rart4x4.h deleted file mode 100644 index 8160420aa2..0000000000 --- a/keyboards/rart/rart4x4/rart4x4.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 Alabahuy -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -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_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ -} diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 3d1fba3231..78f034a063 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -28,55 +28,55 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"label": "Numlock", "x": 0, "y": 0}, - {"label": "/", "x": 1, "y": 0}, - {"label": "*", "x": 2, "y": 0}, - {"label": "-", "x": 3, "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}, - - {"label": "4", "x": 0, "y": 2}, - {"label": "5", "x": 1, "y": 2}, - {"label": "6", "x": 2, "y": 2}, - {"label": "+", "x": 3, "y": 2}, - - {"label": "1", "x": 0, "y": 3}, - {"label": "2", "x": 1, "y": 3}, - {"label": "3", "x": 2, "y": 3}, - {"label": "Esc", "x": 3, "y": 3}, - - {"label": "0", "x": 0, "y": 4}, - {"label": "00", "x": 1, "y": 4}, - {"label": ".", "x": 2, "y": 4}, - {"label": "Enter", "x": 3, "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": [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}, + + {"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": [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} ] }, "LAYOUT_numpad_5x4": { "layout": [ - {"label": "Numlock", "x": 0, "y": 0}, - {"label": "/", "x": 1, "y": 0}, - {"label": "*", "x": 2, "y": 0}, - {"label": "-", "x": 3, "y": 0}, - - {"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": "+", "x": 3, "y": 1, "h": 2}, - - {"label": "1", "x": 0, "y": 3}, - {"label": "2", "x": 1, "y": 3}, - {"label": "3", "x": 2, "y": 3}, - - {"label": "0", "x": 0, "y": 4, "w": 2}, - {"label": ".", "x": 2, "y": 4}, - {"label": "Enter", "x": 3, "y": 3, "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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/rart/rartpad/rartpad.h b/keyboards/rart/rartpad/rartpad.h deleted file mode 100644 index 2e516e2cfe..0000000000 --- a/keyboards/rart/rartpad/rartpad.h +++ /dev/null @@ -1,41 +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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ -} -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO }, \ -} diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json index a1044084de..573d7dcaea 100644 --- a/keyboards/redscarf_i/info.json +++ b/keyboards/redscarf_i/info.json @@ -22,100 +22,118 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "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": [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}, + + {"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": [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} ] }, "LAYOUT_ortho_6x4": { "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "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": [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}, + + {"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": [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": [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} ] }, "LAYOUT_numpad_5x4": { "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":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_numpad_6x4": { "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":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":2}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "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": [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": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/redscarf_i/redscarf_i.c b/keyboards/redscarf_i/redscarf_i.c index 039e20664d..fac3e245fb 100644 --- a/keyboards/redscarf_i/redscarf_i.c +++ b/keyboards/redscarf_i/redscarf_i.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "redscarf_i.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // initialize top row leds diff --git a/keyboards/redscarf_i/redscarf_i.h b/keyboards/redscarf_i/redscarf_i.h deleted file mode 100644 index 44e4689347..0000000000 --- a/keyboards/redscarf_i/redscarf_i.h +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright 2019 Ben Weakley - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -#define LAYOUT_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO } \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { k40, k41, k42, k43 }, \ - { k50, KC_NO, k52, KC_NO } \ -} - -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k42, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, KC_NO }, \ - { k30, k31, k32, k33 }, \ - { k40, KC_NO, k42, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/reversestudio/decadepad/decadepad.h b/keyboards/reversestudio/decadepad/decadepad.h deleted file mode 100644 index 7da10094c7..0000000000 --- a/keyboards/reversestudio/decadepad/decadepad.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" -#define LAYOUT_numpad_6x4( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, \ - k31, k32, k33, k34, \ - k41, k42, k43, \ - k51, k53, k54 \ -) \ -{ \ - { k01, k02, k03, k04 }, \ - { k11, k12, k13, k14 }, \ - { k21, k22, k23, KC_NO }, \ - { k31, k32, k33, k34 }, \ - { k41, k42, k43, KC_NO }, \ - { k51, KC_NO, k53, k54 }, \ -} diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json index 3d9df3ea4a..bae2ecb1dc 100644 --- a/keyboards/reversestudio/decadepad/info.json +++ b/keyboards/reversestudio/decadepad/info.json @@ -23,32 +23,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":2, "h":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": 2, "h": 2}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - - {"x":0, "y":5, "w":2}, - {"x":2, "y":5}, - {"x":3, "y":4, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index 427c0c6f98..cda09d1d81 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -26,16 +26,196 @@ "community_layouts": ["ortho_4x12", "ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "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":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":"BKSP", "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":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":"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":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":"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":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":"Enter", "x":12, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Super", "x":2, "y":4}, {"label":"RGB", "x":3, "y":4}, {"label":"⇓", "x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"label":"FN", "x":8, "y":4}, {"label":"Left", "x":9, "y":4}, {"label":"Down", "x":10, "y":4}, {"label":"Up", "x":11, "y":4}, {"label":"Right", "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, 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}, + {"matrix": [4, 5], "x": 5, "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} + ] }, "LAYOUT_ortho_4x12": { - "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":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":"\\|", "x":12, "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":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":"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":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":"Enter", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"Super", "x":2, "y":3}, {"label":"RGB", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"label":"FN", "x":8, "y":3}, {"label":"Left", "x":9, "y":3}, {"label":"Down", "x":10, "y":3}, {"label":"Up", "x":11, "y":3}, {"label":"Right", "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": [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} + ] }, "LAYOUT_ortho_5x6": { - "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":"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":"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":"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}, {"x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"⇓", "x":4, "y":4}, {"x":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": [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": [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, 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, 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} + ] }, "LAYOUT_ortho_4x6": { - "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":"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":"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}, {"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}] + "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": [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": [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, 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} + ] } } } diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c index 036bbd511a..7588ffc75f 100644 --- a/keyboards/rgbkb/zygomorph/rev1/rev1.c +++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/rgbkb/zygomorph/rev1/rev1.h b/keyboards/rgbkb/zygomorph/rev1/rev1.h deleted file mode 100644 index b0b5c7069a..0000000000 --- a/keyboards/rgbkb/zygomorph/rev1/rev1.h +++ /dev/null @@ -1,86 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef RGBLIGHT_ENABLE -//rgb led driver -#include "ws2812.h" -#endif - -#define LAYOUT_ortho_5x6( \ - 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 \ - ) \ - { \ - { 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, 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, KC_NO, KC_NO } \ - } - -#define LAYOUT_ortho_5x12( \ - 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 }, \ - { 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 } \ - } - -#define LAYOUT_ortho_4x6( \ - L00, L01, L02, L03, L04, L05, \ - L10, L11, L12, L13, L14, L15, \ - L20, L21, L22, L23, L24, L25, \ - L30, L31, L32, L33, L34, L35 \ - ) \ - { \ - { 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, 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, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ - } - -#define LAYOUT_ortho_4x12( \ - 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json index 0562e534f5..c6ab31ece1 100644 --- a/keyboards/rmkeebs/rm_numpad/info.json +++ b/keyboards/rmkeebs/rm_numpad/info.json @@ -22,98 +22,130 @@ "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { + "LAYOUT_big_enter_6x4": { + "layout": [ + {"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.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": [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.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.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": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 2], "x": 1, "y": 5.25}, + {"matrix": [5, 3], "x": 2, "y": 5.25}, + {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2} + ] + }, "LAYOUT_numpad_6x4": { "layout": [ - {"label": "Pause", "x": 0, "y": 0.25}, - {"label": "Prev", "x": 1, "y": 0.25}, - {"label": "Next", "x": 2, "y": 0.25}, - {"label": "Mute", "x": 3.5, "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": "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": "1", "x": 0, "y": 4.25}, - {"label": "2", "x": 1, "y": 4.25}, - {"label": "3", "x": 2, "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} + {"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.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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": [2, 4], "x": 3, "y": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 3], "x": 2, "y": 5.25}, + {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_split_plus_6x4": { "layout": [ - {"label": "Pause", "x": 0, "y": 0.25}, - {"label": "Prev", "x": 1, "y": 0.25}, - {"label": "Next", "x": 2, "y": 0.25}, - {"label": "Mute", "x": 3.5, "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": "=", "x": 3, "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": 3.25}, - - {"label": "1", "x": 0, "y": 4.25}, - {"label": "2", "x": 1, "y": 4.25}, - {"label": "3", "x": 2, "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} + {"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.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": [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.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.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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 3], "x": 2, "y": 5.25}, + {"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_ortho_6x4": { "layout": [ - {"label": "Pause", "x": 0, "y": 0.25}, - {"label": "Prev", "x": 1, "y": 0.25}, - {"label": "Next", "x": 2, "y": 0.25}, - {"label": "Mute", "x": 3.5, "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": "=", "x": 3, "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": 3.25}, - - {"label": "1", "x": 0, "y": 4.25}, - {"label": "2", "x": 1, "y": 4.25}, - {"label": "3", "x": 2, "y": 4.25}, - {"label": "Enter", "x": 3, "y": 4.25}, - - {"label": "0", "x": 0, "y": 5.25}, - {"label": "00", "x": 1, "y": 5.25}, - {"label": ".", "x": 2, "y": 5.25}, - {"label": "Delete", "x": 3, "y": 5.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.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": [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.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.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": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 2], "x": 1, "y": 5.25}, + {"matrix": [5, 3], "x": 2, "y": 5.25}, + {"matrix": [5, 4], "x": 3, "y": 5.25} ] } diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.c b/keyboards/rmkeebs/rm_numpad/rm_numpad.c index 03dc9025c9..0152566bd1 100644 --- a/keyboards/rmkeebs/rm_numpad/rm_numpad.c +++ b/keyboards/rmkeebs/rm_numpad/rm_numpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rm_numpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/rmkeebs/rm_numpad/rm_numpad.h b/keyboards/rmkeebs/rm_numpad/rm_numpad.h deleted file mode 100644 index 77537f4570..0000000000 --- a/keyboards/rmkeebs/rm_numpad/rm_numpad.h +++ /dev/null @@ -1,158 +0,0 @@ -/* Copyright 2021 RuckerMachine - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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. - */ - -/* rm_numpad default layout - * .-------------------. - * |PAUS|PREV|NEXT|MUTE| - * |-------------------| - * |NLCK| /| *| -| - * |-------------------| - * | 7| 8| 9| | - * |--------------| | - * | 4| 5| 6| +| - * |-------------------| - * | 1| 2| 3| | - * |--------------| | - * | 0| .| Ent| - * '-------------------' - */ - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k24,\ - k40, k41, k42, \ - k51, k53, k44 \ -) { \ - { k00, k01, k02, k03, ___ }, \ - { k10, k11, k12, k13, ___ }, \ - { k20, k21, k22, ___, k24 }, \ - { k30, k31, k32, ___, ___ }, \ - { k40, k41, k42, ___, k44 }, \ - { ___, k51, ___, k53, ___ } \ -} - -/* rm_numpad ortho layout - * .-------------------. - * |PAUS|PREV|NEXT|MUTE| - * |-------------------| - * |NLCK| /| *| -| - * |-------------------| - * | 7| 8| 9| =| - * |-------------------| - * | 4| 5| 6| +| - * |-------------------| - * | 1| 2| 3| Ent| - * |-------------------| - * | 0| 00| .| Del| - * '-------------------' - */ - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k52, k53, k54 \ -) { \ - { k00, k01, k02, k03, ___ }, \ - { k10, k11, k12, k13, ___ }, \ - { k20, k21, k22, k23, ___ }, \ - { k30, k31, k32, k33, ___ }, \ - { k40, k41, k42, k43, ___ }, \ - { k50, ___, k52, k53, k54 } \ -} - - -/* rm_numpad split plus layout - * .-------------------. - * |PAUS|PREV|NEXT|MUTE| - * |-------------------| - * |NLCK| /| *| -| - * |-------------------| - * | 7| 8| 9| =| - * |-------------------| - * | 4| 5| 6| +| - * |-------------------| - * | 1| 2| 3| Ent| - * |--------------| | - * | 0| .| | - * '-------------------' - */ - -#define LAYOUT_split_plus_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k51, k53, k44 \ -) { \ - { k00, k01, k02, k03, ___ }, \ - { k10, k11, k12, k13, ___ }, \ - { k20, k21, k22, k23, ___ }, \ - { k30, k31, k32, k33, ___ }, \ - { k40, k41, k42, ___, k44 }, \ - { ___, k51, ___, k53, ___ } \ -} - -/* rm_numpad big enter layout - * .-------------------. - * |PAUS|PREV|NEXT|MUTE| - * |-------------------| - * |NLCK| /| *| -| - * |-------------------| - * | 7| 8| 9| =| - * |-------------------| - * | 4| 5| 6| +| - * |-------------------| - * | 1| 2| 3| Ent| - * |--------------| | - * | 0| 00| .| | - * '-------------------' - */ - -#define LAYOUT_big_enter_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k52, k53, k44 \ -) { \ - { k00, k01, k02, k03, ___ }, \ - { k10, k11, k12, k13, ___ }, \ - { k20, k21, k22, k23, ___ }, \ - { k30, k31, k32, k33, ___ }, \ - { k40, k41, k42, ___, k44 }, \ - { k50, ___, k52, k53, ___ } \ -} diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json index d66b072f3e..287bceec89 100644 --- a/keyboards/ryanbaekr/rb18/info.json +++ b/keyboards/ryanbaekr/rb18/info.json @@ -18,27 +18,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "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": [1, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [3, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [4, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/ryanbaekr/rb18/rb18.h b/keyboards/ryanbaekr/rb18/rb18.h deleted file mode 100644 index 2dd2d61e86..0000000000 --- a/keyboards/ryanbaekr/rb18/rb18.h +++ /dev/null @@ -1,35 +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_numpad_5x4( \ - k00, k11, k02, k03, \ - k10, k21, k12, \ - k20, k31, k22, k13, \ - k30, k41, k32, \ - k40, k42, k33 \ -){ \ - { k00, ___, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, ___ }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, ___ } \ -} diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index b4013093cd..b3e2754e89 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -19,32 +19,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"\uff1d", "x":2, "y":0}, - {"label":"Del", "x":3, "y":0}, + {"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}, - {"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}, + {"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}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.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}, - {"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}, + {"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}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.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}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2} + {"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} ] } } diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c index b377452770..c31fe5c8f3 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/rev1.c +++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h deleted file mode 100644 index c309296049..0000000000 --- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_numpad_6x4( \ - L05, L15, L25, L35, \ - L04, L14, L24, L34, \ - L03, L13, L23, \ - L02, L12, L22, L32, \ - L01, L11, L21, \ - L00, L20, L30 \ - ) \ - { \ - { 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 } \ - } diff --git a/keyboards/sendyyeah/75pixels/75pixels.h b/keyboards/sendyyeah/75pixels/75pixels.h deleted file mode 100644 index 9ac0f763d9..0000000000 --- a/keyboards/sendyyeah/75pixels/75pixels.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_ortho_5x15(\ - 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, K56, K47, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, 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, K56, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 }, \ - { K90, K91, K92, K93, K94, K95, K96, KC_NO } \ -} diff --git a/keyboards/sendyyeah/75pixels/info.json b/keyboards/sendyyeah/75pixels/info.json index aeaf26da6c..9ccc1a8dfb 100644 --- a/keyboards/sendyyeah/75pixels/info.json +++ b/keyboards/sendyyeah/75pixels/info.json @@ -19,81 +19,85 @@ "layouts": { "LAYOUT_ortho_5x15": { "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": "Bkspc", "x": 11, "y": 0}, - {"label": "NumLock", "x": 12, "y": 0}, - {"label": "/", "x": 13, "y": 0}, - {"label": "*", "x": 14, "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": "7", "x": 12, "y": 1}, - {"label": "8", "x": 13, "y": 1}, - {"label": "9", "x": 14, "y": 1}, - {"label": "Caps", "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": "Enter", "x": 11, "y": 2}, - {"label": "4", "x": 12, "y": 2}, - {"label": "5", "x": 13, "y": 2}, - {"label": "6", "x": 14, "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": "Shift", "x": 11, "y": 3}, - {"label": "1", "x": 12, "y": 3}, - {"label": "2", "x": 13, "y": 3}, - {"label": "3", "x": 14, "y": 3}, - {"label": "Ctrl", "x": 0, "y": 4}, - {"label": "Win", "x": 1, "y": 4}, - {"label": "Alt", "x": 2, "y": 4}, - {"label": "Fn", "x": 3, "y": 4}, - {"label": "Lower", "x": 4, "y": 4}, - {"label": "Space", "x": 5, "y": 4}, - {"label": "Space", "x": 6, "y": 4}, - {"label": "Raise", "x": 7, "y": 4}, - {"label": "Alt", "x": 8, "y": 4}, - {"label": "Win", "x": 9, "y": 4}, - {"label": "Menu", "x": 10, "y": 4}, - {"label": "Ctrl", "x": 11, "y": 4}, - {"label": "0", "x": 12, "y": 4}, - {"label": ".", "x": 13, "y": 4}, - {"label": "Enter", "x": 14, "y": 4} + {"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}, + {"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": [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, "y": 2}, + {"matrix": [4, 3], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [5, 4], "x": 9, "y": 2}, + {"matrix": [4, 5], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [5, 6], "x": 13, "y": 2}, + {"matrix": [4, 7], "x": 14, "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}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [8, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, + {"matrix": [8, 2], "x": 4, "y": 4}, + {"matrix": [9, 2], "x": 5, "y": 4}, + {"matrix": [8, 3], "x": 6, "y": 4}, + {"matrix": [9, 3], "x": 7, "y": 4}, + {"matrix": [8, 4], "x": 8, "y": 4}, + {"matrix": [9, 4], "x": 9, "y": 4}, + {"matrix": [8, 5], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [8, 6], "x": 12, "y": 4}, + {"matrix": [9, 6], "x": 13, "y": 4}, + {"matrix": [8, 7], "x": 14, "y": 4} ] } } diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index a5db65d78b..3a7b43fb83 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -21,20 +21,55 @@ "layouts": { "LAYOUT_numpad_5x4": { "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":1, "h":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, - {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":3, "y":3, "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": [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": [2, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "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": [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}, + + {"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": [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} ] } } diff --git a/keyboards/sentraq/number_pad/number_pad.h b/keyboards/sentraq/number_pad/number_pad.h deleted file mode 100644 index 05bcd527cd..0000000000 --- a/keyboards/sentraq/number_pad/number_pad.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2019 QMK Community - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K42, K43 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { K40, KC_NO, K42, K43 } \ -} - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/shk9/info.json b/keyboards/shk9/info.json index fdb20b9a4d..5974ce3703 100644 --- a/keyboards/shk9/info.json +++ b/keyboards/shk9/info.json @@ -18,15 +18,17 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"label":"7", "x":0, "y":0}, - {"label":"8", "x":1, "y":0}, - {"label":"9", "x":2, "y":0}, - {"label":"4", "x":0, "y":1}, - {"label":"5", "x":1, "y":1}, - {"label":"6", "x":2, "y":1}, - {"label":"1", "x":0, "y":2}, - {"label":"2", "x":1, "y":2}, - {"label":"3", "x":2, "y":2} + {"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/shk9/shk9.h b/keyboards/shk9/shk9.h deleted file mode 100644 index d2c63a49c1..0000000000 --- a/keyboards/shk9/shk9.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 Sam Hudson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_3x3( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 } \ -} diff --git a/keyboards/signum/3_0/3_0.h b/keyboards/signum/3_0/3_0.h deleted file mode 100644 index c857afd7c5..0000000000 --- a/keyboards/signum/3_0/3_0.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 Stan Gurenkov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_ortho_4x12( \ - 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 } \ -} -// clang-format on diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json index 9b134ed610..c8bab9d5c3 100644 --- a/keyboards/signum/3_0/info.json +++ b/keyboards/signum/3_0/info.json @@ -17,59 +17,61 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.5, "r": 15}, + {"matrix": [0, 1], "x": 1, "y": 0.5, "r": 15}, + {"matrix": [0, 2], "x": 2, "y": 0.25, "r": 15}, + {"matrix": [0, 3], "x": 3, "y": 0, "r": 15}, + {"matrix": [0, 4], "x": 4, "y": 0.25, "r": 15}, + {"matrix": [0, 5], "x": 5, "y": 0.5, "r": 15}, - { "x": 0, "y": 0.5, "r": 15 }, - { "x": 1, "y": 0.5, "r": 15 }, - { "x": 2, "y": 0.25, "r": 15 }, - { "x": 3, "y": 0, "r": 15 }, - { "x": 4, "y": 0.25, "r": 15 }, - { "x": 5, "y": 0.5, "r": 15 }, - { "x": 9, "y": 0.5, "r": -15 }, - { "x": 10, "y": 0.25, "r": -15 }, - { "x": 11, "y": 0, "r": -15 }, - { "x": 12, "y": 0.25, "r": -15 }, - { "x": 13, "y": 0.5, "r": -15 }, - { "x": 14, "y": 0.5, "r": -15 }, + {"matrix": [0, 6], "x": 9, "y": 0.5, "r": -15}, + {"matrix": [0, 7], "x": 10, "y": 0.25, "r": -15}, + {"matrix": [0, 8], "x": 11, "y": 0, "r": -15}, + {"matrix": [0, 9], "x": 12, "y": 0.25, "r": -15}, + {"matrix": [0, 10], "x": 13, "y": 0.5, "r": -15}, + {"matrix": [0, 11], "x": 14, "y": 0.5, "r": -15}, - { "x": 0, "y": 1.5, "r": 15 }, - { "x": 1, "y": 1.5, "r": 15 }, - { "x": 2, "y": 1.25, "r": 15 }, - { "x": 3, "y": 1, "r": 15 }, - { "x": 4, "y": 1.25, "r": 15 }, - { "x": 5, "y": 1.5, "r": 15 }, - { "x": 9, "y": 1.5, "r": -15 }, - { "x": 10, "y": 1.25, "r": -15 }, - { "x": 11, "y": 1, "r": -15 }, - { "x": 12, "y": 1.25, "r": -15 }, - { "x": 13, "y": 1.5, "r": -15 }, - { "x": 14, "y": 1.5, "r": -15 }, + {"matrix": [1, 0], "x": 0, "y": 1.5, "r": 15}, + {"matrix": [1, 1], "x": 1, "y": 1.5, "r": 15}, + {"matrix": [1, 2], "x": 2, "y": 1.25, "r": 15}, + {"matrix": [1, 3], "x": 3, "y": 1, "r": 15}, + {"matrix": [1, 4], "x": 4, "y": 1.25, "r": 15}, + {"matrix": [1, 5], "x": 5, "y": 1.5, "r": 15}, - { "x": 0, "y": 2.5, "r": 15 }, - { "x": 1, "y": 2.5, "r": 15 }, - { "x": 2, "y": 2.25, "r": 15 }, - { "x": 3, "y": 2, "r": 15 }, - { "x": 4, "y": 2.25, "r": 15 }, - { "x": 5, "y": 2.5, "r": 15 }, - { "x": 9, "y": 2.5, "r": -15 }, - { "x": 10, "y": 2.25, "r": -15 }, - { "x": 11, "y": 2, "r": -15 }, - { "x": 12, "y": 2.25, "r": -15 }, - { "x": 13, "y": 2.5, "r": -15 }, - { "x": 14, "y": 2.5, "r": -15 }, + {"matrix": [1, 6], "x": 9, "y": 1.5, "r": -15}, + {"matrix": [1, 7], "x": 10, "y": 1.25, "r": -15}, + {"matrix": [1, 8], "x": 11, "y": 1, "r": -15}, + {"matrix": [1, 9], "x": 12, "y": 1.25, "r": -15}, + {"matrix": [1, 10], "x": 13, "y": 1.5, "r": -15}, + {"matrix": [1, 11], "x": 14, "y": 1.5, "r": -15}, - { "x": 0, "y": 4, "r": 15 }, - { "x": 1, "y": 3.5, "r": 15 }, - { "x": 2, "y": 3.25, "r": 15 }, - { "x": 4, "y": 4.25, "r": 15, "h": 1.5 }, - { "x": 5, "y": 4, "r": 15, "h": 2 }, - { "x": 6, "y": 4.25, "r": 15, "h": 1.5 }, - { "x": 8, "y": 4.25, "r": -15, "h": 1.5 }, - { "x": 9, "y": 4, "r": -15, "h": 2 }, - { "x": 10, "y": 4.25, "r": -15, "h": 1.5 }, - { "x": 12, "y": 3.25, "r": -15 }, - { "x": 13, "y": 3.5, "r": -15 }, - { "x": 14, "y": 4, "r": -15 } + {"matrix": [2, 0], "x": 0, "y": 2.5, "r": 15}, + {"matrix": [2, 1], "x": 1, "y": 2.5, "r": 15}, + {"matrix": [2, 2], "x": 2, "y": 2.25, "r": 15}, + {"matrix": [2, 3], "x": 3, "y": 2, "r": 15}, + {"matrix": [2, 4], "x": 4, "y": 2.25, "r": 15}, + {"matrix": [2, 5], "x": 5, "y": 2.5, "r": 15}, + {"matrix": [2, 6], "x": 9, "y": 2.5, "r": -15}, + {"matrix": [2, 7], "x": 10, "y": 2.25, "r": -15}, + {"matrix": [2, 8], "x": 11, "y": 2, "r": -15}, + {"matrix": [2, 9], "x": 12, "y": 2.25, "r": -15}, + {"matrix": [2, 10], "x": 13, "y": 2.5, "r": -15}, + {"matrix": [2, 11], "x": 14, "y": 2.5, "r": -15}, + + {"matrix": [3, 0], "x": 0, "y": 4, "r": 15}, + {"matrix": [3, 1], "x": 1, "y": 3.5, "r": 15}, + {"matrix": [3, 2], "x": 2, "y": 3.25, "r": 15}, + {"matrix": [3, 3], "x": 4, "y": 4.25, "h": 1.5, "r": 15}, + {"matrix": [3, 4], "x": 5, "y": 4, "h": 2, "r": 15}, + {"matrix": [3, 5], "x": 6, "y": 4.25, "h": 1.5, "r": 15}, + + {"matrix": [3, 6], "x": 8, "y": 4.25, "h": 1.5, "r": -15}, + {"matrix": [3, 7], "x": 9, "y": 4, "h": 2, "r": -15}, + {"matrix": [3, 8], "x": 10, "y": 4.25, "h": 1.5, "r": -15}, + {"matrix": [3, 9], "x": 12, "y": 3.25, "r": -15}, + {"matrix": [3, 10], "x": 13, "y": 3.5, "r": -15}, + {"matrix": [3, 11], "x": 14, "y": 4, "r": -15} ] } } diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json index 26c3a2894a..2aefe3e8b9 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/info.json @@ -13,7 +13,15 @@ "community_layouts": ["ortho_2x3"], "layouts": { "LAYOUT_ortho_2x3": { - "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}] + "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/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c index 17d51a8885..ddbd41ac55 100644 --- a/keyboards/sixkeyboard/matrix.c +++ b/keyboards/sixkeyboard/matrix.c @@ -28,7 +28,7 @@ along with this program. If not, see . #include "debug.h" #include "util.h" #include "matrix.h" -#include "sixkeyboard.h" +#include "timer.h" #include /* matrix state(1:on, 0:off) */ diff --git a/keyboards/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c index 85190f6167..7667ee7f44 100644 --- a/keyboards/sixkeyboard/sixkeyboard.c +++ b/keyboards/sixkeyboard/sixkeyboard.c @@ -1,4 +1,4 @@ -#include "sixkeyboard.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h deleted file mode 100644 index 3f563af6d1..0000000000 --- a/keyboards/sixkeyboard/sixkeyboard.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* - * ┌───┬───┬───┐ - * │ A │ B │ C │ - * ├───┼───┼───┤ - * │ D │ E │ F │ - * └───┴───┴───┘ - */ -#define LAYOUT_ortho_2x3( \ - k00, k01, k02, \ - k10, k11, k12 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json index 82f7c4cee1..91bc05fd1c 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/info.json @@ -18,27 +18,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "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}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"+", "x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h b/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h deleted file mode 100644 index 9782090efe..0000000000 --- a/keyboards/skeletonkbd/skeletonnumpad/skeletonnumpad.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2022 SkeletonKBD - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO },\ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO } \ -} diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json index 16c79cf6ad..8934a61917 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/info.json @@ -19,12 +19,13 @@ "layouts": { "LAYOUT_ortho_2x3": { "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} + {"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/smallkeyboard/smallkeyboard.c b/keyboards/smallkeyboard/smallkeyboard.c index 40cf3fc71a..7ea6f2c40a 100644 --- a/keyboards/smallkeyboard/smallkeyboard.c +++ b/keyboards/smallkeyboard/smallkeyboard.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 "smallkeyboard.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/smallkeyboard/smallkeyboard.h b/keyboards/smallkeyboard/smallkeyboard.h deleted file mode 100644 index 7741772be5..0000000000 --- a/keyboards/smallkeyboard/smallkeyboard.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 zhouqiong198401189 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_2x3( \ - K00, K01, K02,\ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 } \ -} diff --git a/keyboards/snampad/info.json b/keyboards/snampad/info.json index a8a9222d67..e5eb0272bb 100644 --- a/keyboards/snampad/info.json +++ b/keyboards/snampad/info.json @@ -19,27 +19,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Tab", "x":1, "y":0}, - {"label":"Fn", "x":2, "y":0}, - {"label":"Back", "x":3, "y":0}, - {"label":"Num Lock", "x":0, "y":1}, - {"label":"/", "x":1, "y":1}, - {"label":"*", "x":2, "y":1}, - {"label":"-", "x":3, "y":1}, - {"label":"7", "x":0, "y":2}, - {"label":"8", "x":1, "y":2}, - {"label":"9", "x":2, "y":2}, - {"label":"4", "x":0, "y":3}, - {"label":"5", "x":1, "y":3}, - {"label":"6", "x":2, "y":3}, - {"label":"+", "x":3, "y":2, "h":2}, - {"label":"1", "x":0, "y":4}, - {"label":"2", "x":1, "y":4}, - {"label":"3", "x":2, "y":4}, - {"label":"0", "x":0, "y":5, "w":2}, - {"label":".", "x":2, "y":5}, - {"label":"Enter", "x":3, "y":4, "h":2} + {"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": [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": [3, 0], "x": 0, "y": 2}, + {"matrix": [3, 1], "x": 1, "y": 2}, + {"matrix": [3, 2], "x": 2, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [1, 0], "x": 0, "y": 4}, + {"matrix": [1, 1], "x": 1, "y": 4}, + {"matrix": [1, 2], "x": 2, "y": 4}, + + {"matrix": [0, 1], "x": 0, "y": 5, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 5}, + {"matrix": [1, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/snampad/snampad.h b/keyboards/snampad/snampad.h deleted file mode 100644 index ec7a779a4c..0000000000 --- a/keyboards/snampad/snampad.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 Peter Tillemans - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k51, k52, k43 \ -) \ -{ \ - { KC_NO, k51, k52 , KC_NO}, \ - { k40, k41, k42 , k43}, \ - { k30, k31, k32 , KC_NO}, \ - { k20, k21, k22 , k23}, \ - { k10, k11, k12 , k13}, \ - { k00, k01, k02 , k03} \ -} diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json index 069427beed..717a3245af 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -19,26 +19,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "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,C7)", "x":3, "y":0}, - {"label":"K10 (B1,B5)", "x":0, "y":1}, - {"label":"K11 (B1,B6)", "x":1, "y":1}, - {"label":"K12 (B1,B7)", "x":2, "y":1}, - {"label":"K13 (B1,C7)", "x":3, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2}, - {"label":"K21 (B2,B6)", "x":1, "y":2}, - {"label":"K22 (B2,B7)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3}, - {"label":"K31 (B3,B6)", "x":1, "y":3}, - {"label":"K32 (B3,B7)", "x":2, "y":3}, - {"label":"K33 (B3,C7)", "x":3, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4}, - {"label":"K41 (B4,B6)", "x":1, "y":4}, - {"label":"K42 (B4,B7)", "x":2, "y":4}, - {"label":"K43 (B4,C7)", "x":3, "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": [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}, + + {"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": [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} ] } } diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h deleted file mode 100644 index c29b04f93d..0000000000 --- a/keyboards/soy20/soy20.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Soy20 PCB}} -Copyright (C) {{ 2020 }} {{ Drewkeys }} - -This program is free software: you can 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_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index 4c532c2dab..6af24d1dd9 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -21,21 +21,21 @@ "layouts": { "LAYOUT_ortho_4x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"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/spaceholdings/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h index cc08bce5e6..24d2bd6545 100755 --- a/keyboards/spaceholdings/nebula12/nebula12.h +++ b/keyboards/spaceholdings/nebula12/nebula12.h @@ -15,21 +15,5 @@ */ #pragma once -#define XXX KC_NO - #include "quantum.h" #include "../wilba_tech/wt_rgb_backlight_keycodes.h" - -// This a shortcut to help you visually see your layout. - -#define LAYOUT_ortho_4x3( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 31cd3640c1..9162370c4c 100644 --- a/keyboards/spaceman/pancake/rev1/info.json +++ b/keyboards/spaceman/pancake/rev1/info.json @@ -14,104 +14,112 @@ "layouts": { "LAYOUT_planck_mit": { "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 }, - { "w": 2, "x": 5, "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, "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} + ] }, "LAYOUT_ortho_4x12": { "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/spaceman/pancake/rev1/rev1.h b/keyboards/spaceman/pancake/rev1/rev1.h deleted file mode 100644 index 312d789b42..0000000000 --- a/keyboards/spaceman/pancake/rev1/rev1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2019 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_planck_mit( \ - 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, 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, k305, k307, k308, k309, k310, k311 } \ -} - -#define LAYOUT_ortho_4x12( \ - 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/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json index 49c12d20e0..22c2b2e78d 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/info.json @@ -19,54 +19,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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, "w":1.5}, - {"x":6.5, "y":3, "w":1.5}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "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, "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": [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": [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": [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": 1.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 1.5}, + {"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} ] } } diff --git a/keyboards/spaceman/pancake/rev2/rev2.c b/keyboards/spaceman/pancake/rev2/rev2.c index 9b186192c5..cc1c2019da 100644 --- a/keyboards/spaceman/pancake/rev2/rev2.c +++ b/keyboards/spaceman/pancake/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 OLED_ENABLE diff --git a/keyboards/spaceman/pancake/rev2/rev2.h b/keyboards/spaceman/pancake/rev2/rev2.h deleted file mode 100644 index 628b1b39ac..0000000000 --- a/keyboards/spaceman/pancake/rev2/rev2.h +++ /dev/null @@ -1,31 +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_ortho_4x12( \ - 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/sporewoh/banime40/banime40.h b/keyboards/sporewoh/banime40/banime40.h deleted file mode 100644 index 98b2bcd098..0000000000 --- a/keyboards/sporewoh/banime40/banime40.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2022 sporewoh - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_4x10( \ - 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/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index 726aef3e28..6dba060131 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -19,46 +19,50 @@ "layouts": { "LAYOUT_ortho_4x10": { "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}] + {"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/subatomic/info.json b/keyboards/subatomic/info.json index 483d7689f1..f8250299f0 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -21,223 +21,235 @@ "layouts": { "LAYOUT_ortho_5x14": { "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}, - {"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": [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}, + {"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} ] }, "LAYOUT_ortho_5x14_1x2uC": { "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}, - {"label":"k43", "x":3, "y":4}, - {"label":"k44", "x":4, "y":4}, - {"label":"k45", "x":5, "y":4}, - {"label":"k46", "x":6, "y":4, "w":2}, - {"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": [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}, + {"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, 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} ] }, "LAYOUT_ortho_5x14_2x2u": { "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}, - {"label":"k43", "x":3, "y":4}, - {"label":"k44", "x":4, "y":4}, - {"label":"k45", "x":5, "y":4, "w":2}, - {"label":"k47", "x":7, "y":4, "w":2}, - {"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": [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}, + {"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, "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/subatomic/subatomic.h b/keyboards/subatomic/subatomic.h deleted file mode 100644 index 5fbc599f83..0000000000 --- a/keyboards/subatomic/subatomic.h +++ /dev/null @@ -1,89 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - - -/* Subatomic Grid layout - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ • │ │ │ • │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ │ │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ - * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_ortho_5x14( \ - 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 } \ -} - - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ • │ │ │ • │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ - * └───┴───┴───┴───┴───┴───┴───────┴───┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_ortho_5x14_1x2uC( \ - 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, 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, XXX, k48, k49, k4a, k4b, k4c, k4d } \ -} - - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ • │ │ │ • │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│ │ │ │ │ │ │ │ │ │ │▓▓▓│▓▓▓│ - * ├───┼───┼───┼───┼───┼───┴───┼───┴───┼───┼───┼───┼───┼───┤ - * │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ │ │▓▓▓│▓▓▓│▓▓▓│▓▓▓│▓▓▓│ - * └───┴───┴───┴───┴───┴───────┴───────┴───┴───┴───┴───┴───┘ - */ -#define LAYOUT_ortho_5x14_2x2u( \ - 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, k47, 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, XXX, k47, XXX, k49, k4a, k4b, k4c, k4d } \ -} diff --git a/keyboards/teleport/numpad/info.json b/keyboards/teleport/numpad/info.json index e1ccc3dc3e..50ab7d0d70 100644 --- a/keyboards/teleport/numpad/info.json +++ b/keyboards/teleport/numpad/info.json @@ -18,23 +18,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"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":"+", "x":3, "y":1, "h":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":",", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":3, "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": [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": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/teleport/numpad/numpad.h b/keyboards/teleport/numpad/numpad.h deleted file mode 100644 index 9c7413cd8e..0000000000 --- a/keyboards/teleport/numpad/numpad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Moritz Plattner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K41, K42 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, KC_NO }, \ - { K40, K41, K42, KC_NO }, \ -} diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json index 8e1a2c62f7..2dd6c5dc78 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/info.json @@ -11,64 +11,63 @@ "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { "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}, + {"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}, - {"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": [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}, - {"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": [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}, - {"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": 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} ] } } diff --git a/keyboards/telophase/telophase.h b/keyboards/telophase/telophase.h index 8ca6744176..112ba79504 100644 --- a/keyboards/telophase/telophase.h +++ b/keyboards/telophase/telophase.h @@ -34,20 +34,3 @@ along with this program. If not, see . #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 - -// 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_ortho_4x12( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json index 6db38bd26d..7f3b3254cd 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/info.json @@ -18,7 +18,32 @@ "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "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}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Bspc", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"=", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"PrtScr", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "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": [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}, + + {"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": [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} + ] } } } diff --git a/keyboards/tenki/tenki.h b/keyboards/tenki/tenki.h deleted file mode 100644 index 29ec6303ab..0000000000 --- a/keyboards/tenki/tenki.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03}, \ - { K10, K11, K12, K13}, \ - { K20, K21, K22, K23}, \ - { K30, K31, K32, K33}, \ - { K40, K41, K42, K43} \ -} - diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json index 6a161c0db0..3552435786 100644 --- a/keyboards/terrazzo/info.json +++ b/keyboards/terrazzo/info.json @@ -25,34 +25,221 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "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":"Back", "x":13.5, "y":0}, - {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Control", "x":2.5, "y":1, "w":1.25}, {"label":"A", "x":3.75, "y":1}, {"label":"S", "x":4.75, "y":1}, {"label":"D", "x":5.75, "y":1}, {"label":"F", "x":6.75, "y":1}, {"label":"G", "x":7.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":"Enter", "x":12.75, "y":1, "w":1.75}, - {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2, "w":1.75}, {"label":"Z", "x":4.25, "y":2}, {"label":"X", "x":5.25, "y":2}, {"label":"C", "x":6.25, "y":2}, {"label":"V", "x":7.25, "y":2}, {"label":"B", "x":8.25, "y":2}, {"label":"N", "x":9.25, "y":2}, {"label":"M", "x":10.25, "y":2}, {"label":"<", "x":11.25, "y":2}, {"label":">", "x":12.25, "y":2}, {"label":"Shift", "x":13.25, "y":2, "w":1.25}, - {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3, "w":1.5}, {"label":"Space", "x":6, "y":3, "w":2.25}, {"label":"Space", "x":8.25, "y":3, "w":2.75}, {"label":"Fn", "x":11, "y":3, "w":1.5}, {"label":"Fn1", "x":12.5, "y":3} + {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0}, + {"matrix": [7, 4], "x": 11.5, "y": 0}, + {"matrix": [7, 5], "x": 12.5, "y": 0}, + {"matrix": [6, 5], "x": 13.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1, "w": 1.25}, + {"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": [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": [5, 5], "x": 12.75, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 2.5, "y": 2, "w": 1.75}, + {"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": [5, 0], "x": 8.25, "y": 2}, + {"matrix": [5, 1], "x": 9.25, "y": 2}, + {"matrix": [5, 2], "x": 10.25, "y": 2}, + {"matrix": [5, 3], "x": 11.25, "y": 2}, + {"matrix": [5, 4], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "x": 13.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 3.5, "y": 3}, + {"matrix": [3, 2], "x": 4.5, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 6, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "x": 8.25, "y": 3, "w": 2.75}, + {"matrix": [4, 2], "x": 11, "y": 3, "w": 1.5}, + {"matrix": [4, 3], "x": 12.5, "y": 3} ] }, "LAYOUT_ortho": { "layout": [ - {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "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":"Back", "x":13.5, "y":0}, - {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "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":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1}, - {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2}, - {"label":"TZ Off", "x":0, "y":3}, {"label":"Win", "x":3.5, "y":3}, {"label":"Alt", "x":4.5, "y":3}, {"label":"Lower", "x":5.5, "y":3}, {"label":"Space", "x":6.5, "y":3, "w":2}, {"label":"Space", "x":8.5, "y":3, "w":2}, {"label":"Raise", "x":10.5, "y":3}, {"label":"Nav", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3} + {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0}, + {"matrix": [7, 4], "x": 11.5, "y": 0}, + {"matrix": [7, 5], "x": 12.5, "y": 0}, + {"matrix": [6, 5], "x": 13.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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": [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": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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": [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": [4, 3], "x": 11.5, "y": 2}, + {"matrix": [4, 4], "x": 12.5, "y": 2}, + {"matrix": [4, 5], "x": 13.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"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, "w": 2}, + {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 2}, + {"matrix": [4, 0], "x": 10.5, "y": 3}, + {"matrix": [4, 1], "x": 11.5, "y": 3}, + {"matrix": [4, 2], "x": 12.5, "y": 3} ] }, "LAYOUT_ortho_mit": { "layout": [ - {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "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":"Back", "x":13.5, "y":0}, - {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "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":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1}, - {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2}, - {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3, "w":2}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3} + {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0}, + {"matrix": [7, 4], "x": 11.5, "y": 0}, + {"matrix": [7, 5], "x": 12.5, "y": 0}, + {"matrix": [6, 5], "x": 13.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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": [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": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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": [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": [4, 3], "x": 11.5, "y": 2}, + {"matrix": [4, 4], "x": 12.5, "y": 2}, + {"matrix": [4, 5], "x": 13.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"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": [8, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3, "w": 2}, + {"matrix": [8, 5], "x": 9.5, "y": 3}, + {"matrix": [4, 0], "x": 10.5, "y": 3}, + {"matrix": [4, 1], "x": 11.5, "y": 3}, + {"matrix": [4, 2], "x": 12.5, "y": 3} ] }, "LAYOUT_ortho_all": { "layout": [ - {"label":"Mute", "x":0, "y":0}, {"label":"Esc", "x":2.5, "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":"Back", "x":13.5, "y":0}, - {"label":"TZ Nxt", "x":0, "y":1}, {"label":"Ctrl", "x":2.5, "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":";", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1}, - {"label":"TZ Prv", "x":0, "y":2}, {"label":"Shift", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"/", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2}, - {"label":"TZ Off", "x":0, "y":3}, {"label":"Tab", "x":3.5, "y":3}, {"label":"Win", "x":4.5, "y":3}, {"label":"Alt", "x":5.5, "y":3}, {"label":"Lower", "x":6.5, "y":3}, {"label":"Space", "x":7.5, "y":3}, {"label":"Space", "x":8.5, "y":3}, {"label":"Raise", "x":9.5, "y":3}, {"label":"Nav", "x":10.5, "y":3}, {"label":"Fn", "x":11.5, "y":3}, {"label":"Del", "x":12.5, "y":3} + {"matrix": [0, 0], "x": 0, "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": [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.5, "y": 0}, + {"matrix": [7, 4], "x": 11.5, "y": 0}, + {"matrix": [7, 5], "x": 12.5, "y": 0}, + {"matrix": [6, 5], "x": 13.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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": [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": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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": [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": [4, 3], "x": 11.5, "y": 2}, + {"matrix": [4, 4], "x": 12.5, "y": 2}, + {"matrix": [4, 5], "x": 13.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"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": [8, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 4], "x": 7.5, "y": 3}, + {"matrix": [3, 5], "x": 8.5, "y": 3}, + {"matrix": [8, 5], "x": 9.5, "y": 3}, + {"matrix": [4, 0], "x": 10.5, "y": 3}, + {"matrix": [4, 1], "x": 11.5, "y": 3}, + {"matrix": [4, 2], "x": 12.5, "y": 3} ] } } diff --git a/keyboards/terrazzo/terrazzo.h b/keyboards/terrazzo/terrazzo.h index 85b35e3050..c27a372088 100644 --- a/keyboards/terrazzo/terrazzo.h +++ b/keyboards/terrazzo/terrazzo.h @@ -18,82 +18,6 @@ #include "quantum.h" -/* Default staggered layout - Bottom row: 1u 1.5u 2.25u 2.75u 1.5u 1u */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \ - K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K55, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K45, \ - K30, K31, K32, K33, K40, K42, K43 \ -){ \ - { K00, K01, K02, K03, K04, K05,}, \ - { K10, K11, K12, K13, K14, K15,}, \ - { K20, K21, K22, K23, K24, K25,}, \ - { K30, K31, K32, K33, KC_NO, KC_NO,},\ - { K40, KC_NO, K42, K43, KC_NO, K45,},\ - { K50, K51, K52, K53, K54, K55,}, \ - { K60, K61, K62, K63, K64, K65,}, \ - { K70, K71, K72, K73, K74, K75, } \ -} - -/* Default ortho layout - Bottom row: 1u 1u 1u 2u 2u 1u 1u 1u */ -#define LAYOUT_ortho( \ - K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \ - K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \ - K30, K31, K32, K33, K34, K35, K40, K41, K42 \ -){ \ - { 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, }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, } \ -} - -/* MIT ortho layout - Bottom row: 1u 1u 1u 1u 2u 1u 1u 1u 1u */ -#define LAYOUT_ortho_mit( \ - K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \ - K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \ - K30, K31, K32, K33, K84, K35, K85, K40, K41, K42 \ -){ \ - { K00, K01, K02, K03, K04, K05,}, \ - { K10, K11, K12, K13, K14, K15,}, \ - { K20, K21, K22, K23, K24, K25,}, \ - { K30, K31, K32, K33, KC_NO, 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, }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \ -} - -/* All 1u ortho layout - Bottom row: 1u 1u 1u 1u 1u 1u 1u 1u 1u 1u */ -#define LAYOUT_ortho_all( \ - K00, K01, K02, K03, K04, K05, K70, K71, K72, K73, K74, K75, K65, \ - K10, K11, K12, K13, K14, K15, K60, K61, K62, K63, K64, K54, K55, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K43, K44, K45, \ - K30, K31, K32, K33, K84, K34, K35, K85, K40, K41, K42 \ -){ \ - { 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, }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K84, K85, } \ -} - - enum terrazzo_matrix_effects { TERRAZZO_NONE = 0, // -------------------------------------- diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index 751ca91542..b8697805dd 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -27,11 +27,68 @@ "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "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": [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": [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.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.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": [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} + ] }, "LAYOUT_numpad_6x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":2.25, "h":2}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":0, "y":5.25, "w":2}, {"x":2, "y":5.25}, {"x":3, "y":4.25, "h":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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2} + ] } } } diff --git a/keyboards/tgr/tris/tris.h b/keyboards/tgr/tris/tris.h deleted file mode 100644 index 5ba1865d3b..0000000000 --- a/keyboards/tgr/tris/tris.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2020 halfenergized - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 ___ KC_NO - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -)\ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, ___ }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, ___, k52, ___ } \ -} diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json index 7b7cf7a27d..9672ea832c 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/info.json +++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json @@ -23,15 +23,17 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"x":0, "y":0}, - {"label":"Encoder", "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} + {"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/themadnoodle/ncc1701kb/v2/v2.h b/keyboards/themadnoodle/ncc1701kb/v2/v2.h deleted file mode 100644 index 5d3b65be56..0000000000 --- a/keyboards/themadnoodle/ncc1701kb/v2/v2.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 The Mad Noodle (Jesse Leventhal) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_3x3( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} - diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json index c5f64fd267..688e4b8f13 100644 --- a/keyboards/themadnoodle/noodlepad/info.json +++ b/keyboards/themadnoodle/noodlepad/info.json @@ -23,15 +23,17 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"x":0, "y":0}, - {"label":"Encoder", "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} + {"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/themadnoodle/noodlepad/noodlepad.h b/keyboards/themadnoodle/noodlepad/noodlepad.h deleted file mode 100644 index e1aa5d2a6f..0000000000 --- a/keyboards/themadnoodle/noodlepad/noodlepad.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 The Mad Noodle (Jesse Leventhal) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_3x3( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/thepanduuh/degenpad/degenpad.c b/keyboards/thepanduuh/degenpad/degenpad.c index d70c8b8c1a..e28254480e 100644 --- a/keyboards/thepanduuh/degenpad/degenpad.c +++ b/keyboards/thepanduuh/degenpad/degenpad.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 "degenpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/thepanduuh/degenpad/degenpad.h b/keyboards/thepanduuh/degenpad/degenpad.h deleted file mode 100644 index 53f949a79f..0000000000 --- a/keyboards/thepanduuh/degenpad/degenpad.h +++ /dev/null @@ -1,136 +0,0 @@ -/* -Copyright 2023 ThePanduuh - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) { \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, k53} \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_zero( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {k50, k51, k52, k53} \ -} - -#define LAYOUT_split_enter( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_enter_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {KC_NO, k51, k52, k53} \ -} - -#define LAYOUT_split_zero_plus( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, KC_NO}, \ - {k50, k51, k52, k53} \ -} diff --git a/keyboards/thepanduuh/degenpad/info.json b/keyboards/thepanduuh/degenpad/info.json index e0988de17d..2eb86b1b7b 100644 --- a/keyboards/thepanduuh/degenpad/info.json +++ b/keyboards/thepanduuh/degenpad/info.json @@ -23,222 +23,222 @@ "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [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.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.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": [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} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_split_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [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.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.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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_split_zero": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [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": 4.25, "h": 2} ] }, "LAYOUT_split_enter": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} ] }, "LAYOUT_split_enter_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [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.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.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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} ] }, "LAYOUT_split_zero_plus": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [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.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.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": [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": 4.25, "h": 2} ] } } diff --git a/keyboards/thevankeyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json index a889fb029e..9323281a32 100644 --- a/keyboards/thevankeyboards/roadkit/info.json +++ b/keyboards/thevankeyboards/roadkit/info.json @@ -18,10 +18,47 @@ "community_layouts": ["numpad_4x4", "ortho_4x4"], "layouts": { "LAYOUT_numpad_4x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"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":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "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, "h": 2}, + + {"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": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3} + ] }, "LAYOUT_ortho_4x4": { - "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}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} + ] } } } diff --git a/keyboards/thevankeyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h deleted file mode 100644 index f367c88ff4..0000000000 --- a/keyboards/thevankeyboards/roadkit/roadkit.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This is a shortcut to help you visually see your layout. -#define LAYOUT_numpad_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k23, \ - k30, k32 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, XXX }, \ - { k20, k21, k22, k23 }, \ - { k30, XXX, k32, XXX } \ -} - -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json index 999f8deb61..173ca1b4d7 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/info.json @@ -13,12 +13,47 @@ "layouts": { "LAYOUT_ortho_6x6": { "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "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":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "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": [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": [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, 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, 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": [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} ] } } diff --git a/keyboards/touchpad/touchpad.h b/keyboards/touchpad/touchpad.h deleted file mode 100644 index 97b59a033c..0000000000 --- a/keyboards/touchpad/touchpad.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once -#include "quantum.h" - -#define LAYOUT_ortho_6x6( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/treasure/type9s2/info.json b/keyboards/treasure/type9s2/info.json index 56b6272ccf..71264940d0 100644 --- a/keyboards/treasure/type9s2/info.json +++ b/keyboards/treasure/type9s2/info.json @@ -21,15 +21,17 @@ "layouts": { "LAYOUT_ortho_3x3": { "layout": [ - {"label": "7", "x": 0, "y": 0}, - {"label": "8", "x": 1, "y": 0}, - {"label": "9", "x": 2, "y": 0}, - {"label": "4", "x": 0, "y": 1}, - {"label": "5", "x": 1, "y": 1}, - {"label": "6", "x": 2, "y": 1}, - {"label": "1", "x": 0, "y": 2}, - {"label": "2", "x": 1, "y": 2}, - {"label": "3", "x": 2, "y": 2} + {"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/treasure/type9s2/type9s2.h b/keyboards/treasure/type9s2/type9s2.h deleted file mode 100644 index 1a18416bc1..0000000000 --- a/keyboards/treasure/type9s2/type9s2.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 Treasure - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_3x3( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 } \ -} diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index e3634bcad0..be205c17e9 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -23,30 +23,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "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} ] } } diff --git a/keyboards/ungodly/launch_pad/launch_pad.c b/keyboards/ungodly/launch_pad/launch_pad.c index e5ec112f9b..9803d8674f 100644 --- a/keyboards/ungodly/launch_pad/launch_pad.c +++ b/keyboards/ungodly/launch_pad/launch_pad.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 "launch_pad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/ungodly/launch_pad/launch_pad.h b/keyboards/ungodly/launch_pad/launch_pad.h deleted file mode 100644 index 7a7815f34f..0000000000 --- a/keyboards/ungodly/launch_pad/launch_pad.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright 2020 Ungodly 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 - -#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. - */ - -/* 4x5 numpad matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | 23 | - * |----|----|----|----| - * | 30 | 31 | 32 | 33 | - * |----|----|----|----| - * | 40 | 41 | 42 | 43 | - * `-------------------' - */ - - /* Numpad matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | 23 | - * |----|----|----|----| - * | 30 | 31 | 32 | | - * |----|----|----| 33 | - * | 41 | 42 | | - * `-------------------' - */ - -#define LAYOUT_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43} \ -} diff --git a/keyboards/unikeyboard/felix/felix.h b/keyboards/unikeyboard/felix/felix.h deleted file mode 100644 index f43a586c8e..0000000000 --- a/keyboards/unikeyboard/felix/felix.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x4( \ - K000, K001, K002, K003, \ - K100, K101, K102, K103, \ - K200, K201, K202, K203, \ - K300, K301, K302, K303, \ - K400, K401, K402, K403 \ -) { \ - { K000, K001, K002, K003 }, \ - { K100, K101, K102, K103 }, \ - { K200, K201, K202, K203 }, \ - { K300, K301, K302, K303 }, \ - { K400, K401, K402, K403 } \ -} - -#define LAYOUT LAYOUT_ortho_5x4 diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index d3200e6ed1..7c5a013d8a 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -20,29 +20,36 @@ "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x4" + }, "layouts": { "LAYOUT_ortho_5x4": { "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":"K100", "x":0, "y":1}, - {"label":"K101", "x":1, "y":1}, - {"label":"K102", "x":2, "y":1}, - {"label":"K103", "x":3, "y":1}, - {"label":"K200", "x":0, "y":2}, - {"label":"K201", "x":1, "y":2}, - {"label":"K202", "x":2, "y":2}, - {"label":"K203", "x":3, "y":2}, - {"label":"K300", "x":0, "y":3}, - {"label":"K301", "x":1, "y":3}, - {"label":"K302", "x":2, "y":3}, - {"label":"K303", "x":3, "y":3}, - {"label":"K400", "x":0, "y":4}, - {"label":"K401", "x":1, "y":4}, - {"label":"K402", "x":2, "y":4}, - {"label":"K403", "x":3, "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": [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}, + + {"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": [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} ] } } diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index 883278d983..8199aca23a 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -9,9 +9,64 @@ }, "processor": "atmega32u4", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "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}] + "LAYOUT_ortho_4x12": { + "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, "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}, + {"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": 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}, + + {"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": 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}, + + {"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": 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} + ] } } } diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c index a6429d87e8..37e8b3ab9b 100644 --- a/keyboards/vitamins_included/vitamins_included.c +++ b/keyboards/vitamins_included/vitamins_included.c @@ -1,4 +1,4 @@ -#include "vitamins_included.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/vitamins_included/vitamins_included.h b/keyboards/vitamins_included/vitamins_included.h deleted file mode 100644 index 21509d9743..0000000000 --- a/keyboards/vitamins_included/vitamins_included.h +++ /dev/null @@ -1,22 +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 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json index 736b7f5d70..77b94ae378 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/info.json @@ -24,22 +24,77 @@ "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - {"label":"ESC", "x":0, "y":0}, {"label":"PRTSC", "x":1, "y":0}, {"label":"F5", "x":2, "y":0}, {"label":"F11", "x":3, "y":0}, {"label":"MUTE", "x":4, "y":0}, - {"label":"NLCK", "x":0, "y":1.5}, {"label":"DEL", "x":1, "y":1.5}, {"label":"/", "x":2, "y":1.5}, {"label":"*", "x":3, "y":1.5}, {"label":"-", "x":4, "y":1.5}, - {"label":"HOME", "x":0, "y":2.5}, {"label":"7", "x":1, "y":2.5}, {"label":"8", "x":2, "y":2.5}, {"label":"9", "x":3, "y":2.5}, - {"label":"END", "x":0, "y":3.5}, {"label":"4", "x":1, "y":3.5}, {"label":"5", "x":2, "y":3.5}, {"label":"6", "x":3, "y":3.5}, {"label":"+", "x":4, "y":2.5, "h":2}, - {"label":"ANY", "x":0, "y":4.5}, {"label":"1", "x":1, "y":4.5}, {"label":"2", "x":2, "y":4.5}, {"label":"3", "x":3, "y":4.5}, - {"label":"FN", "x":0, "y":5.5}, {"label":"0", "x":1, "y":5.5, "w":2}, {"label":".", "x":3, "y":5.5}, {"label":"ENTER", "x":4, "y":4.5, "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": [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": [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": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5}, + {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2}, + {"matrix": [5, 3], "x": 3, "y": 5.5}, + {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2} ] }, "LAYOUT_numpad_6x5_encoder": { "layout": [ - {"label":"ESC", "x":0, "y":0.75}, {"label":"PRTSC", "x":1, "y":0.75}, {"label":"F5", "x":2, "y":0.75}, {"label":"F11", "x":3, "y":0.75}, {"label":"MUTE", "x":4, "y":0.75}, {"label":"VOLD", "x":3.75, "y":0, "w":0.75, "h":0.75}, {"label":"VOLU", "x":4.5, "y":0, "w":0.75, "h":0.75}, - {"label":"NLCK", "x":0, "y":2.25}, {"label":"DEL", "x":1, "y":2.25}, {"label":"/", "x":2, "y":2.25}, {"label":"*", "x":3, "y":2.25}, {"label":"-", "x":4, "y":2.25}, - {"label":"HOME", "x":0, "y":3.25}, {"label":"7", "x":1, "y":3.25}, {"label":"8", "x":2, "y":3.25}, {"label":"9", "x":3, "y":3.25}, - {"label":"END", "x":0, "y":4.25}, {"label":"4", "x":1, "y":4.25}, {"label":"5", "x":2, "y":4.25}, {"label":"6", "x":3, "y":4.25}, {"label":"+", "x":4, "y":3.25, "h":2}, - {"label":"ANY", "x":0, "y":5.25}, {"label":"1", "x":1, "y":5.25}, {"label":"2", "x":2, "y":5.25}, {"label":"3", "x":3, "y":5.25}, - {"label":"FN", "x":0, "y":6.25}, {"label":"0", "x":1, "y":6.25, "w":2}, {"label":".", "x":3, "y":6.25}, {"label":"ENTER", "x":4, "y":5.25, "h":2} + {"matrix": [0, 0], "x": 0, "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.75}, + {"matrix": [0, 4], "x": 4, "y": 0.75}, + + {"matrix": [3, 4], "x": 3.75, "y": 0, "w": 0.75, "h": 0.75}, + {"matrix": [5, 4], "x": 4.5, "y": 0, "w": 0.75, "h": 0.75}, + + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 2.25}, + {"matrix": [1, 4], "x": 4, "y": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 3.25}, + + {"matrix": [3, 0], "x": 0, "y": 4.25}, + {"matrix": [3, 1], "x": 1, "y": 4.25}, + {"matrix": [3, 2], "x": 2, "y": 4.25}, + {"matrix": [3, 3], "x": 3, "y": 4.25}, + {"matrix": [2, 4], "x": 4, "y": 3.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 5.25}, + {"matrix": [4, 1], "x": 1, "y": 5.25}, + {"matrix": [4, 2], "x": 2, "y": 5.25}, + {"matrix": [4, 3], "x": 3, "y": 5.25}, + + {"matrix": [5, 0], "x": 0, "y": 6.25}, + {"matrix": [5, 1], "x": 1, "y": 6.25, "w": 2}, + {"matrix": [5, 3], "x": 3, "y": 6.25}, + {"matrix": [4, 4], "x": 4, "y": 5.25, "h": 2} ] } } diff --git a/keyboards/wekey/we27/we27.c b/keyboards/wekey/we27/we27.c index 2765e6f3bd..9f2b85d95f 100644 --- a/keyboards/wekey/we27/we27.c +++ b/keyboards/wekey/we27/we27.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "we27.h" +#include "quantum.h" #include "encoder_actions.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/wekey/we27/we27.h b/keyboards/wekey/we27/we27.h deleted file mode 100644 index 5542a52d2f..0000000000 --- a/keyboards/wekey/we27/we27.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2021 @wekey - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K24, \ - K40, K41, K42, K43, \ - K50, K51, K53, K44 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, ___ }, \ - { K40, K41, K42, K43, K44 }, \ - { K50, K51, ___, K53, ___ } \ -} - -#define LAYOUT_numpad_6x5_encoder( \ - K00, K01, K02, K03, K04, K34, K54, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K24, \ - K40, K41, K42, K43, \ - K50, K51, K53, K44 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 }, \ - { K50, K51, ___, K53, K54 } \ -} diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 3a0ae1d190..0f366baaba 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -21,57 +21,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "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}, + {"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":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": [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":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": [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/woodkeys/meira/meira.h b/keyboards/woodkeys/meira/meira.h index 55fccf5de5..46d9791e48 100644 --- a/keyboards/woodkeys/meira/meira.h +++ b/keyboards/woodkeys/meira/meira.h @@ -19,19 +19,3 @@ #include "issi.h" void reset_keyboard_kb(void); - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_ortho_4x12( \ - 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 \ -) \ -{ \ - { 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 } \ -} diff --git a/keyboards/x16/info.json b/keyboards/x16/info.json index d1a900d7f5..7a7c8ae022 100644 --- a/keyboards/x16/info.json +++ b/keyboards/x16/info.json @@ -22,25 +22,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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} ] } } diff --git a/keyboards/x16/x16.h b/keyboards/x16/x16.h deleted file mode 100644 index cf8bab4730..0000000000 --- a/keyboards/x16/x16.h +++ /dev/null @@ -1,39 +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" - -/* 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_ortho_4x4( \ - K01, K02, K03, K04, \ - K11, K12, K13, K14, \ - K21, K22, K23, K24, \ - K31, K32, K33, K34 \ -) \ -{ \ - { K01, K02, K03, K04 }, \ - { K11, K12, K13, K14 }, \ - { K21, K22, K23, K24 }, \ - { K31, K32, K33, K34 } \ -} diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json index b99fe9e948..f78ff3c7a3 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/info.json @@ -21,88 +21,91 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_5x15" + }, "layouts": { "LAYOUT_ortho_5x15": { "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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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}, + {"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}, - {"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} + {"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/xiudi/xd75/xd75.h b/keyboards/xiudi/xd75/xd75.h index 33f2ec92a5..f2c1844bef 100644 --- a/keyboards/xiudi/xd75/xd75.h +++ b/keyboards/xiudi/xd75/xd75.h @@ -29,27 +29,3 @@ void gp100_led_on(void); void gp103_led_init(void); void gp103_led_off(void); void gp103_led_on(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_ortho_5x15( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT LAYOUT_ortho_5x15 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 7f2ddf4680..1c4651c94c 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -26,99 +26,102 @@ "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["ortho_6x4", "numpad_6x4"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x6" + }, "layouts": { "LAYOUT_ortho_6x4": { "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": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, + {"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}, - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, + {"matrix": [0, 2], "x": 0, "y": 2.25}, + {"matrix": [1, 2], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [3, 2], "x": 3, "y": 2.25}, - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, + {"matrix": [0, 3], "x": 0, "y": 3.25}, + {"matrix": [1, 3], "x": 1, "y": 3.25}, + {"matrix": [2, 3], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, + {"matrix": [0, 4], "x": 0, "y": 4.25}, + {"matrix": [1, 4], "x": 1, "y": 4.25}, + {"matrix": [2, 4], "x": 2, "y": 4.25}, + {"matrix": [3, 4], "x": 3, "y": 4.25}, - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.25} + {"matrix": [0, 5], "x": 0, "y": 5.25}, + {"matrix": [1, 5], "x": 1, "y": 5.25}, + {"matrix": [2, 5], "x": 2, "y": 5.25}, + {"matrix": [3, 5], "x": 3, "y": 5.25} ] }, "LAYOUT_ortho_4x6": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [0, 4], "x": 1, "y": 0}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0}, + {"matrix": [0, 0], "x": 5.25, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5.25, "y": 1}, + {"matrix": [1, 5], "x": 0, "y": 1}, + {"matrix": [1, 4], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1}, + {"matrix": [1, 0], "x": 5.25, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 0, "y": 2}, + {"matrix": [2, 4], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2}, + {"matrix": [2, 0], "x": 5.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.25, "y": 3} + {"matrix": [3, 5], "x": 0, "y": 3}, + {"matrix": [3, 4], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3}, + {"matrix": [3, 0], "x": 5.25, "y": 3} ] }, "LAYOUT_numpad_6x4": { "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": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, + {"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}, - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, + {"matrix": [0, 2], "x": 0, "y": 2.25}, + {"matrix": [1, 2], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, + {"matrix": [0, 3], "x": 0, "y": 3.25}, + {"matrix": [1, 3], "x": 1, "y": 3.25}, + {"matrix": [2, 3], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2}, - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, + {"matrix": [0, 4], "x": 0, "y": 4.25}, + {"matrix": [1, 4], "x": 1, "y": 4.25}, + {"matrix": [2, 4], "x": 2, "y": 4.25}, - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "h": 2} + {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [2, 5], "x": 2, "y": 5.25}, + {"matrix": [3, 4], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/ymdk/np21/np21.h b/keyboards/ymdk/np21/np21.h deleted file mode 100644 index 7434cf016d..0000000000 --- a/keyboards/ymdk/np21/np21.h +++ /dev/null @@ -1,64 +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_ortho_6x4( \ - k00, k10, k20, k30, \ - k01, k11, k21, k31, \ - k02, k12, k22, k32, \ - k03, k13, k23, k33, \ - k04, k14, k24, k34, \ - k05, k15, k25, k35 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 } \ -} - -#define LAYOUT_ortho_4x6( \ - k05, k04, k03, k02, k01, k00, \ - k15, k14, k13, k12, k11, k10, \ - k25, k24, k23, k22, k21, k20, \ - k35, k34, k33, k32, k31, k30 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 } \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k10, k20, k30, \ - k01, k11, k21, k31, \ - k02, k12, k22, \ - k03, k13, k23, k32, \ - k04, k14, k24, \ - k05, k25, k34 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, XXX }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, XXX, k34, XXX } \ -} - -#define LAYOUT LAYOUT_ortho_4x6 diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 98d881cd4d..927496efa6 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -26,129 +26,129 @@ "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 3.25}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - {"x": 3, "y": 4.25}, - - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 5.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": [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": [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.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.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": [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} ] }, "LAYOUT_ortho_4x6_right": { "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, "w": 1.5}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1, "w": 1.5}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2, "w": 1.5}, - - {"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": 1.5} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [4, 0], "x": 1, "y": 0}, + {"matrix": [3, 0], "x": 2, "y": 0}, + {"matrix": [2, 0], "x": 3, "y": 0}, + {"matrix": [1, 0], "x": 4, "y": 0}, + {"matrix": [0, 0], "x": 5, "y": 0, "w": 1.5}, + + {"matrix": [5, 1], "x": 0, "y": 1}, + {"matrix": [4, 1], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1}, + {"matrix": [0, 1], "x": 5, "y": 1, "w": 1.5}, + + {"matrix": [5, 2], "x": 0, "y": 2}, + {"matrix": [4, 2], "x": 1, "y": 2}, + {"matrix": [3, 2], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [1, 2], "x": 4, "y": 2}, + {"matrix": [0, 2], "x": 5, "y": 2, "w": 1.5}, + + {"matrix": [5, 3], "x": 0, "y": 3}, + {"matrix": [4, 3], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [1, 3], "x": 4, "y": 3}, + {"matrix": [0, 3], "x": 5, "y": 3, "w": 1.5} ] }, "LAYOUT_ortho_4x6_left": { "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": 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": 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": 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} + {"matrix": [0, 3], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [1, 3], "x": 1.5, "y": 0}, + {"matrix": [2, 3], "x": 2.5, "y": 0}, + {"matrix": [3, 3], "x": 3.5, "y": 0}, + {"matrix": [4, 3], "x": 4.5, "y": 0}, + {"matrix": [5, 3], "x": 5.5, "y": 0}, + + {"matrix": [0, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [2, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 2], "x": 3.5, "y": 1}, + {"matrix": [4, 2], "x": 4.5, "y": 1}, + {"matrix": [5, 2], "x": 5.5, "y": 1}, + + {"matrix": [0, 1], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [3, 1], "x": 3.5, "y": 2}, + {"matrix": [4, 1], "x": 4.5, "y": 2}, + {"matrix": [5, 1], "x": 5.5, "y": 2}, + + {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 3}, + {"matrix": [2, 0], "x": 2.5, "y": 3}, + {"matrix": [3, 0], "x": 3.5, "y": 3}, + {"matrix": [4, 0], "x": 4.5, "y": 3}, + {"matrix": [5, 0], "x": 5.5, "y": 3} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, - - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.25}, - {"x": 3, "y": 2.25, "h": 2}, - - {"x": 0, "y": 4.25}, - {"x": 1, "y": 4.25}, - {"x": 2, "y": 4.25}, - - {"x": 0, "y": 5.25, "w": 2}, - {"x": 2, "y": 5.25}, - {"x": 3, "y": 4.25, "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": [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": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "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": 2.25, "h": 2}, + + {"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": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h deleted file mode 100644 index 7615cf2bed..0000000000 --- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2017 Luiz Ribeiro - * Copyright 2021 Simon Arlott - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_6x4( \ - k00, k10, k20, k30, \ - k01, k11, k21, k31, \ - k02, k12, k22, k32, \ - k03, k13, k23, k33, \ - k04, k14, k24, k34, \ - k05, k15, k25, k35 \ -) { \ - { k00, k10, k20, k30 }, \ - { k01, k11, k21, k31 }, \ - { k02, k12, k22, k32 }, \ - { k03, k13, k23, k33 }, \ - { k04, k14, k24, k34 }, \ - { k05, k15, k25, k35 } \ -} - -#define LAYOUT_ortho_4x6_right( \ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35 \ -) { \ - { k05, k15, k25, k35 }, \ - { k04, k14, k24, k34 }, \ - { k03, k13, k23, k33 }, \ - { k02, k12, k22, k32 }, \ - { k01, k11, k21, k31 }, \ - { k00, k10, k20, k30 } \ -} - -#define LAYOUT_ortho_4x6_left( \ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35 \ -) { \ - { k30, k20, k10, k00 }, \ - { k31, k21, k11, k01 }, \ - { k32, k22, k12, k02 }, \ - { k33, k23, k13, k03 }, \ - { k34, k24, k14, k04 }, \ - { k35, k25, k15, k05 } \ -} - -#define LAYOUT_numpad_6x4( \ - k00, k10, k20, k30, \ - k01, k11, k21, k31, \ - k02, k12, k22, \ - k03, k13, k23, k33, \ - k04, k14, k24, \ - k15, k25, k35 \ -) { \ - { k00, k10, k20, k30 }, \ - { k01, k11, k21, k31 }, \ - { k02, k12, k22, XXX }, \ - { k03, k13, k23, k33 }, \ - { k04, k14, k24, XXX }, \ - { XXX, k15, k25, k35 } \ -} diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index 11e85c1e2b..af1906a5fc 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -23,35 +23,35 @@ "layouts": { "LAYOUT_ortho_6x4": { "layout": [ - {"label":"F1", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"F3", "x":2, "y":0}, - {"label":"F4", "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}, - {"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}, + {"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}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, - {"label":"=", "x":3, "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}, + {"matrix": [2, 3], "x": 3, "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":3.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.25}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, - {"label":"Space", "x":3, "y":4.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}, - {"label":"Fn", "x":0, "y":5.25}, - {"label":"0", "x":1, "y":5.25}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":5.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} ] } } diff --git a/keyboards/ymdk/ymd21/v2/v2.h b/keyboards/ymdk/ymd21/v2/v2.h deleted file mode 100644 index a234b60508..0000000000 --- a/keyboards/ymdk/ymd21/v2/v2.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2022 QMK / James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 │ - * └───┴───┴───┴───┘ - * ┌───┬───┬───┬───┐ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ ┌───┐ - * │20 │21 │22 │23 │ │ │ - * ├───┼───┼───┼───┤ │?? │ 2u Plus - * │30 │31 │32 │33 │ │ │ - * ├───┼───┼───┼───┤ ├───┤ - * │40 │41 │42 │43 │ │ │ - * ├───┼───┼───┼───┤ │?? │ 2u Enter - * │50 │51 │52 │53 │ │ │ - * └───┴───┴───┴───┘ └───┘ - * ┌───────┐ - * │?? │ 2u 0 - * └───────┘ - */ - - -#define LAYOUT_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 }, \ -} diff --git a/keyboards/ymdk/ymd40/air40/air40.c b/keyboards/ymdk/ymd40/air40/air40.c index 50e7ad9106..633b4943ff 100644 --- a/keyboards/ymdk/ymd40/air40/air40.c +++ b/keyboards/ymdk/ymd40/air40/air40.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "air40.h" +#include "quantum.h" #if defined(RGB_MATRIX_ENABLE) led_config_t g_led_config = { diff --git a/keyboards/ymdk/ymd40/air40/air40.h b/keyboards/ymdk/ymd40/air40/air40.h deleted file mode 100644 index d28f6d591a..0000000000 --- a/keyboards/ymdk/ymd40/air40/air40.h +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 \ -) { \ - { 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 }, \ -} - -#define LAYOUT_ortho_4x12_2x2u( \ - 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, 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, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uR( \ - 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, 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, K34, K35, KC_NO, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uL( \ - 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, K36, 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, K34, KC_NO, K36, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uC( \ - 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, 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, K34, K35, KC_NO, K37, K38, K39, K3A, K3B }, \ -} diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index b334b81717..273c5e4a7a 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -18,272 +18,272 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3}, - {"label":"K36 (B1,F6)", "x":6, "y":3}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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} ] }, "LAYOUT_ortho_4x12_2x2u": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2}, - {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "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} ] }, "LAYOUT_ortho_4x12_1x2uR": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3}, - {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, 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} ] }, "LAYOUT_ortho_4x12_1x2uL": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2}, - {"label":"K36 (B1,F6)", "x":6, "y":3}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "w": 2}, + {"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} ] }, "LAYOUT_ortho_4x12_1x2uC": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3, "w":2}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "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} ] } diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 37c51da1a5..7d28fcacaf 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -23,272 +23,272 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3}, - {"label":"K36 (B1,F6)", "x":6, "y":3}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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} ] }, "LAYOUT_ortho_4x12_2x2u": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2}, - {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "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} ] }, "LAYOUT_ortho_4x12_1x2uR": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3}, - {"label":"K37 (B1,F7)", "x":6, "y":3, "w":2}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, 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} ] }, "LAYOUT_ortho_4x12_1x2uL": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3, "w":2}, - {"label":"K36 (B1,F6)", "x":6, "y":3}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "w": 2}, + {"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} ] }, "LAYOUT_ortho_4x12_1x2uC": { "layout": [ - {"label":"K00 (D0,F1)", "x":0, "y":0}, - {"label":"K01 (D0,F0)", "x":1, "y":0}, - {"label":"K02 (D0,B0)", "x":2, "y":0}, - {"label":"K03 (D0,C7)", "x":3, "y":0}, - {"label":"K04 (D0,F4)", "x":4, "y":0}, - {"label":"K05 (D0,F5)", "x":5, "y":0}, - {"label":"K06 (D0,F6)", "x":6, "y":0}, - {"label":"K07 (D0,F7)", "x":7, "y":0}, - {"label":"K08 (D0,D4)", "x":8, "y":0}, - {"label":"K09 (D0,D6)", "x":9, "y":0}, - {"label":"K0A (D0,B4)", "x":10, "y":0}, - {"label":"K0B (D0,D7)", "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": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"K10 (B3,F1)", "x":0, "y":1}, - {"label":"K11 (B3,F0)", "x":1, "y":1}, - {"label":"K12 (B3,B0)", "x":2, "y":1}, - {"label":"K13 (B3,C7)", "x":3, "y":1}, - {"label":"K14 (B3,F4)", "x":4, "y":1}, - {"label":"K15 (B3,F5)", "x":5, "y":1}, - {"label":"K16 (B3,F6)", "x":6, "y":1}, - {"label":"K17 (B3,F7)", "x":7, "y":1}, - {"label":"K18 (B3,D4)", "x":8, "y":1}, - {"label":"K19 (B3,D6)", "x":9, "y":1}, - {"label":"K1A (B3,B4)", "x":10, "y":1}, - {"label":"K1B (B3,D7)", "x":11, "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}, - {"label":"K20 (B2,F1)", "x":0, "y":2}, - {"label":"K21 (B2,F0)", "x":1, "y":2}, - {"label":"K22 (B2,B0)", "x":2, "y":2}, - {"label":"K23 (B2,C7)", "x":3, "y":2}, - {"label":"K24 (B2,F4)", "x":4, "y":2}, - {"label":"K25 (B2,F5)", "x":5, "y":2}, - {"label":"K26 (B2,F6)", "x":6, "y":2}, - {"label":"K27 (B2,F7)", "x":7, "y":2}, - {"label":"K28 (B2,D4)", "x":8, "y":2}, - {"label":"K29 (B2,D6)", "x":9, "y":2}, - {"label":"K2A (B2,B4)", "x":10, "y":2}, - {"label":"K2B (B2,D7)", "x":11, "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}, - {"label":"K30 (B1,F1)", "x":0, "y":3}, - {"label":"K31 (B1,F0)", "x":1, "y":3}, - {"label":"K32 (B1,B0)", "x":2, "y":3}, - {"label":"K33 (B1,C7)", "x":3, "y":3}, - {"label":"K34 (B1,F4)", "x":4, "y":3}, - {"label":"K35 (B1,F5)", "x":5, "y":3, "w":2}, - {"label":"K37 (B1,F7)", "x":7, "y":3}, - {"label":"K38 (B1,D4)", "x":8, "y":3}, - {"label":"K39 (B1,D6)", "x":9, "y":3}, - {"label":"K3A (B1,B4)", "x":10, "y":3}, - {"label":"K3B (B1,D7)", "x":11, "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, "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} ] } diff --git a/keyboards/ymdk/ymd40/v2/v2.h b/keyboards/ymdk/ymd40/v2/v2.h deleted file mode 100644 index d28f6d591a..0000000000 --- a/keyboards/ymdk/ymd40/v2/v2.h +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright 2021 James Young (@noroadsleft) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 \ -) { \ - { 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 }, \ -} - -#define LAYOUT_ortho_4x12_2x2u( \ - 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, 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, K34, KC_NO, KC_NO, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uR( \ - 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, 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, K34, K35, KC_NO, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uL( \ - 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, K36, 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, K34, KC_NO, K36, K37, K38, K39, K3A, K3B }, \ -} - -#define LAYOUT_ortho_4x12_1x2uC( \ - 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, 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, K34, K35, KC_NO, K37, K38, K39, K3A, K3B }, \ -} diff --git a/keyboards/yncognito/batpad/batpad.c b/keyboards/yncognito/batpad/batpad.c index caafd57278..d5eef4246d 100644 --- a/keyboards/yncognito/batpad/batpad.c +++ b/keyboards/yncognito/batpad/batpad.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 "batpad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yncognito/batpad/batpad.h b/keyboards/yncognito/batpad/batpad.h deleted file mode 100644 index e3391881bc..0000000000 --- a/keyboards/yncognito/batpad/batpad.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020 Yncognito - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_2x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ -} diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json index fa1efd40eb..362da55e6f 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/info.json @@ -18,14 +18,15 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"label":"K00 (F4,F1)", "x":0, "y":0}, - {"label":"K01 (F4,F0)", "x":1, "y":0}, - {"label":"K02 (F4,D5)", "x":2, "y":0}, - {"label":"K03 (F4,D3)", "x":3, "y":0}, - {"label":"K10 (C7,F1)", "x":0, "y":1}, - {"label":"K11 (C7,F0)", "x":1, "y":1}, - {"label":"K12 (C7,D5)", "x":2, "y":1}, - {"label":"K13 (C7,D3)", "x":3, "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, 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} ] } } diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index 9bee3a5016..e327919dcb 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -16,12 +16,118 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { - "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":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3}, {"label":"K305", "x":5.75, "y":3}, {"label":"K306", "x":6.75, "y":3}, {"label":"K307", "x":7.75, "y":3}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "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}, + + {"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}, + {"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": [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": [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": [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": [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} + ] }, "LAYOUT_planck_mit": { - "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":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3, "w":1.25}, {"label":"K305", "x":6, "y":3, "w":1.5}, {"label":"K307", "x":7.5, "y":3, "w":1.25}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "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}, + + {"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}, + {"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": [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": [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": [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, "w": 1.25}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 1.25}, + {"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/zlant/zlant.h b/keyboards/zlant/zlant.h deleted file mode 100755 index 86cd9fef85..0000000000 --- a/keyboards/zlant/zlant.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x12( \ - 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 \ -) { \ - { 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 } \ -} - -#define LAYOUT_planck_mit( \ - 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, 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, k34, k35, k35, k37, k38, k39, k3A, k3B } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index 53e44b3f3e..ba23913c88 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -33,7 +33,59 @@ "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "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": [5, 5], "x": 6, "y": 1}, + {"matrix": [5, 4], "x": 7, "y": 1}, + {"matrix": [5, 3], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 0], "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": [6, 5], "x": 6, "y": 2}, + {"matrix": [6, 4], "x": 7, "y": 2}, + {"matrix": [6, 3], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 0], "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": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.c b/keyboards/zvecr/split_blackpill/split_blackpill.c index 141f76e7b3..6c7db0580e 100644 --- a/keyboards/zvecr/split_blackpill/split_blackpill.c +++ b/keyboards/zvecr/split_blackpill/split_blackpill.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 "split_blackpill.h" +#include "quantum.h" void keyboard_pre_init_kb(void){ // Workaround for reversible pcb/mcu diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.h b/keyboards/zvecr/split_blackpill/split_blackpill.h deleted file mode 100644 index 27504492ef..0000000000 --- a/keyboards/zvecr/split_blackpill/split_blackpill.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index 2939e30996..e0052a33d4 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -36,7 +36,59 @@ "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { - "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}] + "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, 5], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 7, "y": 0}, + {"matrix": [4, 3], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 0], "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": [5, 5], "x": 6, "y": 1}, + {"matrix": [5, 4], "x": 7, "y": 1}, + {"matrix": [5, 3], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 0], "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": [6, 5], "x": 6, "y": 2}, + {"matrix": [6, 4], "x": 7, "y": 2}, + {"matrix": [6, 3], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 0], "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": [7, 5], "x": 6, "y": 3}, + {"matrix": [7, 4], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c index 3c3d1ab777..2716b78080 100644 --- a/keyboards/zvecr/zv48/zv48.c +++ b/keyboards/zvecr/zv48/zv48.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 "zv48.h" +#include "quantum.h" void keyboard_pre_init_kb(void){ // Workaround for reversible pcb/mcu diff --git a/keyboards/zvecr/zv48/zv48.h b/keyboards/zvecr/zv48/zv48.h deleted file mode 100644 index 27504492ef..0000000000 --- a/keyboards/zvecr/zv48/zv48.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_ortho_4x12( \ - 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 } \ - } -- cgit v1.3.1 From e40b6ca3b05e50253c3f6bbc08673e1720ddd9be Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Apr 2023 13:09:53 +1100 Subject: Move split layouts to data driven (#20290) --- keyboards/alt34/rev1/info.json | 68 ++-- keyboards/alt34/rev1/rev1.h | 41 --- keyboards/bastardkb/dilemma/3x5_2/3x5_2.h | 37 -- keyboards/bastardkb/dilemma/3x5_2/info.json | 75 ++-- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/3x5_3.h | 39 -- keyboards/bastardkb/dilemma/3x5_3/info.json | 79 ++-- keyboards/bastardkb/dilemma/dilemma.h | 10 - keyboards/bastardkb/scylla/info.json | 127 ++++--- keyboards/bastardkb/scylla/scylla.c | 2 +- keyboards/bastardkb/scylla/scylla.h | 44 --- keyboards/bastardkb/skeletyl/info.json | 79 ++-- keyboards/bastardkb/skeletyl/skeletyl.c | 2 +- keyboards/bastardkb/skeletyl/skeletyl.h | 40 -- keyboards/bastardkb/tbk/info.json | 116 +++--- keyboards/bastardkb/tbk/tbk.h | 43 --- keyboards/bastardkb/tbkmini/info.json | 91 ++--- keyboards/bastardkb/tbkmini/tbkmini.c | 2 +- keyboards/bastardkb/tbkmini/tbkmini.h | 40 -- keyboards/bluebell/swoop/info.json | 79 ++-- keyboards/bluebell/swoop/swoop.h | 36 -- keyboards/centromere/centromere.h | 36 -- keyboards/centromere/info.json | 173 +++++---- keyboards/chocv/chocv.h | 43 --- keyboards/chocv/info.json | 72 ++-- keyboards/crkbd/info.json | 104 +----- keyboards/crkbd/r2g/info.json | 107 +++++- keyboards/crkbd/r2g/r2g.c | 2 +- keyboards/crkbd/r2g/r2g.h | 59 --- keyboards/crkbd/rev1/info.json | 107 +++++- keyboards/crkbd/rev1/rev1.c | 2 +- keyboards/crkbd/rev1/rev1.h | 59 --- keyboards/dailycraft/wings42/rev1/info.json | 88 ++--- keyboards/dailycraft/wings42/rev1/rev1.h | 44 --- keyboards/dailycraft/wings42/rev2/info.json | 96 ++--- keyboards/dailycraft/wings42/rev2/rev2.h | 46 --- keyboards/dumbo/dumbo.h | 44 --- keyboards/dumbo/info.json | 88 ++--- keyboards/eek/silk_down/info.json | 51 +++ keyboards/eek/silk_down/silk_down.h | 39 -- keyboards/eek/silk_up/info.json | 51 +++ keyboards/eek/silk_up/silk_up.h | 39 -- keyboards/ferris/0_1/0_1.h | 44 --- keyboards/ferris/0_1/info.json | 71 ++-- keyboards/ferris/0_2/0_2.h | 44 --- keyboards/ferris/0_2/info.json | 71 ++-- keyboards/gboards/gergoplex/gergoplex.h | 18 - keyboards/gboards/gergoplex/info.json | 76 ++-- keyboards/gummykey/gummykey.h | 28 -- keyboards/gummykey/info.json | 130 ++++--- keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c | 2 +- keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h | 38 -- .../handwired/dactyl_manuform/3x5_3/info.json | 72 ++-- keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h | 47 --- .../handwired/dactyl_manuform/5x6_6/info.json | 128 +++---- keyboards/handwired/elrgo_s/elrgo_s.h | 38 -- keyboards/handwired/elrgo_s/info.json | 101 ++--- keyboards/handwired/pteron38/info.json | 76 ++-- keyboards/handwired/pteron38/pteron38.h | 31 -- keyboards/ibnuda/squiggle/rev1/info.json | 407 ++++++++++++++------- keyboards/ibnuda/squiggle/rev1/rev1.h | 117 ------ keyboards/ingrained/info.json | 337 +++++------------ keyboards/ingrained/ingrained.h | 47 --- keyboards/kakunpc/suihankey/split/alpha/alpha.h | 45 --- keyboards/kakunpc/suihankey/split/alpha/info.json | 54 ++- keyboards/kakunpc/suihankey/split/info.json | 51 +-- keyboards/kakunpc/suihankey/split/rev1/info.json | 54 ++- keyboards/kakunpc/suihankey/split/rev1/rev1.h | 47 --- keyboards/maple_computing/minidox/rev1/info.json | 49 ++- keyboards/maple_computing/minidox/rev1/rev1.h | 25 -- keyboards/obosob/arch_36/arch_36.h | 43 --- keyboards/obosob/arch_36/info.json | 76 ++-- keyboards/pierce/info.json | 75 ++-- keyboards/pierce/pierce.h | 31 -- keyboards/pinky/3/3.h | 22 -- keyboards/pinky/3/info.json | 107 +++--- keyboards/pinky/4/4.h | 25 -- keyboards/pinky/4/info.json | 136 +++---- keyboards/pisces/info.json | 46 ++- keyboards/pisces/pisces.c | 2 +- keyboards/pisces/pisces.h | 41 --- keyboards/pteron36/info.json | 156 ++++---- keyboards/pteron36/pteron36.c | 2 +- keyboards/pteron36/pteron36.h | 59 --- keyboards/splitkb/kyria/rev1/info.json | 173 ++++++--- keyboards/splitkb/kyria/rev1/rev1.c | 2 +- keyboards/splitkb/kyria/rev1/rev1.h | 67 ---- keyboards/splitkb/kyria/rev2/info.json | 171 ++++++--- keyboards/splitkb/kyria/rev2/rev2.c | 2 +- keyboards/splitkb/kyria/rev2/rev2.h | 67 ---- keyboards/torn/info.json | 95 ++--- keyboards/torn/torn.h | 16 - keyboards/yanghu/unicorne/info.json | 88 ++--- keyboards/yanghu/unicorne/unicorne.h | 25 -- keyboards/yoichiro/lunakey_mini/info.json | 96 ++--- keyboards/yoichiro/lunakey_mini/lunakey_mini.h | 44 --- keyboards/yoichiro/lunakey_pico/info.json | 96 ++--- keyboards/yoichiro/lunakey_pico/lunakey_pico.h | 23 -- 98 files changed, 2642 insertions(+), 3794 deletions(-) delete mode 100644 keyboards/alt34/rev1/rev1.h delete mode 100644 keyboards/bastardkb/dilemma/3x5_2/3x5_2.h delete mode 100644 keyboards/bastardkb/dilemma/3x5_3/3x5_3.h delete mode 100644 keyboards/bastardkb/scylla/scylla.h delete mode 100644 keyboards/bastardkb/skeletyl/skeletyl.h delete mode 100644 keyboards/bastardkb/tbk/tbk.h delete mode 100644 keyboards/bastardkb/tbkmini/tbkmini.h delete mode 100644 keyboards/bluebell/swoop/swoop.h delete mode 100644 keyboards/chocv/chocv.h delete mode 100644 keyboards/crkbd/r2g/r2g.h delete mode 100644 keyboards/crkbd/rev1/rev1.h delete mode 100644 keyboards/dailycraft/wings42/rev1/rev1.h delete mode 100644 keyboards/dailycraft/wings42/rev2/rev2.h delete mode 100644 keyboards/dumbo/dumbo.h create mode 100644 keyboards/eek/silk_down/info.json delete mode 100644 keyboards/eek/silk_down/silk_down.h create mode 100644 keyboards/eek/silk_up/info.json delete mode 100644 keyboards/eek/silk_up/silk_up.h delete mode 100644 keyboards/ferris/0_1/0_1.h delete mode 100644 keyboards/ferris/0_2/0_2.h delete mode 100644 keyboards/gummykey/gummykey.h delete mode 100644 keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h delete mode 100644 keyboards/handwired/elrgo_s/elrgo_s.h delete mode 100644 keyboards/handwired/pteron38/pteron38.h delete mode 100644 keyboards/ibnuda/squiggle/rev1/rev1.h delete mode 100644 keyboards/ingrained/ingrained.h delete mode 100644 keyboards/kakunpc/suihankey/split/alpha/alpha.h delete mode 100644 keyboards/kakunpc/suihankey/split/rev1/rev1.h delete mode 100644 keyboards/maple_computing/minidox/rev1/rev1.h delete mode 100644 keyboards/obosob/arch_36/arch_36.h delete mode 100644 keyboards/pierce/pierce.h delete mode 100644 keyboards/pinky/3/3.h delete mode 100644 keyboards/pinky/4/4.h delete mode 100644 keyboards/pisces/pisces.h delete mode 100644 keyboards/pteron36/pteron36.h delete mode 100644 keyboards/splitkb/kyria/rev1/rev1.h delete mode 100644 keyboards/splitkb/kyria/rev2/rev2.h delete mode 100644 keyboards/yoichiro/lunakey_mini/lunakey_mini.h delete mode 100644 keyboards/yoichiro/lunakey_pico/lunakey_pico.h (limited to 'keyboards/maple_computing') diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json index b49357c686..cf90324c14 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/info.json @@ -19,47 +19,47 @@ "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "x": 4, "y": 0.42}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"matrix": [4, 4], "x": 7, "y": 0.42}, + {"matrix": [4, 3], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0.31}, + {"matrix": [4, 0], "x": 11, "y": 0.93}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "x": 4, "y": 1.42}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"matrix": [5, 4], "x": 7, "y": 1.42}, + {"matrix": [5, 3], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1.31}, + {"matrix": [5, 0], "x": 11, "y": 1.93}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "x": 4, "y": 2.42}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"matrix": [6, 4], "x": 7, "y": 2.42}, + {"matrix": [6, 3], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2.31}, + {"matrix": [6, 0], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.45}, - {"x": 4.5, "y": 3.7}, + {"matrix": [3, 3], "x": 3.5, "y": 3.45}, + {"matrix": [3, 4], "x": 4.5, "y": 3.7}, - {"x": 6.5, "y": 3.7}, - {"x": 7.5, "y": 3.45} + {"matrix": [7, 4], "x": 6.5, "y": 3.7}, + {"matrix": [7, 3], "x": 7.5, "y": 3.45} ] } } diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h deleted file mode 100644 index 115415bb5f..0000000000 --- a/keyboards/alt34/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 Tommy Alatalo <@altosys> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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 - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_2, K3_3, K3_4, K3_5 )\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {____, ____, ____, K3_2, K3_3},\ - \ - {K0_9, K0_8, K0_7, K0_6, K0_5},\ - {K1_9, K1_8, K1_7, K1_6, K1_5},\ - {K2_9, K2_8, K2_7, K2_6, K2_5},\ - {____, ____, ____, K3_5, K3_4} \ -} diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h deleted file mode 100644 index 7deb32d917..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h +++ /dev/null @@ -1,37 +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 - -// clang-format off -#define LAYOUT_split_3x5_2( \ - 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, \ - k30, k32, k72, k70 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, KC_NO, k32, KC_NO, 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/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json index a758541149..bfd12e81d0 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/info.json @@ -7,40 +7,47 @@ "layouts": { "LAYOUT_split_3x5_2": { "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": "L32", "x": 5, "y": 3 }, - { "label": "R32", "x": 10, "y": 3 }, - { "label": "R30", "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": [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, 0], "x": 4, "y": 3}, + {"matrix": [3, 2], "x": 5, "y": 3}, + + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0b6c657fda..b9787f473e 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "3x5_3.h" +#include "quantum.h" /** * LEDs index. diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h deleted file mode 100644 index 566d5b81d2..0000000000 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.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 "dilemma.h" - -// clang-format off -#define LAYOUT_split_3x5_3( \ - 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, k30, k31, k71, k70, k72 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, k31, k32, KC_NO, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, k71, k72, KC_NO, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 3944f33a65..d9f0f15f2c 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -21,42 +21,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "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": "L32", "x": 4, "y": 3 }, - { "label": "L33", "x": 5, "y": 3 }, - { "label": "L34", "x": 6, "y": 3 }, - { "label": "R32", "x": 11, "y": 3 }, - { "label": "R33", "x": 10, "y": 3 }, - { "label": "R34", "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": [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, 0], "x": 5, "y": 3}, + {"matrix": [3, 1], "x": 6, "y": 3}, + + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3} ] } } diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h index f2c0784533..eefdd5babf 100644 --- a/keyboards/bastardkb/dilemma/dilemma.h +++ b/keyboards/bastardkb/dilemma/dilemma.h @@ -17,16 +17,6 @@ #pragma once -// clang-format off -#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled) -# include "3x5_2.h" -#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3) -# include "3x5_3.h" -#else -# error "Unsuported format" -#endif -// clang-format on - #include "quantum.h" #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index d8120f5070..682b2dc6db 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json @@ -6,64 +6,75 @@ "layouts": { "LAYOUT_split_4x6_5": { "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/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c index 504cb0a219..7aaa0fc1ce 100644 --- a/keyboards/bastardkb/scylla/scylla.c +++ b/keyboards/bastardkb/scylla/scylla.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "scylla.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/scylla/scylla.h b/keyboards/bastardkb/scylla/scylla.h deleted file mode 100644 index 4039ad3a94..0000000000 --- a/keyboards/bastardkb/scylla/scylla.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * 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 "quantum.h" - -// clang-format off -#define LAYOUT_split_4x6_5( \ - 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 }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index 90568ef1fd..b325ca7196 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -7,42 +7,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "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": "L33", "x": 4, "y": 3 }, - { "label": "L34", "x": 5, "y": 3 }, - { "label": "L31", "x": 6, "y": 3 }, - { "label": "R33", "x": 9, "y": 3 }, - { "label": "R34", "x": 10, "y": 3 }, - { "label": "R31", "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": [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, 3], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c index b72becbb25..6c65c3fa87 100644 --- a/keyboards/bastardkb/skeletyl/skeletyl.c +++ b/keyboards/bastardkb/skeletyl/skeletyl.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "skeletyl.h" +#include "quantum.h" /** * LEDs index. diff --git a/keyboards/bastardkb/skeletyl/skeletyl.h b/keyboards/bastardkb/skeletyl/skeletyl.h deleted file mode 100644 index 6d8073153f..0000000000 --- a/keyboards/bastardkb/skeletyl/skeletyl.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly DELAY - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x5_3( \ - 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, k73, 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, k73, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 247e86160f..43254b2804 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -18,64 +18,64 @@ "layouts": { "LAYOUT_split_4x6_5": { "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/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h deleted file mode 100644 index 5958097880..0000000000 --- a/keyboards/bastardkb/tbk/tbk.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright 2021 Quentin LEBASTARD - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_4x6_5( \ - 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 }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index 2056aeeb5d..94c357cd3b 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -7,48 +7,55 @@ "layouts": { "LAYOUT_split_3x6_3": { "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": "R33", "x": 9, "y": 3 }, - { "label": "R34", "x": 10, "y": 3 }, - { "label": "R31", "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": [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}, + + {"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": 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": [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, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 1], "x": 7, "y": 3}, + + {"matrix": [7, 1], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3} ] } } diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c index 34b42951a0..51baefb737 100644 --- a/keyboards/bastardkb/tbkmini/tbkmini.c +++ b/keyboards/bastardkb/tbkmini/tbkmini.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "tbkmini.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/tbkmini/tbkmini.h b/keyboards/bastardkb/tbkmini/tbkmini.h deleted file mode 100644 index f031c9fed2..0000000000 --- a/keyboards/bastardkb/tbkmini/tbkmini.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly DELAY - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x6_3( \ - 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, k74, 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, k74, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 7a0adea313..223aa9b9bc 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -34,42 +34,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label":"SW1", "x":0, "y":0.375}, - {"label":"SW2", "x":1, "y":0.125}, - {"label":"SW3", "x":2, "y":0}, - {"label":"SW4", "x":3, "y":0.125}, - {"label":"SW5", "x":4, "y":0.25}, - {"label":"SW19", "x":8, "y":0.25}, - {"label":"SW20", "x":9, "y":0.125}, - {"label":"SW21", "x":10, "y":0}, - {"label":"SW22", "x":11, "y":0.125}, - {"label":"SW23", "x":12, "y":0.375}, - {"label":"SW6", "x":0, "y":1.375}, - {"label":"SW7", "x":1, "y":1.125}, - {"label":"SW8", "x":2, "y":1}, - {"label":"SW9", "x":3, "y":1.125}, - {"label":"SW10", "x":4, "y":1.25}, - {"label":"SW24", "x":8, "y":1.25}, - {"label":"SW25", "x":9, "y":1.125}, - {"label":"SW26", "x":10, "y":1}, - {"label":"SW27", "x":11, "y":1.125}, - {"label":"SW28", "x":12, "y":1.375}, - {"label":"SW11", "x":0, "y":2.375}, - {"label":"SW12", "x":1, "y":2.125}, - {"label":"SW13", "x":2, "y":2}, - {"label":"SW14", "x":3, "y":2.125}, - {"label":"SW15", "x":4, "y":2.25}, - {"label":"SW29", "x":8, "y":2.25}, - {"label":"SW30", "x":9, "y":2.125}, - {"label":"SW31", "x":10, "y":2}, - {"label":"SW32", "x":11, "y":2.125}, - {"label":"SW33", "x":12, "y":2.375}, - {"label":"SW16", "x":2.875, "y":3.25}, - {"label":"SW17", "x":4, "y":3.375}, - {"label":"SW28", "x":5.125, "y":3.625}, - {"label":"SW34", "x":6.875, "y":3.625}, - {"label":"SW35", "x":8, "y":3.375}, - {"label":"SW36", "x":9.125, "y":3.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}, + + {"matrix": [4, 4], "x": 8, "y": 0.25}, + {"matrix": [4, 3], "x": 9, "y": 0.125}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0.125}, + {"matrix": [4, 0], "x": 12, "y": 0.375}, + + {"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}, + + {"matrix": [5, 4], "x": 8, "y": 1.25}, + {"matrix": [5, 3], "x": 9, "y": 1.125}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1.125}, + {"matrix": [5, 0], "x": 12, "y": 1.375}, + + {"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}, + + {"matrix": [6, 4], "x": 8, "y": 2.25}, + {"matrix": [6, 3], "x": 9, "y": 2.125}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2.125}, + {"matrix": [6, 0], "x": 12, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.875, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3.375}, + {"matrix": [3, 4], "x": 5.125, "y": 3.625}, + + {"matrix": [7, 4], "x": 6.875, "y": 3.625}, + {"matrix": [7, 3], "x": 8, "y": 3.375}, + {"matrix": [7, 2], "x": 9.125, "y": 3.25} ] } } diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h deleted file mode 100644 index 4160f3af8a..0000000000 --- a/keyboards/bluebell/swoop/swoop.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 James White - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_split_3x5_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L30, L31, L32 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 } \ - } diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h index bf13aa7b00..078cdca07f 100644 --- a/keyboards/centromere/centromere.h +++ b/keyboards/centromere/centromere.h @@ -27,39 +27,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 - -// For readability -#define ___ KC_NO - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_split_3x6_3( \ - k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \ - k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\ - k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\ - 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 }, \ - { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \ - { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ } \ - } - -#define LAYOUT_split_3x5_3( \ - 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 }, \ - { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ - } - -#define LAYOUT LAYOUT_split_3x6_3 diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json index cd1c07c67c..5f9b57d97a 100644 --- a/keyboards/centromere/info.json +++ b/keyboards/centromere/info.json @@ -11,91 +11,108 @@ "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3" "split_3x6_3"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_3" + }, "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - {"label":"Tab", "x":0, "y":0.25}, - {"label":"Q", "x":1, "y":0.25}, - {"label":"W", "x":2, "y":0.125}, - {"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.125}, - {"label":"P", "x":12, "y":0.25}, - {"label":"Backspace", "x":13, "y":0.25}, - {"label":"LCtrl", "x":0, "y":1.25}, - {"label":"A", "x":1, "y":1.25}, - {"label":"S", "x":2, "y":1.125}, - {"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.125}, - {"label":";", "x":12, "y":1.25}, - {"label":"'", "x":13, "y":1.25}, - {"label":"Shift", "x":0, "y":2.25}, - {"label":"Z", "x":1, "y":2.25}, - {"label":"X", "x":2, "y":2.125}, - {"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.125}, - {"label":"/", "x":12, "y":2.25}, - {"label":"Enter", "x":13, "y":2.25}, - {"label":"LGUI", "x":3.5, "y":3.125}, - {"label":"MO(_FN)", "x":4.5, "y":3.25}, - {"label":"Space", "x":5.5, "y":3.375}, - {"label":"Space", "x":7.5, "y":3.375}, - {"label":"MO(_NUM)", "x":8.5, "y":3.25}, - {"label":"RAlt", "x":9.5, "y":3.125} + {"matrix": [4, 4], "x": 0, "y": 0.25}, + {"matrix": [0, 0], "x": 1, "y": 0.25}, + {"matrix": [0, 1], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0.125}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + + {"matrix": [0, 5], "x": 8, "y": 0.25}, + {"matrix": [0, 6], "x": 9, "y": 0.125}, + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0.125}, + {"matrix": [0, 9], "x": 12, "y": 0.25}, + {"matrix": [4, 5], "x": 13, "y": 0.25}, + + {"matrix": [4, 3], "x": 0, "y": 1.25}, + {"matrix": [1, 0], "x": 1, "y": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1.125}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + + {"matrix": [1, 5], "x": 8, "y": 1.25}, + {"matrix": [1, 6], "x": 9, "y": 1.125}, + {"matrix": [1, 7], "x": 10, "y": 1}, + {"matrix": [1, 8], "x": 11, "y": 1.125}, + {"matrix": [1, 9], "x": 12, "y": 1.25}, + {"matrix": [4, 6], "x": 13, "y": 1.25}, + + {"matrix": [4, 2], "x": 0, "y": 2.25}, + {"matrix": [2, 0], "x": 1, "y": 2.25}, + {"matrix": [2, 1], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2.125}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + + {"matrix": [2, 5], "x": 8, "y": 2.25}, + {"matrix": [2, 6], "x": 9, "y": 2.125}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2.125}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [4, 7], "x": 13, "y": 2.25}, + + {"matrix": [3, 2], "x": 3.5, "y": 3.125}, + {"matrix": [3, 3], "x": 4.5, "y": 3.25}, + {"matrix": [3, 4], "x": 5.5, "y": 3.375}, + + {"matrix": [3, 5], "x": 7.5, "y": 3.375}, + {"matrix": [3, 6], "x": 8.5, "y": 3.25}, + {"matrix": [3, 7], "x": 9.5, "y": 3.125} ] }, "LAYOUT_split_3x5_3": { "layout": [ - {"label":"Q", "x":0, "y":0.25}, - {"label":"W", "x":1, "y":0.125}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.125}, - {"label":"T", "x":4, "y":0.25}, - {"label":"Y", "x":7, "y":0.25}, - {"label":"U", "x":8, "y":0.125}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0.125}, - {"label":"P", "x":11, "y":0.25}, - {"label":"A", "x":0, "y":1.25}, - {"label":"S", "x":1, "y":1.125}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.125}, - {"label":"G", "x":4, "y":1.25}, - {"label":"H", "x":7, "y":1.25}, - {"label":"J", "x":8, "y":1.125}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1.125}, - {"label":";", "x":11, "y":1.25}, - {"label":"Z", "x":0, "y":2.25}, - {"label":"X", "x":1, "y":2.125}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.125}, - {"label":"B", "x":4, "y":2.25}, - {"label":"N", "x":7, "y":2.25}, - {"label":"M", "x":8, "y":2.125}, - {"label":",", "x":9, "y":2}, - {"label":".", "x":10, "y":2.125}, - {"label":"/", "x":11, "y":2.25}, - {"label":"LGUI", "x":2.5, "y":3.125}, - {"label":"MO(_FN)", "x":3.5, "y":3.25}, - {"label":"Space", "x":4.5, "y":3.375}, - {"label":"Space", "x":6.5, "y":3.375}, - {"label":"MO(_NUM)", "x":7.5, "y":3.25}, - {"label":"RAlt", "x":8.5, "y":3.125} + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"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}, + + {"matrix": [0, 5], "x": 7, "y": 0.25}, + {"matrix": [0, 6], "x": 8, "y": 0.125}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0.125}, + {"matrix": [0, 9], "x": 11, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"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}, + + {"matrix": [1, 5], "x": 7, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.125}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1.125}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"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}, + + {"matrix": [2, 5], "x": 7, "y": 2.25}, + {"matrix": [2, 6], "x": 8, "y": 2.125}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2.125}, + {"matrix": [2, 9], "x": 11, "y": 2.25}, + + {"matrix": [3, 2], "x": 2.5, "y": 3.125}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.375}, + + {"matrix": [3, 5], "x": 6.5, "y": 3.375}, + {"matrix": [3, 6], "x": 7.5, "y": 3.25}, + {"matrix": [3, 7], "x": 8.5, "y": 3.125} ] } } diff --git a/keyboards/chocv/chocv.h b/keyboards/chocv/chocv.h deleted file mode 100644 index 2691dfcb83..0000000000 --- a/keyboards/chocv/chocv.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 BrickBots 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" - -/* 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_split_3x5_3( \ - 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 \ - ) \ - { \ - { 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, k30, k31, k32, k33, k34, k35, KC_NO, KC_NO} \ - } - diff --git a/keyboards/chocv/info.json b/keyboards/chocv/info.json index 16ba0fe4d2..e5361b1399 100644 --- a/keyboards/chocv/info.json +++ b/keyboards/chocv/info.json @@ -19,49 +19,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "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":"KC_LSFT", "x":3, "y":3.7}, - {"label":"LC_LALT", "x":4, "y":3.7}, - {"label":"KC_ENT", "x":5, "y":3.2, "h":1.5}, + {"matrix": [3, 2], "x": 3, "y": 3.7}, + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.2, "h": 1.5}, - {"label":"KC_SPC", "x":7, "y":3.2, "h":1.5}, - {"label":"KC_DEL", "x":8, "y":3.7}, - {"label":"KC_RCTL", "x":9, "y":3.7} + {"matrix": [3, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [3, 6], "x": 8, "y": 3.7}, + {"matrix": [3, 7], "x": 9, "y": 3.7} ] } } diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index 9f1b12ca25..0f254d380f 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -14,107 +14,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "community_layouts": ["split_3x5_3", "split_3x6_3"], - "layouts": { - "LAYOUT_split_3x6_3": { - "layout": [ - {"label":"Esc", "x":0, "y":0.3}, - {"label":"Q", "x":1, "y":0.3}, - {"label":"W", "x":2, "y":0.1}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.1}, - {"label":"T", "x":5, "y":0.2}, - - {"label":"Y", "x":9, "y":0.2}, - {"label":"U", "x":10, "y":0.1}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.1}, - {"label":"P", "x":13, "y":0.3}, - {"label":"Back Space", "x":14, "y":0.3}, - - {"label":"Ctrl / Tab", "x":0, "y":1.3}, - {"label":"A", "x":1, "y":1.3}, - {"label":"S", "x":2, "y":1.1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.1}, - {"label":"G", "x":5, "y":1.2}, - - {"label":"H", "x":9, "y":1.2}, - {"label":"J", "x":10, "y":1.1}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.1}, - {"label":";", "x":13, "y":1.3}, - {"label":"'", "x":14, "y":1.3}, - - {"label":"Shift", "x":0, "y":2.3}, - {"label":"Z", "x":1, "y":2.3}, - {"label":"X", "x":2, "y":2.1}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.1}, - {"label":"B", "x":5, "y":2.2}, - - {"label":"N", "x":9, "y":2.2}, - {"label":"M", "x":10, "y":2.1}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.1}, - {"label":"/", "x":13, "y":2.3}, - {"label":"Shift", "x":14, "y":2.3}, - - {"label":"GUI", "x":4, "y":3.7}, - {"label":"Lower", "x":5, "y":3.7}, - {"label":"Space", "x":6, "y":3.2, "h":1.5}, - - {"label":"Enter", "x":8, "y":3.2, "h":1.5}, - {"label":"Raise", "x":9, "y":3.7}, - {"label":"Alt", "x":10, "y":3.7} - ] - }, - "LAYOUT_split_3x5_3": { - "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}, - - {"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}, - - {"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}, - - {"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}, - - {"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}, - - {"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}, - - {"label":"GUI", "x":3, "y":3.7}, - {"label":"Lower", "x":4, "y":3.7}, - {"label":"Space", "x":5, "y":3.2, "h":1.5}, - - {"label":"Enter", "x":7, "y":3.2, "h":1.5}, - {"label":"Raise", "x":8, "y":3.7}, - {"label":"Alt", "x":9, "y":3.7} - ] - } - } + "community_layouts": ["split_3x5_3", "split_3x6_3"] } diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json index 8c878dfcc8..c74336c5cd 100644 --- a/keyboards/crkbd/r2g/info.json +++ b/keyboards/crkbd/r2g/info.json @@ -2,5 +2,110 @@ "split": { "soft_serial_pin": "D2" }, - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0.3}, + {"matrix": [0, 2], "x": 1, "y": 0.1}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0.1}, + {"matrix": [0, 5], "x": 4, "y": 0.2}, + + {"matrix": [4, 5], "x": 8, "y": 0.2}, + {"matrix": [4, 4], "x": 9, "y": 0.1}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.1}, + {"matrix": [4, 1], "x": 12, "y": 0.3}, + + {"matrix": [1, 1], "x": 0, "y": 1.3}, + {"matrix": [1, 2], "x": 1, "y": 1.1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 4], "x": 3, "y": 1.1}, + {"matrix": [1, 5], "x": 4, "y": 1.2}, + + {"matrix": [5, 5], "x": 8, "y": 1.2}, + {"matrix": [5, 4], "x": 9, "y": 1.1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.1}, + {"matrix": [5, 1], "x": 12, "y": 1.3}, + + {"matrix": [2, 1], "x": 0, "y": 2.3}, + {"matrix": [2, 2], "x": 1, "y": 2.1}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2.1}, + {"matrix": [2, 5], "x": 4, "y": 2.2}, + + {"matrix": [6, 5], "x": 8, "y": 2.2}, + {"matrix": [6, 4], "x": 9, "y": 2.1}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.1}, + {"matrix": [6, 1], "x": 12, "y": 2.3}, + + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 8, "y": 3.7}, + {"matrix": [7, 3], "x": 9, "y": 3.7} + ] + }, + "LAYOUT_split_3x6_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [4, 5], "x": 9, "y": 0.2}, + {"matrix": [4, 4], "x": 10, "y": 0.1}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.1}, + {"matrix": [4, 1], "x": 13, "y": 0.3}, + {"matrix": [4, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [5, 5], "x": 9, "y": 1.2}, + {"matrix": [5, 4], "x": 10, "y": 1.1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.1}, + {"matrix": [5, 1], "x": 13, "y": 1.3}, + {"matrix": [5, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [6, 5], "x": 9, "y": 2.2}, + {"matrix": [6, 4], "x": 10, "y": 2.1}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.1}, + {"matrix": [6, 1], "x": 13, "y": 2.3}, + {"matrix": [6, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 9, "y": 3.7}, + {"matrix": [7, 3], "x": 10, "y": 3.7} + ] + } + } } diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c index 7fb95c043c..a4d138b98a 100644 --- a/keyboards/crkbd/r2g/r2g.c +++ b/keyboards/crkbd/r2g/r2g.c @@ -16,7 +16,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 "r2g.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/r2g/r2g.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@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" - -// clang-format off -#define LAYOUT_split_3x6_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, 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 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - -#define LAYOUT_split_3x5_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { KC_NO, L00, L01, L02, L03, L04 }, \ - { KC_NO, L10, L11, L12, L13, L14 }, \ - { KC_NO, L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { KC_NO, R04, R03, R02, R01, R00 }, \ - { KC_NO, R14, R13, R12, R11, R10 }, \ - { KC_NO, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - - -#define LAYOUT LAYOUT_split_3x6_3 diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json index 931c20aa4d..1226b3f69f 100644 --- a/keyboards/crkbd/rev1/info.json +++ b/keyboards/crkbd/rev1/info.json @@ -2,5 +2,110 @@ "split": { "soft_serial_pin": "D2" }, - "bootloader": "caterina" + "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0.3}, + {"matrix": [0, 2], "x": 1, "y": 0.1}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0.1}, + {"matrix": [0, 5], "x": 4, "y": 0.2}, + + {"matrix": [4, 5], "x": 8, "y": 0.2}, + {"matrix": [4, 4], "x": 9, "y": 0.1}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.1}, + {"matrix": [4, 1], "x": 12, "y": 0.3}, + + {"matrix": [1, 1], "x": 0, "y": 1.3}, + {"matrix": [1, 2], "x": 1, "y": 1.1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 4], "x": 3, "y": 1.1}, + {"matrix": [1, 5], "x": 4, "y": 1.2}, + + {"matrix": [5, 5], "x": 8, "y": 1.2}, + {"matrix": [5, 4], "x": 9, "y": 1.1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.1}, + {"matrix": [5, 1], "x": 12, "y": 1.3}, + + {"matrix": [2, 1], "x": 0, "y": 2.3}, + {"matrix": [2, 2], "x": 1, "y": 2.1}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2.1}, + {"matrix": [2, 5], "x": 4, "y": 2.2}, + + {"matrix": [6, 5], "x": 8, "y": 2.2}, + {"matrix": [6, 4], "x": 9, "y": 2.1}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.1}, + {"matrix": [6, 1], "x": 12, "y": 2.3}, + + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 8, "y": 3.7}, + {"matrix": [7, 3], "x": 9, "y": 3.7} + ] + }, + "LAYOUT_split_3x6_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [4, 5], "x": 9, "y": 0.2}, + {"matrix": [4, 4], "x": 10, "y": 0.1}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.1}, + {"matrix": [4, 1], "x": 13, "y": 0.3}, + {"matrix": [4, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [5, 5], "x": 9, "y": 1.2}, + {"matrix": [5, 4], "x": 10, "y": 1.1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.1}, + {"matrix": [5, 1], "x": 13, "y": 1.3}, + {"matrix": [5, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [6, 5], "x": 9, "y": 2.2}, + {"matrix": [6, 4], "x": 10, "y": 2.1}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.1}, + {"matrix": [6, 1], "x": 13, "y": 2.3}, + {"matrix": [6, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 9, "y": 3.7}, + {"matrix": [7, 3], "x": 10, "y": 3.7} + ] + } + } } diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index 63e4bed522..cb337d15bc 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c @@ -15,7 +15,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 "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/rev1/rev1.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@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" - -// clang-format off -#define LAYOUT_split_3x6_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, 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 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - -#define LAYOUT_split_3x5_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { KC_NO, L00, L01, L02, L03, L04 }, \ - { KC_NO, L10, L11, L12, L13, L14 }, \ - { KC_NO, L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { KC_NO, R04, R03, R02, R01, R00 }, \ - { KC_NO, R14, R13, R12, R11, R10 }, \ - { KC_NO, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - - -#define LAYOUT LAYOUT_split_3x6_3 diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 04bb07c0bc..657c8a9e51 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -24,51 +24,55 @@ "layouts": { "LAYOUT_split_3x6_3": { "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":"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": [4, 5], "x": 9, "y": 0.125}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.375}, + {"matrix": [4, 1], "x": 13, "y": 0.625}, + {"matrix": [4, 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":"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}, - {"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": [5, 5], "x": 9, "y": 1.125}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.375}, + {"matrix": [5, 1], "x": 13, "y": 1.625}, + {"matrix": [5, 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": [6, 5], "x": 9, "y": 2.125}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.375}, + {"matrix": [6, 1], "x": 13, "y": 2.625}, + {"matrix": [6, 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": [7, 5], "x": 8, "y": 3.375}, + {"matrix": [7, 4], "x": 9, "y": 3.125}, + {"matrix": [7, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h deleted file mode 100644 index cd6e35a711..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.h +++ /dev/null @@ -1,44 +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_split_3x6_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, 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 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index f80dcd0dfe..09cf423e93 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -21,55 +21,59 @@ "layouts": { "LAYOUT_split_3x6_3_2": { "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":"L31", "x":6, "y":1.625}, - {"label":"R33", "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": [5, 5], "x": 9, "y": 0.125}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.375}, + {"matrix": [5, 1], "x": 13, "y": 0.625}, + {"matrix": [5, 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":"L32", "x":6, "y":2.625}, - {"label":"R34", "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": [3, 1], "x": 6, "y": 1.625}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.125}, - {"label":"L35", "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": [8, 2], "x": 8, "y": 1.625}, + {"matrix": [6, 5], "x": 9, "y": 1.125}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.375}, + {"matrix": [6, 1], "x": 13, "y": 1.625}, + {"matrix": [6, 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": [3, 2], "x": 6, "y": 2.625}, + + {"matrix": [8, 1], "x": 8, "y": 2.625}, + {"matrix": [7, 5], "x": 9, "y": 2.125}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.375}, + {"matrix": [7, 1], "x": 13, "y": 2.625}, + {"matrix": [7, 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": [8, 5], "x": 8, "y": 3.375}, + {"matrix": [8, 4], "x": 9, "y": 3.125}, + {"matrix": [8, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h deleted file mode 100644 index 4720592264..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.h +++ /dev/null @@ -1,46 +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_split_3x6_3_2( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \ - L33, L34, L35, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, L31, L32, L33, L34, L35 }, \ - { KC_NO, 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 }, \ - { KC_NO, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/dumbo/dumbo.h b/keyboards/dumbo/dumbo.h deleted file mode 100644 index bd1d02f8ec..0000000000 --- a/keyboards/dumbo/dumbo.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Adam Naldal - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x6_4( \ - 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/dumbo/info.json b/keyboards/dumbo/info.json index 5b4a7bb23a..faf59b7ecc 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json @@ -35,57 +35,57 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"x":0, "y":1.25}, - {"x":1, "y":1}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.5}, - {"x":5, "y":0.75}, + {"matrix": [0, 0], "x": 0, "y": 1.25}, + {"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.5}, + {"matrix": [0, 5], "x": 5, "y": 0.75}, - {"x":9.5, "y":0.75}, - {"x":10.5, "y":0.5}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0.25}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1.25}, + {"matrix": [4, 5], "x": 9.5, "y": 0.75}, + {"matrix": [4, 4], "x": 10.5, "y": 0.5}, + {"matrix": [4, 3], "x": 11.5, "y": 0}, + {"matrix": [4, 2], "x": 12.5, "y": 0.25}, + {"matrix": [4, 1], "x": 13.5, "y": 1}, + {"matrix": [4, 0], "x": 14.5, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.5}, - {"x":5, "y":1.75}, + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"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.5}, + {"matrix": [1, 5], "x": 5, "y": 1.75}, - {"x":9.5, "y":1.75}, - {"x":10.5, "y":1.5}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1.25}, - {"x":13.5, "y":2}, - {"x":14.5, "y":2.25}, + {"matrix": [5, 5], "x": 9.5, "y": 1.75}, + {"matrix": [5, 4], "x": 10.5, "y": 1.5}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [5, 2], "x": 12.5, "y": 1.25}, + {"matrix": [5, 1], "x": 13.5, "y": 2}, + {"matrix": [5, 0], "x": 14.5, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.5}, - {"x":5, "y":2.75}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"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.5}, + {"matrix": [2, 5], "x": 5, "y": 2.75}, - {"x":9.5, "y":2.75}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":3}, - {"x":14.5, "y":3.25}, + {"matrix": [6, 5], "x": 9.5, "y": 2.75}, + {"matrix": [6, 4], "x": 10.5, "y": 2.5}, + {"matrix": [6, 3], "x": 11.5, "y": 2}, + {"matrix": [6, 2], "x": 12.5, "y": 2.25}, + {"matrix": [6, 1], "x": 13.5, "y": 3}, + {"matrix": [6, 0], "x": 14.5, "y": 3.25}, - {"x":3.25, "y":3.75}, - {"x":4.25, "y":3.75, "h":1.5}, - {"x":5.25, "y":3.75, "h":1.5}, - {"x":6.25, "y":4.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.75}, + {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5}, + {"matrix": [3, 5], "x": 6.25, "y": 4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":3.75, "h":1.5}, - {"x":10.25, "y":3.75, "h":1.5}, - {"x":11.25, "y":3.75} + {"matrix": [7, 5], "x": 8.25, "y": 4.25}, + {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5}, + {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5}, + {"matrix": [7, 2], "x": 11.25, "y": 3.75} ] } } diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json new file mode 100644 index 0000000000..3091643e4f --- /dev/null +++ b/keyboards/eek/silk_down/info.json @@ -0,0 +1,51 @@ +{ + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.88}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.38}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [0, 5], "x": 6, "y": 0.5}, + {"matrix": [0, 6], "x": 7, "y": 0.38}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0.38}, + {"matrix": [0, 9], "x": 10, "y": 0.88}, + + {"matrix": [1, 0], "x": 0, "y": 1.88}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.38}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + + {"matrix": [1, 5], "x": 6, "y": 1.5}, + {"matrix": [1, 6], "x": 7, "y": 1.38}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1.38}, + {"matrix": [1, 9], "x": 10, "y": 1.88}, + + {"matrix": [2, 0], "x": 0, "y": 2.88}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.38}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [2, 5], "x": 6, "y": 2.5}, + {"matrix": [2, 6], "x": 7, "y": 2.38}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2.38}, + {"matrix": [2, 9], "x": 10, "y": 2.88}, + + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.38}, + {"matrix": [3, 4], "x": 4, "y": 3.5}, + + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.38}, + {"matrix": [3, 7], "x": 8, "y": 3.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h deleted file mode 100644 index 23ff61e58f..0000000000 --- a/keyboards/eek/silk_down/silk_down.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 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 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_split_3x5_3( \ - 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 }, \ - { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ -} diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json new file mode 100644 index 0000000000..a810549d55 --- /dev/null +++ b/keyboards/eek/silk_up/info.json @@ -0,0 +1,51 @@ +{ + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 9], "x": 0, "y": 0.88}, + {"matrix": [0, 8], "x": 1, "y": 0.38}, + {"matrix": [0, 7], "x": 2, "y": 0}, + {"matrix": [0, 6], "x": 3, "y": 0.38}, + {"matrix": [0, 5], "x": 4, "y": 0.5}, + + {"matrix": [0, 4], "x": 6, "y": 0.5}, + {"matrix": [0, 3], "x": 7, "y": 0.38}, + {"matrix": [0, 2], "x": 8, "y": 0}, + {"matrix": [0, 1], "x": 9, "y": 0.38}, + {"matrix": [0, 0], "x": 10, "y": 0.88}, + + {"matrix": [1, 9], "x": 0, "y": 1.88}, + {"matrix": [1, 8], "x": 1, "y": 1.38}, + {"matrix": [1, 7], "x": 2, "y": 1}, + {"matrix": [1, 6], "x": 3, "y": 1.38}, + {"matrix": [1, 5], "x": 4, "y": 1.5}, + + {"matrix": [1, 4], "x": 6, "y": 1.5}, + {"matrix": [1, 3], "x": 7, "y": 1.38}, + {"matrix": [1, 2], "x": 8, "y": 1}, + {"matrix": [1, 1], "x": 9, "y": 1.38}, + {"matrix": [1, 0], "x": 10, "y": 1.88}, + + {"matrix": [2, 9], "x": 0, "y": 2.88}, + {"matrix": [2, 8], "x": 1, "y": 2.38}, + {"matrix": [2, 7], "x": 2, "y": 2}, + {"matrix": [2, 6], "x": 3, "y": 2.38}, + {"matrix": [2, 5], "x": 4, "y": 2.5}, + + {"matrix": [2, 4], "x": 6, "y": 2.5}, + {"matrix": [2, 3], "x": 7, "y": 2.38}, + {"matrix": [2, 2], "x": 8, "y": 2}, + {"matrix": [2, 1], "x": 9, "y": 2.38}, + {"matrix": [2, 0], "x": 10, "y": 2.88}, + + {"matrix": [3, 7], "x": 2, "y": 3.25}, + {"matrix": [3, 6], "x": 3, "y": 3.38}, + {"matrix": [3, 5], "x": 4, "y": 3.5}, + + {"matrix": [3, 4], "x": 6, "y": 3.5}, + {"matrix": [3, 3], "x": 7, "y": 3.38}, + {"matrix": [3, 2], "x": 8, "y": 3.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h deleted file mode 100644 index eebcc8fd2e..0000000000 --- a/keyboards/eek/silk_up/silk_up.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 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 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_split_3x5_3( \ - K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, \ - K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, \ - K29, K28, K27, K26, K25, K24, K23, K22, K21, K20, \ - K37, K36, K35, K34, K33, 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 }, \ - { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ -} diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_1/0_1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_3, K3_4, K3_5, K3_6)\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ - \ - {K0_5, K0_6, K0_7, K0_8, K0_9},\ - {K1_5, K1_6, K1_7, K1_8, K1_9},\ - {K2_5, K2_6, K2_7, K2_8, K2_9},\ - {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ -} - -// clang-format on -#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 0738a0491f..5a65369f61 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -9,50 +9,53 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "x": 4, "y": 0.42}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"matrix": [4, 0], "x": 7, "y": 0.42}, + {"matrix": [4, 1], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.31}, + {"matrix": [4, 4], "x": 11, "y": 0.93}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "x": 4, "y": 1.42}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"matrix": [5, 0], "x": 7, "y": 1.42}, + {"matrix": [5, 1], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.31}, + {"matrix": [5, 4], "x": 11, "y": 1.93}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "x": 4, "y": 2.42}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"matrix": [6, 0], "x": 7, "y": 2.42}, + {"matrix": [6, 1], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2.31}, + {"matrix": [6, 4], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} + {"matrix": [7, 0], "x": 6.5, "y": 4}, + {"matrix": [7, 1], "x": 7.5, "y": 3.75} ] } } diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h deleted file mode 100644 index 2f58831df7..0000000000 --- a/keyboards/ferris/0_2/0_2.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 Pierre Chevalier - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 - -/* left hand right hand */ -#define LAYOUT_split_3x5_2(\ - K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ - K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ - K3_3, K3_4, K3_5, K3_6)\ -/* matrix positions */\ -{\ - {K0_0, K0_1, K0_2, K0_3, K0_4},\ - {K1_0, K1_1, K1_2, K1_3, K1_4},\ - {K2_0, K2_1, K2_2, K2_3, K2_4},\ - {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ - \ - {K0_5, K0_6, K0_7, K0_8, K0_9},\ - {K1_5, K1_6, K1_7, K1_8, K1_9},\ - {K2_5, K2_6, K2_7, K2_8, K2_9},\ - {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ -} - -// clang-format on -#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index f2b6b4b07b..c6584ecf01 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -7,50 +7,53 @@ "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": ["split_3x5_2"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_2" + }, "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"x": 0, "y": 0.93}, - {"x": 1, "y": 0.31}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.28}, - {"x": 4, "y": 0.42}, + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.31}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.28}, + {"matrix": [0, 4], "x": 4, "y": 0.42}, - {"x": 7, "y": 0.42}, - {"x": 8, "y": 0.28}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.31}, - {"x": 11, "y": 0.93}, + {"matrix": [4, 0], "x": 7, "y": 0.42}, + {"matrix": [4, 1], "x": 8, "y": 0.28}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0.31}, + {"matrix": [4, 4], "x": 11, "y": 0.93}, - {"x": 0, "y": 1.93}, - {"x": 1, "y": 1.31}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.28}, - {"x": 4, "y": 1.42}, + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.31}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.28}, + {"matrix": [1, 4], "x": 4, "y": 1.42}, - {"x": 7, "y": 1.42}, - {"x": 8, "y": 1.28}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.31}, - {"x": 11, "y": 1.93}, + {"matrix": [5, 0], "x": 7, "y": 1.42}, + {"matrix": [5, 1], "x": 8, "y": 1.28}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1.31}, + {"matrix": [5, 4], "x": 11, "y": 1.93}, - {"x": 0, "y": 2.93}, - {"x": 1, "y": 2.31}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.28}, - {"x": 4, "y": 2.42}, + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.31}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.28}, + {"matrix": [2, 4], "x": 4, "y": 2.42}, - {"x": 7, "y": 2.42}, - {"x": 8, "y": 2.28}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2.31}, - {"x": 11, "y": 2.93}, + {"matrix": [6, 0], "x": 7, "y": 2.42}, + {"matrix": [6, 1], "x": 8, "y": 2.28}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2.31}, + {"matrix": [6, 4], "x": 11, "y": 2.93}, - {"x": 3.5, "y": 3.75}, - {"x": 4.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, - {"x": 6.5, "y": 4}, - {"x": 7.5, "y": 3.75} + {"matrix": [7, 0], "x": 6.5, "y": 4}, + {"matrix": [7, 1], "x": 7.5, "y": 3.75} ] } } diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h index eda21d2a94..549228104a 100644 --- a/keyboards/gboards/gergoplex/gergoplex.h +++ b/keyboards/gboards/gergoplex/gergoplex.h @@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status; #define OLATA 0x14 // output latch register uint8_t init_mcp23018(void); - -#define LAYOUT_split_3x5_3( \ - 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, R30, R31, R32 \ -) { \ - { L04, L14, L24, XXX }, \ - { L03, L13, L23, L32 }, \ - { L02, L12, L22, L31 }, \ - { L01, L11, L21, L30 }, \ - { L00, L10, L20, XXX }, \ - { R00, R10, R20, XXX }, \ - { R01, R11, R21, R30 }, \ - { R02, R12, R22, R31 }, \ - { R03, R13, R23, R32 }, \ - { R04, R14, R24, XXX } \ -} diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index 914832aacf..061f8ff869 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -14,45 +14,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label":"L00", "x":0, "y":0.25}, - {"label":"L01", "x":1, "y":0.125}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0.125}, - {"label":"L04", "x":4, "y":0.375}, - {"label":"R00", "x":8, "y":0.375}, - {"label":"R01", "x":9, "y":0.125}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0.125}, - {"label":"R04", "x":12, "y":0.25}, + {"matrix": [4, 0], "x": 0, "y": 0.25}, + {"matrix": [3, 0], "x": 1, "y": 0.125}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 3, "y": 0.125}, + {"matrix": [0, 0], "x": 4, "y": 0.375}, - {"label":"L10", "x":0, "y":1.25}, - {"label":"L11", "x":1, "y":1.125}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1.125}, - {"label":"L14", "x":4, "y":1.375}, - {"label":"R10", "x":8, "y":1.375}, - {"label":"R11", "x":9, "y":1.125}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1.125}, - {"label":"R14", "x":12, "y":1.25}, + {"matrix": [5, 0], "x": 8, "y": 0.375}, + {"matrix": [6, 0], "x": 9, "y": 0.125}, + {"matrix": [7, 0], "x": 10, "y": 0}, + {"matrix": [8, 0], "x": 11, "y": 0.125}, + {"matrix": [9, 0], "x": 12, "y": 0.25}, - {"label":"L20", "x":0, "y":2.25}, - {"label":"L21", "x":1, "y":2.125}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2.125}, - {"label":"L24", "x":4, "y":2.375}, - {"label":"R20", "x":8, "y":2.375}, - {"label":"R21", "x":9, "y":2.125}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2.125}, - {"label":"R24", "x":12, "y":2.25}, + {"matrix": [4, 1], "x": 0, "y": 1.25}, + {"matrix": [3, 1], "x": 1, "y": 1.125}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1.125}, + {"matrix": [0, 1], "x": 4, "y": 1.375}, - {"label":"L30", "x":2, "y":3.5}, - {"label":"L31", "x":3.25, "y":3.625, "w":1.5}, - {"label":"L32", "x":5, "y":3.125, "h":2}, - {"label":"R30", "x":7, "y":3.125, "h":2}, - {"label":"R31", "x":8.25, "y":3.625, "w":1.5}, - {"label":"R32", "x":10, "y":3.5} + {"matrix": [5, 1], "x": 8, "y": 1.375}, + {"matrix": [6, 1], "x": 9, "y": 1.125}, + {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1.125}, + {"matrix": [9, 1], "x": 12, "y": 1.25}, + + {"matrix": [4, 2], "x": 0, "y": 2.25}, + {"matrix": [3, 2], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 3, "y": 2.125}, + {"matrix": [0, 2], "x": 4, "y": 2.375}, + + {"matrix": [5, 2], "x": 8, "y": 2.375}, + {"matrix": [6, 2], "x": 9, "y": 2.125}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [8, 2], "x": 11, "y": 2.125}, + {"matrix": [9, 2], "x": 12, "y": 2.25}, + + {"matrix": [3, 3], "x": 2, "y": 3.5}, + {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5}, + {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2}, + + {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2}, + {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5}, + {"matrix": [8, 3], "x": 10, "y": 3.5} ] } } diff --git a/keyboards/gummykey/gummykey.h b/keyboards/gummykey/gummykey.h deleted file mode 100644 index 79d36dc8a5..0000000000 --- a/keyboards/gummykey/gummykey.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2023 Gummor (@gumorr) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_split_4x6_5( \ - 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, L44, L45, R45, R44, 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, ___, 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 }, \ - { R40, R41, R42, ___, R44, R45 } \ -} diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json index 4f2136f358..6f3758c31a 100644 --- a/keyboards/gummykey/info.json +++ b/keyboards/gummykey/info.json @@ -13,77 +13,75 @@ "diode_direction": "ROW2COL", "layouts": { "LAYOUT_split_4x6_5": { - "layout": - [ - {"x":0.25, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0.125}, - {"x":5.25, "y":0.25}, - - {"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.125}, - {"x":5.25, "y":1.25}, - - {"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.125}, - {"x":5.25, "y":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.125}, - {"x":5.25, "y":3.25}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4}, - {"x":2.25, "y":4}, - {"x":3.5, "y":4.25, "w":2.25}, - {"x":6.75, "y":4.25}, - + "layout": [ + {"matrix": [0, 0], "x": 0.25, "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.125}, + {"matrix": [0, 5], "x": 5.25, "y": 0.25}, - {"x":13.25, "y":0}, - {"x":12.25, "y":0}, - {"x":11.25, "y":0}, - {"x":10.25, "y":0}, - {"x":9.25, "y":0.125}, - {"x":8.25, "y":0.25}, + {"matrix": [5, 5], "x": 0.25, "y": 1}, + {"matrix": [5, 4], "x": 1.25, "y": 1}, + {"matrix": [5, 3], "x": 2.25, "y": 1}, + {"matrix": [5, 2], "x": 3.25, "y": 1}, + {"matrix": [5, 1], "x": 4.25, "y": 1.125}, + {"matrix": [5, 0], "x": 5.25, "y": 1.25}, - {"x":13.25, "y":1}, - {"x":12.25, "y":1}, - {"x":11.25, "y":1}, - {"x":10.25, "y":1}, - {"x":9.25, "y":1.125}, - {"x":8.25, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 2}, + {"matrix": [1, 2], "x": 2.25, "y": 2}, + {"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}, - {"x":13.25, "y":2, "w":1.25}, - {"x":12.25, "y":2}, - {"x":11.25, "y":2}, - {"x":10.25, "y":2}, - {"x":9.25, "y":2.125}, - {"x":8.25, "y":2.25}, + {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [6, 4], "x": 1.25, "y": 3}, + {"matrix": [6, 3], "x": 2.25, "y": 3}, + {"matrix": [6, 2], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3.125}, + {"matrix": [6, 0], "x": 5.25, "y": 3.25}, - {"x":13.25, "y":3, "w":1.25}, - {"x":12.25, "y":3}, - {"x":11.25, "y":3}, - {"x":10.25, "y":3}, - {"x":9.25, "y":3.125}, - {"x":8.25, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 4}, + {"matrix": [2, 2], "x": 2.25, "y": 4}, + {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25}, + {"matrix": [2, 4], "x": 6.75, "y": 4.25}, + {"matrix": [2, 5], "x": 13.25, "y": 0}, - {"x":13.25, "y":4, "w":1.25}, - {"x":12.25, "y":4}, - {"x":11.25, "y":4}, - {"x":8, "y":4.25, "w":2.25}, - {"x":7, "y":4.25} - ] + {"matrix": [7, 5], "x": 12.25, "y": 0}, + {"matrix": [7, 4], "x": 11.25, "y": 0}, + {"matrix": [7, 3], "x": 10.25, "y": 0}, + {"matrix": [7, 2], "x": 9.25, "y": 0.125}, + {"matrix": [7, 1], "x": 8.25, "y": 0.25}, + {"matrix": [7, 0], "x": 13.25, "y": 1}, + + {"matrix": [3, 0], "x": 12.25, "y": 1}, + {"matrix": [3, 1], "x": 11.25, "y": 1}, + {"matrix": [3, 2], "x": 10.25, "y": 1}, + {"matrix": [3, 3], "x": 9.25, "y": 1.125}, + {"matrix": [3, 4], "x": 8.25, "y": 1.25}, + {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25}, + + {"matrix": [8, 5], "x": 12.25, "y": 2}, + {"matrix": [8, 4], "x": 11.25, "y": 2}, + {"matrix": [8, 3], "x": 10.25, "y": 2}, + {"matrix": [8, 2], "x": 9.25, "y": 2.125}, + {"matrix": [8, 1], "x": 8.25, "y": 2.25}, + {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25}, + + {"matrix": [4, 0], "x": 12.25, "y": 3}, + {"matrix": [4, 1], "x": 11.25, "y": 3}, + {"matrix": [4, 2], "x": 10.25, "y": 3}, + {"matrix": [4, 4], "x": 9.25, "y": 3.125}, + {"matrix": [4, 5], "x": 8.25, "y": 3.25}, + + {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.25, "y": 4}, + {"matrix": [9, 2], "x": 11.25, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25}, + {"matrix": [9, 0], "x": 7, "y": 4.25} + ] } } } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c index 2bd1aefadb..5afb908d02 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.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 "3x5_3.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h deleted file mode 100644 index 0a03dd9b1f..0000000000 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 @dlford - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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_split_3x5_3( \ - 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, \ - L32, L33, L34, R30, R31, R32 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, XXX, L32, L33, L34 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index f99eba6502..f6309cba46 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -22,49 +22,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "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": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [4, 0], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0}, + {"matrix": [4, 4], "x": 14, "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": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, + {"matrix": [5, 0], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1}, + {"matrix": [5, 4], "x": 14, "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": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, + {"matrix": [6, 0], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2}, + {"matrix": [6, 4], "x": 14, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3} + {"matrix": [7, 0], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 2], "x": 12, "y": 3} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h deleted file mode 100644 index 1392cb0b18..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2022 fgoodwin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General 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 "quantum.h" -#pragma once - -#define XXX KC_NO - -#define LAYOUT_split_5x6_6( \ - 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, \ - L42, L43, L44, L45, R40, R41, R42, R43, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ - { XXX, XXX, XXX, XXX, L54, L55 }, \ - { XXX, XXX, XXX, XXX, L64, L65 }, \ -\ - { 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, XXX, XXX }, \ - { R50, R51, XXX, XXX, XXX, XXX }, \ - { R60, R61, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index 9635c47123..a00a3bda18 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -21,83 +21,83 @@ "layouts": { "LAYOUT_split_5x6_6": { "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": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 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": [8, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 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": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "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": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "y": 3}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [11, 0], "x": 7, "y": 4}, + {"matrix": [11, 1], "x": 9, "y": 4}, + {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 3], "x": 11, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, + {"matrix": [5, 4], "x": 13, "y": 4}, + {"matrix": [5, 5], "x": 14, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, + {"matrix": [12, 0], "x": 5, "y": 5}, + {"matrix": [12, 1], "x": 6, "y": 5}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [6, 4], "x": 7, "y": 5}, + {"matrix": [6, 5], "x": 5, "y": 5}, - {"x": 5, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5} + {"matrix": [13, 0], "x": 9, "y": 5}, + {"matrix": [13, 1], "x": 10, "y": 5} ] } } diff --git a/keyboards/handwired/elrgo_s/elrgo_s.h b/keyboards/handwired/elrgo_s/elrgo_s.h deleted file mode 100644 index 0fb2b58e51..0000000000 --- a/keyboards/handwired/elrgo_s/elrgo_s.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Yaroslav Smirnov - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_split_3x6_5(\ - 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, \ - L31, L32, L33, L34, L35, R30, R31, R32, R33, R34 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - {KC_NO, 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, KC_NO} \ -} diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index ba850bb5d4..9a43e14c88 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -21,52 +21,61 @@ "layouts": { "LAYOUT_split_3x6_5": { "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":"L31", "x":3, "y":3}, - {"label":"L32", "x":4, "y":3}, - {"label":"L33", "x":5, "y":3}, - {"label":"L34", "x":6, "y":3}, - {"label":"L35", "x":6, "y":2}, - {"label":"R30", "x":8, "y":2}, - {"label":"R31", "x":8, "y":3}, - {"label":"R32", "x":9, "y":3}, - {"label":"R33", "x":10, "y":3}, - {"label":"R34", "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": [4, 0], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "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, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1}, + {"matrix": [5, 5], "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, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2}, + {"matrix": [6, 5], "x": 14, "y": 2}, + + {"matrix": [3, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + + {"matrix": [3, 5], "x": 6, "y": 2}, + + {"matrix": [7, 0], "x": 8, "y": 2}, + + {"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} ] } } diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json index d728ba1a73..6770e467eb 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/info.json @@ -18,51 +18,51 @@ "layouts": { "LAYOUT_split_3x5_4": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.35}, - {"x":4, "y":0.45}, + {"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.35}, + {"matrix": [0, 4], "x": 4, "y": 0.45}, - {"x":10, "y":0.45}, - {"x":11, "y":0.35}, - {"x":12, "y":0}, - {"x":13, "y":0.25}, - {"x":14, "y":0.75}, + {"matrix": [0, 5], "x": 10, "y": 0.45}, + {"matrix": [0, 6], "x": 11, "y": 0.35}, + {"matrix": [0, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0.25}, + {"matrix": [0, 9], "x": 14, "y": 0.75}, - {"x":0, "y":1.75}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.35}, - {"x":4, "y":1.45}, + {"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.35}, + {"matrix": [1, 4], "x": 4, "y": 1.45}, - {"x":10, "y":1.45}, - {"x":11, "y":1.35}, - {"x":12, "y":1}, - {"x":13, "y":1.25}, - {"x":14, "y":1.75}, + {"matrix": [1, 5], "x": 10, "y": 1.45}, + {"matrix": [1, 6], "x": 11, "y": 1.35}, + {"matrix": [1, 7], "x": 12, "y": 1}, + {"matrix": [1, 8], "x": 13, "y": 1.25}, + {"matrix": [1, 9], "x": 14, "y": 1.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.25}, - {"x":2, "y":2}, - {"x":3, "y":2.35}, - {"x":4, "y":2.45}, + {"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.35}, + {"matrix": [2, 4], "x": 4, "y": 2.45}, - {"x":10, "y":2.45}, - {"x":11, "y":2.35}, - {"x":12, "y":2}, - {"x":13, "y":2.25}, - {"x":14, "y":2.75}, + {"matrix": [2, 5], "x": 10, "y": 2.45}, + {"matrix": [2, 6], "x": 11, "y": 2.35}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2.25}, + {"matrix": [2, 9], "x": 14, "y": 2.75}, - {"x":3, "y":3.35}, - {"x":4, "y":3.45}, - {"x":5, "y":3.65}, - {"x":6, "y":3.95}, + {"matrix": [3, 1], "x": 3, "y": 3.35}, + {"matrix": [3, 2], "x": 4, "y": 3.45}, + {"matrix": [3, 3], "x": 5, "y": 3.65}, + {"matrix": [3, 4], "x": 6, "y": 3.95}, - {"x":8, "y":3.95}, - {"x":9, "y":3.65}, - {"x":10, "y":3.45}, - {"x":11, "y":3.35} + {"matrix": [3, 5], "x": 8, "y": 3.95}, + {"matrix": [3, 6], "x": 9, "y": 3.65}, + {"matrix": [3, 7], "x": 10, "y": 3.45}, + {"matrix": [3, 8], "x": 11, "y": 3.35} ] } } diff --git a/keyboards/handwired/pteron38/pteron38.h b/keyboards/handwired/pteron38/pteron38.h deleted file mode 100644 index 7b9e734cfb..0000000000 --- a/keyboards/handwired/pteron38/pteron38.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_split_3x5_4( \ - K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ - { KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO } \ -} diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index e2e2b4a3f7..c5f15104f6 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -22,143 +22,290 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc/lwr", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc/ris", "x":6, "y":3.6, "h":2} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2} + ] + }, + "LAYOUT_complicated": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6}, + {"matrix": [3, 4], "x": 4, "y": 3.65}, + + {"matrix": [7, 4], "x": 5, "y": 3.65}, + {"matrix": [7, 3], "x": 6, "y": 3.6}, + + {"matrix": [3, 1], "x": 3, "y": 4.6}, + {"matrix": [3, 2], "x": 4, "y": 4.65}, + + {"matrix": [7, 2], "x": 5, "y": 4.65}, + {"matrix": [7, 1], "x": 6, "y": 4.6} + ] + }, + "LAYOUT_full": { + "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": [4, 4], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 0], "x": 30, "y": 0}, + {"matrix": [3, 1], "x": 31, "y": 0}, + {"matrix": [3, 2], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0}, + {"matrix": [3, 4], "x": 34, "y": 0}, + + {"matrix": [7, 4], "x": 35, "y": 0}, + {"matrix": [7, 3], "x": 36, "y": 0}, + {"matrix": [7, 2], "x": 37, "y": 0}, + {"matrix": [7, 1], "x": 38, "y": 0}, + {"matrix": [7, 0], "x": 39, "y": 0} + ] + }, + "LAYOUT_reversed": { + "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": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 1], "x": 8, "y": 0}, + {"matrix": [0, 0], "x": 9, "y": 0}, + + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 4], "x": 14, "y": 0}, + + {"matrix": [1, 4], "x": 15, "y": 0}, + {"matrix": [1, 3], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 1], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 19, "y": 0}, + + {"matrix": [6, 0], "x": 20, "y": 0}, + {"matrix": [6, 1], "x": 21, "y": 0}, + {"matrix": [6, 2], "x": 22, "y": 0}, + {"matrix": [6, 3], "x": 23, "y": 0}, + {"matrix": [6, 4], "x": 24, "y": 0}, + + {"matrix": [2, 4], "x": 25, "y": 0}, + {"matrix": [2, 3], "x": 26, "y": 0}, + {"matrix": [2, 2], "x": 27, "y": 0}, + {"matrix": [2, 1], "x": 28, "y": 0}, + {"matrix": [2, 0], "x": 29, "y": 0}, + + {"matrix": [7, 3], "x": 30, "y": 0}, + {"matrix": [7, 4], "x": 31, "y": 0}, + + {"matrix": [3, 4], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0} ] }, "LAYOUT_split_3x5_3": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"lower", "x":2, "y":3.6, "h":1.25}, - {"label":"bspc", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc", "x":6, "y":3.6, "h":2}, - {"label":"raise", "x":7, "y":3.6, "h":1.25} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25}, + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}, + {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25} ] }, - "LAYOUT_complicated": { + "LAYOUT_thumbrow": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc", "x":3, "y":3.6}, - {"label":"esc/sft", "x":4, "y":3.65}, - {"label":"ent/alt", "x":5, "y":3.65}, - {"label":"spc", "x":6, "y":3.6}, - - {"label":"lower", "x":3, "y":4.6}, - {"label":"gui", "x":4, "y":4.65}, - {"label":"tab", "x":5, "y":4.65}, - {"label":"raise", "x":6, "y":4.6} + {"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": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 1], "x": 30, "y": 0}, + {"matrix": [3, 2], "x": 31, "y": 0}, + {"matrix": [3, 3], "x": 32, "y": 0}, + {"matrix": [3, 4], "x": 33, "y": 0}, + + {"matrix": [7, 4], "x": 34, "y": 0}, + {"matrix": [7, 3], "x": 35, "y": 0}, + {"matrix": [7, 2], "x": 36, "y": 0}, + {"matrix": [7, 1], "x": 37, "y": 0} ] } } diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h deleted file mode 100644 index 7d2ce91cdd..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ /dev/null @@ -1,117 +0,0 @@ -#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( \ - 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, \ - L33, L34, R30, R31 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_reversed( \ - R04, R03, R02, R01, R00, L04, L03, L02, L01, L00, \ - R14, R13, R12, R11, R10, L14, L13, L12, L11, L10, \ - R24, R23, R22, R21, R20, L24, L23, L22, L21, L20, \ - R31, R30, L34, L33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_split_3x5_3(\ - 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, \ - L32, L33, L34, R30, R31, R32 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 }, \ -} - -#define LAYOUT_complicated(\ - 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, \ - L33, L34, R30, R31, \ - L31, L32, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_thumbrow(\ - 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, L33, L34, R30, R31, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_full(\ - 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 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { R34, R33, R32, R31, R30 }, \ -} - diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json index 7030086a5c..d9259d5f32 100644 --- a/keyboards/ingrained/info.json +++ b/keyboards/ingrained/info.json @@ -14,266 +14,103 @@ "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0.3 - }, - { - "label": "Q", - "x": 1, - "y": 0.3 - }, - { - "label": "W", - "x": 2, - "y": 0.1 - }, - { - "label": "E", - "x": 3, - "y": 0 - }, - { - "label": "R", - "x": 4, - "y": 0.1 - }, - { - "label": "T", - "x": 5, - "y": 0.2 - }, - { - "label": "Y", - "x": 9, - "y": 0.2 - }, - { - "label": "U", - "x": 10, - "y": 0.1 - }, - { - "label": "I", - "x": 11, - "y": 0 - }, - { - "label": "O", - "x": 12, - "y": 0.1 - }, - { - "label": "P", - "x": 13, - "y": 0.3 - }, - { - "label": "Back Space", - "x": 14, - "y": 0.3 - }, - { - "label": "Tab", - "x": 0, - "y": 1.3 - }, - { - "label": "A", - "x": 1, - "y": 1.3 - }, - { - "label": "S", - "x": 2, - "y": 1.1 - }, - { - "label": "D", - "x": 3, - "y": 1 - }, - { - "label": "F", - "x": 4, - "y": 1.1 - }, - { - "label": "G", - "x": 5, - "y": 1.2 - }, - { - "label": "H", - "x": 9, - "y": 1.2 - }, - { - "label": "J", - "x": 10, - "y": 1.1 - }, - { - "label": "K", - "x": 11, - "y": 1 - }, - { - "label": "L", - "x": 12, - "y": 1.1 - }, - { - "label": ";", - "x": 13, - "y": 1.3 - }, - { - "label": "'", - "x": 14, - "y": 1.3 - }, - { - "label": "Shift", - "x": 0, - "y": 2.3 - }, - { - "label": "Z", - "x": 1, - "y": 2.3 - }, - { - "label": "X", - "x": 2, - "y": 2.1 - }, - { - "label": "C", - "x": 3, - "y": 2 - }, - { - "label": "V", - "x": 4, - "y": 2.1 - }, - { - "label": "B", - "x": 5, - "y": 2.2 - }, - { - "label": "N", - "x": 9, - "y": 2.2 - }, - { - "label": "M", - "x": 10, - "y": 2.1 - }, - { - "label": ",", - "x": 11, - "y": 2 - }, - { - "label": ".", - "x": 12, - "y": 2.1 - }, - { - "label": "/", - "x": 13, - "y": 2.3 - }, - { - "label": "Shift", - "x": 14, - "y": 2.3 - }, - { - "label": "GUI", - "x": 4, - "y": 3.7 - }, - { - "label": "Lower", - "x": 5, - "y": 3.7 - }, - { - "label": "Space", - "x": 6, - "y": 3.2, - "h": 1.5 - }, - { - "label": "Enter", - "x": 8, - "y": 3.2, - "h": 1.5 - }, - { - "label": "Raise", - "x": 9, - "y": 3.7 - }, - { - "label": "Alt", - "x": 10, - "y": 3.7 - } + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [4, 5], "x": 9, "y": 0.2}, + {"matrix": [4, 4], "x": 10, "y": 0.1}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.1}, + {"matrix": [4, 1], "x": 13, "y": 0.3}, + {"matrix": [4, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [5, 5], "x": 9, "y": 1.2}, + {"matrix": [5, 4], "x": 10, "y": 1.1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.1}, + {"matrix": [5, 1], "x": 13, "y": 1.3}, + {"matrix": [5, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [6, 5], "x": 9, "y": 2.2}, + {"matrix": [6, 4], "x": 10, "y": 2.1}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.1}, + {"matrix": [6, 1], "x": 13, "y": 2.3}, + {"matrix": [6, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 9, "y": 3.7}, + {"matrix": [7, 3], "x": 10, "y": 3.7} ] }, "LAYOUT_split_3x5_3": { - "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}, + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0.3}, + {"matrix": [0, 2], "x": 1, "y": 0.1}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0.1}, + {"matrix": [0, 5], "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": [4, 5], "x": 8, "y": 0.2}, + {"matrix": [4, 4], "x": 9, "y": 0.1}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.1}, + {"matrix": [4, 1], "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, 1], "x": 0, "y": 1.3}, + {"matrix": [1, 2], "x": 1, "y": 1.1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 4], "x": 3, "y": 1.1}, + {"matrix": [1, 5], "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": [5, 5], "x": 8, "y": 1.2}, + {"matrix": [5, 4], "x": 9, "y": 1.1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.1}, + {"matrix": [5, 1], "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, 1], "x": 0, "y": 2.3}, + {"matrix": [2, 2], "x": 1, "y": 2.1}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2.1}, + {"matrix": [2, 5], "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": [6, 5], "x": 8, "y": 2.2}, + {"matrix": [6, 4], "x": 9, "y": 2.1}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.1}, + {"matrix": [6, 1], "x": 12, "y": 2.3}, - {"label":"GUI", "x":3, "y":3.7}, - {"label":"Lower", "x":4, "y":3.7}, - {"label":"Space", "x":5, "y":3.2, "h":1.5}, + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, - {"label":"Enter", "x":7, "y":3.2, "h":1.5}, - {"label":"Raise", "x":8, "y":3.7}, - {"label":"Alt", "x":9, "y":3.7} - ] + {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 8, "y": 3.7}, + {"matrix": [7, 3], "x": 9, "y": 3.7} + ] } } } diff --git a/keyboards/ingrained/ingrained.h b/keyboards/ingrained/ingrained.h deleted file mode 100644 index d2e3055951..0000000000 --- a/keyboards/ingrained/ingrained.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2021 s8erdude (@jpuerto96) -// 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 XXX KC_NO - -#define LAYOUT_split_3x6_3( \ - k00, k01, k02, k03, k04, k05, k011, k010, k09, k08, k07, k06,\ - k10, k11, k12, k13, k14, k15, k111, k110, k19, k18, k17, k16,\ - k20, k21, k22, k23, k24, k25, k211, k210, k29, k28, k27, k26,\ - k33, k34, k35, k311, k310, k39\ -) { \ - { k00, k01, k02, k03, k04, k05 },\ - { k10, k11, k12, k13, k14, k15 },\ - { k20, k21, k22, k23, k24, k25 },\ - { XXX, XXX, XXX, k33, k34, k35 },\ - { k06, k07, k08, k09, k010, k011 },\ - { k16, k17, k18, k19, k110, k111 },\ - { k26, k27, k28, k29, k210, k211 },\ - { XXX, XXX, XXX, k39, k310, k311 }\ -} -#define LAYOUT_split_3x5_3( \ - k01, k02, k03, k04, k05, k011, k010, k09, k08, k07,\ - k11, k12, k13, k14, k15, k111, k110, k19, k18, k17,\ - k21, k22, k23, k24, k25, k211, k210, k29, k28, k27,\ - k33, k34, k35, k311, k310, k39\ -) { \ - { XXX, k01, k02, k03, k04, k05 },\ - { XXX, k11, k12, k13, k14, k15 },\ - { XXX, k21, k22, k23, k24, k25 },\ - { XXX, XXX, XXX, k33, k34, k35 },\ - { XXX, k07, k08, k09, k010, k011 },\ - { XXX, k17, k18, k19, k110, k111 },\ - { XXX, k27, k28, k29, k210, k211 },\ - { XXX, XXX, XXX, k39, k310, k311 }\ -} diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h deleted file mode 100644 index ba93405ecc..0000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h +++ /dev/null @@ -1,45 +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_split_3x5_3( \ - 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, R32, R31, R30 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32 }, \ -} - -#define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json index d1bbbdde66..fa44995dbd 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/info.json +++ b/keyboards/kakunpc/suihankey/split/alpha/info.json @@ -3,5 +3,57 @@ "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4", "F5", "F6", "F7"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"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}, + + {"matrix": [4, 4], "x": 8.2, "y": 0.25}, + {"matrix": [4, 3], "x": 9.2, "y": 0.125}, + {"matrix": [4, 2], "x": 10.2, "y": 0}, + {"matrix": [4, 1], "x": 11.2, "y": 0.125}, + {"matrix": [4, 0], "x": 12.2, "y": 0.375}, + + {"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}, + + {"matrix": [5, 4], "x": 8.2, "y": 1.25}, + {"matrix": [5, 3], "x": 9.2, "y": 1.125}, + {"matrix": [5, 2], "x": 10.2, "y": 1}, + {"matrix": [5, 1], "x": 11.2, "y": 1.125}, + {"matrix": [5, 0], "x": 12.2, "y": 1.375}, + + {"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}, + + {"matrix": [6, 4], "x": 8.2, "y": 2.25}, + {"matrix": [6, 3], "x": 9.2, "y": 2.125}, + {"matrix": [6, 2], "x": 10.2, "y": 2}, + {"matrix": [6, 1], "x": 11.2, "y": 2.125}, + {"matrix": [6, 0], "x": 12.2, "y": 2.375}, + + {"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}, + + {"matrix": [7, 2], "x": 6.8, "y": 3.85}, + {"matrix": [7, 1], "x": 7.8, "y": 3.55}, + {"matrix": [7, 0], "x": 8.8, "y": 3.25} + ] + } + } } diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 4cab8c48f2..8f624aeb6c 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -13,54 +13,5 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "community_layouts": ["split_3x5_3"], - "layouts": { - "LAYOUT_split_3x5_3": { - "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}, - - {"x": 8.2, "y": 0.25}, - {"x": 9.2, "y": 0.125}, - {"x": 10.2, "y": 0}, - {"x": 11.2, "y": 0.125}, - {"x": 12.2, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, - - {"x": 8.2, "y": 1.25}, - {"x": 9.2, "y": 1.125}, - {"x": 10.2, "y": 1}, - {"x": 11.2, "y": 1.125}, - {"x": 12.2, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, - - {"x": 8.2, "y": 2.25}, - {"x": 9.2, "y": 2.125}, - {"x": 10.2, "y": 2}, - {"x": 11.2, "y": 2.125}, - {"x": 12.2, "y": 2.375}, - - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85}, - - {"x": 6.8, "y": 3.85}, - {"x": 7.8, "y": 3.55}, - {"x": 8.8, "y": 3.25} - ] - } - } + "community_layouts": ["split_3x5_3"] } diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json index 3d13b5b2f2..071d876c1a 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/info.json +++ b/keyboards/kakunpc/suihankey/split/rev1/info.json @@ -3,5 +3,57 @@ "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"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}, + + {"matrix": [9, 0], "x": 8.2, "y": 0.25}, + {"matrix": [8, 0], "x": 9.2, "y": 0.125}, + {"matrix": [7, 0], "x": 10.2, "y": 0}, + {"matrix": [6, 0], "x": 11.2, "y": 0.125}, + {"matrix": [5, 0], "x": 12.2, "y": 0.375}, + + {"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}, + + {"matrix": [9, 1], "x": 8.2, "y": 1.25}, + {"matrix": [8, 1], "x": 9.2, "y": 1.125}, + {"matrix": [7, 1], "x": 10.2, "y": 1}, + {"matrix": [6, 1], "x": 11.2, "y": 1.125}, + {"matrix": [5, 1], "x": 12.2, "y": 1.375}, + + {"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}, + + {"matrix": [9, 2], "x": 8.2, "y": 2.25}, + {"matrix": [8, 2], "x": 9.2, "y": 2.125}, + {"matrix": [7, 2], "x": 10.2, "y": 2}, + {"matrix": [6, 2], "x": 11.2, "y": 2.125}, + {"matrix": [5, 2], "x": 12.2, "y": 2.375}, + + {"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}, + + {"matrix": [7, 3], "x": 6.8, "y": 3.85}, + {"matrix": [6, 3], "x": 7.8, "y": 3.55}, + {"matrix": [5, 3], "x": 8.8, "y": 3.25} + ] + } + } } diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h deleted file mode 100644 index 98618ba712..0000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h +++ /dev/null @@ -1,47 +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_split_3x5_3( \ - 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, R32, R31, R30 \ -) \ -{ \ - { L00, L10, L20, L30 }, \ - { L01, L11, L21, L31 }, \ - { L02, L12, L22, L32 }, \ - { L03, L13, L23, KC_NO }, \ - { L04, L14, L24, KC_NO }, \ - { R00, R10, R20, R30 }, \ - { R01, R11, R21, R31 }, \ - { R02, R12, R22, R32 }, \ - { R03, R13, R23, KC_NO }, \ - { R04, R14, R24, KC_NO }, \ -} - -#define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 9d1e2b806f..e42ec5a08d 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -19,9 +19,56 @@ "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, "layouts": { "LAYOUT_split_3x5_3": { - "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}, {"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":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "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":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "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":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] + "layout": [ + {"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}, + + {"matrix": [4, 4], "x": 7, "y": 0.25}, + {"matrix": [4, 3], "x": 8, "y": 0.125}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0.125}, + {"matrix": [4, 0], "x": 11, "y": 0.375}, + + {"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}, + + {"matrix": [5, 4], "x": 7, "y": 1.25}, + {"matrix": [5, 3], "x": 8, "y": 1.125}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1.125}, + {"matrix": [5, 0], "x": 11, "y": 1.375}, + + {"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}, + + {"matrix": [6, 4], "x": 7, "y": 2.25}, + {"matrix": [6, 3], "x": 8, "y": 2.125}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2.125}, + {"matrix": [6, 0], "x": 11, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.5, "y": 4.75}, + {"matrix": [3, 3], "x": 3.5, "y": 4.75}, + {"matrix": [3, 4], "x": 4.5, "y": 3.75, "h": 2}, + + {"matrix": [7, 4], "x": 6.5, "y": 3.75, "h": 2}, + {"matrix": [7, 3], "x": 7.5, "y": 4.75}, + {"matrix": [7, 2], "x": 8.5, "y": 4.75} + ] } } } diff --git a/keyboards/maple_computing/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h deleted file mode 100644 index bb8bd64666..0000000000 --- a/keyboards/maple_computing/minidox/rev1/rev1.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define ___ KC_NO - -#define LAYOUT_split_3x5_3( \ - k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \ - k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \ - k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \ - k33, k34, k35, k75, k74, k73 \ - ) \ - { \ - { k01, k02, k03, k04, k05 }, \ - { k11, k12, k13, k14, k15 }, \ - { k21, k22, k23, k24, k25 }, \ - { ___, ___, k33, k34, k35 }, \ - { k41, k42, k43, k44, k45 }, \ - { k51, k52, k53, k54, k55 }, \ - { k61, k62, k63, k64, k65 }, \ - { ___, ___, k73, k74, k75 } \ - } - -#define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/obosob/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h deleted file mode 100644 index 11c5e2de22..0000000000 --- a/keyboards/obosob/arch_36/arch_36.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 Obosob - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x5_3( \ - L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ - L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \ - L32, L33, L34, R35, R36, R37 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, L32, L33, L34 }, \ - { R09, R08, R07, R06, R05 }, \ - { R19, R18, R17, R16, R15 }, \ - { R29, R28, R27, R26, R25 }, \ - { KC_NO, KC_NO, R37, R36, R35 }, \ -} diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 9b0fa7841e..9eef360e86 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -22,45 +22,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "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":3.5, "y":3.5}, - {"x":4.5, "y":3.7}, - {"x":5.5, "y":4.1}, - {"x":7.5, "y":4.1}, - {"x":8.5, "y":3.7}, - {"x":9.5, "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, 2], "x": 3.5, "y": 3.5}, + {"matrix": [3, 3], "x": 4.5, "y": 3.7}, + {"matrix": [3, 4], "x": 5.5, "y": 4.1}, + + {"matrix": [7, 4], "x": 7.5, "y": 4.1}, + {"matrix": [7, 3], "x": 8.5, "y": 3.7}, + {"matrix": [7, 2], "x": 9.5, "y": 3.5} ] } } diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json index 1f11badbfc..971b9939cf 100644 --- a/keyboards/pierce/info.json +++ b/keyboards/pierce/info.json @@ -14,46 +14,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.13}, - {"x":2, "y":0}, - {"x":3, "y":0.13}, - {"x":4, "y":0.25}, - {"x":7, "y":0.25}, - {"x":8, "y":0.13}, - {"x":9, "y":0}, - {"x":10, "y":0.13}, - {"x":11, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.13}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.13}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, - {"x":0, "y":1.5}, - {"x":1, "y":1.13}, - {"x":2, "y":1}, - {"x":3, "y":1.13}, - {"x":4, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.13}, - {"x":9, "y":1}, - {"x":10, "y":1.13}, - {"x":11, "y":1.5}, + {"matrix": [0, 5], "x": 7, "y": 0.25}, + {"matrix": [0, 6], "x": 8, "y": 0.13}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0.13}, + {"matrix": [0, 9], "x": 11, "y": 0.5}, - {"x":0, "y":2.5}, - {"x":1, "y":2.13}, - {"x":2, "y":2}, - {"x":3, "y":2.13}, - {"x":4, "y":2.25}, - {"x":7, "y":2.25}, - {"x":8, "y":2.13}, - {"x":9, "y":2}, - {"x":10, "y":2.13}, - {"x":11, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.13}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.13}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"x":2.5, "y":3.16}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.75}, + {"matrix": [1, 5], "x": 7, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.13}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1.13}, + {"matrix": [1, 9], "x": 11, "y": 1.5}, - {"x":6.5, "y":3.75}, - {"x":7.5, "y":3.5}, - {"x":8.5, "y":3.16} + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.13}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.13}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [2, 5], "x": 7, "y": 2.25}, + {"matrix": [2, 6], "x": 8, "y": 2.13}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2.13}, + {"matrix": [2, 9], "x": 11, "y": 2.5}, + + {"matrix": [3, 2], "x": 2.5, "y": 3.16}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"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.5}, + {"matrix": [3, 7], "x": 8.5, "y": 3.16} ] } } diff --git a/keyboards/pierce/pierce.h b/keyboards/pierce/pierce.h deleted file mode 100644 index edb4151740..0000000000 --- a/keyboards/pierce/pierce.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2022 durken (https://github.com/durken1/) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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_split_3x5_3( \ - 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 }, \ - { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \ -} diff --git a/keyboards/pinky/3/3.h b/keyboards/pinky/3/3.h deleted file mode 100644 index f492646176..0000000000 --- a/keyboards/pinky/3/3.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_split_3x7_4( \ - 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, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \ - } - -#define LAYOUT LAYOUT_split_3x7_4 diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/info.json index 13a87f9121..770d368399 100644 --- a/keyboards/pinky/3/info.json +++ b/keyboards/pinky/3/info.json @@ -18,62 +18,69 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x7_4" + }, "layouts": { "LAYOUT_split_3x7_4": { "layout": [ - {"label":"Esc", "x":0, "y":0.3}, - {"label":"Q", "x":1, "y":0.3}, - {"label":"W", "x":2, "y":0.2}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.2}, - {"label":"T", "x":5, "y":0.4}, - {"label":"(", "x":6, "y":0.6}, - {"label":")", "x":9, "y":0.6}, - {"label":"Y", "x":10, "y":0.4}, - {"label":"U", "x":11, "y":0.2}, - {"label":"I", "x":12, "y":0}, - {"label":"O", "x":13, "y":0.2}, - {"label":"P", "x":14, "y":0.3}, - {"label":"Backspace", "x":15, "y":0.3}, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"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}, + {"matrix": [0, 6], "x": 6, "y": 0.6}, + + {"matrix": [4, 6], "x": 9, "y": 0.6}, + {"matrix": [4, 5], "x": 10, "y": 0.4}, + {"matrix": [4, 4], "x": 11, "y": 0.2}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0.2}, + {"matrix": [4, 1], "x": 14, "y": 0.3}, + {"matrix": [4, 0], "x": 15, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"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}, + {"matrix": [1, 6], "x": 6, "y": 1.6}, + + {"matrix": [5, 6], "x": 9, "y": 1.6}, + {"matrix": [5, 5], "x": 10, "y": 1.4}, + {"matrix": [5, 4], "x": 11, "y": 1.2}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1.2}, + {"matrix": [5, 1], "x": 14, "y": 1.3}, + {"matrix": [5, 0], "x": 15, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"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}, + {"matrix": [2, 6], "x": 6, "y": 3}, - {"label":"Ctrl / Tab", "x":0, "y":1.3}, - {"label":"A", "x":1, "y":1.3}, - {"label":"S", "x":2, "y":1.2}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.2}, - {"label":"G", "x":5, "y":1.4}, - {"label":"[", "x":6, "y":1.6}, - {"label":"]", "x":9, "y":1.6}, - {"label":"H", "x":10, "y":1.4}, - {"label":"J", "x":11, "y":1.2}, - {"label":"K", "x":12, "y":1}, - {"label":"L", "x":13, "y":1.2}, - {"label":":", "x":14, "y":1.3}, - {"label":"\"", "x":15, "y":1.3}, + {"matrix": [6, 6], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 2.4}, + {"matrix": [6, 4], "x": 11, "y": 2.2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2.2}, + {"matrix": [6, 1], "x": 14, "y": 2.3}, + {"matrix": [6, 0], "x": 15, "y": 2.3}, - {"label":"Shift", "x":0, "y":2.3}, - {"label":"Z", "x":1, "y":2.3}, - {"label":"X", "x":2, "y":2.2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.2}, - {"label":"B", "x":5, "y":2.4}, - {"label":"MO(_ADJUST)", "x":6, "y":3}, - {"label":"MO(_ADJUST)", "x":9, "y":3}, - {"label":"N", "x":10, "y":2.4}, - {"label":"M", "x":11, "y":2.2}, - {"label":"<", "x":12, "y":2}, - {"label":">", "x":13, "y":2.2}, - {"label":"?", "x":14, "y":2.3}, - {"label":"Enter", "x":15, "y":2.3}, + {"matrix": [3, 3], "x": 3.5, "y": 3.7}, + {"matrix": [3, 4], "x": 4.5, "y": 3.8}, + {"matrix": [3, 5], "x": 5.5, "y": 4}, + {"matrix": [3, 6], "x": 6.5, "y": 4.3}, - {"label":"Alt", "x":3.5, "y":3.7}, - {"label":"MO(_LOWER)", "x":4.5, "y":3.8}, - {"label":"GUI", "x":5.5, "y":4}, - {"label":"Space", "x":6.5, "y":4.3}, - {"label":"Space", "x":8.5, "y":4.3}, - {"label":"GUI", "x":9.5, "y":4}, - {"label":"MO(_RAISE)", "x":10.5, "y":3.8}, - {"label":"Alt", "x":11.5, "y":3.7} + {"matrix": [7, 6], "x": 8.5, "y": 4.3}, + {"matrix": [7, 5], "x": 9.5, "y": 4}, + {"matrix": [7, 4], "x": 10.5, "y": 3.8}, + {"matrix": [7, 3], "x": 11.5, "y": 3.7} ] } } diff --git a/keyboards/pinky/4/4.h b/keyboards/pinky/4/4.h deleted file mode 100644 index 381ce82bce..0000000000 --- a/keyboards/pinky/4/4.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_split_4x7_4( \ - 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, R40, 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, KC_NO, KC_NO, L40, L41, L42, L43 }, \ - { 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 }, \ - { KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \ - } - -#define LAYOUT LAYOUT_split_4x7_4 diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/info.json index 2c1732ea16..01e44a647b 100644 --- a/keyboards/pinky/4/info.json +++ b/keyboards/pinky/4/info.json @@ -18,77 +18,85 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_4x7_4" + }, "layouts": { "LAYOUT_split_4x7_4": { "layout": [ - {"label":"Esc", "x":0, "y":0.3}, - {"label":"1", "x":1, "y":0.3}, - {"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}, - {"label":"(", "x":6, "y":0.6}, - {"label":")", "x":9, "y":0.6}, - {"label":"6", "x":10, "y":0.4}, - {"label":"7", "x":11, "y":0.2}, - {"label":"8", "x":12, "y":0}, - {"label":"9", "x":13, "y":0.2}, - {"label":"0", "x":14, "y":0.3}, - {"label":"Backspace", "x":15, "y":0.3}, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"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}, + {"matrix": [0, 6], "x": 6, "y": 0.6}, + + {"matrix": [5, 6], "x": 9, "y": 0.6}, + {"matrix": [5, 5], "x": 10, "y": 0.4}, + {"matrix": [5, 4], "x": 11, "y": 0.2}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0.2}, + {"matrix": [5, 1], "x": 14, "y": 0.3}, + {"matrix": [5, 0], "x": 15, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"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}, + {"matrix": [1, 6], "x": 6, "y": 1.6}, + + {"matrix": [6, 6], "x": 9, "y": 1.6}, + {"matrix": [6, 5], "x": 10, "y": 1.4}, + {"matrix": [6, 4], "x": 11, "y": 1.2}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1.2}, + {"matrix": [6, 1], "x": 14, "y": 1.3}, + {"matrix": [6, 0], "x": 15, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"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}, + {"matrix": [2, 6], "x": 6, "y": 2.6}, + + {"matrix": [7, 6], "x": 9, "y": 2.6}, + {"matrix": [7, 5], "x": 10, "y": 2.4}, + {"matrix": [7, 4], "x": 11, "y": 2.2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2.2}, + {"matrix": [7, 1], "x": 14, "y": 2.3}, + {"matrix": [7, 0], "x": 15, "y": 2.3}, - {"label":"Tab", "x":0, "y":1.3}, - {"label":"Q", "x":1, "y":1.3}, - {"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}, - {"label":"[", "x":6, "y":1.6}, - {"label":"]", "x":9, "y":1.6}, - {"label":"Y", "x":10, "y":1.4}, - {"label":"U", "x":11, "y":1.2}, - {"label":"I", "x":12, "y":1}, - {"label":"O", "x":13, "y":1.2}, - {"label":"P", "x":14, "y":1.3}, - {"label":"\\", "x":15, "y":1.3}, + {"matrix": [3, 0], "x": 0, "y": 3.3}, + {"matrix": [3, 1], "x": 1, "y": 3.3}, + {"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": [3, 6], "x": 6, "y": 4}, - {"label":"Ctrl / Tab", "x":0, "y":2.3}, - {"label":"A", "x":1, "y":2.3}, - {"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}, - {"label":"{", "x":6, "y":2.6}, - {"label":"}", "x":9, "y":2.6}, - {"label":"H", "x":10, "y":2.4}, - {"label":"J", "x":11, "y":2.2}, - {"label":"K", "x":12, "y":2}, - {"label":"L", "x":13, "y":2.2}, - {"label":":", "x":14, "y":2.3}, - {"label":"\"", "x":15, "y":2.3}, + {"matrix": [8, 6], "x": 9, "y": 4}, + {"matrix": [8, 5], "x": 10, "y": 3.4}, + {"matrix": [8, 4], "x": 11, "y": 3.2}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3.2}, + {"matrix": [8, 1], "x": 14, "y": 3.3}, + {"matrix": [8, 0], "x": 15, "y": 3.3}, - {"label":"Shift", "x":0, "y":3.3}, - {"label":"Z", "x":1, "y":3.3}, - {"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":"MO(_ADJUST)", "x":6, "y":4}, - {"label":"MO(_ADJUST)", "x":9, "y":4}, - {"label":"N", "x":10, "y":3.4}, - {"label":"M", "x":11, "y":3.2}, - {"label":"<", "x":12, "y":3}, - {"label":">", "x":13, "y":3.2}, - {"label":"?", "x":14, "y":3.3}, - {"label":"Enter", "x":15, "y":3.3}, + {"matrix": [4, 3], "x": 3.5, "y": 4.7}, + {"matrix": [4, 4], "x": 4.5, "y": 4.8}, + {"matrix": [4, 5], "x": 5.5, "y": 5}, + {"matrix": [4, 6], "x": 6.5, "y": 5.3}, - {"label":"Alt", "x":3.5, "y":4.7}, - {"label":"MO(_LOWER)", "x":4.5, "y":4.8}, - {"label":"GUI", "x":5.5, "y":5}, - {"label":"Space", "x":6.5, "y":5.3}, - {"label":"Space", "x":8.5, "y":5.3}, - {"label":"GUI", "x":9.5, "y":5}, - {"label":"MO(_RAISE)", "x":10.5, "y":4.8}, - {"label":"Alt", "x":11.5, "y":4.7} + {"matrix": [9, 6], "x": 8.5, "y": 5.3}, + {"matrix": [9, 5], "x": 9.5, "y": 5}, + {"matrix": [9, 4], "x": 10.5, "y": 4.8}, + {"matrix": [9, 3], "x": 11.5, "y": 4.7} ] } } diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json index f1d548a8a0..e3dfef5ab7 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/info.json @@ -21,9 +21,49 @@ "layouts": { "LAYOUT_split_3x6_1": { "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":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": [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, 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}, + + {"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": 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/pisces/pisces.c b/keyboards/pisces/pisces.c index 18814c4744..ca2016280d 100644 --- a/keyboards/pisces/pisces.c +++ b/keyboards/pisces/pisces.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "pisces.h" +#include "quantum.h" const matrix_row_t matrix_mask[MATRIX_ROWS] = { // 87654321 diff --git a/keyboards/pisces/pisces.h b/keyboards/pisces/pisces.h deleted file mode 100644 index b2d61c17c3..0000000000 --- a/keyboards/pisces/pisces.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 knaruo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x6_1( \ - 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, L26, R26, R20, R21, R22, R23, R24, R25 \ -) { \ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { R05, R04, R03, R02, R01, R00, KC_NO }, \ - { R15, R14, R13, R12, R11, R10, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, R26 } \ -} diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 66092d592c..54bcb2e7fa 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -34,90 +34,98 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"x":0, "y":1}, - {"x":1, "y":0.5}, - {"x":2, "y":0}, - {"x":3, "y":0.5}, - {"x":4, "y":0.75}, - {"x":10, "y":0.75}, - {"x":11, "y":0.5}, - {"x":12, "y":0}, - {"x":13, "y":0.5}, - {"x":14, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.75}, - {"x":0, "y":2}, - {"x":1, "y":1.5}, - {"x":2, "y":1}, - {"x":3, "y":1.5}, - {"x":4, "y":1.75}, - {"x":10, "y":1.75}, - {"x":11, "y":1.5}, - {"x":12, "y":1}, - {"x":13, "y":1.5}, - {"x":14, "y":2}, + {"matrix": [4, 4], "x": 10, "y": 0.75}, + {"matrix": [4, 3], "x": 11, "y": 0.5}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0.5}, + {"matrix": [4, 0], "x": 14, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":2.5}, - {"x":2, "y":2}, - {"x":3, "y":2.5}, - {"x":4, "y":2.75}, - {"x":10, "y":2.75}, - {"x":11, "y":2.5}, - {"x":12, "y":2}, - {"x":13, "y":2.5}, - {"x":14, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.75}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4} + {"matrix": [5, 4], "x": 10, "y": 1.75}, + {"matrix": [5, 3], "x": 11, "y": 1.5}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 1], "x": 13, "y": 1.5}, + {"matrix": [5, 0], "x": 14, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.75}, + + {"matrix": [6, 4], "x": 10, "y": 2.75}, + {"matrix": [6, 3], "x": 11, "y": 2.5}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 1], "x": 13, "y": 2.5}, + {"matrix": [6, 0], "x": 14, "y": 3}, + + {"matrix": [3, 0], "x": 4, "y": 4}, + {"matrix": [3, 1], "x": 5, "y": 4}, + {"matrix": [3, 2], "x": 6, "y": 4}, + + {"matrix": [7, 2], "x": 8, "y": 4}, + {"matrix": [7, 1], "x": 9, "y": 4}, + {"matrix": [7, 0], "x": 10, "y": 4} ] }, "LAYOUT_split_3x5_3_encoder": { "layout": [ - {"x":0, "y":1}, - {"x":1, "y":0.5}, - {"x":2, "y":0}, - {"x":3, "y":0.5}, - {"x":4, "y":0.75}, - {"x":10, "y":0.75}, - {"x":11, "y":0.5}, - {"x":12, "y":0}, - {"x":13, "y":0.5}, - {"x":14, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.75}, + + {"matrix": [4, 4], "x": 10, "y": 0.75}, + {"matrix": [4, 3], "x": 11, "y": 0.5}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0.5}, + {"matrix": [4, 0], "x": 14, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.75}, + + {"matrix": [5, 4], "x": 10, "y": 1.75}, + {"matrix": [5, 3], "x": 11, "y": 1.5}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 1], "x": 13, "y": 1.5}, + {"matrix": [5, 0], "x": 14, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.75}, + {"matrix": [3, 4], "x": 5.5, "y": 2.75}, - {"x":0, "y":2}, - {"x":1, "y":1.5}, - {"x":2, "y":1}, - {"x":3, "y":1.5}, - {"x":4, "y":1.75}, - {"x":10, "y":1.75}, - {"x":11, "y":1.5}, - {"x":12, "y":1}, - {"x":13, "y":1.5}, - {"x":14, "y":2}, + {"matrix": [7, 4], "x": 8.5, "y": 2.75}, + {"matrix": [6, 4], "x": 10, "y": 2.75}, + {"matrix": [6, 3], "x": 11, "y": 2.5}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 1], "x": 13, "y": 2.5}, + {"matrix": [6, 0], "x": 14, "y": 3}, - {"x":0, "y":3}, - {"x":1, "y":2.5}, - {"x":2, "y":2}, - {"x":3, "y":2.5}, - {"x":4, "y":2.75}, - {"label":"enc1", "x":5.5, "y":2.75}, - {"label":"enc2", "x":8.5, "y":2.75}, - {"x":10, "y":2.75}, - {"x":11, "y":2.5}, - {"x":12, "y":2}, - {"x":13, "y":2.5}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 4, "y": 4}, + {"matrix": [3, 1], "x": 5, "y": 4}, + {"matrix": [3, 2], "x": 6, "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} + {"matrix": [7, 2], "x": 8, "y": 4}, + {"matrix": [7, 1], "x": 9, "y": 4}, + {"matrix": [7, 0], "x": 10, "y": 4} ] } } diff --git a/keyboards/pteron36/pteron36.c b/keyboards/pteron36/pteron36.c index 4c14e6ebd5..fbcc64b706 100644 --- a/keyboards/pteron36/pteron36.c +++ b/keyboards/pteron36/pteron36.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "pteron36.h" +#include "quantum.h" //common encoder setup diff --git a/keyboards/pteron36/pteron36.h b/keyboards/pteron36/pteron36.h deleted file mode 100644 index 113e7270db..0000000000 --- a/keyboards/pteron36/pteron36.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2021 Harshit Goel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x5_3( \ - 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, R32, R31, R30\ -) {\ - {L00, L01, L02,L03, L04 },\ - {L10, L11, L12,L13, L14 },\ - {L20, L21, L22,L23, L24 },\ - {L30, L31, L32, KC_NO, KC_NO },\ - {R00, R01, R02,R03, R04 },\ - {R10, R11, R12,R13, R14 },\ - {R20, R21, R22,R23, R24 },\ - {R30, R31, R32,KC_NO, KC_NO }\ -} -#define LAYOUT_split_3x5_3_encoder(\ - 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 ,L34, R34,R24, R23, R22, R21, R20, \ - L30, L31, L32, R32, R31, R30\ -){\ - {L00, L01, L02,L03, L04 },\ - {L10, L11, L12,L13, L14 },\ - {L20, L21, L22,L23, L24 },\ - {L30, L31, L32, KC_NO, L34 },\ - {R00, R01, R02,R03, R04 },\ - {R10, R11, R12,R13, R14 },\ - {R20, R21, R22,R23, R24 },\ - {R30, R31, R32,KC_NO, R34 }\ -} diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 3a2b853eac..03774dcfe5 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -23,59 +23,130 @@ } } }, + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_5" + }, "layouts": { - "LAYOUT": { + "LAYOUT_split_3x6_5": { + "layout": [ + {"matrix": [0, 7], "x": 0, "y": 0.75}, + {"matrix": [0, 6], "x": 1, "y": 0.75}, + {"matrix": [0, 5], "x": 2, "y": 0.25}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0.25}, + {"matrix": [0, 2], "x": 5, "y": 0.5}, + + {"matrix": [4, 2], "x": 10.5, "y": 0.5}, + {"matrix": [4, 3], "x": 11.5, "y": 0.25}, + {"matrix": [4, 4], "x": 12.5, "y": 0}, + {"matrix": [4, 5], "x": 13.5, "y": 0.25}, + {"matrix": [4, 6], "x": 14.5, "y": 0.75}, + {"matrix": [4, 7], "x": 15.5, "y": 0.75}, + + {"matrix": [1, 7], "x": 0, "y": 1.75}, + {"matrix": [1, 6], "x": 1, "y": 1.75}, + {"matrix": [1, 5], "x": 2, "y": 1.25}, + {"matrix": [1, 4], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 2], "x": 5, "y": 1.5}, + + {"matrix": [5, 2], "x": 10.5, "y": 1.5}, + {"matrix": [5, 3], "x": 11.5, "y": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1.25}, + {"matrix": [5, 6], "x": 14.5, "y": 1.75}, + {"matrix": [5, 7], "x": 15.5, "y": 1.75}, + + {"matrix": [2, 7], "x": 0, "y": 2.75}, + {"matrix": [2, 6], "x": 1, "y": 2.75}, + {"matrix": [2, 5], "x": 2, "y": 2.25}, + {"matrix": [2, 4], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 2], "x": 5, "y": 2.5}, + {"matrix": [2, 1], "x": 6, "y": 3}, + {"matrix": [2, 0], "x": 7, "y": 3.25}, + + {"matrix": [6, 0], "x": 8.5, "y": 3.25}, + {"matrix": [6, 1], "x": 9.5, "y": 3}, + {"matrix": [6, 2], "x": 10.5, "y": 2.5}, + {"matrix": [6, 3], "x": 11.5, "y": 2.25}, + {"matrix": [6, 4], "x": 12.5, "y": 2}, + {"matrix": [6, 5], "x": 13.5, "y": 2.25}, + {"matrix": [6, 6], "x": 14.5, "y": 2.75}, + {"matrix": [6, 7], "x": 15.5, "y": 2.75}, + + {"matrix": [3, 4], "x": 2.5, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 2], "x": 4.5, "y": 3.5}, + {"matrix": [3, 1], "x": 5.5, "y": 4}, + {"matrix": [3, 0], "x": 6.5, "y": 4.25}, + + {"matrix": [7, 0], "x": 9, "y": 4.25}, + {"matrix": [7, 1], "x": 10, "y": 4}, + {"matrix": [7, 2], "x": 11, "y": 3.5}, + {"matrix": [7, 3], "x": 12, "y": 3.25}, + {"matrix": [7, 4], "x": 13, "y": 3.25} + ] + }, + "LAYOUT_stack": { "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":10.5, "y":0.5}, - {"x":11.5, "y":0.25}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0.25}, - {"x":14.5, "y":0.75}, - {"x":15.5, "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.5}, - {"x":10.5, "y":1.5}, - {"x":11.5, "y":1.25}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1.25}, - {"x":14.5, "y":1.75}, - {"x":15.5, "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.5}, - {"x":6, "y":3}, - {"x":7, "y":3.25}, - {"x":8.5, "y":3.25}, - {"x":9.5, "y":3}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2.25}, - {"x":14.5, "y":2.75}, - {"x":15.5, "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":4}, - {"x":6.5, "y":4.25}, - {"x":9, "y":4.25}, - {"x":10, "y":4}, - {"x":11, "y":3.5}, - {"x":12, "y":3.25}, - {"x":13, "y":3.25} + {"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": [1, 7], "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": [2, 7], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [2, 5], "x": 14, "y": 0}, + {"matrix": [2, 4], "x": 15, "y": 0}, + {"matrix": [2, 3], "x": 16, "y": 0}, + {"matrix": [2, 2], "x": 17, "y": 0}, + {"matrix": [2, 1], "x": 18, "y": 0}, + {"matrix": [2, 0], "x": 19, "y": 0}, + + {"matrix": [3, 4], "x": 20, "y": 0}, + {"matrix": [3, 3], "x": 21, "y": 0}, + {"matrix": [3, 2], "x": 22, "y": 0}, + {"matrix": [3, 1], "x": 23, "y": 0}, + {"matrix": [3, 0], "x": 24, "y": 0}, + + {"matrix": [4, 2], "x": 25, "y": 0}, + {"matrix": [4, 3], "x": 26, "y": 0}, + {"matrix": [4, 4], "x": 27, "y": 0}, + {"matrix": [4, 5], "x": 28, "y": 0}, + {"matrix": [4, 6], "x": 29, "y": 0}, + {"matrix": [4, 7], "x": 30, "y": 0}, + + {"matrix": [5, 2], "x": 31, "y": 0}, + {"matrix": [5, 3], "x": 32, "y": 0}, + {"matrix": [5, 4], "x": 33, "y": 0}, + {"matrix": [5, 5], "x": 34, "y": 0}, + {"matrix": [5, 6], "x": 35, "y": 0}, + {"matrix": [5, 7], "x": 36, "y": 0}, + + {"matrix": [6, 0], "x": 37, "y": 0}, + {"matrix": [6, 1], "x": 38, "y": 0}, + {"matrix": [6, 2], "x": 39, "y": 0}, + {"matrix": [6, 3], "x": 40, "y": 0}, + {"matrix": [6, 4], "x": 41, "y": 0}, + {"matrix": [6, 5], "x": 42, "y": 0}, + {"matrix": [6, 6], "x": 43, "y": 0}, + {"matrix": [6, 7], "x": 44, "y": 0}, + + {"matrix": [7, 0], "x": 45, "y": 0}, + {"matrix": [7, 1], "x": 46, "y": 0}, + {"matrix": [7, 2], "x": 47, "y": 0}, + {"matrix": [7, 3], "x": 48, "y": 0}, + {"matrix": [7, 4], "x": 49, "y": 0} ] } } diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c index 52a62ccef8..db14411933 100644 --- a/keyboards/splitkb/kyria/rev1/rev1.c +++ b/keyboards/splitkb/kyria/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 SWAP_HANDS_ENABLE // clang-format off diff --git a/keyboards/splitkb/kyria/rev1/rev1.h b/keyboards/splitkb/kyria/rev1/rev1.h deleted file mode 100644 index 9b5ea58ead..0000000000 --- a/keyboards/splitkb/kyria/rev1/rev1.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 2019 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, R06, R07, R08, R09, R10, R11, \ - L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ - L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \ - L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \ -) \ -{ \ - { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ - { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ - { L31, L30, L29, L28, L27, L26, L25, L24 }, \ - { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ - { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ - { R32, R33, R34, R35, R36, R37, R38, R39 }, \ - { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ -} - -#define LAYOUT_stack( \ - L00, L01, L02, L03, L04, L05, \ - L12, L13, L14, L15, L16, L17, \ - L24, L25, L26, L27, L28, L29, L30, L31, \ - L40, L41, L42, L43, L44, \ - \ - R06, R07, R08, R09, R10, R11, \ - R18, R19, R20, R21, R22, R23, \ - R32, R33, R34, R35, R36, R37, R38, R39, \ - R45, R46, R47, R48, R49 \ -) \ -{ \ - { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ - { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ - { L31, L30, L29, L28, L27, L26, L25, L24 }, \ - { L44, L43, L42, L41, L40, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ - { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ - { R32, R33, R34, R35, R36, R37, R38, R39 }, \ - { R45, R46, R47, R48, R49, KC_NO, KC_NO, KC_NO }, \ -} - -#define LAYOUT_split_3x6_5 LAYOUT diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index c0aa1047c5..67c9e7a775 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -29,59 +29,130 @@ } } }, + "layout_aliases": { + "LAYOUT_split_3x6_5": "LAYOUT" + }, "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":10.5, "y":0.5}, - {"x":11.5, "y":0.25}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0.25}, - {"x":14.5, "y":0.75}, - {"x":15.5, "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.5}, - {"x":10.5, "y":1.5}, - {"x":11.5, "y":1.25}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1.25}, - {"x":14.5, "y":1.75}, - {"x":15.5, "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.5}, - {"x":6, "y":3}, - {"x":7, "y":3.25}, - {"x":8.5, "y":3.25}, - {"x":9.5, "y":3}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2.25}, - {"x":14.5, "y":2.75}, - {"x":15.5, "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":4}, - {"x":6.5, "y":4.25}, - {"x":9, "y":4.25}, - {"x":10, "y":4}, - {"x":11, "y":3.5}, - {"x":12, "y":3.25}, - {"x":13, "y":3.25} + {"matrix": [0, 7], "x": 0, "y": 0.75}, + {"matrix": [0, 6], "x": 1, "y": 0.75}, + {"matrix": [0, 5], "x": 2, "y": 0.25}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0.25}, + {"matrix": [0, 2], "x": 5, "y": 0.5}, + + {"matrix": [4, 2], "x": 10.5, "y": 0.5}, + {"matrix": [4, 3], "x": 11.5, "y": 0.25}, + {"matrix": [4, 4], "x": 12.5, "y": 0}, + {"matrix": [4, 5], "x": 13.5, "y": 0.25}, + {"matrix": [4, 6], "x": 14.5, "y": 0.75}, + {"matrix": [4, 7], "x": 15.5, "y": 0.75}, + + {"matrix": [1, 7], "x": 0, "y": 1.75}, + {"matrix": [1, 6], "x": 1, "y": 1.75}, + {"matrix": [1, 5], "x": 2, "y": 1.25}, + {"matrix": [1, 4], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 2], "x": 5, "y": 1.5}, + + {"matrix": [5, 2], "x": 10.5, "y": 1.5}, + {"matrix": [5, 3], "x": 11.5, "y": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1.25}, + {"matrix": [5, 6], "x": 14.5, "y": 1.75}, + {"matrix": [5, 7], "x": 15.5, "y": 1.75}, + + {"matrix": [2, 7], "x": 0, "y": 2.75}, + {"matrix": [2, 6], "x": 1, "y": 2.75}, + {"matrix": [2, 5], "x": 2, "y": 2.25}, + {"matrix": [2, 4], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 2], "x": 5, "y": 2.5}, + {"matrix": [2, 1], "x": 6, "y": 3}, + {"matrix": [2, 0], "x": 7, "y": 3.25}, + + {"matrix": [6, 0], "x": 8.5, "y": 3.25}, + {"matrix": [6, 1], "x": 9.5, "y": 3}, + {"matrix": [6, 2], "x": 10.5, "y": 2.5}, + {"matrix": [6, 3], "x": 11.5, "y": 2.25}, + {"matrix": [6, 4], "x": 12.5, "y": 2}, + {"matrix": [6, 5], "x": 13.5, "y": 2.25}, + {"matrix": [6, 6], "x": 14.5, "y": 2.75}, + {"matrix": [6, 7], "x": 15.5, "y": 2.75}, + + {"matrix": [3, 5], "x": 2.5, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 2], "x": 4.5, "y": 3.5}, + {"matrix": [3, 1], "x": 5.5, "y": 4}, + {"matrix": [3, 0], "x": 6.5, "y": 4.25}, + + {"matrix": [7, 0], "x": 9, "y": 4.25}, + {"matrix": [7, 1], "x": 10, "y": 4}, + {"matrix": [7, 2], "x": 11, "y": 3.5}, + {"matrix": [7, 3], "x": 12, "y": 3.25}, + {"matrix": [7, 5], "x": 13, "y": 3.25} + ] + }, + "LAYOUT_stack": { + "layout": [ + {"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": [1, 7], "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": [2, 7], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [2, 5], "x": 14, "y": 0}, + {"matrix": [2, 4], "x": 15, "y": 0}, + {"matrix": [2, 3], "x": 16, "y": 0}, + {"matrix": [2, 2], "x": 17, "y": 0}, + {"matrix": [2, 1], "x": 18, "y": 0}, + {"matrix": [2, 0], "x": 19, "y": 0}, + + {"matrix": [3, 5], "x": 20, "y": 0}, + {"matrix": [3, 3], "x": 21, "y": 0}, + {"matrix": [3, 2], "x": 22, "y": 0}, + {"matrix": [3, 1], "x": 23, "y": 0}, + {"matrix": [3, 0], "x": 24, "y": 0}, + + {"matrix": [4, 2], "x": 25, "y": 0}, + {"matrix": [4, 3], "x": 26, "y": 0}, + {"matrix": [4, 4], "x": 27, "y": 0}, + {"matrix": [4, 5], "x": 28, "y": 0}, + {"matrix": [4, 6], "x": 29, "y": 0}, + {"matrix": [4, 7], "x": 30, "y": 0}, + + {"matrix": [5, 2], "x": 31, "y": 0}, + {"matrix": [5, 3], "x": 32, "y": 0}, + {"matrix": [5, 4], "x": 33, "y": 0}, + {"matrix": [5, 5], "x": 34, "y": 0}, + {"matrix": [5, 6], "x": 35, "y": 0}, + {"matrix": [5, 7], "x": 36, "y": 0}, + + {"matrix": [6, 0], "x": 37, "y": 0}, + {"matrix": [6, 1], "x": 38, "y": 0}, + {"matrix": [6, 2], "x": 39, "y": 0}, + {"matrix": [6, 3], "x": 40, "y": 0}, + {"matrix": [6, 4], "x": 41, "y": 0}, + {"matrix": [6, 5], "x": 42, "y": 0}, + {"matrix": [6, 6], "x": 43, "y": 0}, + {"matrix": [6, 7], "x": 44, "y": 0}, + + {"matrix": [7, 0], "x": 45, "y": 0}, + {"matrix": [7, 1], "x": 46, "y": 0}, + {"matrix": [7, 2], "x": 47, "y": 0}, + {"matrix": [7, 3], "x": 48, "y": 0}, + {"matrix": [7, 5], "x": 49, "y": 0} ] } } diff --git a/keyboards/splitkb/kyria/rev2/rev2.c b/keyboards/splitkb/kyria/rev2/rev2.c index 3ec4aa37f0..37300c8188 100644 --- a/keyboards/splitkb/kyria/rev2/rev2.c +++ b/keyboards/splitkb/kyria/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" // Mask out handedness diode to prevent it // from keeping the keyboard awake diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h deleted file mode 100644 index 89d69abc9a..0000000000 --- a/keyboards/splitkb/kyria/rev2/rev2.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, R06, R07, R08, R09, R10, R11, \ - L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ - L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \ - L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \ -) \ -{ \ - { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ - { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ - { L31, L30, L29, L28, L27, L26, L25, L24 }, \ - { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ - { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ - { R32, R33, R34, R35, R36, R37, R38, R39 }, \ - { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \ -} - -#define LAYOUT_stack( \ - L00, L01, L02, L03, L04, L05, \ - L12, L13, L14, L15, L16, L17, \ - L24, L25, L26, L27, L28, L29, L30, L31, \ - L40, L41, L42, L43, L44, \ - \ - R06, R07, R08, R09, R10, R11, \ - R18, R19, R20, R21, R22, R23, \ - R32, R33, R34, R35, R36, R37, R38, R39, \ - R45, R46, R47, R48, R49 \ -) \ -{ \ - { KC_NO, KC_NO, L05, L04, L03, L02, L01, L00 }, \ - { KC_NO, KC_NO, L17, L16, L15, L14, L13, L12 }, \ - { L31, L30, L29, L28, L27, L26, L25, L24 }, \ - { L44, L43, L42, L41, KC_NO, L40, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, R06, R07, R08, R09, R10, R11 }, \ - { KC_NO, KC_NO, R18, R19, R20, R21, R22, R23 }, \ - { R32, R33, R34, R35, R36, R37, R38, R39 }, \ - { R45, R46, R47, R48, KC_NO, R49, KC_NO, KC_NO }, \ -} - -#define LAYOUT_split_3x6_5 LAYOUT diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index 32b7c90d44..c5294d14af 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json @@ -18,50 +18,57 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"label":"SW1", "x":0, "y":0.375}, - {"label":"SW2", "x":1, "y":0.375}, - {"label":"SW3", "x":2, "y":0.125}, - {"label":"SW4", "x":3, "y":0}, - {"label":"SW5", "x":4, "y":0.125}, - {"label":"SW6", "x":5, "y":0.25}, - {"label":"SW23", "x":9, "y":0.25}, - {"label":"SW24", "x":10, "y":0.125}, - {"label":"SW25", "x":11, "y":0}, - {"label":"SW26", "x":12, "y":0.125}, - {"label":"SW27", "x":13, "y":0.375}, - {"label":"SW28", "x":14, "y":0.375}, - {"label":"SW7", "x":0, "y":1.375}, - {"label":"SW8", "x":1, "y":1.375}, - {"label":"SW9", "x":2, "y":1.125}, - {"label":"SW10", "x":3, "y":1}, - {"label":"SW11", "x":4, "y":1.125}, - {"label":"SW12", "x":5, "y":1.25}, - {"label":"SW29", "x":9, "y":1.25}, - {"label":"SW30", "x":10, "y":1.125}, - {"label":"SW31", "x":11, "y":1}, - {"label":"SW32", "x":12, "y":1.125}, - {"label":"SW33", "x":13, "y":1.375}, - {"label":"SW34", "x":14, "y":1.375}, - {"label":"SW13", "x":0, "y":2.375}, - {"label":"SW14", "x":1, "y":2.375}, - {"label":"SW15", "x":2, "y":2.125}, - {"label":"SW16", "x":3, "y":2}, - {"label":"SW17", "x":4, "y":2.125}, - {"label":"SW18", "x":5, "y":2.25}, - {"label":"SW35", "x":9, "y":2.25}, - {"label":"SW36", "x":10, "y":2.125}, - {"label":"SW37", "x":11, "y":2}, - {"label":"SW38", "x":12, "y":2.125}, - {"label":"SW39", "x":13, "y":2.375}, - {"label":"SW40", "x":14, "y":2.375}, - {"label":"SW19", "x":3, "y":3.1}, - {"label":"SW20", "x":4, "y":3.25}, - {"label":"SW21", "x":5, "y":3.4}, - {"label":"SW22", "x":6, "y":3.55}, - {"label":"SW41", "x":8, "y":3.55}, - {"label":"SW42", "x":9, "y":3.4}, - {"label":"SW43", "x":10, "y":3.25}, - {"label":"SW44", "x":11, "y":3.1} + {"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": 9, "y": 0.25}, + {"matrix": [0, 7], "x": 10, "y": 0.125}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0.125}, + {"matrix": [0, 10], "x": 13, "y": 0.375}, + {"matrix": [0, 11], "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": [1, 6], "x": 9, "y": 1.25}, + {"matrix": [1, 7], "x": 10, "y": 1.125}, + {"matrix": [1, 8], "x": 11, "y": 1}, + {"matrix": [1, 9], "x": 12, "y": 1.125}, + {"matrix": [1, 10], "x": 13, "y": 1.375}, + {"matrix": [1, 11], "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": [2, 6], "x": 9, "y": 2.25}, + {"matrix": [2, 7], "x": 10, "y": 2.125}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2.125}, + {"matrix": [2, 10], "x": 13, "y": 2.375}, + {"matrix": [2, 11], "x": 14, "y": 2.375}, + + {"matrix": [3, 2], "x": 3, "y": 3.1}, + {"matrix": [3, 3], "x": 4, "y": 3.25}, + {"matrix": [3, 4], "x": 5, "y": 3.4}, + {"matrix": [3, 5], "x": 6, "y": 3.55}, + + {"matrix": [3, 6], "x": 8, "y": 3.55}, + {"matrix": [3, 7], "x": 9, "y": 3.4}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3.1} ] } } diff --git a/keyboards/torn/torn.h b/keyboards/torn/torn.h index c25b5c2a0c..0b4355e86a 100644 --- a/keyboards/torn/torn.h +++ b/keyboards/torn/torn.h @@ -19,22 +19,6 @@ #include "quantum.h" -#define ___ KC_NO - -// clang-format off -#define LAYOUT_split_3x6_4( \ - 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, \ - k32, k33, k34, k35, k36, k37, k38, k39 \ -) { \ - { 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 }, \ - { ___, ___, k32, k33, k34, k35, k36, k37, k38, k39, ___, ___ } \ -} -// clang-format on - void torn_set_led(uint8_t led, bool on); void secondary_encoder_read(void); diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 3365ea7cf5..78aaa10e72 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -28,57 +28,57 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"label":"Tab", "x":0, "y":0.8}, - {"label":"Q", "x":1, "y":0.8}, - {"label":"W", "x":2, "y":0.1}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.1}, - {"label":"T", "x":5, "y":0.2}, + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, - {"label":"Y", "x":9, "y":0.2}, - {"label":"U", "x":10, "y":0.1}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.1}, - {"label":"P", "x":13, "y":0.8}, - {"label":"Back Space", "x":14, "y":0.8}, + {"matrix": [0, 6], "x": 9, "y": 0.2}, + {"matrix": [0, 7], "x": 10, "y": 0.1}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0.1}, + {"matrix": [0, 10], "x": 13, "y": 0.8}, + {"matrix": [0, 11], "x": 14, "y": 0.8}, - {"label":"Ctrl / Esc", "x":0, "y":1.8}, - {"label":"A", "x":1, "y":1.8}, - {"label":"S", "x":2, "y":1.1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.1}, - {"label":"G", "x":5, "y":1.2}, + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, - {"label":"H", "x":9, "y":1.2}, - {"label":"J", "x":10, "y":1.1}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.1}, - {"label":";", "x":13, "y":1.8}, - {"label":"'", "x":14, "y":1.8}, + {"matrix": [1, 6], "x": 9, "y": 1.2}, + {"matrix": [1, 7], "x": 10, "y": 1.1}, + {"matrix": [1, 8], "x": 11, "y": 1}, + {"matrix": [1, 9], "x": 12, "y": 1.1}, + {"matrix": [1, 10], "x": 13, "y": 1.8}, + {"matrix": [1, 11], "x": 14, "y": 1.8}, - {"label":"Shift", "x":0, "y":2.8}, - {"label":"Z", "x":1, "y":2.8}, - {"label":"X", "x":2, "y":2.1}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.1}, - {"label":"B", "x":5, "y":2.2}, + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, - {"label":"N", "x":9, "y":2.2}, - {"label":"M", "x":10, "y":2.1}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.1}, - {"label":"/", "x":13, "y":2.8}, - {"label":"Shift / Enter", "x":14, "y":2.8}, + {"matrix": [2, 6], "x": 9, "y": 2.2}, + {"matrix": [2, 7], "x": 10, "y": 2.1}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2.1}, + {"matrix": [2, 10], "x": 13, "y": 2.8}, + {"matrix": [2, 11], "x": 14, "y": 2.8}, - {"label":"Ctrl", "x":3, "y":3.7}, - {"label":"Alt", "x":4, "y":3.7}, - {"label":"Lower", "x":5, "y":3.7}, - {"label":"Enter", "x":6, "y":3.2, "h":1.5}, + {"matrix": [3, 2], "x": 3, "y": 3.7}, + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, - {"label":"Backspace", "x":8, "y":3.2, "h":1.5}, - {"label":"Space", "x":9, "y":3.7}, - {"label":"Raise", "x":10, "y":3.7}, - {"label":"RGUI", "x":11, "y":3.7} + {"matrix": [3, 6], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [3, 7], "x": 9, "y": 3.7}, + {"matrix": [3, 8], "x": 10, "y": 3.7}, + {"matrix": [3, 9], "x": 11, "y": 3.7} ] } } diff --git a/keyboards/yanghu/unicorne/unicorne.h b/keyboards/yanghu/unicorne/unicorne.h index f0b5685f1d..6f89e393a7 100644 --- a/keyboards/yanghu/unicorne/unicorne.h +++ b/keyboards/yanghu/unicorne/unicorne.h @@ -23,28 +23,3 @@ void oled_render_capslock(bool caps_on); void oled_render_mods(void); void oled_render_keylog(void); #endif -/* 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. - */ - -// clang-format off -#define LAYOUT_split_3x6_4( \ - 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 \ -) \ -{ \ - { 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, K30, K31, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO} \ -} -// clang-format on - -#define LAYOUT LAYOUT_split_3x6_4 diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index d32b1490d1..ebd425050b 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -21,50 +21,58 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"label":"L00", "x":0, "y":1.5}, - {"label":"L01", "x":1, "y":1.25}, - {"label":"L02", "x":2, "y":0.5}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.25}, - {"label":"L05", "x":5, "y":0.5}, - {"label":"R00", "x":8.75, "y":0.5}, - {"label":"R01", "x":9.75, "y":0.25}, - {"label":"R02", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0.5}, - {"label":"R04", "x":12.75, "y":1.25}, - {"label":"R05", "x":13.75, "y":1.5}, - {"label":"L10", "x":0, "y":2.5}, - {"label":"L11", "x":1, "y":2.25}, - {"label":"L12", "x":2, "y":1.5}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.25}, - {"label":"L15", "x":5, "y":1.5}, - {"label":"R10", "x":8.75, "y":1.5}, - {"label":"R11", "x":9.75, "y":1.25}, - {"label":"R12", "x":10.75, "y":1}, - {"label":"R13", "x":11.75, "y":1.5}, - {"label":"R14", "x":12.75, "y":2.25}, - {"label":"R15", "x":13.75, "y":2.5}, - {"label":"L20", "x":0, "y":3.5}, - {"label":"L21", "x":1, "y":3.25}, - {"label":"L22", "x":2, "y":2.5}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.25}, - {"label":"L25", "x":5, "y":2.5}, - {"label":"R20", "x":8.75, "y":2.5}, - {"label":"R21", "x":9.75, "y":2.25}, - {"label":"R22", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2.5}, - {"label":"R24", "x":12.75, "y":3.25}, - {"label":"R25", "x":13.75, "y":3.5}, - {"label":"L30", "x":3, "y":4}, - {"label":"L31", "x":4, "y":3.75}, - {"label":"L32", "x":5, "y":3.75}, - {"label":"L33", "x":6, "y":4}, - {"label":"R30", "x":7.75, "y":4}, - {"label":"R31", "x":8.75, "y":3.75}, - {"label":"R32", "x":9.75, "y":3.75}, - {"label":"R33", "x":10.75, "y":4}] + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.25}, + {"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": 0.5}, + + {"matrix": [4, 5], "x": 8.75, "y": 0.5}, + {"matrix": [4, 4], "x": 9.75, "y": 0.25}, + {"matrix": [4, 3], "x": 10.75, "y": 0}, + {"matrix": [4, 2], "x": 11.75, "y": 0.5}, + {"matrix": [4, 1], "x": 12.75, "y": 1.25}, + {"matrix": [4, 0], "x": 13.75, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"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": 1.5}, + + {"matrix": [5, 5], "x": 8.75, "y": 1.5}, + {"matrix": [5, 4], "x": 9.75, "y": 1.25}, + {"matrix": [5, 3], "x": 10.75, "y": 1}, + {"matrix": [5, 2], "x": 11.75, "y": 1.5}, + {"matrix": [5, 1], "x": 12.75, "y": 2.25}, + {"matrix": [5, 0], "x": 13.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"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": 2.5}, + + {"matrix": [6, 5], "x": 8.75, "y": 2.5}, + {"matrix": [6, 4], "x": 9.75, "y": 2.25}, + {"matrix": [6, 3], "x": 10.75, "y": 2}, + {"matrix": [6, 2], "x": 11.75, "y": 2.5}, + {"matrix": [6, 1], "x": 12.75, "y": 3.25}, + {"matrix": [6, 0], "x": 13.75, "y": 3.5}, + + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 3.75}, + {"matrix": [3, 4], "x": 5, "y": 3.75}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [7, 5], "x": 7.75, "y": 4}, + {"matrix": [7, 4], "x": 8.75, "y": 3.75}, + {"matrix": [7, 3], "x": 9.75, "y": 3.75}, + {"matrix": [7, 2], "x": 10.75, "y": 4} + ] } } } diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/keyboards/yoichiro/lunakey_mini/lunakey_mini.h deleted file mode 100644 index bb649cc018..0000000000 --- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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_split_3x6_4( \ - 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/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json index 3253eb7edc..e98e38a335 100644 --- a/keyboards/yoichiro/lunakey_pico/info.json +++ b/keyboards/yoichiro/lunakey_pico/info.json @@ -59,50 +59,58 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"label":"L00", "x":0, "y":1.5}, - {"label":"L01", "x":1, "y":1.25}, - {"label":"L02", "x":2, "y":0.5}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.25}, - {"label":"L05", "x":5, "y":0.5}, - {"label":"R00", "x":8.75, "y":0.5}, - {"label":"R01", "x":9.75, "y":0.25}, - {"label":"R02", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0.5}, - {"label":"R04", "x":12.75, "y":1.25}, - {"label":"R05", "x":13.75, "y":1.5}, - {"label":"L10", "x":0, "y":2.5}, - {"label":"L11", "x":1, "y":2.25}, - {"label":"L12", "x":2, "y":1.5}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.25}, - {"label":"L15", "x":5, "y":1.5}, - {"label":"R10", "x":8.75, "y":1.5}, - {"label":"R11", "x":9.75, "y":1.25}, - {"label":"R12", "x":10.75, "y":1}, - {"label":"R13", "x":11.75, "y":1.5}, - {"label":"R14", "x":12.75, "y":2.25}, - {"label":"R15", "x":13.75, "y":2.5}, - {"label":"L20", "x":0, "y":3.5}, - {"label":"L21", "x":1, "y":3.25}, - {"label":"L22", "x":2, "y":2.5}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.25}, - {"label":"L25", "x":5, "y":2.5}, - {"label":"R20", "x":8.75, "y":2.5}, - {"label":"R21", "x":9.75, "y":2.25}, - {"label":"R22", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2.5}, - {"label":"R24", "x":12.75, "y":3.25}, - {"label":"R25", "x":13.75, "y":3.5}, - {"label":"L30", "x":3, "y":4}, - {"label":"L31", "x":4, "y":3.75}, - {"label":"L32", "x":5, "y":3.75}, - {"label":"L33", "x":6, "y":4}, - {"label":"R30", "x":7.75, "y":4}, - {"label":"R31", "x":8.75, "y":3.75}, - {"label":"R32", "x":9.75, "y":3.75}, - {"label":"R33", "x":10.75, "y":4}] + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.25}, + {"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": 0.5}, + + {"matrix": [4, 5], "x": 8.75, "y": 0.5}, + {"matrix": [4, 4], "x": 9.75, "y": 0.25}, + {"matrix": [4, 3], "x": 10.75, "y": 0}, + {"matrix": [4, 2], "x": 11.75, "y": 0.5}, + {"matrix": [4, 1], "x": 12.75, "y": 1.25}, + {"matrix": [4, 0], "x": 13.75, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"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": 1.5}, + + {"matrix": [5, 5], "x": 8.75, "y": 1.5}, + {"matrix": [5, 4], "x": 9.75, "y": 1.25}, + {"matrix": [5, 3], "x": 10.75, "y": 1}, + {"matrix": [5, 2], "x": 11.75, "y": 1.5}, + {"matrix": [5, 1], "x": 12.75, "y": 2.25}, + {"matrix": [5, 0], "x": 13.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"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": 2.5}, + + {"matrix": [6, 5], "x": 8.75, "y": 2.5}, + {"matrix": [6, 4], "x": 9.75, "y": 2.25}, + {"matrix": [6, 3], "x": 10.75, "y": 2}, + {"matrix": [6, 2], "x": 11.75, "y": 2.5}, + {"matrix": [6, 1], "x": 12.75, "y": 3.25}, + {"matrix": [6, 0], "x": 13.75, "y": 3.5}, + + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 3.75}, + {"matrix": [3, 4], "x": 5, "y": 3.75}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [7, 5], "x": 7.75, "y": 4}, + {"matrix": [7, 4], "x": 8.75, "y": 3.75}, + {"matrix": [7, 3], "x": 9.75, "y": 3.75}, + {"matrix": [7, 2], "x": 10.75, "y": 4} + ] } } } diff --git a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h b/keyboards/yoichiro/lunakey_pico/lunakey_pico.h deleted file mode 100644 index 0725054f0f..0000000000 --- a/keyboards/yoichiro/lunakey_pico/lunakey_pico.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2022 Yoichiro Tanaka (@yoichiro) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT_split_3x6_4( \ - 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 } \ - } -- cgit v1.3.1 From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:32:47 +0200 Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) --- data/mappings/info_config.hjson | 2 +- docs/config_options.md | 5 +- docs/ja/config_options.md | 3 - docs/ja/tap_hold.md | 28 ------- docs/mod_tap.md | 2 - docs/tap_hold.md | 89 +++------------------- keyboards/0xcb/splaytoraid/keymaps/pi/config.h | 3 - .../gherkin/keymaps/pierrec83/config.h | 1 - .../gherkin/keymaps/stevexyz/config.h | 2 - .../half_n_half/keymaps/Boy_314/config.h | 1 - .../nori/keymaps/wings_36key/config.h | 2 - keyboards/atreus/keymaps/kejadlen/config.h | 1 - keyboards/atreus/keymaps/khitsule/config.h | 2 - keyboards/atreus62/keymaps/hvp/config.h | 1 - keyboards/aya/keymaps/default/config.h | 1 - keyboards/b_sides/rev41lp/keymaps/cyril/config.h | 1 - keyboards/b_sides/rev41lp/keymaps/namnlos/config.h | 1 - keyboards/bajjak/config.h | 1 - keyboards/barracuda/keymaps/default/config.h | 1 - keyboards/barracuda/keymaps/via/config.h | 1 - .../bastardkb/charybdis/3x5/keymaps/bstiq/config.h | 14 ---- .../bastardkb/charybdis/3x5/keymaps/via/config.h | 12 --- .../bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h | 14 ---- .../bastardkb/dilemma/3x5_2/keymaps/via/config.h | 12 --- .../bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h | 12 --- keyboards/bastardkb/scylla/keymaps/xyverz/config.h | 1 - keyboards/bastardkb/tbk/keymaps/xyverz/config.h | 1 - .../manibus/keymaps/samurai/config.h | 1 - .../boardsource/lulu/keymaps/davidrambo/config.h | 1 - keyboards/buzzard/keymaps/crehmann/config.h | 5 +- keyboards/buzzard/keymaps/default/config.h | 5 +- keyboards/centromere/keymaps/mini_bom/config.h | 1 - .../clickety_split/leeloo/keymaps/default/config.h | 2 - keyboards/converter/usb_usb/keymaps/narze/config.h | 1 - keyboards/cradio/keymaps/default/config.h | 1 - keyboards/crkbd/keymaps/antosha417/config.h | 1 - keyboards/crkbd/keymaps/ardakilic/config.h | 1 - keyboards/crkbd/keymaps/armand1m/config.h | 1 - keyboards/crkbd/keymaps/benrestech/config.h | 1 - keyboards/crkbd/keymaps/bermeo/config.h | 1 - keyboards/crkbd/keymaps/crkdves/config.h | 1 - keyboards/crkbd/keymaps/crkqwes/config.h | 1 - keyboards/crkbd/keymaps/edvorakjp/config.h | 1 - keyboards/crkbd/keymaps/gotham/config.h | 1 - keyboards/crkbd/keymaps/hvp/config.h | 1 - keyboards/crkbd/keymaps/julian_turner/config.h | 3 - keyboards/crkbd/keymaps/markstos/config.h | 3 - keyboards/crkbd/keymaps/nimishgautam/config.h | 1 - keyboards/crkbd/keymaps/rpbaptist/config.h | 1 - keyboards/crkbd/keymaps/sharkby7e/config.h | 2 - keyboards/crkbd/keymaps/snowe/config.h | 4 - keyboards/crkbd/keymaps/soundmonster/config.h | 1 - keyboards/crkbd/keymaps/thunderbird2086/config.h | 1 - keyboards/crkbd/keymaps/xyverz/config.h | 1 - keyboards/drhigsby/ogurec/keymaps/dack/config.h | 1 - keyboards/dumbo/keymaps/trip-trap/config.h | 3 - .../dztech/dz60rgb/keymaps/kgreulich/config.h | 1 - .../dztech/dz60rgb/keymaps/matthewrobo/config.h | 1 - keyboards/dztech/dz60rgb/keymaps/xunz/config.h | 1 - .../dztech/dz65rgb/keymaps/matthewrobo/config.h | 1 - keyboards/ein_60/keymaps/klackygears/config.h | 1 - keyboards/ergodox_ez/config.h | 1 - .../ergodox_ez/keymaps/bepo_tm_style/config.h | 2 - .../ergodox_ez/keymaps/bpruitt-goddard/config.h | 2 - keyboards/ergodox_ez/keymaps/danielo515/config.h | 1 - .../ergodox_ez/keymaps/hacker_dvorak/config.h | 2 - .../ergodox_ez/keymaps/nathanvercaemert/config.h | 4 +- keyboards/ergodox_ez/keymaps/nfriend/config.h | 2 - keyboards/ergodox_ez/keymaps/rgb_layer/config.h | 1 - keyboards/ferris/keymaps/bruun-baer/config.h | 1 - keyboards/ferris/keymaps/default/config.h | 1 - keyboards/ferris/keymaps/madhatter/config.h | 1 - keyboards/ferris/keymaps/pierrec83/config.h | 1 - keyboards/ferris/keymaps/via/config.h | 1 - keyboards/foostan/cornelius/keymaps/hvp/config.h | 1 - keyboards/fungo/keymaps/default/config.h | 24 ------ keyboards/gboards/ergotaco/config.h | 1 - keyboards/gboards/georgi/config.h | 2 - .../gboards/georgi/keymaps/colemak-dh/keymap.c | 1 - keyboards/gboards/gergo/config.h | 1 - .../gboards/gergo/keymaps/abstractkb/config.h | 2 - keyboards/gboards/gergo/keymaps/colemak/keymap.c | 1 - keyboards/gboards/gergo/keymaps/default/config.h | 1 - keyboards/gboards/gergo/keymaps/germ/config.h | 1 - keyboards/gboards/gergo/keymaps/gotham/config.h | 1 - keyboards/gboards/gergo/keymaps/oled/config.h | 1 - keyboards/gboards/gergoplex/config.h | 1 - keyboards/handwired/angel/config.h | 1 - .../handwired/aranck/keymaps/turkishish/config.h | 3 +- keyboards/handwired/bolek/config.h | 1 - keyboards/handwired/brain/config.h | 1 - .../handwired/brain/keymaps/klackygears/config.h | 1 - .../handwired/chiron/keymaps/default/config.h | 1 - keyboards/handwired/dactyl/config.h | 1 - .../dactyl_manuform/3x5_3/keymaps/dlford/config.h | 1 - .../dactyl_manuform/5x6/keymaps/rishka/config.h | 1 - .../5x6_68/keymaps/default/config.h | 1 - keyboards/handwired/frenchdev/config.h | 1 - .../heisenberg/keymaps/turkishish/config.h | 3 +- .../jscotto/scotto36/keymaps/default/config.h | 1 - .../jscotto/scotto40/keymaps/default/config.h | 1 - .../jscotto/scottocmd/keymaps/default/config.h | 1 - .../jscotto/scottostarter/keymaps/default/config.h | 1 - .../handwired/lagrange/keymaps/dpapavas/config.h | 1 - keyboards/handwired/pterodactyl/config.h | 2 - .../stef9998/split_5x7/keymaps/stef9998/config.h | 2 - keyboards/handwired/xealous/rev1/config.h | 2 - keyboards/helix/rev2/keymaps/edvorakjp/config.h | 1 - keyboards/hhkb/ansi/keymaps/blakedietz/config.h | 4 - keyboards/hhkb/ansi/keymaps/brett/config.h | 3 - keyboards/hidtech/bastyl/keymaps/xyverz/config.h | 1 - keyboards/hotdox/config.h | 1 - keyboards/ibnuda/alicia_cook/keymaps/rick/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default/config.h | 1 - .../ibnuda/squiggle/keymaps/default38/config.h | 1 - .../ibnuda/squiggle/keymaps/defaultfull/config.h | 1 - .../squiggle/keymaps/defaultminidox/config.h | 1 - .../squiggle/keymaps/rick-complicated/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick/config.h | 1 - keyboards/idobao/id75/keymaps/egstad/config.h | 1 - keyboards/idobao/id75/keymaps/gkbd_75/config.h | 1 - keyboards/idobao/id75/keymaps/gkbd_orthon/config.h | 1 - keyboards/input_club/ergodox_infinity/config.h | 1 - .../ergodox_infinity/keymaps/narze/config.h | 1 - keyboards/jian/keymaps/advanced/config.h | 1 - keyboards/jian/keymaps/default/config.h | 2 - keyboards/jian/keymaps/left_hand/config.h | 1 - keyboards/jian/keymaps/via/config.h | 1 - keyboards/k34/keymaps/default/config.h | 1 - keyboards/karn/keymaps/colemak/config.h | 5 -- .../bfo9000/keymaps/insertsnideremarks/config.h | 1 - .../keebio/bfo9000/keymaps/tuesdayjohn/config.h | 1 - keyboards/keebio/iris/keymaps/edvorakjp/config.h | 1 - keyboards/keebio/iris/keymaps/emp/config.h | 6 -- .../keebio/iris/keymaps/fluffactually/config.h | 1 - keyboards/keebio/iris/keymaps/khitsule/config.h | 1 - keyboards/keebio/iris/keymaps/radlinskii/config.h | 1 - keyboards/keebio/iris/keymaps/sq5rix/config.h | 1 - keyboards/keebio/iris/keymaps/two_knob/config.h | 3 - .../keebio/quefrency/keymaps/bfiedler/config.h | 1 - .../keebio/quefrency/keymaps/bjohnson/config.h | 1 - .../rorschach/keymaps/insertsnideremarks/config.h | 1 - .../keebio/rorschach/keymaps/tuesdayjohn/config.h | 1 - .../keyboardio/atreus/keymaps/kkokdae/config.h | 1 - keyboards/keyhive/ut472/keymaps/hvp/config.h | 1 - .../kinesis/keymaps/insertsnideremarks/config.h | 1 - keyboards/kinesis/keymaps/tuesdayjohn/config.h | 1 - keyboards/kinesis/kint2pp/config.h | 2 - keyboards/kinesis/kint36/config.h | 2 - keyboards/kinesis/kint41/config.h | 2 - keyboards/kinesis/kintlc/config.h | 2 - keyboards/kinesis/stapelberg/config.h | 2 - .../kprepublic/bm40hsrgb/keymaps/34keys/config.h | 3 - .../bm40hsrgb/keymaps/gabustoledo/config.h | 3 - .../bm68hsrgb/rev1/keymaps/peepeetee/config.h | 1 - .../bm80hsrgb/keymaps/peepeetee/config.h | 1 - .../kprepublic/jj40/keymaps/stevexyz/config.h | 2 - keyboards/lets_split/keymaps/adam/config.h | 1 - keyboards/lets_split/keymaps/shaymdev/config.h | 1 - keyboards/lily58/keymaps/hvp/config.h | 1 - keyboards/lily58/keymaps/muppetjones/config.h | 3 - keyboards/lily58/keymaps/muuko/config.h | 1 - keyboards/lily58/keymaps/narze/config.h | 1 - keyboards/lily58/keymaps/niolang/config.h | 3 - keyboards/lyso1/lck75/config.h | 1 - .../makenova/omega/omega4/keymaps/default/config.h | 1 - .../omega/omega4/keymaps/default_10u_bar/config.h | 1 - .../omega/omega4/keymaps/default_6u_bar/config.h | 1 - .../maple_computing/minidox/keymaps/bepo/config.h | 1 - .../minidox/keymaps/dustypomerleau/config.h | 1 - .../minidox/keymaps/khitsule/config.h | 6 -- .../minidox/keymaps/rsthd_combos/config.h | 1 - .../minidox/keymaps/xyverz/config.h | 1 - .../marksard/leftover30/keymaps/default/config.h | 1 - .../marksard/treadstone32/keymaps/default/config.h | 1 - .../treadstone32/keymaps/like_jis/config.h | 1 - .../treadstone48/rev1/keymaps/like_jis_rs/config.h | 1 - keyboards/massdrop/alt/keymaps/b_/config.h | 1 - keyboards/massdrop/alt/keymaps/pregame/config.h | 1 - keyboards/massdrop/ctrl/keymaps/endgame/config.h | 1 - .../massdrop/ctrl/keymaps/matthewrobo/config.h | 1 - keyboards/massdrop/ctrl/keymaps/xanimos/config.h | 1 - .../mechwild/bde/lefty/keymaps/default/config.h | 2 - .../mechwild/bde/lefty/keymaps/fancy/config.h | 2 - keyboards/mechwild/bde/lefty/keymaps/via/config.h | 2 - keyboards/mechwild/bde/rev2/keymaps/via/config.h | 2 - .../mechwild/bde/righty/keymaps/default/config.h | 3 - keyboards/mechwild/bde/righty/keymaps/via/config.h | 2 - keyboards/moonlander/keymaps/jjerrell/config.h | 1 - keyboards/numatreus/keymaps/like_jis/config.h | 1 - .../steal_this_keyboard/keymaps/default/config.h | 1 - keyboards/orthodox/keymaps/shaymdev/config.h | 1 - keyboards/pica40/keymaps/zzeneg/config.h | 1 - keyboards/pierce/keymaps/durken1/config.h | 3 - keyboards/pisces/keymaps/default/config.h | 1 - keyboards/pisces/keymaps/via/config.h | 1 - keyboards/planck/ez/config.h | 2 - keyboards/planck/keymaps/altgr/config.h | 1 - keyboards/planck/keymaps/antosha417/config.h | 1 - keyboards/planck/keymaps/ariccb/config.h | 2 - keyboards/planck/keymaps/hiea/config.h | 1 - keyboards/planck/keymaps/hieax/config.h | 1 - keyboards/planck/keymaps/hvp/config.h | 1 - keyboards/planck/keymaps/jweickm/config.h | 1 - keyboards/planck/keymaps/mattly/config.h | 1 - keyboards/planck/keymaps/muppetjones/config.h | 3 - keyboards/planck/keymaps/mwpeterson/config.h | 1 - keyboards/planck/keymaps/narze/config.h | 1 - keyboards/planck/keymaps/sdothum/config.h | 1 - keyboards/planck/keymaps/snowkuma/config.h | 1 - keyboards/planck/keymaps/tylerwince/config.h | 1 - keyboards/preonic/keymaps/egstad/config.h | 1 - keyboards/preonic/keymaps/laurentlaurent/config.h | 4 +- keyboards/q4z/keymaps/default/config.h | 2 - keyboards/q4z/keymaps/rjboone/config.h | 2 - keyboards/qpockets/eggman/keymaps/default/config.h | 1 - .../space_space/rev1/keymaps/big_space/config.h | 1 - .../space_space/rev1/keymaps/default/config.h | 1 - .../space_space/rev2/keymaps/big_space/config.h | 1 - .../space_space/rev2/keymaps/default/config.h | 1 - .../space_space/rev2/keymaps/qpockets/config.h | 1 - keyboards/qpockets/wanten/keymaps/2u_bars/config.h | 1 - keyboards/qpockets/wanten/keymaps/625_bar/config.h | 1 - keyboards/qpockets/wanten/keymaps/default/config.h | 1 - .../nomu30/keymaps/center_sprit/config.h | 1 - .../nomu30/keymaps/like_jis/config.h | 1 - keyboards/redox/keymaps/eightbitraptor/config.h | 1 - keyboards/redox/keymaps/finex/config.h | 1 - keyboards/redox_w/keymaps/danielo515/config.h | 1 - keyboards/rmi_kb/chevron/config.h | 1 - keyboards/rmi_kb/herringbone/pro/config.h | 1 - keyboards/rmi_kb/herringbone/v1/config.h | 1 - keyboards/rmi_kb/squishyfrl/config.h | 1 - keyboards/rmi_kb/squishytkl/config.h | 1 - keyboards/rmi_kb/wete/v2/config.h | 1 - keyboards/signum/3_0/keymaps/sgurenkov/config.h | 3 - .../splitkb/aurora/corne/keymaps/x123/config.h | 3 +- keyboards/splitkb/kyria/keymaps/artflag/config.h | 3 - keyboards/splitkb/kyria/keymaps/default/config.h | 2 - keyboards/splitkb/kyria/keymaps/gotham/config.h | 1 - .../splitkb/kyria/keymaps/jimmysjolund/config.h | 20 ----- keyboards/splitkb/kyria/keymaps/lw/config.h | 5 +- .../splitkb/kyria/keymaps/maherma-adg/config.h | 2 - .../splitkb/kyria/keymaps/muppetjones/config.h | 3 - keyboards/splitkb/kyria/keymaps/ohlin/config.h | 2 - keyboards/splitkb/kyria/keymaps/pierrec83/config.h | 1 - keyboards/splitkb/kyria/keymaps/via/config.h | 1 - .../splitkb/kyria/keymaps/winternebs/config.h | 1 - keyboards/splitkb/kyria/keymaps/zigotica/config.h | 1 - keyboards/synapse/keymaps/7u_space/config.h | 1 - keyboards/synapse/keymaps/default/config.h | 1 - .../thevankeyboards/minivan/keymaps/budi/config.h | 1 - .../thevankeyboards/minivan/keymaps/hvp/config.h | 1 - .../minivan/keymaps/like_jis/config.h | 1 - .../tominabox1/le_chiffre/keymaps/default/config.h | 2 - keyboards/z34/keymaps/zigotica/config.h | 1 - layouts/community/ergodox/berfarah/config.h | 1 - layouts/community/ergodox/kejadlen/config.h | 1 - layouts/community/ortho_4x12/junonum/config.h | 3 - layouts/community/planck_mit/guidoism/config.h | 1 - quantum/action.c | 2 +- quantum/action_tapping.c | 17 +---- quantum/process_keycode/process_auto_shift.c | 14 +--- .../default_mod_tap/config.h | 2 - .../quick_tap/test_quick_tap.cpp | 80 ------------------- users/curry/config.h | 1 - users/cwebster2/config.h | 1 - users/drashna/config.h | 1 - users/dshields/config.h | 1 - users/ericgebhart/config.h | 2 - users/ericgebhart/miryoku_hd_gold_config.h | 2 - users/ibnuda/config.h | 1 - users/jarred/config.h | 2 - users/kuchosauronad0/config.h | 5 -- users/manna-harbour_miryoku/config.h | 2 - users/mattly/config.h | 1 - users/muppetjones/config.h | 3 - users/pvinis/config.h | 2 - users/ridingqwerty/config.h | 1 - users/rmeli/config.h | 4 - users/snowe/snowe.h | 1 - users/tominabox1/tominabox1.c | 1 - users/uqs/config.h | 1 - users/vosechu/config.h | 5 -- users/wanleg/config.h | 4 - users/yet-another-developer/config.h | 5 -- users/zer09/config.h | 5 -- 287 files changed, 28 insertions(+), 734 deletions(-) delete mode 100644 keyboards/fungo/keymaps/default/config.h delete mode 100644 keyboards/maple_computing/minidox/keymaps/khitsule/config.h delete mode 100644 keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h (limited to 'keyboards/maple_computing') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 21d9d49104..bc4f46c353 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -133,7 +133,7 @@ "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true}, "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true}, - "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_deprecated.ignore_mod_tap_interrupt", "value_type": "bool", "deprecated": true}, + "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "bool", "invalid": true}, "IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true} // USB params, need to mark as failure when specified in config.h, rather than deprecated diff --git a/docs/config_options.md b/docs/config_options.md index 5bfb7c5d58..8ea059a352 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -150,7 +150,7 @@ If you define these options you will enable the associated feature, which may in * `#define TAPPING_TERM_PER_KEY` * enables handling for per key `TAPPING_TERM` settings * `#define RETRO_TAPPING` - * tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release + * tap anyway, even after `TAPPING_TERM`, if there was no other key interruption between press and release * See [Retro Tapping](tap_hold.md#retro-tapping) for details * `#define RETRO_TAPPING_PER_KEY` * enables handling for per key `RETRO_TAPPING` settings @@ -161,9 +161,6 @@ If you define these options you will enable the associated feature, which may in * See [Permissive Hold](tap_hold.md#permissive-hold) for details * `#define PERMISSIVE_HOLD_PER_KEY` * enabled handling for per key `PERMISSIVE_HOLD` settings -* `#define IGNORE_MOD_TAP_INTERRUPT` - * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the `TAPPING_TERM` for both keys. - * See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for details * `#define QUICK_TAP_TERM 100` * tap-then-hold timing to use a dual role key to repeat keycode * See [Quick Tap Term](tap_hold.md#quick-tap-term) diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md index 6135721a42..4f9f1f2770 100644 --- a/docs/ja/config_options.md +++ b/docs/ja/config_options.md @@ -159,9 +159,6 @@ QMK での全ての利用可能な設定にはデフォルトがあります。 * 詳細は [Permissive Hold](ja/tap_hold.md#permissive-hold) を見てください * `#define PERMISSIVE_HOLD_PER_KEY` * キーごとの `PERMISSIVE_HOLD` 設定の処理を有効にします -* `#define IGNORE_MOD_TAP_INTERRUPT` - * 両方のキーに `TAPPING_TERM` を適用することで、ホールド時に他のキーに変換するキーを使ってローリングコンボ (zx) をすることができるようにします - * 詳細は [Ignore Mod Tap Interrupt](ja/tap_hold.md#ignore-mod-tap-interrupt) を見てください * `#define TAPPING_FORCE_HOLD` * タップされた直後に、デュアルロールキーを修飾子として使用できるようにします * [Tapping Force Hold](ja/tap_hold.md#tapping-force-hold)を見てください diff --git a/docs/ja/tap_hold.md b/docs/ja/tap_hold.md index ac64fe6ce3..00b80c8b22 100644 --- a/docs/ja/tap_hold.md +++ b/docs/ja/tap_hold.md @@ -63,8 +63,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { 通常、これら全てを `TAPPING_TERM` (デフォルト: 200ms) 内で行うと、ファームウェアとホストシステムによって `ax` として登録されます。許容ホールドを有効にすると、別のキーがタップされた場合にモッドタップキーを修飾キーと見なすように処理を変更し、 `X` (`SHIFT`+`x`) と登録されます。 -?> `モッドタップ割り込みの無視`を有効にしている場合、これにより両方の動きが変更されます。通常のキーには、最初のキーが最初に放された場合、あるいは両方のキーが `TAPPING_TERM` より長くホールドされた場合に、修飾キーが追加されます。 - この機能をより細かく制御するために、以下を `config.h` に追加することができます: ```c @@ -84,32 +82,6 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { } ``` -## モッドタップ割り込みの無視 - -この設定を有効にするには、これを `config.h` に追加してください: - -```c -#define IGNORE_MOD_TAP_INTERRUPT -``` - -許容ホールドと同様に、これは高速なタイピストのためのファームウェアの処理方法を変更します。モッドタップキーを押し、他のキーを押し、モッドタップキーを放し、通常のキーを放すと、`TAPPING_TERM` 内で押された場合でも、通常はモッドと通常のキーが出力されます。これは、ローリングコンボキーや、頻繁に使用するキー(例えば、`RCTL_T(KC_QUOT)`)にモッドタップを使う高速なタイピストには望ましくない場合があります。 - -`モッドタップ割り込みの無視`を設定するには、両方のキーを `TAPPING_TERM` の間ホールドすると、(その修飾キーの)ホールド機能を実行する必要があります。 - -例えば: - -- `SFT_T(KC_A)` を押す -- `KC_X` を押す -- `SFT_T(KC_A)` を放す -- `KC_X` を放す - -通常、これは大文字の `X` (`SHIFT`+`x`)、またはモッド + キーを送信します。`モッドタップ割り込みの無視` を有効にすると、ホールドアクションを登録するには、両方のキーを `TAPPING_TERM` の間ホールドする必要があります。この場合、素早いタップは `ax` を送信しますが、両方をホールドすると、大文字の `X` (`SHIFT`+`x`) を出力します。 - - -?> __注意__: これはモディファイアにのみ関係し、レイヤー切り替えキーには関係しません。 - -?> `許容ホールド`を有効にすると、これは両方がどのように動作するかを変更します。通常のキーには、最初のキーが最初に放された場合、あるいは両方のキーが `TAPPING_TERM` より長くホールドされた場合に、修飾キーが追加されます。 - ## タッピング強制ホールド `タッピング強制ホールド` を有効にするには、以下を `config.h` に追加します: diff --git a/docs/mod_tap.md b/docs/mod_tap.md index ca3a2752c7..8b953d76b4 100644 --- a/docs/mod_tap.md +++ b/docs/mod_tap.md @@ -111,8 +111,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } ``` -Enabling `IGNORE_MOD_TAP_INTERRUPT` is recommended when using Mod-Tap on alphanumeric keys to avoid hold function taking precendence when the next key is pressed quickly. See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for more details. - ### Changing both tap and hold This last example implements custom tap and hold function with `LT(0,KC_NO)` to create a single copy-on-tap, paste-on-hold key: diff --git a/docs/tap_hold.md b/docs/tap_hold.md index 348e2655eb..cdc1cfeca7 100644 --- a/docs/tap_hold.md +++ b/docs/tap_hold.md @@ -130,20 +130,18 @@ Note that until the tap-or-hold decision completes (which happens when either th To better illustrate the tap-or-hold decision modes, let us compare the expected output of each decision mode in a handful of tapping scenarios involving a mod-tap key (`LSFT_T(KC_A)`) and a regular key (`KC_B`) with the `TAPPING_TERM` set to 200ms. -By default, mod-taps behave like `HOLD_ON_OTHER_KEY_PRESS`, while layer-taps behave like "Ignore Interrupt" out of the box. If you want "Ignore Interrupt"-like behaviour for mod-taps, you must enable `IGNORE_MOD_TAP_INTERRUPT`, or return `false` in the `get_hold_on_other_key_press` function for all mod-taps. - Note: "`kc` held" in the "Physical key event" column means that the key wasn't physically released yet at this point in time. #### Distinct taps (AABB) :id=distinct-taps -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 199 | `LSFT_T(KC_A)` up | a | a | a | | 210 | `KC_B` down | ab | ab | ab | | 220 | `KC_B` up | ab | ab | ab | -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 200 | `LSFT_T(KC_A)` held|Shift| Shift | Shift | @@ -153,14 +151,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p #### Nested tap (ABBA) :id=nested-tap -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 110 | `KC_B` down | | | B | | 120 | `KC_B` up | | B | B | | 199 | `LSFT_T(KC_A)` up | ab | B | B | -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 110 | `KC_B` down | | | B | @@ -168,7 +166,7 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p | 200 | `LSFT_T(KC_A)` held| B | B | B | | 210 | `LSFT_T(KC_A)` up | B | B | B | -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 200 | `LSFT_T(KC_A)` held|Shift| Shift | Shift | @@ -178,14 +176,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p #### Rolling keys (ABAB) :id=rolling-keys -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 110 | `KC_B` down | | | B | | 130 | `LSFT_T(KC_A)` up | ab | ab | B | | 140 | `KC_B` up | ab | ab | B | -| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | +| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` | |------|--------------------|----------------|-------------------|----------------------------| | 0 | `LSFT_T(KC_A)` down| | | | | 110 | `KC_B` down | | | B | @@ -241,10 +239,8 @@ Example sequence 3 (Mod Tap): | +--------------+ | | +---------------------------|--------+ ``` -Based on previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X` -since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`. -However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons -explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt). +In the above sequence, `SFT_T(KC_A)` has been released before the end of its `TAPPING_TERM` and as such will be interpreted as `KC_A`, +followed by any key event that happened after the initial press of `SFT_T(KC_A)`. In this instance, the output would be `KC_A` `KC_X`. ### Permissive Hold @@ -379,73 +375,6 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { } ``` - -## Ignore Mod Tap Interrupt - -To enable this setting, add this to your `config.h`: - -```c -#define IGNORE_MOD_TAP_INTERRUPT -``` - -?> This option affects only the Mod Tap keys; it does not affect other dual-role keys such as Layer Tap. - -By default, the tap-or-hold decision for Mod Tap keys strongly prefers the hold action. If you press a Mod Tap key, then press another key while still holding the Mod Tap key down, the Mod Tap press will be handled as a modifier hold even if the Mod Tap key is then released within the tapping term, and irrespective of the order in which those keys are released. Using options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` will not affect the functionality of Mod Tap keys in a major way (these options would still affect the delay until the common code for dual-role keys finishes its tap-or-hold decision, but then the special code for Mod Tap keys will override the result of that decision and choose the hold action if another key was pressed). In fact, by default, the tap-or-hold decision for Mod Tap keys is done in the same way as if the `HOLD_ON_OTHER_KEY_PRESS` option was enabled, but without the decreased delay provided by `HOLD_ON_OTHER_KEY_PRESS`. - -If the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, Mod Tap keys are no longer treated as a special case, and their behavior will match the behavior of other dual-role keys such as Layer Tap. Then the behavior of Mod Tap keys can be further tuned using other options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS`. - -An example of a sequence that will be affected by the `IGNORE_MOD_TAP_INTERRUPT` option (assuming that options like `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` are not enabled): - -- `SFT_T(KC_A)` Down -- `KC_X` Down -- `SFT_T(KC_A)` Up -- `KC_X` Up - -``` - TAPPING_TERM - +---------------------------|--------+ - | +-------------+ | | - | | SFT_T(KC_A) | | | - | +-------------+ | | - | +--------------+ | | - | | KC_X | | | - | +--------------+ | | - +---------------------------|--------+ -``` - -Normally, this would send a capital `X` (`SHIFT`+`x`), even if the sequence is performed faster than the `TAPPING_TERM`. However, if the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, the `SFT_T(KC_A)` key must be held longer than the `TAPPING_TERM` to register the hold action. A quick tap will output `ax` in this case, while a hold will still output a capital `X` (`SHIFT`+`x`). - -However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster than the `TAPPING_TERM`. The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option, the host will start receiving key events when the `KC_X` key is pressed. - -For more granular control of this feature, you can add the following to your `config.h`: - -```c -#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -``` - -?> This option affects *all* dual-role keys. - -You can then add the following function to your keymap: - -```c -bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case SFT_T(KC_SPC): - // Do not force the mod-tap key press to be handled as a modifier - // if any other key was pressed while the mod-tap key is held down. - return false; - default: - // Force the dual-role key press to be handled as a modifier if any - // other key was pressed while the mod-tap key is held down. - return true; - } -} -``` - -Note that you must return `false` in `get_hold_on_other_key_press` in order to apply `IGNORE_MOD_TAP_INTERRUPT` for a certain mod-tap key. - -?> `IGNORE_MOD_TAP_INTERRUPT[_PER_KEY]` is being progressively phased out to align the (default) behavior and configuration of mod-taps with the rest of dual-role keys. - ## Quick Tap Term When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `QUICK_TAP_TERM` enables fine tuning of that ability. If set to `0`, it will remove the auto-repeat ability and activate the hold function instead. diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h index d955f36ab3..52e39aef65 100644 --- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h +++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h @@ -5,9 +5,6 @@ #define TAPPING_TERM 180 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - #undef LOCKING_SUPPORT_ENABLE #undef LOCKING_RESYNC_ENABLE diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h index bde9ec2055..0df91ad925 100644 --- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h @@ -27,5 +27,4 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h index 243b953f68..589a67f03d 100644 --- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h @@ -13,8 +13,6 @@ #define PERMISSIVE_HOLD // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM -#define IGNORE_MOD_TAP_INTERRUPT - // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. #define QUICK_TAP_TERM 0 // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h index f73fd055cc..be51c48d8a 100644 --- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h +++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h @@ -17,6 +17,5 @@ #pragma once // place overrides here -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h index eacfacc5a7..f076ded9ba 100644 --- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h +++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h @@ -16,8 +16,6 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT // MT key must be held longer than tapping term for - // modifer to be registered #define RETRO_TAPPING_PER_KEY #define TAPPING_TERM_PER_KEY diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h index 5a9573c57f..a75070e199 100644 --- a/keyboards/atreus/keymaps/kejadlen/config.h +++ b/keyboards/atreus/keymaps/kejadlen/config.h @@ -7,7 +7,6 @@ #define DIODE_DIRECTION COL2ROW -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 #define USB_MAX_POWER_CONSUMPTION 50 diff --git a/keyboards/atreus/keymaps/khitsule/config.h b/keyboards/atreus/keymaps/khitsule/config.h index c74909a9ff..7fa3bf328e 100644 --- a/keyboards/atreus/keymaps/khitsule/config.h +++ b/keyboards/atreus/keymaps/khitsule/config.h @@ -3,6 +3,4 @@ #include "../../config.h" -#define IGNORE_MOD_TAP_INTERRUPT - #endif diff --git a/keyboards/atreus62/keymaps/hvp/config.h b/keyboards/atreus62/keymaps/hvp/config.h index e1222e21f5..8013c0cb6d 100644 --- a/keyboards/atreus62/keymaps/hvp/config.h +++ b/keyboards/atreus62/keymaps/hvp/config.h @@ -1,5 +1,4 @@ #pragma once #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/aya/keymaps/default/config.h b/keyboards/aya/keymaps/default/config.h index 5ef534d04f..6e57fd6499 100644 --- a/keyboards/aya/keymaps/default/config.h +++ b/keyboards/aya/keymaps/default/config.h @@ -16,4 +16,3 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h index 4677c5f1d4..7029bdddb7 100644 --- a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h +++ b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h @@ -18,4 +18,3 @@ along with this program. If not, see . #define TAPPING_TERM 150 #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h index 1ad3156afa..19b366f4a8 100644 --- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h +++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h @@ -22,7 +22,6 @@ #define BACKLIGHT_DEFAULT_LEVEL 3 #define COMBO_COUNT 3 -#define IGNORE_MOD_TAP_INTERRUPT #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h index 07f6dcaf50..614d7a7813 100644 --- a/keyboards/bajjak/config.h +++ b/keyboards/bajjak/config.h @@ -46,7 +46,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/barracuda/keymaps/default/config.h b/keyboards/barracuda/keymaps/default/config.h index 810b6546db..fbac4dcb26 100644 --- a/keyboards/barracuda/keymaps/default/config.h +++ b/keyboards/barracuda/keymaps/default/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 175 // milliseconds -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/barracuda/keymaps/via/config.h b/keyboards/barracuda/keymaps/via/config.h index 810b6546db..fbac4dcb26 100644 --- a/keyboards/barracuda/keymaps/via/config.h +++ b/keyboards/barracuda/keymaps/via/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 175 // milliseconds -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index 0a2db20561..d7b6d01bce 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h @@ -67,20 +67,6 @@ */ #define PERMISSIVE_HOLD -/** - * Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt - */ -#define IGNORE_MOD_TAP_INTERRUPT - /** Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h index 5d9d4662f0..fd33c84758 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h @@ -24,18 +24,6 @@ /* Disable unused features. */ #define NO_ACTION_ONESHOT -/** - * \brief Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - */ -#define IGNORE_MOD_TAP_INTERRUPT - /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h index 2390d10ca5..8d8baa5c32 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h @@ -65,20 +65,6 @@ */ #define PERMISSIVE_HOLD -/** - * Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt - */ -#define IGNORE_MOD_TAP_INTERRUPT - /** Dilemma-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h index 5bfac4b6c5..f92ea9a4c9 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h @@ -21,18 +21,6 @@ # define DYNAMIC_KEYMAP_LAYER_COUNT 6 #endif // VIA_ENABLE -/** - * \brief Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - */ -#define IGNORE_MOD_TAP_INTERRUPT - /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h index fce6c3a1f6..cfdafc4a51 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h @@ -59,18 +59,6 @@ */ #define PERMISSIVE_HOLD -/** - * Prevent normal rollover on alphas from accidentally triggering mods. - * - * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod. - * - * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e - * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`: - * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae - */ -#define IGNORE_MOD_TAP_INTERRUPT - /** Dilemma-specific features. */ #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h index 335f968e2a..4fa185e956 100644 --- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h @@ -28,6 +28,5 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 \ No newline at end of file diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h index 335f968e2a..4fa185e956 100644 --- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h +++ b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h @@ -28,6 +28,5 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 \ No newline at end of file diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h index d3017fbc06..2644dc8d65 100644 --- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h +++ b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h @@ -17,7 +17,6 @@ #pragma once #define EE_HANDS #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define MOUSEKEY_INTERVAL 16 #define MOUSEKEY_MAX_SPEED 3 #define MOUSEKEY_TIME_TO_MAX 30 diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h index 8728002a39..7dea913a0f 100644 --- a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h @@ -23,7 +23,6 @@ #define TAPPING_TERM 210 /*#define PERMISSIVE_HOLD*/ -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_FORCE_HOLD #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h index c5638c767d..181396ad26 100644 --- a/keyboards/buzzard/keymaps/crehmann/config.h +++ b/keyboards/buzzard/keymaps/crehmann/config.h @@ -6,9 +6,6 @@ // Configure the global tapping term (default: 200ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 @@ -35,4 +32,4 @@ #ifdef PS2_MOUSE_ENABLE #define PS2_MOUSE_SCROLL_BTN_MASK (1<. #define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define RETRO_TAPPING diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h index f4b8c08a3f..8d97cf1465 100644 --- a/keyboards/crkbd/keymaps/armand1m/config.h +++ b/keyboards/crkbd/keymaps/armand1m/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . // #define QUICK_TAP_TERM 0 // #define PERMISSIVE_HOLD #define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h index f700899883..b827d76fcb 100644 --- a/keyboards/crkbd/keymaps/benrestech/config.h +++ b/keyboards/crkbd/keymaps/benrestech/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 175 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h index 188f717aba..fce27a7265 100644 --- a/keyboards/crkbd/keymaps/bermeo/config.h +++ b/keyboards/crkbd/keymaps/bermeo/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . // #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 // #define RETRO_TAPPING -// #define IGNORE_MOD_TAP_INTERRUPT // #define PERMISSIVE_HOLD #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h index ca025830b4..07d930137f 100644 --- a/keyboards/crkbd/keymaps/crkdves/config.h +++ b/keyboards/crkbd/keymaps/crkdves/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING -// #define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_SLEEP diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h index bf33cc90aa..5be6a0449b 100644 --- a/keyboards/crkbd/keymaps/crkqwes/config.h +++ b/keyboards/crkbd/keymaps/crkqwes/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 // #define RETRO_TAPPING -// #define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/edvorakjp/config.h b/keyboards/crkbd/keymaps/edvorakjp/config.h index ee4e7388be..94896f6898 100644 --- a/keyboards/crkbd/keymaps/edvorakjp/config.h +++ b/keyboards/crkbd/keymaps/edvorakjp/config.h @@ -10,7 +10,6 @@ // #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE # undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h index 3f56ef92a5..753854c01c 100644 --- a/keyboards/crkbd/keymaps/gotham/config.h +++ b/keyboards/crkbd/keymaps/gotham/config.h @@ -3,7 +3,6 @@ #define EE_HANDS #define SPLIT_USB_DETECT -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 250 diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h index a926f67537..1a9ac69498 100644 --- a/keyboards/crkbd/keymaps/hvp/config.h +++ b/keyboards/crkbd/keymaps/hvp/config.h @@ -33,7 +33,6 @@ along with this program. If not, see . #define TAPPING_TERM 150 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE # undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h index 3b875235a8..2d200d7d55 100644 --- a/keyboards/crkbd/keymaps/julian_turner/config.h +++ b/keyboards/crkbd/keymaps/julian_turner/config.h @@ -25,9 +25,6 @@ // Configure the global tapping term (default: 200ms) #define TAPPING_TERM 500 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index ff00a04a8d..5644812e5e 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -42,9 +42,6 @@ This is the C configuration file for the keymap #define QMK_LED D5 #define QMK_SPEAKER C6 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // When enabled, typing a mod-tap plus second within term will register as the mod-combo // Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold #define PERMISSIVE_HOLD diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h index 53b5f1b834..d169988be7 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/config.h +++ b/keyboards/crkbd/keymaps/nimishgautam/config.h @@ -21,7 +21,6 @@ //Tapping values //#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h index 95485797cc..d0cda95794 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/config.h +++ b/keyboards/crkbd/keymaps/rpbaptist/config.h @@ -98,7 +98,6 @@ along with this program. If not, see . #define TAPPING_TERM 140 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 2 diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h index 60503a51a5..50a4247765 100644 --- a/keyboards/crkbd/keymaps/sharkby7e/config.h +++ b/keyboards/crkbd/keymaps/sharkby7e/config.h @@ -30,8 +30,6 @@ along with this program. If not, see . //#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h index 57a253428b..82097c503a 100644 --- a/keyboards/crkbd/keymaps/snowe/config.h +++ b/keyboards/crkbd/keymaps/snowe/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #ifdef RGBLIGHT_ENABLE @@ -55,8 +54,5 @@ along with this program. If not, see . #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" -// fix for me putting alt under A and being a fast typist -#define IGNORE_MOD_TAP_INTERRUPT - #define LAYER_STATE_8BIT #define SPLIT_WPM_ENABLE diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h index 6cd090f9fd..97614f3b70 100644 --- a/keyboards/crkbd/keymaps/soundmonster/config.h +++ b/keyboards/crkbd/keymaps/soundmonster/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . // #define QUICK_TAP_TERM 0 #define TAPPING_TERM 150 #define RETRO_TAPPING -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h index 41e5c3ff43..ad2bfcabc7 100644 --- a/keyboards/crkbd/keymaps/thunderbird2086/config.h +++ b/keyboards/crkbd/keymaps/thunderbird2086/config.h @@ -8,7 +8,6 @@ // #define RGB_LAYER_ENABLE -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #if defined(TAPPING_TERM) diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h index 2ccbb229b8..3b7eab62e6 100644 --- a/keyboards/crkbd/keymaps/xyverz/config.h +++ b/keyboards/crkbd/keymaps/xyverz/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h index af5d55bf6e..cadd53a971 100644 --- a/keyboards/drhigsby/ogurec/keymaps/dack/config.h +++ b/keyboards/drhigsby/ogurec/keymaps/dack/config.h @@ -14,6 +14,5 @@ * along with this program. If not, see . */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 230 #define TAPPING_TERM_PER_KEY diff --git a/keyboards/dumbo/keymaps/trip-trap/config.h b/keyboards/dumbo/keymaps/trip-trap/config.h index 7f713e4a3d..15b6ce7c0d 100644 --- a/keyboards/dumbo/keymaps/trip-trap/config.h +++ b/keyboards/dumbo/keymaps/trip-trap/config.h @@ -19,9 +19,6 @@ // Tapping term is ever so slightly lowered from the 200ms default to make layer and mod usage more snappy. #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // If you are using an Elite C rev3 on the slave side, uncomment the lines below: // #define SPLIT_USB_DETECT // #define NO_USB_STARTUP_CHECK diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h index a5235259ff..6ad73f6edf 100644 --- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h @@ -20,7 +20,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h index 4ea0d150ea..90627f894f 100644 --- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h @@ -66,7 +66,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h index c302214061..d981df82ed 100644 --- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h @@ -50,4 +50,3 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h index 93e6990950..bce34bcfbc 100644 --- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h @@ -60,7 +60,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" diff --git a/keyboards/ein_60/keymaps/klackygears/config.h b/keyboards/ein_60/keymaps/klackygears/config.h index d3b1c7b4d9..91c51cb51c 100644 --- a/keyboards/ein_60/keymaps/klackygears/config.h +++ b/keyboards/ein_60/keymaps/klackygears/config.h @@ -20,7 +20,6 @@ #define PERMISSIVE_HOLD #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 05aec8e958..bb91701044 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -47,7 +47,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h index 11c81f2eba..c03ee70bd5 100755 --- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h +++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h @@ -21,8 +21,6 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 1 #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h index 11c81f2eba..c03ee70bd5 100644 --- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h +++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h @@ -21,8 +21,6 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 1 #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h index c69c0dfe57..7428cccc82 100644 --- a/keyboards/ergodox_ez/keymaps/danielo515/config.h +++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h @@ -4,7 +4,6 @@ */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 200 #define ONESHOT_TAP_TOGGLE 3 diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h index 3f8c68ceb7..e90d7184ee 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h @@ -12,8 +12,6 @@ #undef DEBOUNCE #define DEBOUNCE 15 -#undef IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h index 06c50e0a96..232b608be9 100644 --- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h +++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h @@ -25,8 +25,6 @@ // #undef TAPPING_TERM // #define TAPPING_TERM 499 -/* Turning permissive hold and ignore mod tap interrupt off in order to test the tapping term. */ +/* Turning permissive hold off in order to test the tapping term. */ #undef PERMISSIVE_HOLD #define PERMISSIVE_HOLD -#undef IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ergodox_ez/keymaps/nfriend/config.h b/keyboards/ergodox_ez/keymaps/nfriend/config.h index 36d23c96b7..141d7ac89a 100644 --- a/keyboards/ergodox_ez/keymaps/nfriend/config.h +++ b/keyboards/ergodox_ez/keymaps/nfriend/config.h @@ -26,6 +26,4 @@ #define PERMISSIVE_HOLD -#undef IGNORE_MOD_TAP_INTERRUPT - #define RGBLIGHT_SLEEP diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h index 84c5adfc9e..edd1f130cc 100644 --- a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h +++ b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h @@ -5,7 +5,6 @@ #define RGBLIGHT_SLEEP -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h index 5c2377be1e..fce5cb445b 100644 --- a/keyboards/ferris/keymaps/bruun-baer/config.h +++ b/keyboards/ferris/keymaps/bruun-baer/config.h @@ -35,5 +35,4 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h index b10555bb0d..1a4d15ff42 100644 --- a/keyboards/ferris/keymaps/default/config.h +++ b/keyboards/ferris/keymaps/default/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 // Underglow configuration diff --git a/keyboards/ferris/keymaps/madhatter/config.h b/keyboards/ferris/keymaps/madhatter/config.h index 79496ae750..65a14e6622 100644 --- a/keyboards/ferris/keymaps/madhatter/config.h +++ b/keyboards/ferris/keymaps/madhatter/config.h @@ -19,4 +19,3 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h index b10555bb0d..1a4d15ff42 100644 --- a/keyboards/ferris/keymaps/pierrec83/config.h +++ b/keyboards/ferris/keymaps/pierrec83/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 // Underglow configuration diff --git a/keyboards/ferris/keymaps/via/config.h b/keyboards/ferris/keymaps/via/config.h index 0d822891d1..4bdd1774a7 100644 --- a/keyboards/ferris/keymaps/via/config.h +++ b/keyboards/ferris/keymaps/via/config.h @@ -5,7 +5,6 @@ // Good defaults for home row modifiers #define TAPPING_TERM 230 -#define IGNORE_MOD_TAP_INTERRUPT // Handle master/slave detection on low cost Promicro #ifdef __AVR__ diff --git a/keyboards/foostan/cornelius/keymaps/hvp/config.h b/keyboards/foostan/cornelius/keymaps/hvp/config.h index ea23adfab5..a2a492ff27 100644 --- a/keyboards/foostan/cornelius/keymaps/hvp/config.h +++ b/keyboards/foostan/cornelius/keymaps/hvp/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/fungo/keymaps/default/config.h b/keyboards/fungo/keymaps/default/config.h deleted file mode 100644 index c6d778d109..0000000000 --- a/keyboards/fungo/keymaps/default/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* This is the c configuration file for the keymap - * 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 - - - - -#define IGNORE_MOD_TAP_INTERRUPT - diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index 3274a5ab92..ba0078e71b 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 858f99208f..3e090f9e57 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define FORCE_NKRO #define NO_ACTION_ONESHOT -#define IGNORE_MOD_TAP_INTERRUPT /* key matrix size */ #define MATRIX_ROWS 14 @@ -42,7 +41,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c index bb6ed9dd3e..9b3365d02f 100644 --- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c +++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c @@ -13,7 +13,6 @@ #include QMK_KEYBOARD_H #include "sten.h" #include "keymap_steno.h" -#define IGNORE_MOD_TAP_INTERRUPT // Steno Layers #define FUNCT ( LSD | LK | LP | LH ) diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 2eda942c15..37d4fe8499 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -44,7 +44,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h index bc7b9f7845..d3c17757c8 100644 --- a/keyboards/gboards/gergo/keymaps/abstractkb/config.h +++ b/keyboards/gboards/gergo/keymaps/abstractkb/config.h @@ -1,6 +1,4 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - #undef DEBOUNCE #define DEBOUNCE 10 diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c index b72e81f6d7..39bafc5e31 100644 --- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c +++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c @@ -8,7 +8,6 @@ #include QMK_KEYBOARD_H -#define IGNORE_MOD_TAP_INTERRUPT #define BASE 0 // default layer #define SYMB 1 // symbols #define NUMB 2 // numbers/motion diff --git a/keyboards/gboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/default/config.h +++ b/keyboards/gboards/gergo/keymaps/default/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/germ/config.h +++ b/keyboards/gboards/gergo/keymaps/germ/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/gotham/config.h +++ b/keyboards/gboards/gergo/keymaps/gotham/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h index af960a1eed..327e03d56d 100644 --- a/keyboards/gboards/gergo/keymaps/oled/config.h +++ b/keyboards/gboards/gergo/keymaps/oled/config.h @@ -1,4 +1,3 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c" diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h index d733cb3b7a..e6ef1def9e 100644 --- a/keyboards/gboards/gergoplex/config.h +++ b/keyboards/gboards/gergoplex/config.h @@ -34,6 +34,5 @@ along with this program. If not, see . */ #define MATRIX_COL_PINS { F6, F5, F4, F1 } #define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 } -#define IGNORE_MOD_TAP_INTERRUPT #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h index b7e08c2b24..3439d8c8c1 100644 --- a/keyboards/handwired/angel/config.h +++ b/keyboards/handwired/angel/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . // https://docs.qmk.fm/using-qmk/software-features/tap_hold #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h index 69c1beb03c..53cf5bbc0f 100644 --- a/keyboards/handwired/aranck/keymaps/turkishish/config.h +++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h @@ -20,5 +20,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define QUICK_TAP_TERM 0 \ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h index 02f5f29c3f..72c76ac580 100644 --- a/keyboards/handwired/bolek/config.h +++ b/keyboards/handwired/bolek/config.h @@ -39,4 +39,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 088f03a379..6ab3491141 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -69,5 +69,4 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define TAPPING_TERM 150 -//#define IGNORE_MOD_TAP_INTERRUPT //#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/brain/keymaps/klackygears/config.h b/keyboards/handwired/brain/keymaps/klackygears/config.h index 5115f01801..b572858448 100644 --- a/keyboards/handwired/brain/keymaps/klackygears/config.h +++ b/keyboards/handwired/brain/keymaps/klackygears/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define PERMISSIVE_HOLD #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h index 06c5f586e4..c373743a39 100644 --- a/keyboards/handwired/chiron/keymaps/default/config.h +++ b/keyboards/handwired/chiron/keymaps/default/config.h @@ -19,7 +19,6 @@ #define MASTER_RIGHT //#define MASTER_LEFT -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h index 61f997b5b4..0b98f64a4f 100644 --- a/keyboards/handwired/dactyl/config.h +++ b/keyboards/handwired/dactyl/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* key combination for command */ #define IS_COMMAND() ( \ diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h index b8df581b72..783a2c46b1 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 2 // number of taps to toggle TT #define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key -#define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term #define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key #define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key #undef MOUSEKEY_INTERVAL diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h index fb01f969d3..7eaeceb44a 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 3 #define ONESHOT_TAP_TOGGLE 3 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 300 #ifdef RGBLED_NUM # undef RGBLED_NUM diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h index 44fe0587fc..0b5e296dc8 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h @@ -5,5 +5,4 @@ #define SPLIT_USB_DETECT -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 250 diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h index b9ebeee96b..fc5d819060 100644 --- a/keyboards/handwired/frenchdev/config.h +++ b/keyboards/handwired/frenchdev/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* key combination for command */ #define IS_COMMAND() ( \ diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h index 69c1beb03c..53cf5bbc0f 100644 --- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h +++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h @@ -20,5 +20,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define QUICK_TAP_TERM 0 \ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h index 049ba598a9..0114d6c7f9 100644 --- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h +++ b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h @@ -20,4 +20,3 @@ #define TAPPING_TERM 175 #define TAPPING_TERM_PER_KEY #define PERMISSIVE_HOLD_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h index 6ca97d3e73..40aee1e05e 100644 --- a/keyboards/handwired/pterodactyl/config.h +++ b/keyboards/handwired/pterodactyl/config.h @@ -39,8 +39,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h index d8a98f8d40..22d68ab390 100644 --- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h +++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h @@ -28,5 +28,3 @@ along with this program. If not, see . #define RCPC_KEYS KC_RCTL,KC_TRNS,KC_RBRC #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h index 9910669457..49be10cce4 100644 --- a/keyboards/handwired/xealous/rev1/config.h +++ b/keyboards/handwired/xealous/rev1/config.h @@ -33,5 +33,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING #define NO_ACTION_ONESHOT - -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h index 6854249be0..0dff4b59ca 100644 --- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h +++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h @@ -5,7 +5,6 @@ #undef QUICK_TAP_TERM #undef TAPPING_TERM #define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT // If you need more program area, try select and reduce rgblight modes to use. diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h index e0d2bce0f1..8d281f2604 100644 --- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h @@ -17,8 +17,4 @@ //#define TAPPING_TOGGLE 1 // TAPPING_TERM is set in config.h this defaults to 200 -// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when -// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT - #endif diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h index 8f769d603f..0711122d74 100644 --- a/keyboards/hhkb/ansi/keymaps/brett/config.h +++ b/keyboards/hhkb/ansi/keymaps/brett/config.h @@ -12,6 +12,3 @@ #define LSPO_MOD KC_LSFT #define RSPC_MOD KC_RSFT -// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when -// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h index 335f968e2a..4fa185e956 100644 --- a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h +++ b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h @@ -28,6 +28,5 @@ along with this program. If not, see . #define QUICK_TAP_TERM 0 #define TAPPING_TERM 300 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 \ No newline at end of file diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h index ee7b25cf6f..56eda36984 100644 --- a/keyboards/hotdox/config.h +++ b/keyboards/hotdox/config.h @@ -14,7 +14,6 @@ #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index fc9cdfe786..ccfd50638b 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -17,7 +17,6 @@ #define COMBO_TERM 50 #define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 175 #define TAPPING_TERM 175 diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h index 9b7c369dda..fa95320e90 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h @@ -21,5 +21,4 @@ along with this program. If not, see . #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h index 1c8cff4bb6..65eec1d7f8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h @@ -18,5 +18,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h index 5b97451890..9920602ab8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h @@ -2,7 +2,6 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define LEADER_TIMEOUT 300 diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h index c0227431fb..7e1868813f 100644 --- a/keyboards/idobao/id75/keymaps/egstad/config.h +++ b/keyboards/idobao/id75/keymaps/egstad/config.h @@ -16,7 +16,6 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_SLEEP diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h index 7813d776e5..d969bd88a2 100644 --- a/keyboards/idobao/id75/keymaps/gkbd_75/config.h +++ b/keyboards/idobao/id75/keymaps/gkbd_75/config.h @@ -17,5 +17,4 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h index e8fc39faad..3e8dcc7570 100644 --- a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h +++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index 6ebc0f4083..6d642e5d45 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h index d5ed0a8e9e..3fef45f887 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h +++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h @@ -6,7 +6,6 @@ #define COMBO_TERM 20 #define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #undef MOUSEKEY_DELAY diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h index 85b41c86d8..1a033d8311 100644 --- a/keyboards/jian/keymaps/advanced/config.h +++ b/keyboards/jian/keymaps/advanced/config.h @@ -22,6 +22,5 @@ along with this program. If not, see . //#define AUTO_SHIFT_TIMEOUT 150 //#define NO_AUTO_SHIFT_NUMERIC //#define AUTO_SHIFT_MODIFIERS -#define IGNORE_MOD_TAP_INTERRUPT #define ALT_LAYOUTS_ENABLE //#define TRAINING_HALFES_LOCK diff --git a/keyboards/jian/keymaps/default/config.h b/keyboards/jian/keymaps/default/config.h index 4d9cb17cac..314836a54d 100644 --- a/keyboards/jian/keymaps/default/config.h +++ b/keyboards/jian/keymaps/default/config.h @@ -18,5 +18,3 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #pragma once - -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h index 4d9cb17cac..cae66a5c3a 100644 --- a/keyboards/jian/keymaps/left_hand/config.h +++ b/keyboards/jian/keymaps/left_hand/config.h @@ -19,4 +19,3 @@ along with this program. If not, see . */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/jian/keymaps/via/config.h b/keyboards/jian/keymaps/via/config.h index 4d9cb17cac..cae66a5c3a 100644 --- a/keyboards/jian/keymaps/via/config.h +++ b/keyboards/jian/keymaps/via/config.h @@ -19,4 +19,3 @@ along with this program. If not, see . */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h index 803471e550..c86bbebdc7 100644 --- a/keyboards/k34/keymaps/default/config.h +++ b/keyboards/k34/keymaps/default/config.h @@ -20,5 +20,4 @@ // mod taps for home row mods #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/karn/keymaps/colemak/config.h b/keyboards/karn/keymaps/colemak/config.h index 71eb08ed1e..22d190164b 100644 --- a/keyboards/karn/keymaps/colemak/config.h +++ b/keyboards/karn/keymaps/colemak/config.h @@ -3,11 +3,6 @@ #pragma once -// Equivalent to zmk behavior-hold-tap tap-preferred flavor -// Do not force the mod-tap key press to be handled as a modifier -// if any other key was pressed while the mod-tap key is held down. -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY - // Equivalent to zmk behavior-hold-tap hold-preferred flavor #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h index 8290ffd799..9538405eb2 100644 --- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h +++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 150 #define TAPPING_TOGGLE 2 diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h index 8290ffd799..9538405eb2 100644 --- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h +++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 150 #define TAPPING_TOGGLE 2 diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h index 864cedae98..d5caa23369 100644 --- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h +++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h @@ -8,7 +8,6 @@ #define SWAP_SCLN #define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM #define RGBLIGHT_EFFECT_STATIC_GRADIENT diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h index 9f1982935a..0aa25a88bc 100644 --- a/keyboards/keebio/iris/keymaps/emp/config.h +++ b/keyboards/keebio/iris/keymaps/emp/config.h @@ -50,12 +50,6 @@ along with this program. If not, see . */ #undef PERMISSIVE_HOLD -/* IGNORE_MOD_TAP_INTERRUPT - * when on: rolling tap-hold keys taps all keys - * when off: rolling tap-hold keys modifies keys -*/ -#undef IGNORE_MOD_TAP_INTERRUPT - /* TAPPING_TERM x (ms) * how long before a tap becomes a hold. if set above 500, a key tapped during * the tapping term will turn it into a hold too diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h index fd3ebfd94b..44c4fbd1e5 100644 --- a/keyboards/keebio/iris/keymaps/fluffactually/config.h +++ b/keyboards/keebio/iris/keymaps/fluffactually/config.h @@ -19,6 +19,5 @@ along with this program. If not, see . // #define USE_I2C #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 175 diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h index 62760cce35..22b4d6eac7 100644 --- a/keyboards/keebio/iris/keymaps/khitsule/config.h +++ b/keyboards/keebio/iris/keymaps/khitsule/config.h @@ -19,6 +19,5 @@ along with this program. If not, see . // #define USE_I2C #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h index 359dda7b61..c2ea15af87 100644 --- a/keyboards/keebio/iris/keymaps/radlinskii/config.h +++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h @@ -8,7 +8,6 @@ #define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_LAYERS diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h index 8c576917e8..59004bfa8a 100644 --- a/keyboards/keebio/iris/keymaps/sq5rix/config.h +++ b/keyboards/keebio/iris/keymaps/sq5rix/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define EE_HANDS #define TAPPING_TERM 164 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define RGBLIGHT_LAYERS #define ENCODER_RESOLUTION 4 diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h index 37ffb20a2f..83b0fcfc44 100644 --- a/keyboards/keebio/iris/keymaps/two_knob/config.h +++ b/keyboards/keebio/iris/keymaps/two_knob/config.h @@ -13,9 +13,6 @@ /* If you're setting colors per key, this is required. */ #define SPLIT_LAYER_STATE_ENABLE -/* If you type too fast, it confuses the Mod key combos. This resolves it: */ -#define IGNORE_MOD_TAP_INTERRUPT - /* Set tapdance speed */ #define TAPPING_TERM 210 diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h index 8a35b6f197..1751a65b2e 100644 --- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h +++ b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h @@ -25,4 +25,3 @@ along with this program. If not, see . // https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options #define TAPPING_TERM 120 //#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h index 82ace2ef68..3e2c097853 100644 --- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h +++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define TAPPING_TERM 500 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define FORCE_NKRO #define RETRO_TAPPING diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h index 0ac1cc4a6e..c02549e477 100644 --- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h +++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h @@ -8,7 +8,6 @@ // #define MASTER_RIGHT #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 150 #define TAPPING_TOGGLE 2 diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h index 3bb69ef31c..9d65e8da70 100644 --- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h +++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h @@ -8,7 +8,6 @@ // #define MASTER_RIGHT #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 175 #define TAPPING_TOGGLE 2 diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h index f66f840bfd..c34fa270b4 100644 --- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h +++ b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h @@ -16,7 +16,6 @@ #pragma once //#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 200 #define ONESHOT_TAP_TOGGLE 5 #define ONESHOT_TIMEOUT 5000 diff --git a/keyboards/keyhive/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h index ea23adfab5..a2a492ff27 100644 --- a/keyboards/keyhive/ut472/keymaps/hvp/config.h +++ b/keyboards/keyhive/ut472/keymaps/hvp/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h index 053a291b7c..7749c523f3 100644 --- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h +++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h @@ -5,7 +5,6 @@ #include "../../config.h" // place overrides here -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 150 #define TAPPING_TOGGLE 2 diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/config.h b/keyboards/kinesis/keymaps/tuesdayjohn/config.h index ebed17fede..b0816d6ae5 100644 --- a/keyboards/kinesis/keymaps/tuesdayjohn/config.h +++ b/keyboards/kinesis/keymaps/tuesdayjohn/config.h @@ -1,6 +1,5 @@ #pragma once // place overrides here -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 175 #define TAPPING_TOGGLE 2 diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h index aa87459cd4..b81985f1ef 100644 --- a/keyboards/kinesis/kint2pp/config.h +++ b/keyboards/kinesis/kint2pp/config.h @@ -1,7 +1,5 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as // per https://www.pjrc.com/teensy/low_power.html #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h index b9bb73219c..8b291df88e 100644 --- a/keyboards/kinesis/kint36/config.h +++ b/keyboards/kinesis/kint36/config.h @@ -16,8 +16,6 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz: // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6 #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h index 152a7d9c9b..74d1a8a78f 100644 --- a/keyboards/kinesis/kint41/config.h +++ b/keyboards/kinesis/kint41/config.h @@ -16,8 +16,6 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz // as per https://www.pjrc.com/store/teensy41.html #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h index c1699c2d6d..a5610a4c8c 100644 --- a/keyboards/kinesis/kintlc/config.h +++ b/keyboards/kinesis/kintlc/config.h @@ -16,8 +16,6 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - // The Teensy LC power consumption is unknown as per // https://www.pjrc.com/store/teensylc.html but since // https://www.pjrc.com/store/teensy41.html says 100mA, let's go with half. diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h index 3489b5104b..a3ae6615ac 100644 --- a/keyboards/kinesis/stapelberg/config.h +++ b/keyboards/kinesis/stapelberg/config.h @@ -6,5 +6,3 @@ #define MOUSEKEY_MAX_SPEED 3 #define MOUSEKEY_TIME_TO_MAX 10 */ - -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h index a6a97d5b76..3a48491679 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h @@ -8,9 +8,6 @@ #define TAPPING_TERM 200 // time of holding key, milliseconds -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h index 9d566d388d..a669c31c24 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h @@ -19,9 +19,6 @@ #undef TAPPING_TERM #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h index c1f1a06a33..ceb40da092 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h @@ -43,7 +43,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h index be172a8cf6..eaff1148d0 100644 --- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h @@ -28,7 +28,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h index 3be7f6f0cb..48d86aedf5 100644 --- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h +++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h @@ -8,8 +8,6 @@ #define PERMISSIVE_HOLD // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM -#define IGNORE_MOD_TAP_INTERRUPT - // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. #define QUICK_TAP_TERM 0 // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h index 826c381b32..9ba612359e 100644 --- a/keyboards/lets_split/keymaps/adam/config.h +++ b/keyboards/lets_split/keymaps/adam/config.h @@ -47,7 +47,6 @@ along with this program. If not, see . #undef TAPPING_TERM #define TAPPING_TERM 200 //At 500 some bad logic takes hold -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #endif diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index 1a46cdf108..2135f04351 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -52,5 +52,4 @@ along with this program. If not, see . #define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 220 diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h index 5699395f73..ec0960470a 100644 --- a/keyboards/lily58/keymaps/hvp/config.h +++ b/keyboards/lily58/keymaps/hvp/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define TAPPING_TERM 150 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h index 283a4ed890..81bc728d5a 100644 --- a/keyboards/lily58/keymaps/muppetjones/config.h +++ b/keyboards/lily58/keymaps/muppetjones/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . // Change "hold" time (default is 200 ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h index 377ee816fe..5d833d34d0 100644 --- a/keyboards/lily58/keymaps/muuko/config.h +++ b/keyboards/lily58/keymaps/muuko/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define NO_MUSIC_MODE #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #ifdef TAPPING_TERM #undef TAPPING_TERM diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h index a6fac1a58b..814338c18f 100644 --- a/keyboards/lily58/keymaps/narze/config.h +++ b/keyboards/lily58/keymaps/narze/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define COMBO_TERM 20 #define COMBO_COUNT 3 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define QUICK_TAP_TERM 0 diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h index 58ffd90e2f..dedefc2fcf 100644 --- a/keyboards/lily58/keymaps/niolang/config.h +++ b/keyboards/lily58/keymaps/niolang/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -/* Necessary because of use fo tap dance for ç (leads to un wanted modifications after typing c if not) */ -#define IGNORE_MOD_TAP_INTERRUPT - /* RGB light */ #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h index fd8587b1e4..ef5df5dd3d 100644 --- a/keyboards/lyso1/lck75/config.h +++ b/keyboards/lyso1/lck75/config.h @@ -41,7 +41,6 @@ along with this program. If not, see . # undef LOCKING_RESYNC_ENABLE #endif -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h index 1d2dd05351..c60e064e21 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h @@ -9,4 +9,3 @@ #endif #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h index 1d2dd05351..c60e064e21 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h @@ -9,4 +9,3 @@ #endif #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h index 1d2dd05351..c60e064e21 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h @@ -9,4 +9,3 @@ #endif #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h index f2a669ec94..1809262044 100644 --- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h +++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h @@ -1,4 +1,3 @@ #pragma once #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h index 0bb532c663..af4401a4a0 100644 --- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h +++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h @@ -3,7 +3,6 @@ #pragma once #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT #define ONESHOT_TIMEOUT 1000 #define TAPPING_TERM 200 diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h deleted file mode 100644 index 645e80ee8f..0000000000 --- a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#define IGNORE_MOD_TAP_INTERRUPT - -#endif diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h index 37602b9163..98f8d6b071 100644 --- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h +++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h @@ -5,4 +5,3 @@ #define COMBO_COUNT 10 #define COMBO_TERM 100 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h index ee5aaa8294..023781e111 100644 --- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h +++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h @@ -43,7 +43,6 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #endif diff --git a/keyboards/marksard/leftover30/keymaps/default/config.h b/keyboards/marksard/leftover30/keymaps/default/config.h index 8bffbbb3b5..8d29b8e6c9 100644 --- a/keyboards/marksard/leftover30/keymaps/default/config.h +++ b/keyboards/marksard/leftover30/keymaps/default/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/treadstone32/keymaps/default/config.h b/keyboards/marksard/treadstone32/keymaps/default/config.h index 863588c5aa..82020a59b8 100644 --- a/keyboards/marksard/treadstone32/keymaps/default/config.h +++ b/keyboards/marksard/treadstone32/keymaps/default/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h index 863588c5aa..82020a59b8 100644 --- a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h +++ b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h index 54ac1f2fce..f18bcf44e7 100644 --- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h +++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h @@ -23,7 +23,6 @@ #endif #define TAPPING_TERM 225 #define PREVENT_STUCK_MODIFIERS -#define IGNORE_MOD_TAP_INTERRUPT #ifdef MOUSEKEY_ENABLE #undef MOUSEKEY_INTERVAL diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h index 8f06c0dd34..d87bdade68 100644 --- a/keyboards/massdrop/alt/keymaps/b_/config.h +++ b/keyboards/massdrop/alt/keymaps/b_/config.h @@ -31,7 +31,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h index 83f0d13bd5..331b34c9b0 100644 --- a/keyboards/massdrop/alt/keymaps/pregame/config.h +++ b/keyboards/massdrop/alt/keymaps/pregame/config.h @@ -44,7 +44,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h index 8584c07a5d..c8fa629552 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h +++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h @@ -28,7 +28,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h index b975b7895b..a17ad45c4c 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h @@ -46,7 +46,6 @@ along with this program. If not, see . // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release // #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h index 87db7fe8ea..2166f67e8c 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h @@ -44,7 +44,6 @@ // #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle // #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details -// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details // #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) // #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. // #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h index 5c2d15a006..c8b98febcd 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/default/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h index 8476c8ccd6..656cf1a794 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h index 8476c8ccd6..656cf1a794 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/via/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h index d09385ca5d..9630c999ff 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/via/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/righty/keymaps/default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h index 5c2d15a006..2507b2e612 100644 --- a/keyboards/mechwild/bde/righty/keymaps/default/config.h +++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/righty/keymaps/via/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h index 5c2d15a006..c8b98febcd 100644 --- a/keyboards/mechwild/bde/righty/keymaps/via/config.h +++ b/keyboards/mechwild/bde/righty/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h index aa4bf3885e..e39340c80a 100644 --- a/keyboards/moonlander/keymaps/jjerrell/config.h +++ b/keyboards/moonlander/keymaps/jjerrell/config.h @@ -24,4 +24,3 @@ #undef PRODUCT #define PRODUCT "Moonlander Mark I - Modified by <@jjerrell>" -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h index 961de83e42..70faffdf37 100644 --- a/keyboards/numatreus/keymaps/like_jis/config.h +++ b/keyboards/numatreus/keymaps/like_jis/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #undef TAPPING_TERM #endif #define TAPPING_TERM 225 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef MOUSEKEY_ENABLE #undef MOUSEKEY_INTERVAL diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h index 3e3ba7a401..71b4813515 100644 --- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h +++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h @@ -35,5 +35,4 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 5f20923107..2fa05fda7c 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -50,5 +50,4 @@ along with this program. If not, see . #define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 220 diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h index ec422c4d8e..f29f5ba1a7 100644 --- a/keyboards/pica40/keymaps/zzeneg/config.h +++ b/keyboards/pica40/keymaps/zzeneg/config.h @@ -3,7 +3,6 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_FORCE_HOLD #define TAPPING_FORCE_HOLD_PER_KEY #define TAPPING_TERM 150 diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h index 7049a692ed..8ff2df3709 100644 --- a/keyboards/pierce/keymaps/durken1/config.h +++ b/keyboards/pierce/keymaps/durken1/config.h @@ -19,9 +19,6 @@ // default but important #define TAPPING_TERM 220 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/pisces/keymaps/default/config.h b/keyboards/pisces/keymaps/default/config.h index 810b6546db..fbac4dcb26 100644 --- a/keyboards/pisces/keymaps/default/config.h +++ b/keyboards/pisces/keymaps/default/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 175 // milliseconds -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/pisces/keymaps/via/config.h b/keyboards/pisces/keymaps/via/config.h index 810b6546db..fbac4dcb26 100644 --- a/keyboards/pisces/keymaps/via/config.h +++ b/keyboards/pisces/keymaps/via/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 175 // milliseconds -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 6828e4dce2..3b10a2b753 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -111,8 +111,6 @@ #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define IGNORE_MOD_TAP_INTERRUPT - #define TAPPING_TOGGLE 1 #define MOUSEKEY_INTERVAL 20 diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h index e517a8b24b..b6c010a825 100644 --- a/keyboards/planck/keymaps/altgr/config.h +++ b/keyboards/planck/keymaps/altgr/config.h @@ -36,7 +36,6 @@ #define HOME_MODS // fix dual function timing #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default) #define BEAKLGR diff --git a/keyboards/planck/keymaps/antosha417/config.h b/keyboards/planck/keymaps/antosha417/config.h index 9bbb1192c7..3ad322687a 100644 --- a/keyboards/planck/keymaps/antosha417/config.h +++ b/keyboards/planck/keymaps/antosha417/config.h @@ -29,6 +29,5 @@ #define ENCODER_RESOLUTION 4 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define COMBO_TERM 30 diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h index 464a8cd5db..e9fcc865fa 100644 --- a/keyboards/planck/keymaps/ariccb/config.h +++ b/keyboards/planck/keymaps/ariccb/config.h @@ -41,8 +41,6 @@ #define TAPPING_TERM 150 #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT -// #define IGNORE_MOD_TAP_INTERRUPT // #define HOLD_ON_OTHER_KEY_PRESS #define COMBO_TERM 20 diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h index eb86704578..65845fe3e7 100644 --- a/keyboards/planck/keymaps/hiea/config.h +++ b/keyboards/planck/keymaps/hiea/config.h @@ -36,7 +36,6 @@ #define HOME_MODS // fix dual function timing #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default) #define DEFAULT diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h index eb86704578..65845fe3e7 100644 --- a/keyboards/planck/keymaps/hieax/config.h +++ b/keyboards/planck/keymaps/hieax/config.h @@ -36,7 +36,6 @@ #define HOME_MODS // fix dual function timing #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default) #define DEFAULT diff --git a/keyboards/planck/keymaps/hvp/config.h b/keyboards/planck/keymaps/hvp/config.h index 009a8f7122..472320ed68 100644 --- a/keyboards/planck/keymaps/hvp/config.h +++ b/keyboards/planck/keymaps/hvp/config.h @@ -1,6 +1,5 @@ #pragma once #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #ifdef AUDIO_ENABLE diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h index bd34fca202..2b7a3b02d6 100644 --- a/keyboards/planck/keymaps/jweickm/config.h +++ b/keyboards/planck/keymaps/jweickm/config.h @@ -57,7 +57,6 @@ #define TAPPING_TERM 160 // 200 ms is the default value #define TAPPING_TERM_PER_KEY //#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM_PER_KEY // settings for LEADER key diff --git a/keyboards/planck/keymaps/mattly/config.h b/keyboards/planck/keymaps/mattly/config.h index 46fe973417..31c47c85b4 100644 --- a/keyboards/planck/keymaps/mattly/config.h +++ b/keyboards/planck/keymaps/mattly/config.h @@ -34,7 +34,6 @@ // Most tactile encoders have detents every 4 stages #define ENCODER_RESOLUTION 4 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h index 1a05bfc837..88331e71f6 100644 --- a/keyboards/planck/keymaps/muppetjones/config.h +++ b/keyboards/planck/keymaps/muppetjones/config.h @@ -49,8 +49,5 @@ // Change "hold" time (default is 200 ms) #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/planck/keymaps/mwpeterson/config.h b/keyboards/planck/keymaps/mwpeterson/config.h index 2665bd7c56..657ffda599 100644 --- a/keyboards/planck/keymaps/mwpeterson/config.h +++ b/keyboards/planck/keymaps/mwpeterson/config.h @@ -1,7 +1,6 @@ #pragma once #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(ONE_UP_SOUND) diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h index 9ab1637306..fddd9cd376 100644 --- a/keyboards/planck/keymaps/narze/config.h +++ b/keyboards/planck/keymaps/narze/config.h @@ -26,7 +26,6 @@ #define COMBO_TERM 20 #define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define SUPER_DUPER_SOUND S__NOTE(_B1) diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h index 903bbe8095..6afcc69064 100644 --- a/keyboards/planck/keymaps/sdothum/config.h +++ b/keyboards/planck/keymaps/sdothum/config.h @@ -36,7 +36,6 @@ #define HOME_MODS // fix dual function timing #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT // layout ADNW*, BEAKL*, COLEKA*, QWERTY (default) #define BEAKLSP diff --git a/keyboards/planck/keymaps/snowkuma/config.h b/keyboards/planck/keymaps/snowkuma/config.h index 694245582d..c61d252804 100644 --- a/keyboards/planck/keymaps/snowkuma/config.h +++ b/keyboards/planck/keymaps/snowkuma/config.h @@ -36,7 +36,6 @@ // Settings for homerow mods #define TAPPING_TERM 250 -#define IGNORE_MOD_TAP_INTERRUPT // Add the leader key feature diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h index 52c1494a1d..d0fb8680e3 100644 --- a/keyboards/planck/keymaps/tylerwince/config.h +++ b/keyboards/planck/keymaps/tylerwince/config.h @@ -13,6 +13,5 @@ See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file */ #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT #define EECONFIG_RGB_MATRIX (uint32_t *)16 diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h index 4f4fbfe05c..16a4c267e5 100644 --- a/keyboards/preonic/keymaps/egstad/config.h +++ b/keyboards/preonic/keymaps/egstad/config.h @@ -1,6 +1,5 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/preonic/keymaps/laurentlaurent/config.h b/keyboards/preonic/keymaps/laurentlaurent/config.h index 2c1b1a7059..20ce699a19 100644 --- a/keyboards/preonic/keymaps/laurentlaurent/config.h +++ b/keyboards/preonic/keymaps/laurentlaurent/config.h @@ -33,6 +33,4 @@ /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ //#define MIDI_TONE_KEYCODE_OCTAVES 2 -// Fix Home Row mod keys -#define IGNORE_MOD_TAP_INTERRUPT -//#define RETRO_TAPPING \ No newline at end of file +//#define RETRO_TAPPING diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/q4z/keymaps/default/config.h index ac3a08778d..c129199230 100644 --- a/keyboards/q4z/keymaps/default/config.h +++ b/keyboards/q4z/keymaps/default/config.h @@ -15,8 +15,6 @@ */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods - #ifdef COMBO_ENABLE #define COMBO_COUNT 5 #define COMBO_TERM 200 diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h index 9921a19178..7530b24262 100644 --- a/keyboards/q4z/keymaps/rjboone/config.h +++ b/keyboards/q4z/keymaps/rjboone/config.h @@ -15,8 +15,6 @@ */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods - #undef TAPPING_TERM #define TAPPING_TERM 300 diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h index dd1d9753fd..90d12ee7da 100644 --- a/keyboards/qpockets/eggman/keymaps/default/config.h +++ b/keyboards/qpockets/eggman/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h index ffc2124e1b..fd24168f47 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 175 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h index 0b0e89fa1f..7fdb8504a6 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 165 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h index bf8c47eb3e..31291ecc8f 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h +++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h +++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h index 51e54382af..072519ff6c 100644 --- a/keyboards/qpockets/wanten/keymaps/default/config.h +++ b/keyboards/qpockets/wanten/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 145 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h index 8861dc5396..739186fdeb 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h index 8861dc5396..739186fdeb 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h index 9697f561da..045b6a2165 100644 --- a/keyboards/redox/keymaps/eightbitraptor/config.h +++ b/keyboards/redox/keymaps/eightbitraptor/config.h @@ -39,4 +39,3 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 #define RETRO_TAPPING -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h index f155c6900c..e65e610046 100644 --- a/keyboards/redox/keymaps/finex/config.h +++ b/keyboards/redox/keymaps/finex/config.h @@ -39,5 +39,4 @@ along with this program. If not, see . #define RGBLIGHT_VAL_STEP 8 // #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 200 diff --git a/keyboards/redox_w/keymaps/danielo515/config.h b/keyboards/redox_w/keymaps/danielo515/config.h index 43d4ff9cb2..df14c8c269 100644 --- a/keyboards/redox_w/keymaps/danielo515/config.h +++ b/keyboards/redox_w/keymaps/danielo515/config.h @@ -1,6 +1,5 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 200 #undef ONESHOT_TIMEOUT #define ONESHOT_TIMEOUT 1500 diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h index 77ef2c19b8..7cc6ae4689 100644 --- a/keyboards/rmi_kb/chevron/config.h +++ b/keyboards/rmi_kb/chevron/config.h @@ -40,4 +40,3 @@ along with this program. If not, see . /* QoL improvements */ #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h index 06c118b1b6..27cd8fb6b6 100644 --- a/keyboards/rmi_kb/herringbone/pro/config.h +++ b/keyboards/rmi_kb/herringbone/pro/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Small QoL improvements */ #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT /* * Feature disable options diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h index 06c118b1b6..27cd8fb6b6 100644 --- a/keyboards/rmi_kb/herringbone/v1/config.h +++ b/keyboards/rmi_kb/herringbone/v1/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Small QoL improvements */ #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT /* * Feature disable options diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index fd42b9f29b..970cf0532c 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -58,4 +58,3 @@ along with this program. If not, see . /* QoL improvements */ #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h index fd42b9f29b..970cf0532c 100644 --- a/keyboards/rmi_kb/squishytkl/config.h +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -58,4 +58,3 @@ along with this program. If not, see . /* QoL improvements */ #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h index 10d9733e05..8605706bbd 100644 --- a/keyboards/rmi_kb/wete/v2/config.h +++ b/keyboards/rmi_kb/wete/v2/config.h @@ -60,4 +60,3 @@ along with this program. If not, see . // QoL improvements #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/config.h b/keyboards/signum/3_0/keymaps/sgurenkov/config.h index 7d164aa3a9..17f6d09479 100644 --- a/keyboards/signum/3_0/keymaps/sgurenkov/config.h +++ b/keyboards/signum/3_0/keymaps/sgurenkov/config.h @@ -23,9 +23,6 @@ // default but used in macros #define TAPPING_TERM 300 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Auto Shift and Retro Shift (Auto Shift for Tap Hold). #define AUTO_SHIFT_TIMEOUT TAPPING_TERM diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h index 12ca322b04..29d2337f10 100644 --- a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h +++ b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h @@ -21,5 +21,4 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 280 -#define IGNORE_MOD_TAP_INTERRUPT -#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX \ No newline at end of file +#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX diff --git a/keyboards/splitkb/kyria/keymaps/artflag/config.h b/keyboards/splitkb/kyria/keymaps/artflag/config.h index 5607926cd3..de044c8d29 100644 --- a/keyboards/splitkb/kyria/keymaps/artflag/config.h +++ b/keyboards/splitkb/kyria/keymaps/artflag/config.h @@ -18,6 +18,3 @@ #define TAPPING_TERM 175 #define TAPPING_TOGGLE 2 - -// Lets you roll mod-tap keys -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/default/config.h b/keyboards/splitkb/kyria/keymaps/default/config.h index 00be07e2fa..3fcf25be13 100644 --- a/keyboards/splitkb/kyria/keymaps/default/config.h +++ b/keyboards/splitkb/kyria/keymaps/default/config.h @@ -35,5 +35,3 @@ # endif #endif -// Lets you roll mod-tap keys -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/gotham/config.h b/keyboards/splitkb/kyria/keymaps/gotham/config.h index 1b0ba183d0..8feb6042f5 100644 --- a/keyboards/splitkb/kyria/keymaps/gotham/config.h +++ b/keyboards/splitkb/kyria/keymaps/gotham/config.h @@ -17,7 +17,6 @@ #pragma once #define EE_HANDS -#define IGNORE_MOD_TAP_INTERRUPT // Fix for Elite C rev3 #define SPLIT_USB_DETECT diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h b/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h deleted file mode 100644 index 217e97f931..0000000000 --- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 Thomas Baart - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// Lets you roll mod-tap keys -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h index 6766ab5cdb..efacab2ffe 100644 --- a/keyboards/splitkb/kyria/keymaps/lw/config.h +++ b/keyboards/splitkb/kyria/keymaps/lw/config.h @@ -16,11 +16,8 @@ #pragma once -// Lets you roll mod-tap keys -#define IGNORE_MOD_TAP_INTERRUPT - // If you are using an Elite C rev3 on the slave side, uncomment the lines below: // #define SPLIT_USB_DETECT // #define NO_USB_STARTUP_CHECK -#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode \ No newline at end of file +#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h index 1a4c64ed13..e4146661c6 100644 --- a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h +++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h @@ -33,8 +33,6 @@ # define RGBLIGHT_LIMIT_VAL 150 #endif -// Lets you roll mod-tap keys -#define IGNORE_MOD_TAP_INTERRUPT // If you are using an Elite C rev3 on the slave side, uncomment the lines below: // #define SPLIT_USB_DETECT diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h index b6351869fe..210beee0ed 100644 --- a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h +++ b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h @@ -39,9 +39,6 @@ // -- defined in user namespace // #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h index 4451ff731c..6e07be170b 100644 --- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h +++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h @@ -23,7 +23,5 @@ // Configure the global tapping term (default: 200ms) #define TAPPING_TERM 175 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h index b4f3f32255..280e6b1d12 100644 --- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h +++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h @@ -43,7 +43,6 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 // Allows to use either side as the master. Look at the documentation for info: // https://docs.qmk.fm/#/config_options?id=setting-handedness diff --git a/keyboards/splitkb/kyria/keymaps/via/config.h b/keyboards/splitkb/kyria/keymaps/via/config.h index f4449ac7a0..9d1c0eee5c 100644 --- a/keyboards/splitkb/kyria/keymaps/via/config.h +++ b/keyboards/splitkb/kyria/keymaps/via/config.h @@ -18,7 +18,6 @@ #define LAYER_STATE_8BIT #define DYNAMIC_KEYMAP_LAYER_COUNT 5 -#define IGNORE_MOD_TAP_INTERRUPT #undef LOCKING_SUPPORT_ENABLE #undef LOCKING_RESYNC_ENABLE diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h index f0632e90ae..95e2a04152 100755 --- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h +++ b/keyboards/splitkb/kyria/keymaps/winternebs/config.h @@ -28,4 +28,3 @@ #define NO_ACTION_FUNCTION #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h index 8c4e8dfece..9376550cab 100644 --- a/keyboards/splitkb/kyria/keymaps/zigotica/config.h +++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . // these should work better for homerow modifiers #define TAPPING_TERM 350 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 #define LEADER_PER_KEY_TIMING diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/synapse/keymaps/7u_space/config.h index 0b0e89fa1f..7fdb8504a6 100644 --- a/keyboards/synapse/keymaps/7u_space/config.h +++ b/keyboards/synapse/keymaps/7u_space/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 165 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/synapse/keymaps/default/config.h index 0b0e89fa1f..7fdb8504a6 100644 --- a/keyboards/synapse/keymaps/default/config.h +++ b/keyboards/synapse/keymaps/default/config.h @@ -18,7 +18,6 @@ /*Modtaps*/ #define TAPPING_TERM 165 -#define IGNORE_MOD_TAP_INTERRUPT /*Combos*/ #ifdef COMBO_ENABLE diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h index dc36b73808..e6c4f24877 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h @@ -17,6 +17,5 @@ #define MOUSEKEY_WHEEL_TIME_TO_MAX 120 #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define FORCE_NKRO #endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h index cd2aa46c44..8b64f40337 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h @@ -1,5 +1,4 @@ #pragma once #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD \ No newline at end of file diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h index 4c4e6d37b5..910696f86c 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h @@ -2,7 +2,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM_PER_KEY #ifdef MOUSEKEY_ENABLE diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h index ce604301a3..67b668d4bb 100644 --- a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h +++ b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h @@ -15,7 +15,5 @@ */ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods - #define COMBO_COUNT 5 #define COMBO_TERM 30 diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h index 545722ebde..9fe28b9675 100644 --- a/keyboards/z34/keymaps/zigotica/config.h +++ b/keyboards/z34/keymaps/zigotica/config.h @@ -22,6 +22,5 @@ along with this program. If not, see . // these should work better for homerow modifiers #define TAPPING_TERM 350 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define QUICK_TAP_TERM 0 diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h index 0acb95b85f..381b66edf1 100644 --- a/layouts/community/ergodox/berfarah/config.h +++ b/layouts/community/ergodox/berfarah/config.h @@ -6,4 +6,3 @@ #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.4 #define RGBLIGHT_EFFECT_BREATHE_MAX 150 -#undef IGNORE_MOD_TAP_INTERRUPT diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h index 4e554e8a1a..4f14eff96b 100644 --- a/layouts/community/ergodox/kejadlen/config.h +++ b/layouts/community/ergodox/kejadlen/config.h @@ -3,4 +3,3 @@ #define FORCE_NKRO #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h index 91be890a8b..c16d74892d 100644 --- a/layouts/community/ortho_4x12/junonum/config.h +++ b/layouts/community/ortho_4x12/junonum/config.h @@ -38,6 +38,3 @@ // Short tap threshold #define TAPPING_TERM 250 - -// For homerow mods -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/layouts/community/planck_mit/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h index e22f298035..df53dda471 100644 --- a/layouts/community/planck_mit/guidoism/config.h +++ b/layouts/community/planck_mit/guidoism/config.h @@ -20,5 +20,4 @@ along with this program. If not, see . #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define USB_MAX_POWER_CONSUMPTION 50 diff --git a/quantum/action.c b/quantum/action.c index a601737376..21fa98dc54 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -487,7 +487,7 @@ void process_action(keyrecord_t *record, action_t action) { default: if (event.pressed) { if (tap_count > 0) { -# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) +# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY if ( # ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY get_hold_on_other_key_press(get_event_keycode(record->event, false), record) && diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c index 5a38bf96e3..dbb5b8d4e5 100644 --- a/quantum/action_tapping.c +++ b/quantum/action_tapping.c @@ -11,10 +11,8 @@ # if defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY) # error "IGNORE_MOD_TAP_INTERRUPT_PER_KEY has been removed; the code needs to be ported to use HOLD_ON_OTHER_KEY_PRESS_PER_KEY instead." -# elif !defined(IGNORE_MOD_TAP_INTERRUPT) -# if !defined(PERMISSIVE_HOLD) && !defined(PERMISSIVE_HOLD_PER_KEY) && !defined(HOLD_ON_OTHER_KEY_PRESS) && !defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) -# pragma message "The default behavior of mod-taps will change to mimic IGNORE_MOD_TAP_INTERRUPT in the future.\nIf you wish to keep the old default behavior of mod-taps, please use HOLD_ON_OTHER_KEY_PRESS." -# endif +# elif defined(IGNORE_MOD_TAP_INTERRUPT) +# error "IGNORE_MOD_TAP_INTERRUPT is no longer necessary as it is now the default behavior of mod-tap keys. Please remove it from your config." # endif # define IS_TAPPING() IS_EVENT(tapping_key.event) @@ -162,12 +160,6 @@ void action_tapping_process(keyrecord_t record) { # define TAP_GET_HOLD_ON_OTHER_KEY_PRESS false # endif -# if defined(IGNORE_MOD_TAP_INTERRUPT) -# define TAP_GET_IGNORE_MOD_TAP_INTERRUPT true -# else -# define TAP_GET_IGNORE_MOD_TAP_INTERRUPT false -# endif - /** \brief Tapping * * Rule: Tap key is typed(pressed and released) within TAPPING_TERM. @@ -217,9 +209,8 @@ bool process_tapping(keyrecord_t *keyp) { (TAP_IS_MT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS) ) ) - // Makes Retro Shift ignore [IGNORE_MOD_TAP_INTERRUPT's - // effects on nested taps for MTs and the default - // behavior of LTs] below TAPPING_TERM or RETRO_SHIFT. + // Makes Retro Shift ignore the default behavior of + // MTs and LTs on nested taps below TAPPING_TERM or RETRO_SHIFT || ( TAP_IS_RETRO && (event.key.col != tapping_key.event.key.col || event.key.row != tapping_key.event.key.row) diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c index aad1a164ae..62c347ae0c 100644 --- a/quantum/process_keycode/process_auto_shift.c +++ b/quantum/process_keycode/process_auto_shift.c @@ -400,12 +400,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { // If Retro Shift is disabled, possible custom actions shouldn't happen. // clang-format off # if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) -# if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) +# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record); -# elif defined(IGNORE_MOD_TAP_INTERRUPT) - const bool is_hold_on_interrupt = false; # else - const bool is_hold_on_interrupt = IS_QK_MOD_TAP(keycode); + const bool is_hold_on_interrupt = false; # endif # endif if (IS_RETRO(keycode) @@ -443,12 +441,8 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { # endif ) { // Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set. -# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) - if (autoshift_flags.in_progress -# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY - && get_hold_on_other_key_press(keycode, record) -# endif - ) { +# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY + if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) { autoshift_end(KC_NO, now, false, &autoshift_lastrecord); } # endif diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h index f22448845e..6d872dd57b 100644 --- a/tests/tap_hold_configurations/default_mod_tap/config.h +++ b/tests/tap_hold_configurations/default_mod_tap/config.h @@ -17,5 +17,3 @@ #pragma once #include "test_common.h" - -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp index 8ec6ea62a3..dda58463fb 100644 --- a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp +++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp @@ -27,86 +27,6 @@ using testing::InSequence; class QuickTap : public TestFixture {}; -TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto regular_key = KeymapKey(0, 2, 0, KC_A); - - set_keymap({mod_tap_key, regular_key}); - - /* Press mod-tap key. */ - EXPECT_NO_REPORT(driver); - mod_tap_key.press(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Press regular key. */ - EXPECT_NO_REPORT(driver); - regular_key.press(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Release regular key. */ - EXPECT_NO_REPORT(driver); - regular_key.release(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Release mod-tap key. */ - EXPECT_REPORT(driver, (KC_LSFT)); - mod_tap_key.release(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Idle for tapping term of mod tap hold key. */ - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_EMPTY_REPORT(driver); - idle_for(TAPPING_TERM - 3); - VERIFY_AND_CLEAR(driver); -} - -TEST_F(QuickTap, tap_mod_tap_key_while_mod_tap_key_is_held) { - TestDriver driver; - InSequence s; - auto first_mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P)); - auto second_mod_tap_key = KeymapKey(0, 2, 0, RSFT_T(KC_A)); - - set_keymap({first_mod_tap_key, second_mod_tap_key}); - - /* Press first mod-tap key */ - EXPECT_NO_REPORT(driver); - first_mod_tap_key.press(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Press second mod-tap key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_key.press(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Release second tap-hold key */ - EXPECT_NO_REPORT(driver); - second_mod_tap_key.release(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Release first mod-tap key */ - EXPECT_REPORT(driver, (KC_LSFT)); - first_mod_tap_key.release(); - run_one_scan_loop(); - VERIFY_AND_CLEAR(driver); - - /* Idle for tapping term of first mod-tap key. */ - EXPECT_REPORT(driver, (KC_LSFT, KC_A)); - EXPECT_REPORT(driver, (KC_LSFT)); - EXPECT_EMPTY_REPORT(driver); - idle_for(TAPPING_TERM - 3); - VERIFY_AND_CLEAR(driver); -} - TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) { TestDriver driver; InSequence s; diff --git a/users/curry/config.h b/users/curry/config.h index d5e1ba7bc5..94e09350cd 100644 --- a/users/curry/config.h +++ b/users/curry/config.h @@ -71,7 +71,6 @@ # define ONESHOT_TIMEOUT 3000 #endif // !ONESHOT_TIMEOUT -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #define FORCE_NKRO diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h index 313e6d533f..caee7d184d 100644 --- a/users/cwebster2/config.h +++ b/users/cwebster2/config.h @@ -20,7 +20,6 @@ #define TAPPING_TERM_PER_KEY //#define QUICK_TAP_TERM 0 #undef PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define NO_ACTION_ONESHOT #ifdef AUTO_SHIFT_ENABLE diff --git a/users/drashna/config.h b/users/drashna/config.h index 465ea63ee2..b4aa1283eb 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -62,7 +62,6 @@ # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY # define TAPPING_TERM_PER_KEY #else -# define IGNORE_MOD_TAP_INTERRUPT # undef PERMISSIVE_HOLD #endif diff --git a/users/dshields/config.h b/users/dshields/config.h index 279bcf217b..a406ff9330 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -4,7 +4,6 @@ #define USB_MAX_POWER_CONSUMPTION 100 #define ONESHOT_TAP_TOGGLE 2 #define ONESHOT_TIMEOUT 3000 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY #define QUICK_TAP_TERM_PER_KEY #define TAPPING_TERM 200 diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h index 6cd983b37b..fe0f41327d 100644 --- a/users/ericgebhart/config.h +++ b/users/ericgebhart/config.h @@ -44,11 +44,9 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAP_HOLD_TERM 200 diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h index 8b5d06da3a..9eafdd2a5a 100644 --- a/users/ericgebhart/miryoku_hd_gold_config.h +++ b/users/ericgebhart/miryoku_hd_gold_config.h @@ -56,11 +56,9 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAP_HOLD_TERM 200 diff --git a/users/ibnuda/config.h b/users/ibnuda/config.h index f9a89389b6..c4fec5bc2d 100644 --- a/users/ibnuda/config.h +++ b/users/ibnuda/config.h @@ -3,5 +3,4 @@ #define COMBO_TERM 50 #define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD \ No newline at end of file diff --git a/users/jarred/config.h b/users/jarred/config.h index e63ec4d9b7..bea1f48310 100644 --- a/users/jarred/config.h +++ b/users/jarred/config.h @@ -37,12 +37,10 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(PLANCK_SOUND) diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h index bc0fe67df8..28e41215b9 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -64,11 +64,6 @@ # define FORCE_NKRO #endif // !NKRO_ENABLE -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index 429e08493d..3656e9eded 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -11,8 +11,6 @@ #undef TAPPING_TERM #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 diff --git a/users/mattly/config.h b/users/mattly/config.h index 0f7ce4a64b..bea04255aa 100644 --- a/users/mattly/config.h +++ b/users/mattly/config.h @@ -1,6 +1,5 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h index 583567d4f3..cbc318d24f 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -30,9 +30,6 @@ // -- used for tap dance and other tap mods # define TAPPING_TERM 175 -// Prevent normal rollover on alphas from accidentally triggering mods. -# define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. # define QUICK_TAP_TERM 0 diff --git a/users/pvinis/config.h b/users/pvinis/config.h index 14ec0dc8f1..01bb47dde1 100644 --- a/users/pvinis/config.h +++ b/users/pvinis/config.h @@ -1,7 +1,5 @@ #pragma once -// allow rolling when keys have hold functionality -#define IGNORE_MOD_TAP_INTERRUPT // #define TAPPING_TERM 150 #if defined(MOUSE_KEYS) diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h index 291c4877e1..2bb32a0120 100644 --- a/users/ridingqwerty/config.h +++ b/users/ridingqwerty/config.h @@ -8,4 +8,3 @@ #define QUICK_TAP_TERM_PER_KEY // testing #define TAPPING_TERM_PER_KEY -//#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc... diff --git a/users/rmeli/config.h b/users/rmeli/config.h index 5c31462d35..c51093ab38 100644 --- a/users/rmeli/config.h +++ b/users/rmeli/config.h @@ -27,10 +27,6 @@ along with this program. If not, see . # define AUTO_SHIFT_REPEAT #endif -#ifdef HOME_ROW_MODS_ENABLED -# define IGNORE_MOD_TAP_INTERRUPT -#endif - #ifdef CAPS_WORD_ENABLE # define BOTH_SHIFTS_TURNS_ON_CAPS_WORD //#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h index 6a2fc2aba1..caba9d21bc 100644 --- a/users/snowe/snowe.h +++ b/users/snowe/snowe.h @@ -26,7 +26,6 @@ along with this program. If not, see . #include "wrappers.h" #include "keycode_aliases.h" -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#if defined(RGBLIGHT_ENABLE) diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index 44f4c7795c..2c3c1ac9ff 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c @@ -100,7 +100,6 @@ tap_dance_action_t tap_dance_actions[] = { }; #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef KEYBOARD_crkbd_rev1 diff --git a/users/uqs/config.h b/users/uqs/config.h index 455aae9da8..94e50d063b 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h @@ -16,7 +16,6 @@ #define TAPPING_TERM 170 // ms to trigger tap // https://precondition.github.io/home-row-mods #define QUICK_TAP_TERM 0 // make tap-then-hold _not_ do key auto repeat -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD // I don't think this works for me, hence I rolled my own implementation. #define LEADER_TIMEOUT 400 diff --git a/users/vosechu/config.h b/users/vosechu/config.h index 81d9305d50..7f4f000c41 100644 --- a/users/vosechu/config.h +++ b/users/vosechu/config.h @@ -1,10 +1,5 @@ #pragma once -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/wanleg/config.h b/users/wanleg/config.h index d29054694c..984bdf6194 100644 --- a/users/wanleg/config.h +++ b/users/wanleg/config.h @@ -40,10 +40,6 @@ #define PERMISSIVE_HOLD -//// Disable mod tap interrrupt -//#ifndef IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT -//#endif // !mod tap interrrupt //set max breathing brightness on kbd6x #if defined(KEYBOARD_kbdfans_kbd6x) diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h index 030872d3dd..e783d08dc5 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -25,11 +25,6 @@ #define FORCE_NKRO #endif // !NKRO_ENABLE -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/zer09/config.h b/users/zer09/config.h index 0324aaa7d3..48dd17dfc3 100644 --- a/users/zer09/config.h +++ b/users/zer09/config.h @@ -1,11 +1,6 @@ #ifndef USERSPACE_CONFIG_H #define USERSPACE_CONFIG_H -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #define STRICT_LAYER_RELEASE -- cgit v1.3.1 From 2d9140af53e4e5bbc5cd50a2b6f3eda20ed8f71e Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Apr 2023 15:50:31 +1000 Subject: Fix a handful of CLI errors (#20321) --- keyboards/frobiac/redtilt/info.json | 92 +++++++------- .../handwired/tractyl_manuform/5x6_right/config.h | 3 - keyboards/lfkeyboards/lfk78/revj/config.h | 13 -- keyboards/lily58/glow_enc/info.json | 6 + keyboards/lily58/glow_enc/rules.mk | 9 +- keyboards/lily58/light/info.json | 7 + keyboards/lily58/light/rules.mk | 4 +- keyboards/lily58/rev1/info.json | 4 + keyboards/lily58/rules.mk | 16 +-- keyboards/maple_computing/ivy/config.h | 4 - keyboards/maple_computing/launchpad/config.h | 8 -- keyboards/nightly_boards/n40_o/config.h | 3 - keyboards/skme/zeno/info.json | 141 +++++++++++---------- keyboards/splitkb/kyria/info.json | 3 - keyboards/splitkb/kyria/rev1/base/info.json | 5 + keyboards/splitkb/kyria/rev1/base/rules.mk | 0 keyboards/splitkb/kyria/rev1/proton_c/rules.mk | 2 - keyboards/splitkb/kyria/rev2/base/info.json | 5 + keyboards/splitkb/kyria/rev2/base/rules.mk | 0 keyboards/splitkb/kyria/rev2/proton_c/rules.mk | 2 - keyboards/splitkb/kyria/rev3/info.json | 3 + keyboards/wilba_tech/wt60_h1/info.json | 5 - keyboards/wilba_tech/wt60_h3/info.json | 5 - 23 files changed, 154 insertions(+), 186 deletions(-) create mode 100644 keyboards/splitkb/kyria/rev1/base/info.json create mode 100644 keyboards/splitkb/kyria/rev1/base/rules.mk create mode 100644 keyboards/splitkb/kyria/rev2/base/info.json create mode 100644 keyboards/splitkb/kyria/rev2/base/rules.mk (limited to 'keyboards/maple_computing') diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json index 4b2d928775..c7702ee3e8 100644 --- a/keyboards/frobiac/redtilt/info.json +++ b/keyboards/frobiac/redtilt/info.json @@ -34,59 +34,59 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "label":"", "x":0, "y":2}, - {"matrix": [0, 1], "label":"K", "x":1, "y":2}, - {"matrix": [0, 2], "label":"U", "x":2, "y":1.5}, - {"matrix": [0, 3], "label":"Q", "x":3, "y":1}, - {"matrix": [0, 4], "label":".", "x":4, "y":1}, - {"matrix": [0, 5], "label":"J", "x":5, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [4, 0], "label":"P", "x":8, "y":1}, - {"matrix": [4, 1], "label":"C", "x":9, "y":1}, - {"matrix": [4, 2], "label":"L", "x":10, "y":1}, - {"matrix": [4, 3], "label":"M", "x":11, "y":1.5}, - {"matrix": [4, 4], "label":"F", "x":12, "y":2}, - {"matrix": [4, 5], "label":"", "x":13, "y":2}, + {"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.5}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, - {"matrix": [1, 0], "label":" ", "x":0, "y":3}, - {"matrix": [1, 1], "label":"H", "x":1, "y":3}, - {"matrix": [1, 2], "label":"I", "x":2, "y":2.5}, - {"matrix": [1, 3], "label":"E", "x":3, "y":2}, - {"matrix": [1, 4], "label":"A", "x":4, "y":2}, - {"matrix": [1, 5], "label":"O", "x":5, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [5, 0], "label":"D", "x":8, "y":2}, - {"matrix": [5, 1], "label":"T", "x":9, "y":2}, - {"matrix": [5, 2], "label":"R", "x":10, "y":2}, - {"matrix": [5, 3], "label":"N", "x":11, "y":2.5}, - {"matrix": [5, 4], "label":"S", "x":12, "y":3}, - {"matrix": [5, 5], "label":"", "x":13, "y":3}, + {"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.5}, + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 5], "x": 12, "y": 1}, - {"matrix": [2, 0], "label":"", "x":0, "y":4}, - {"matrix": [2, 1], "label":"X", "x":1, "y":4}, - {"matrix": [2, 2], "label":"Y", "x":2, "y":3.5}, - {"matrix": [2, 3], "label":"-", "x":3, "y":3}, - {"matrix": [2, 4], "label":",", "x":4, "y":3}, - {"matrix": [2, 5], "label":"/", "x":5, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [6, 0], "label":"B", "x":8, "y":3}, - {"matrix": [6, 1], "label":"G", "x":9, "y":3}, - {"matrix": [6, 2], "label":"W", "x":10, "y":3}, - {"matrix": [6, 3], "label":"V", "x":11, "y":3.5}, - {"matrix": [6, 4], "label":"Z", "x":12, "y":4}, - {"matrix": [6, 5], "label":"", "x":13, "y":4}, + {"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.5}, + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 5], "x": 12, "y": 2}, - {"matrix": [3, 0], "label":"", "x":0, "y":1}, - {"matrix": [3, 1], "label":"", "x":1, "y":1}, - {"matrix": [3, 3], "label":"Gui", "x":3, "y":4}, - {"matrix": [3, 4], "label":"Tab", "x":4, "y":4}, - {"matrix": [3, 5], "label":"Spc", "x":5, "y":4}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "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], "label":"L2", "x":8, "y":4}, - {"matrix": [7, 1], "label":"Sh", "x":9, "y":4}, - {"matrix": [7, 2], "label":"L3", "x":10, "y":4}, - {"matrix": [7, 4], "label":"Fx", "x":12, "y":1}, - {"matrix": [7, 5], "label":"", "x":13, "y":1} + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3} ] } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 8eff4ae0df..194874b5cf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once - -#define DIODE_DIRECTION COL2ROW - #define ROTATIONAL_TRANSFORM_ANGLE -25 #define POINTING_DEVICE_INVERT_X diff --git a/keyboards/lfkeyboards/lfk78/revj/config.h b/keyboards/lfkeyboards/lfk78/revj/config.h index 46db66470b..78343dc888 100644 --- a/keyboards/lfkeyboards/lfk78/revj/config.h +++ b/keyboards/lfkeyboards/lfk78/revj/config.h @@ -1,16 +1,3 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D3, D4, D5, D6 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, E6, E7, F0, F1, F2, F3, C0, C1, C2, C3 } - #define RGBLED_NUM 27 diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 01bd6835ff..47911a04a2 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -8,6 +8,11 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "features": { + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +24,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk index 3d80190eb2..4da205a168 100644 --- a/keyboards/lily58/glow_enc/rules.mk +++ b/keyboards/lily58/glow_enc/rules.mk @@ -1,8 +1 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features -BOOTMAGIC_ENABLE = no -RGB_MATRIX_ENABLE = no # Per key rgb leds - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file +LTO_ENABLE = yes diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 0ab0bd68d2..fcbae26163 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -8,6 +8,12 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +25,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk index d4957d98e4..4da205a168 100644 --- a/keyboards/lily58/light/rules.mk +++ b/keyboards/lily58/light/rules.mk @@ -1,3 +1 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features +LTO_ENABLE = yes diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 373fd0c5c8..a484904923 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -8,12 +8,16 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "features": { + "oled": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index 2fca52967d..76ce166170 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # OLED display -SPLIT_KEYBOARD = yes +OLED_DRIVER = SSD1306 DEFAULT_FOLDER = lily58/rev1 diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 3192143e77..49b31f1edf 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h @@ -16,10 +16,6 @@ along with this program. If not, see . */ #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index bc4eacf9a3..b9449c4714 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -41,7 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 671e700ce3..1183cd7d49 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B4 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/info.json index c701f0b795..bc35967537 100644 --- a/keyboards/skme/zeno/info.json +++ b/keyboards/skme/zeno/info.json @@ -27,72 +27,81 @@ "layouts": { "LAYOUT_default": { "layout": [ - {"matrix":[0,0], "x":0.6, "y":0.25}, - {"matrix":[0,1], "x":1.6, "y":0.25}, - {"matrix":[0,2], "x":2.6, "y":0.235}, - {"matrix":[0,3], "x":0, "y":1.3001}, - {"matrix":[0,4], "x":1, "y":1.3001}, - {"matrix":[0,5], "x":2, "y":1.3001}, - {"matrix":[0,6], "x":3, "y":1.3001}, - {"matrix":[0,7], "x":-3.75, "y":3.3}, - {"matrix":[0,8], "x":-2.75, "y":3.3}, - {"matrix":[0,9], "x":-1.75, "y":3.3}, - {"matrix":[0,10], "x":-0.75, "y":3.3}, - {"matrix":[0,11], "x":12.75, "y":0.28}, - {"matrix":[0,12], "x":13.75, "y":0.3001}, - {"matrix":[0,13], "x":14.75, "y":0.3001}, - {"matrix":[1,14], "x":15.75, "y":0.3001}, - {"matrix":[1,0], "x":0.5, "y":1.25, "w":1.5}, - {"matrix":[1,1], "x":2, "y":1.25}, - {"matrix":[1,2], "x":-0.5, "y":2.3001}, - {"matrix":[1,3], "x":0.5, "y":2.3001}, - {"matrix":[1,4], "x":1.5, "y":2.3001}, - {"matrix":[1,5], "x":2.5, "y":2.3001}, - {"matrix":[1,6], "x":-4.25, "y":4.3}, - {"matrix":[1,7], "x":-3.25, "y":4.3}, - {"matrix":[1,8], "x":-2.25, "y":4.3}, - {"matrix":[1,9], "x":-1.25, "y":4.3}, - {"matrix":[1,10], "x":12.4, "y":1.28}, - {"matrix":[1,11], "x":13.4, "y":1.3}, - {"matrix":[1,12], "x":14.4, "y":1.3}, - {"matrix":[1,13], "x":15.4, "y":1.3, "w":1.5}, - {"matrix":[2,0], "x":0.4, "y":2.25, "w":1.75}, - {"matrix":[2,1], "x":2.15, "y":2.25}, - {"matrix":[2,2], "x":-0.25, "y":3.3001}, - {"matrix":[2,3], "x":0.75, "y":3.3001}, - {"matrix":[2,4], "x":1.75, "y":3.3001}, - {"matrix":[2,5], "x":2.75, "y":3.3001}, - {"matrix":[2,6], "x":-3.95, "y":5.3}, - {"matrix":[2,7], "x":-2.95, "y":5.3}, - {"matrix":[2,8], "x":-1.9501, "y":5.3}, - {"matrix":[2,9], "x":-0.9501, "y":5.3}, - {"matrix":[2,10], "x":12.8, "y":2.3001}, - {"matrix":[2,11], "x":13.8, "y":2.3001}, - {"matrix":[2,12], "x":14.8, "y":2.3001, "w":2.25}, - {"matrix":[3,0], "x":0.25, "y":3.25, "w":2.25}, - {"matrix":[3,1], "x":2.5, "y":3.25}, - {"matrix":[3,2], "x":0.25, "y":4.3}, - {"matrix":[3,3], "x":1.25, "y":4.3}, - {"matrix":[3,4], "x":2.25, "y":4.3}, - {"matrix":[3,5], "x":3.25, "y":4.3}, - {"matrix":[3,6], "x":-4.45, "y":6.3}, - {"matrix":[3,7], "x":-3.45, "y":6.3}, - {"matrix":[3,8], "x":-2.45, "y":6.3}, - {"matrix":[3,9], "x":-1.4501, "y":6.3}, - {"matrix":[3,10], "x":12.4, "y":3.3001}, - {"matrix":[3,11], "x":13.4, "y":3.3001}, - {"matrix":[3,12], "x":14.4, "y":3.3001, "w":1.75}, - {"matrix":[3,14], "x":16.15, "y":3.3001}, - {"matrix":[4,0], "x":0.25, "y":4.3, "w":1.25}, - {"matrix":[4,1], "x":1.5, "y":4.3, "w":1.25}, - {"matrix":[4,3], "x":0.5, "y":5.3}, - {"matrix":[4,5], "x":-7.8, "y":8.45, "w":2.75}, - {"matrix":[4,7], "x":-4.45, "y":7.3, "w":2}, - {"matrix":[4,8], "x":-2.45, "y":7.3}, - {"matrix":[4,9], "x":-1.4501, "y":7.3, "w":1.25}, - {"matrix":[4,12], "x":14.65, "y":4.3, "w":1.25}, - {"matrix":[4,14], "x":15.9, "y":4.3, "w":1.25} - ] + {"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": 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, 14], "x": 16, "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, 6], "x": 8.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, "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": [2, 6], "x": 9.25, "y": 2}, + {"matrix": [2, 7], "x": 10.25, "y": 2}, + {"matrix": [2, 8], "x": 11.25, "y": 2}, + {"matrix": [2, 9], "x": 12.25, "y": 2}, + {"matrix": [2, 10], "x": 13.25, "y": 2}, + {"matrix": [2, 11], "x": 14.25, "y": 2}, + {"matrix": [2, 12], "x": 15.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": 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": [3, 12], "x": 15, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 16.75, "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": 3.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 9, "y": 4, "w": 2}, + {"matrix": [4, 8], "x": 11, "y": 4}, + {"matrix": [4, 9], "x": 12, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/splitkb/kyria/info.json b/keyboards/splitkb/kyria/info.json index f70e8e3bb2..7249007962 100644 --- a/keyboards/splitkb/kyria/info.json +++ b/keyboards/splitkb/kyria/info.json @@ -9,8 +9,5 @@ "development_board": "elite_c", "split": { "enabled": true - }, - "build": { - "lto": true } } diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/info.json new file mode 100644 index 0000000000..9f75b9c218 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/info.json @@ -0,0 +1,5 @@ +{ + "build": { + "lto": true + } +} diff --git a/keyboards/splitkb/kyria/rev1/base/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk index bf6a9bf97f..a58b20c575 100644 --- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk @@ -1,4 +1,2 @@ SERIAL_DRIVER = usart -AUDIO_ENABLE = no -LTO_ENABLE = no CONVERT_TO = proton_c diff --git a/keyboards/splitkb/kyria/rev2/base/info.json b/keyboards/splitkb/kyria/rev2/base/info.json new file mode 100644 index 0000000000..9f75b9c218 --- /dev/null +++ b/keyboards/splitkb/kyria/rev2/base/info.json @@ -0,0 +1,5 @@ +{ + "build": { + "lto": true + } +} diff --git a/keyboards/splitkb/kyria/rev2/base/rules.mk b/keyboards/splitkb/kyria/rev2/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk index bf6a9bf97f..a58b20c575 100644 --- a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk @@ -1,4 +1,2 @@ SERIAL_DRIVER = usart -AUDIO_ENABLE = no -LTO_ENABLE = no CONVERT_TO = proton_c diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json index 71191323a6..96bf65847f 100644 --- a/keyboards/splitkb/kyria/rev3/info.json +++ b/keyboards/splitkb/kyria/rev3/info.json @@ -6,6 +6,9 @@ "bootmagic": { "matrix": [0, 6] }, + "build": { + "lto": true + }, "features": { "mousekey": true, "bootmagic": true, diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json index 2291c6de12..a6b200ed7e 100644 --- a/keyboards/wilba_tech/wt60_h1/info.json +++ b/keyboards/wilba_tech/wt60_h1/info.json @@ -15,11 +15,6 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F6", "F7"], - "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] - }, "community_layouts": ["60_ansi_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json index 11ffd919bb..167de96a03 100644 --- a/keyboards/wilba_tech/wt60_h3/info.json +++ b/keyboards/wilba_tech/wt60_h3/info.json @@ -15,11 +15,6 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F6", "F7"], - "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"] - }, "community_layouts": ["60_iso_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" -- cgit v1.3.1 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/maple_computing') 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 --git a/keyboards/biacco42/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h deleted file mode 100644 index 776e0b0e1d..0000000000 --- a/keyboards/biacco42/meishi2/meishi2.h +++ /dev/null @@ -1,34 +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 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 \ -) \ -{ \ - { k00, k01 }, \ - { k02, k03 } \ -} diff --git a/keyboards/boston_meetup/boston_meetup.h b/keyboards/boston_meetup/boston_meetup.h deleted file mode 100644 index 4b000a1ca5..0000000000 --- a/keyboards/boston_meetup/boston_meetup.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ - ) \ -{ \ - { K00, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json index 2c25d4ff06..6be55c249c 100644 --- a/keyboards/boston_meetup/info.json +++ b/keyboards/boston_meetup/info.json @@ -9,6 +9,24 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "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":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "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}] } + "layout": [ + {"matrix": [0, 0], "x": 0, "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}, + + {"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} + ] + } } } diff --git a/keyboards/bthlabs/geekpad/geekpad.h b/keyboards/bthlabs/geekpad/geekpad.h deleted file mode 100644 index 4dc6800fe5..0000000000 --- a/keyboards/bthlabs/geekpad/geekpad.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019-present Tomek Wójcik - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k20, k21, k22 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/bthlabs/geekpad/info.json b/keyboards/bthlabs/geekpad/info.json index 8200e7d036..c1b0ef54c0 100644 --- a/keyboards/bthlabs/geekpad/info.json +++ b/keyboards/bthlabs/geekpad/info.json @@ -18,15 +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": 2}, - {"x": 1, "y": 2}, - {"x": 2,"y": 2} + {"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/capsunlocked/cu7/cu7.h b/keyboards/capsunlocked/cu7/cu7.h deleted file mode 100644 index 2f30dbb2d5..0000000000 --- a/keyboards/capsunlocked/cu7/cu7.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2021 CapsUnlocked -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -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, \ - K10, K11, K12, \ - K20, K21, K22 \ -) { \ - { KC_NO, K01, KC_NO }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 } \ -} - diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json index c210f9a96c..ba3d10471b 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/info.json @@ -23,15 +23,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.5, "y":0, "w":2, "h":2}, + {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 2, "h": 2}, - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"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}, - {"x":0, "y":3.5}, - {"x":1, "y":3.5}, - {"x":2, "y":3.5} + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.5}, + {"matrix": [2, 2], "x": 2, "y": 3.5} ] } } diff --git a/keyboards/catch22/catch22.h b/keyboards/catch22/catch22.h deleted file mode 100644 index 6eefb9cd51..0000000000 --- a/keyboards/catch22/catch22.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2018 QMK Community - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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( \ - K01, K02, K03, K04, \ - K11, K12, K13, K14, \ -K20, K21, K22, K23, K24, \ -K30, K31, K32, K33, K34, \ - K41, K42, K43, K44 \ -) { \ - { KC_NO, K01, K02, K03, K04 }, \ - { KC_NO, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { KC_NO, K41, K42, K43, K44 }, \ -} diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json index f9a9b08ff7..1aa4664ef5 100644 --- a/keyboards/catch22/info.json +++ b/keyboards/catch22/info.json @@ -15,7 +15,34 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"A", "x":1, "y":0}, {"label":"B", "x":2, "y":0}, {"label":"C", "x":3, "y":0}, {"label":"D", "x":4, "y":0}, {"label":"E", "x":1, "y":1}, {"label":"F", "x":2, "y":1}, {"label":"G", "x":3, "y":1}, {"label":"H", "x":4, "y":1}, {"label":"I", "x":0, "y":2}, {"label":"J", "x":1, "y":2}, {"label":"K", "x":2, "y":2}, {"label":"L", "x":3, "y":2}, {"label":"M", "x":4, "y":2}, {"label":"1", "x":0, "y":3, "h":2}, {"label":"N", "x":1, "y":3}, {"label":"O", "x":2, "y":3}, {"label":"P", "x":3, "y":3}, {"label":"Q", "x":4, "y":3}, {"label":"R", "x":1, "y":4}, {"label":"S", "x":2, "y":4}, {"label":"T", "x":3, "y":4}, {"label":"U", "x":4, "y":4}] + "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": [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": [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": [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}, + + {"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} + ] } } } diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json index a442db236d..e86d162ace 100644 --- a/keyboards/ckeys/thedora/info.json +++ b/keyboards/ckeys/thedora/info.json @@ -24,30 +24,30 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":1, "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}, + {"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}, - {"label":"k10", "x":1, "y":1}, - {"label":"k11", "x":2, "y":1}, - {"label":"k12", "x":3, "y":1}, - {"label":"k13", "x":4, "y":1}, - {"label":"k14", "x":5, "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}, - {"label":"k20", "x":1, "y":2}, - {"label":"k21", "x":2, "y":2}, - {"label":"k22", "x":3, "y":2}, - {"label":"k23", "x":4, "y":2}, - {"label":"k24", "x":5, "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}, - {"label":"k05 (Rotary Push)", "x":0, "y":3}, - {"label":"k30", "x":1, "y":3}, - {"label":"k31", "x":2, "y":3}, - {"label":"k32", "x":3, "y":3}, - {"label":"k33", "x":4, "y":3}, - {"label":"k34", "x":5, "y":3} + {"matrix": [0, 5], "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} ] } } diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c index 58953f7437..c9c4069534 100755 --- a/keyboards/ckeys/thedora/thedora.c +++ b/keyboards/ckeys/thedora/thedora.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "thedora.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { diff --git a/keyboards/ckeys/thedora/thedora.h b/keyboards/ckeys/thedora/thedora.h deleted file mode 100755 index 5e66f67166..0000000000 --- a/keyboards/ckeys/thedora/thedora.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 Branden Byers (@brandenbyers) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, \ - k10, k11, k12, k13, k14, \ - k20, k21, k22, k23, k24, \ - k05, k30, k31, k32, k33, k34 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, XXX }, \ - { k20, k21, k22, k23, k24, XXX }, \ - { k30, k31, k32, k33, k34, XXX } \ -} diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json index 03649056f2..d6029eeabb 100644 --- a/keyboards/ckeys/washington/info.json +++ b/keyboards/ckeys/washington/info.json @@ -26,7 +26,21 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}] + "layout": [ + {"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": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 0.75}, + + {"matrix": [2, 1], "x": 0.5, "y": 1.75}, + + {"matrix": [2, 2], "x": 1.5, "y": 2} + ] } } } diff --git a/keyboards/ckeys/washington/washington.h b/keyboards/ckeys/washington/washington.h deleted file mode 100644 index 6fba7b3281..0000000000 --- a/keyboards/ckeys/washington/washington.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 merlin04 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/clawsome/bookerboard/bookerboard.h b/keyboards/clawsome/bookerboard/bookerboard.h deleted file mode 100644 index 11ece7594b..0000000000 --- a/keyboards/clawsome/bookerboard/bookerboard.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, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ -} diff --git a/keyboards/clawsome/bookerboard/info.json b/keyboards/clawsome/bookerboard/info.json index d0ac88f548..8c6a4dc0f9 100644 --- a/keyboards/clawsome/bookerboard/info.json +++ b/keyboards/clawsome/bookerboard/info.json @@ -18,18 +18,21 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B5,B6)", "x":0, "y":0}, - {"label":"K01 (B5,B2)", "x":1, "y":0}, - {"label":"K02 (B5,B3)", "x":2, "y":0}, - {"label":"K10 (B4,B6)", "x":0, "y":1}, - {"label":"K11 (B4,B2)", "x":1, "y":1}, - {"label":"K12 (B4,B3)", "x":2, "y":1}, - {"label":"K20 (E6,B6)", "x":0, "y":2}, - {"label":"K21 (E6,B2)", "x":1, "y":2}, - {"label":"K22 (E6,B3)", "x":2, "y":2}, - {"label":"K30 (D7,B6)", "x":0, "y":3}, - {"label":"K31 (D7,B2)", "x":1, "y":3}, - {"label":"K32 (D7,B3)", "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": 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/clawsome/doodle/doodle.h b/keyboards/clawsome/doodle/doodle.h deleted file mode 100644 index 131d50ad26..0000000000 --- a/keyboards/clawsome/doodle/doodle.h +++ /dev/null @@ -1,27 +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, K02, \ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 } \ -} diff --git a/keyboards/clawsome/doodle/info.json b/keyboards/clawsome/doodle/info.json index 8b675684eb..e7883a6f1a 100644 --- a/keyboards/clawsome/doodle/info.json +++ b/keyboards/clawsome/doodle/info.json @@ -18,12 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D4,D7)", "x":0, "y":0}, - {"label":"K01 (D4,F4)", "x":1, "y":0}, - {"label":"K02 (D4,E6)", "x":2, "y":0}, - {"label":"K10 (C6,D7)", "x":0, "y":1}, - {"label":"K11 (C6,F4)", "x":1, "y":1}, - {"label":"K12 (C6,E6)", "x":2, "y":1} + {"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/clawsome/fightpad/fightpad.h b/keyboards/clawsome/fightpad/fightpad.h deleted file mode 100644 index ff92afd6bb..0000000000 --- a/keyboards/clawsome/fightpad/fightpad.h +++ /dev/null @@ -1,26 +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( \ - K01, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16 \ -) { \ - { KC_NO, K01, KC_NO, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ -} diff --git a/keyboards/clawsome/fightpad/info.json b/keyboards/clawsome/fightpad/info.json index 3aad087486..fbd4673dd7 100644 --- a/keyboards/clawsome/fightpad/info.json +++ b/keyboards/clawsome/fightpad/info.json @@ -18,18 +18,21 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K01 (B5,E6)", "x":1, "y":0}, - {"label":"K03 (B5,B2)", "x":4, "y":0}, - {"label":"K04 (B5,B3)", "x":5, "y":0}, - {"label":"K05 (B5,B1)", "x":6, "y":0}, - {"label":"K06 (B5,F7)", "x":7, "y":0}, - {"label":"K10 (B6,D7)", "x":0, "y":1}, - {"label":"K11 (B6,E6)", "x":1, "y":1}, - {"label":"K12 (B6,B4)", "x":2, "y":1}, - {"label":"K13 (B6,B2)", "x":4, "y":1}, - {"label":"K14 (B6,B3)", "x":5, "y":1}, - {"label":"K15 (B6,B1)", "x":6, "y":1}, - {"label":"K16 (B6,F7)", "x":7, "y":1} + {"matrix": [0, 1], "x": 1, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "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} ] } } diff --git a/keyboards/clawsome/gamebuddy/v1_0/info.json b/keyboards/clawsome/gamebuddy/v1_0/info.json index b4875077f4..269c4b8602 100644 --- a/keyboards/clawsome/gamebuddy/v1_0/info.json +++ b/keyboards/clawsome/gamebuddy/v1_0/info.json @@ -18,32 +18,36 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F5)", "x":0, "y":0}, - {"label":"K01 (D1,F6)", "x":1, "y":0}, - {"label":"K02 (D1,F7)", "x":2, "y":0}, - {"label":"K03 (D1,B1)", "x":3, "y":0}, - {"label":"K04 (D1,C6)", "x":4, "y":0}, - {"label":"K05 (D1,D7)", "x":5, "y":0}, - {"label":"K10 (D0,F5)", "x":0, "y":1}, - {"label":"K11 (D0,F6)", "x":1, "y":1}, - {"label":"K12 (D0,F7)", "x":2, "y":1}, - {"label":"K13 (D0,B1)", "x":3, "y":1}, - {"label":"K14 (D0,C6)", "x":4, "y":1}, - {"label":"K15 (D0,D7)", "x":5, "y":1}, - {"label":"K20 (E6,F5)", "x":0, "y":2, "w":2}, - {"label":"K22 (E6,F7)", "x":2, "y":2}, - {"label":"K23 (E6,B1)", "x":3, "y":2}, - {"label":"K24 (E6,C6)", "x":4, "y":2}, - {"label":"K25 (E6,D7)", "x":5, "y":2}, - {"label":"K30 (B3,F5)", "x":0, "y":3}, - {"label":"K31 (B3,F6)", "x":1, "y":3}, - {"label":"K32 (B3,F7)", "x":2, "y":3}, - {"label":"K33 (B3,B1)", "x":3, "y":3}, - {"label":"K34 (B3,C6)", "x":4, "y":3}, - {"label":"K35 (B3,D7)", "x":5, "y":3}, - {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2}, - {"label":"K44 (B2,C6)", "x":4, "y":4}, - {"label":"K45 (B2,D7)", "x":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": [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": [2, 0], "x": 0, "y": 2, "w": 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, 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, 6], "x": 6, "y": 3, "h": 2}, + + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4} ] } } diff --git a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h b/keyboards/clawsome/gamebuddy/v1_0/v1_0.h deleted file mode 100644 index f1ee9ab357..0000000000 --- a/keyboards/clawsome/gamebuddy/v1_0/v1_0.h +++ /dev/null @@ -1,32 +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, \ - K10, K11, K12, K13, K14, K15, \ - K20, K22, K23, K24, K25, \ - K30, K31, K32, K33, K34, K35, K46, \ - K44, K45 \ -) { \ - { K00, K01, K02, K03, K04, K05, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, KC_NO }, \ - { K20, KC_NO, K22, K23, K24, K25, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K44, K45, K46 }, \ -} diff --git a/keyboards/clawsome/gamebuddy/v1_m/info.json b/keyboards/clawsome/gamebuddy/v1_m/info.json index 3330139b59..3709bbbe3c 100644 --- a/keyboards/clawsome/gamebuddy/v1_m/info.json +++ b/keyboards/clawsome/gamebuddy/v1_m/info.json @@ -18,33 +18,37 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C6,B1)", "x":0, "y":0}, - {"label":"K01 (C6,F7)", "x":1, "y":0}, - {"label":"K02 (C6,F6)", "x":2, "y":0}, - {"label":"K03 (C6,F5)", "x":3, "y":0}, - {"label":"K04 (C6,E6)", "x":4, "y":0}, - {"label":"K05 (C6,B4)", "x":5, "y":0}, - {"label":"K10 (D7,B1)", "x":0, "y":1}, - {"label":"K11 (D7,F7)", "x":1, "y":1}, - {"label":"K12 (D7,F6)", "x":2, "y":1}, - {"label":"K13 (D7,F5)", "x":3, "y":1}, - {"label":"K14 (D7,E6)", "x":4, "y":1}, - {"label":"K15 (D7,B4)", "x":5, "y":1}, - {"label":"K20 (B5,B1)", "x":0, "y":2}, - {"label":"K21 (B5,F7)", "x":1, "y":2}, - {"label":"K22 (B5,F6)", "x":2, "y":2}, - {"label":"K23 (B5,F5)", "x":3, "y":2}, - {"label":"K24 (B5,E6)", "x":4, "y":2}, - {"label":"K25 (B5,B4)", "x":5, "y":2}, - {"label":"K30 (B3,B1)", "x":0, "y":3}, - {"label":"K31 (B3,F7)", "x":1, "y":3}, - {"label":"K32 (B3,F6)", "x":2, "y":3}, - {"label":"K33 (B3,F5)", "x":3, "y":3}, - {"label":"K34 (B3,E6)", "x":4, "y":3}, - {"label":"K35 (B3,B4)", "x":5, "y":3}, - {"label":"K46 (B2,B6)", "x":6, "y":3, "h":2}, - {"label":"K44 (B2,E6)", "x":4, "y":4}, - {"label":"K45 (B2,B4)", "x":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": [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": [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, 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, 6], "x": 6, "y": 3, "h": 2}, + + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4} ] } } diff --git a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h b/keyboards/clawsome/gamebuddy/v1_m/v1_m.h deleted file mode 100644 index 23e4d03bbc..0000000000 --- a/keyboards/clawsome/gamebuddy/v1_m/v1_m.h +++ /dev/null @@ -1,33 +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, K02, K03, K04, K05, \ - K10, K11, K12, K13, K14, K15, \ - K20, K21, K22, K23, K24, K25, \ - K30, K31, K32, K33, K34, K35, K46, \ - K44, K45 \ -) { \ - { 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K44, K45, K46 }, \ -} diff --git a/keyboards/clawsome/luggage_rack/info.json b/keyboards/clawsome/luggage_rack/info.json index 3c813bd36a..5996c9d8f4 100644 --- a/keyboards/clawsome/luggage_rack/info.json +++ b/keyboards/clawsome/luggage_rack/info.json @@ -18,19 +18,23 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D3,D4)", "x":0, "y":0}, - {"label":"K11 (F4,D0)", "x":1, "y":0}, - {"label":"K02 (D3,D1)", "x":2, "y":0}, - {"label":"K20 (B0,D4)", "x":0, "y":1.5}, - {"label":"K31 (B2,D0)", "x":1, "y":1.5}, - {"label":"K22 (B0,D1)", "x":2, "y":1.5}, - {"label":"K40 (F7,D4)", "x":0, "y":2.5}, - {"label":"K51 (B6,D0)", "x":1, "y":2.5}, - {"label":"K42 (F7,D1)", "x":2, "y":2.5}, - {"label":"K61 (B1,D0)", "x":1, "y":4.5}, - {"label":"K70 (F5,D4)", "x":0, "y":5.5}, - {"label":"K81 (F6,D0)", "x":1, "y":5.5}, - {"label":"K72 (F5,D1)", "x":2, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 1], "x": 1, "y": 1.5}, + {"matrix": [2, 2], "x": 2, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [5, 1], "x": 1, "y": 2.5}, + {"matrix": [4, 2], "x": 2, "y": 2.5}, + + {"matrix": [6, 1], "x": 1, "y": 4.5}, + + {"matrix": [7, 0], "x": 0, "y": 5.5}, + {"matrix": [8, 1], "x": 1, "y": 5.5}, + {"matrix": [7, 2], "x": 2, "y": 5.5} ] } } diff --git a/keyboards/clawsome/luggage_rack/luggage_rack.h b/keyboards/clawsome/luggage_rack/luggage_rack.h deleted file mode 100644 index 20c4947bd2..0000000000 --- a/keyboards/clawsome/luggage_rack/luggage_rack.h +++ /dev/null @@ -1,38 +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, K11, K02, \ - K20, K31, K22, \ - K40, K51, K42, \ - \ - K61, \ - K70, K81, K72 \ -) { \ - { K00, KC_NO, K02 }, \ - { KC_NO, K11, KC_NO }, \ - { K20, KC_NO, K22 }, \ - { KC_NO, K31, KC_NO }, \ - { K40, KC_NO, K42 }, \ - { KC_NO, K51, KC_NO }, \ - { KC_NO, K61, KC_NO }, \ - { K70, KC_NO, K72 }, \ - { KC_NO, K81, KC_NO }, \ -} diff --git a/keyboards/clawsome/sidekick/info.json b/keyboards/clawsome/sidekick/info.json index cfc028476f..ee4df7538c 100644 --- a/keyboards/clawsome/sidekick/info.json +++ b/keyboards/clawsome/sidekick/info.json @@ -18,33 +18,37 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D0,F6)", "x":0, "y":0}, - {"label":"K01 (D0,F5)", "x":1, "y":0}, - {"label":"K02 (D0,B1)", "x":2, "y":0}, - {"label":"K03 (D0,B3)", "x":3, "y":0}, - {"label":"K04 (D0,E6)", "x":4, "y":0}, - {"label":"K05 (D0,D7)", "x":5, "y":0}, - {"label":"K06 (D0,D4)", "x":6, "y":0}, - {"label":"K10 (C6,F6)", "x":0, "y":1}, - {"label":"K11 (C6,F5)", "x":1, "y":1}, - {"label":"K12 (C6,B1)", "x":2, "y":1}, - {"label":"K13 (C6,B3)", "x":3, "y":1}, - {"label":"K14 (C6,E6)", "x":4, "y":1}, - {"label":"K15 (C6,D7)", "x":5, "y":1}, - {"label":"K16 (C6,D4)", "x":6, "y":1, "h":2}, - {"label":"K23 (B2,B3)", "x":3, "y":2}, - {"label":"K24 (B2,E6)", "x":4, "y":2}, - {"label":"K25 (B2,D7)", "x":5, "y":2}, - {"label":"K31 (B6,F5)", "x":1, "y":3}, - {"label":"K33 (B6,B3)", "x":3, "y":3}, - {"label":"K34 (B6,E6)", "x":4, "y":3}, - {"label":"K35 (B6,D7)", "x":5, "y":3}, - {"label":"K36 (B6,D4)", "x":6, "y":3, "h":2}, - {"label":"K40 (B5,F6)", "x":0, "y":4}, - {"label":"K41 (B5,F5)", "x":1, "y":4}, - {"label":"K42 (B5,B1)", "x":2, "y":4}, - {"label":"K43 (B5,B3)", "x":3, "y":4, "w":2}, - {"label":"K45 (B5,D7)", "x":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": [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, "h": 2}, + + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [3, 1], "x": 1, "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, "h": 2}, + + {"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}, + {"matrix": [4, 5], "x": 5, "y": 4} ] } } diff --git a/keyboards/clawsome/sidekick/sidekick.h b/keyboards/clawsome/sidekick/sidekick.h deleted file mode 100644 index fcb93a9bb1..0000000000 --- a/keyboards/clawsome/sidekick/sidekick.h +++ /dev/null @@ -1,33 +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, \ - K10, K11, K12, K13, K14, K15, K16, \ - K23, K24, K25, \ - K31, K33, K34, K35, K36, \ - K40, K41, K42, K43, K45 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { KC_NO, KC_NO, KC_NO, K23, K24, K25, KC_NO }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36 }, \ - { K40, K41, K42, K43, KC_NO, K45, KC_NO }, \ -} - diff --git a/keyboards/contender/contender.h b/keyboards/contender/contender.h deleted file mode 100644 index 4dd71a5d24..0000000000 --- a/keyboards/contender/contender.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 sotoba - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, k34, \ - k40, k41, k42, k43, k44, \ - k50, k51, k52, k53 \ -) { \ - { KC_NO, k00, k01, k02, k03 }, \ - { KC_NO, k10, k11, k12, k13 }, \ - { KC_NO, k20, k21, k22, k23 }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, KC_NO } \ -} diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json index 385aad6e0e..14692509ec 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/info.json @@ -18,32 +18,37 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":1, "y":0}, - {"label":"Tab", "x":2, "y":0}, - {"label":"Shift", "x":3, "y":0}, - {"label":"Back", "x":4, "y":0}, - {"label":"Num", "x":1, "y":1.25}, - {"label":"/", "x":2, "y":1.25}, - {"label":"*", "x":3, "y":1.25}, - {"label":"=", "x":4, "y":1.25}, - {"label":"7", "x":1, "y":2.25}, - {"label":"8", "x":2, "y":2.25}, - {"label":"9", "x":3, "y":2.25}, - {"label":"-", "x":4, "y":2.25}, - {"label":"fn","x":0, "y":3.25}, - {"label":"4", "x":1, "y":3.25}, - {"label":"5", "x":2, "y":3.25}, - {"label":"6", "x":3, "y":3.25}, - {"label":"+", "x":4, "y":3.25}, - {"label":"RGB","x":0, "y":4.25}, - {"label":"1", "x":1, "y":4.25}, - {"label":"2", "x":2, "y":4.25}, - {"label":"3", "x":3, "y":4.25}, - {"label":"Enter", "x":4, "y":4.25, "h":2}, - {"label":"TG","x":0, "y":5.25}, - {"label":"0", "x":1, "y":5.25}, - {"label":"00", "x":2, "y":5.25}, - {"label":".", "x":3, "y":5.25} + {"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, 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": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "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.25}, + {"matrix": [3, 4], "x": 4, "y": 3.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, "h": 2}, + + {"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} ] } } diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index ae160c7038..a6a81507ec 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -17,7 +17,43 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}] + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0}, + + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [3, 2], "x": 3, "y": 0}, + {"matrix": [3, 3], "x": 4, "y": 0}, + + {"matrix": [2, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 0], "x": 6.5, "y": 0}, + + {"matrix": [1, 1], "x": 0, "y": 1}, + + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [1, 0], "x": 6.5, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 2}, + + {"matrix": [1, 3], "x": 2, "y": 2}, + {"matrix": [1, 4], "x": 3, "y": 2}, + {"matrix": [1, 5], "x": 4, "y": 2}, + + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 0], "x": 6.5, "y": 2}, + + {"matrix": [2, 1], "x": 0, "y": 3}, + + {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5}, + {"matrix": [2, 5], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [2, 4], "x": 5.5, "y": 3}, + {"matrix": [2, 0], "x": 6.5, "y": 3} + ] } } } diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h deleted file mode 100644 index 8892b5553b..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright Adam Newbold - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - K_ESC, K_7, K_8, K_9, K_LEFT_PARENS, K_RIGHT_PARENS, \ - K_LEFT, K_4, K_5, K_6, K_MINUS, K_DIVIDE, \ - K_RIGHT, K_1, K_2, K_3, K_PLUS, K_MULTIPLY, \ - K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN, K_PRINT \ -){ \ - { K_RIGHT_PARENS, K_ESC, K_4, K_5, K_6, K_7 },\ - { K_DIVIDE, K_LEFT, K_0, K_1, K_2, K_3 },\ - { K_PRINT, K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\ - { K_MULTIPLY, K_RIGHT, K_8, K_9, K_DOT, K_PLUS },\ -} diff --git a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h b/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h deleted file mode 100755 index a5a8d9d699..0000000000 --- a/keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2019 mini-ninja-64 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 ) { { k00 } } \ No newline at end of file diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json index 1298de4c89..213425abc0 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/info.json @@ -21,7 +21,9 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}] + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0} + ] } } } diff --git a/keyboards/craftwalk/craftwalk.h b/keyboards/craftwalk/craftwalk.h deleted file mode 100644 index 80c32ef05e..0000000000 --- a/keyboards/craftwalk/craftwalk.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 sotoba - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, k24, k25, k26 \ -) \ -{ \ - { KC_NO, k00, k01, k02, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, KC_NO, KC_NO, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26 } \ -} diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json index 67c7fe6525..1f8bd3e0f7 100644 --- a/keyboards/craftwalk/info.json +++ b/keyboards/craftwalk/info.json @@ -18,20 +18,23 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":1.25, "y":0.25}, - {"label":"W", "x":2.25, "y":0}, - {"label":"E", "x":3.25, "y":0.25}, - {"label":"Ctrl", "x":0, "y":1}, - {"label":"A", "x":1.25, "y":1.25}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1.25}, - {"label":"Shift", "x":0, "y":2}, - {"label":"Adjust", "x":1.25, "y":2.25}, - {"label":"Mouse", "x":2.25, "y":2}, - {"label":"Mouse", "x":3.25, "y":2.25}, - {"label":"F", "x":4.25, "y":2}, - {"label":"Num", "x":5.25, "y":3, "h":1.5}, - {"label":"Space", "x":6.25, "y":3, "h":1.5} + {"matrix": [0, 1], "x": 1.25, "y": 0.25}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1.25}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + + {"matrix": [2, 5], "x": 5.25, "y": 3, "h": 1.5}, + {"matrix": [2, 6], "x": 6.25, "y": 3, "h": 1.5} ] } } diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index 032023388d..8ff7c65a2f 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -18,17 +18,17 @@ "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}, + {"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}, - {"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} + {"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} ] } } diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.h b/keyboards/dailycraft/sandbox/rev1/rev1.h deleted file mode 100644 index d15cffe1ae..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/rev1.h +++ /dev/null @@ -1,35 +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( \ - k00, k01, k02, k03, k04, \ - k10, k11, k12, k13, k14 \ -) { \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 } \ -} diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index e20a1a2692..99535b9473 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -21,27 +21,29 @@ "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":"A", "x":6, "y":0}, - {"label":"B", "x":7, "y":0}, - {"label":"C", "x":8, "y":0}, - {"label":"D", "x":9, "y":0}, - {"label":"E", "x":10, "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}, - {"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":"F", "x":6, "y":1}, - {"label":"G", "x":7, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"I", "x":9, "y":1}, - {"label":"J", "x":10, "y":1} + {"matrix": [2, 0], "x": 6, "y": 0}, + {"matrix": [2, 1], "x": 7, "y": 0}, + {"matrix": [2, 2], "x": 8, "y": 0}, + {"matrix": [2, 3], "x": 9, "y": 0}, + {"matrix": [2, 4], "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": [3, 0], "x": 6, "y": 1}, + {"matrix": [3, 1], "x": 7, "y": 1}, + {"matrix": [3, 2], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1} ] } } diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.h b/keyboards/dailycraft/sandbox/rev2/rev2.h deleted file mode 100644 index f5cc3de8a0..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/rev2.h +++ /dev/null @@ -1,37 +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, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 } \ -} diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json index 47804ea542..b7369bf331 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/info.json @@ -25,21 +25,25 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3.5, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3.5, "y":1.5}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3.5, "y":3}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3.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": [1, 4], "x": 3.5, "y": 1.5}, + + {"matrix": [0, 2], "x": 0, "y": 2}, + {"matrix": [1, 2], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [0, 4], "x": 3.5, "y": 3}, + {"matrix": [0, 3], "x": 0, "y": 3}, + {"matrix": [1, 3], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3} ] } } diff --git a/keyboards/dmqdesign/spin/spin.h b/keyboards/dmqdesign/spin/spin.h deleted file mode 100644 index d60dbe82fb..0000000000 --- a/keyboards/dmqdesign/spin/spin.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2019-2020 DMQ 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 - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32 \ -) { \ - {k00, k10, k20, k30, k23}, \ - {k01, k11, k21, k31, k13}, \ - {k02, k12, k22, k32, k03} \ -} diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c index c0f7f96b9e..34b315a87b 100644 --- a/keyboards/doio/kb16/kb16.c +++ b/keyboards/doio/kb16/kb16.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "kb16.h" +#include "quantum.h" // OLED animation #include "./lib/logo.h" diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h deleted file mode 100644 index 6e6ab2f7f4..0000000000 --- a/keyboards/doio/kb16/kb16.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2022 DOIO - * 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 │ │14 │ - * ├───┼───┼───┼───┤ └───┘ └───┘ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ - * │20 │21 │22 │23 │ ┌───┐ - * ├───┼───┼───┼───┤ │24 │ - * │30 │31 │32 │33 │ └───┘ - * └───┴───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, XXX } \ -} diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index 03deae0cbc..7cc263246c 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -25,31 +25,31 @@ "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}, + {"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}, - {"label":"Encoder 1", "x":4.75, "y":0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, - {"label":"5%", "x":0, "y":1}, - {"label":"6^", "x":1, "y":1}, - {"label":"7&", "x":2, "y":1}, - {"label":"8*", "x":3, "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}, - {"label":"Encoder 2", "x":6, "y":0}, + {"matrix": [1, 4], "x": 6, "y": 0}, - {"label":"9(", "x":0, "y":2}, - {"label":"0)", "x":1, "y":2}, - {"label":"\u2191", "x":2, "y":2}, - {"label":"Enter", "x":3, "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}, - {"label":"Encoder 3", "x":5.375, "y":2.5}, + {"matrix": [2, 4], "x": 5.375, "y": 2.5}, - {"label":"Fn", "x":0, "y":3}, - {"label":"\u2190", "x":1, "y":3}, - {"label":"\u2193", "x":2, "y":3}, - {"label":"\u2192", "x":3, "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} ] } } diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index 6e90528e0f..839708ada0 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -25,31 +25,31 @@ "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}, + {"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}, - {"label":"Encoder 1", "x":4.75, "y":0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, - {"label":"5%", "x":0, "y":1}, - {"label":"6^", "x":1, "y":1}, - {"label":"7&", "x":2, "y":1}, - {"label":"8*", "x":3, "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}, - {"label":"Encoder 2", "x":6, "y":0}, + {"matrix": [1, 4], "x": 6, "y": 0}, - {"label":"9(", "x":0, "y":2}, - {"label":"0)", "x":1, "y":2}, - {"label":"\u2191", "x":2, "y":2}, - {"label":"Enter", "x":3, "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}, - {"label":"Encoder 3", "x":5.375, "y":2.5}, + {"matrix": [2, 4], "x": 5.375, "y": 2.5}, - {"label":"Fn", "x":0, "y":3}, - {"label":"\u2190", "x":1, "y":3}, - {"label":"\u2193", "x":2, "y":3}, - {"label":"\u2192", "x":3, "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} ] } } diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json index f4e43522d5..570d0d9ab0 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/info.json @@ -25,46 +25,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.25, "y":0}, - {"label":"K05", "x":5.25, "y":0}, - {"label":"K06", "x":6.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, "h":2}, - {"label":"K14", "x":4.25, "y":1}, - {"label":"K15", "x":5.25, "y":1}, - {"label":"K16", "x":6.25, "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, 3], "x": 3, "y": 0}, - {"label":"Encoder 1", "x":8.25, "y":2}, + {"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":"K20", "x":0, "y":2}, - {"label":"K21", "x":1, "y":2}, - {"label":"K22", "x":2, "y":2}, - {"label":"K23", "x":4.25, "y":2}, - {"label":"K24", "x":5.25, "y":2}, - {"label":"K25", "x":6.25, "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, "h": 2}, - {"label":"Encoder 2", "x":11, "y":2}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, - {"label":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K33", "x":4.25, "y":3, "h":2}, - {"label":"K35", "x":5.25, "y":3}, + {"matrix": [2, 0], "x": 8.25, "y": 2}, - {"label":"Encoder 3", "x":9, "y":4}, + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, - {"label":"K40", "x":0, "y":4, "w":2}, - {"label":"K41", "x":2, "y":4}, - {"label":"K42", "x":4.25, "y":4}, - {"label":"K43", "x":5.25, "y":4}, - {"label":"K44", "x":6.25, "y":4} + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [3, 0], "x": 6.25, "y": 2}, + + {"matrix": [3, 1], "x": 11, "y": 2}, + + {"matrix": [3, 2], "x": 0, "y": 3}, + {"matrix": [3, 3], "x": 1, "y": 3}, + {"matrix": [3, 5], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2}, + {"matrix": [4, 1], "x": 5.25, "y": 3}, + + {"matrix": [4, 2], "x": 9, "y": 4}, + + {"matrix": [4, 3], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 2, "y": 4}, + + {"matrix": [5, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 5], "x": 5.25, "y": 4}, + {"matrix": [5, 6], "x": 6.25, "y": 4} ] } } diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c index 3272863ad1..53a4546e06 100644 --- a/keyboards/doio/kb30/kb30.c +++ b/keyboards/doio/kb30/kb30.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "kb30.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/doio/kb30/kb30.h b/keyboards/doio/kb30/kb30.h deleted file mode 100644 index 1a294c9735..0000000000 --- a/keyboards/doio/kb30/kb30.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2022 DOIO - * Copyright 2022 DOIO2022 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, \ - K30, K31, K32, K33, K35, \ - K40, K41, K42, K43, K44, \ - 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}, \ - { K30, K31, K32, K33, KC_NO, K35, KC_NO}, \ - { K40, K41, K42, K43, K44, KC_NO, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, K56 } \ -} diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json index ea0659607c..8642865cd9 100644 --- a/keyboards/donutcables/scrabblepad/info.json +++ b/keyboards/donutcables/scrabblepad/info.json @@ -17,7 +17,247 @@ "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":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":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":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":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":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":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, {"x":6, "y":6}, {"x":7, "y":6}, {"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, {"x":14, "y":6}, {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, {"x":5, "y":7}, {"x":6, "y":7}, {"x":7, "y":7}, {"x":8, "y":7}, {"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, {"x":14, "y":7}, {"x":0, "y":8}, {"x":1, "y":8}, {"x":2, "y":8}, {"x":3, "y":8}, {"x":4, "y":8}, {"x":5, "y":8}, {"x":6, "y":8}, {"x":7, "y":8}, {"x":8, "y":8}, {"x":9, "y":8}, {"x":10, "y":8}, {"x":11, "y":8}, {"x":12, "y":8}, {"x":13, "y":8}, {"x":14, "y":8}, {"x":0, "y":9}, {"x":1, "y":9}, {"x":2, "y":9}, {"x":3, "y":9}, {"x":4, "y":9}, {"x":5, "y":9}, {"x":6, "y":9}, {"x":7, "y":9}, {"x":8, "y":9}, {"x":9, "y":9}, {"x":10, "y":9}, {"x":11, "y":9}, {"x":12, "y":9}, {"x":13, "y":9}, {"x":14, "y":9}, {"x":0, "y":10}, {"x":1, "y":10}, {"x":2, "y":10}, {"x":3, "y":10}, {"x":4, "y":10}, {"x":5, "y":10}, {"x":6, "y":10}, {"x":7, "y":10}, {"x":8, "y":10}, {"x":9, "y":10}, {"x":10, "y":10}, {"x":11, "y":10}, {"x":12, "y":10}, {"x":13, "y":10}, {"x":14, "y":10}, {"x":0, "y":11}, {"x":1, "y":11}, {"x":2, "y":11}, {"x":3, "y":11}, {"x":4, "y":11}, {"x":5, "y":11}, {"x":6, "y":11}, {"x":7, "y":11}, {"x":8, "y":11}, {"x":9, "y":11}, {"x":10, "y":11}, {"x":11, "y":11}, {"x":12, "y":11}, {"x":13, "y":11}, {"x":14, "y":11}, {"x":0, "y":12}, {"x":1, "y":12}, {"x":2, "y":12}, {"x":3, "y":12}, {"x":4, "y":12}, {"x":5, "y":12}, {"x":6, "y":12}, {"x":7, "y":12}, {"x":8, "y":12}, {"x":9, "y":12}, {"x":10, "y":12}, {"x":11, "y":12}, {"x":12, "y":12}, {"x":13, "y":12}, {"x":14, "y":12}, {"x":0, "y":13}, {"x":1, "y":13}, {"x":2, "y":13}, {"x":3, "y":13}, {"x":4, "y":13}, {"x":5, "y":13}, {"x":6, "y":13}, {"x":7, "y":13}, {"x":8, "y":13}, {"x":9, "y":13}, {"x":10, "y":13}, {"x":11, "y":13}, {"x":12, "y":13}, {"x":13, "y":13}, {"x":14, "y":13}, {"x":0, "y":14}, {"x":1, "y":14}, {"x":2, "y":14}, {"x":3, "y":14}, {"x":4, "y":14}, {"x":5, "y":14}, {"x":6, "y":14}, {"x":7, "y":14}, {"x":8, "y":14}, {"x":9, "y":14}, {"x":10, "y":14}, {"x":11, "y":14}, {"x":12, "y":14}, {"x":13, "y":14}, {"x":14, "y":14}] + "layout": [ + {"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": 0, "y": 1}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1}, + {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1}, + {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1}, + + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2}, + {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2}, + {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2}, + {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2}, + + {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3}, + {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3}, + {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3}, + {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3}, + {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3}, + {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3}, + + {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4}, + {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4}, + {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4}, + {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4}, + {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4}, + {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4}, + {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4}, + {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4}, + + {"label": "k50", "matrix": [5, 0], "x": 0, "y": 5}, + {"label": "k51", "matrix": [5, 1], "x": 1, "y": 5}, + {"label": "k52", "matrix": [5, 2], "x": 2, "y": 5}, + {"label": "k53", "matrix": [5, 3], "x": 3, "y": 5}, + {"label": "k54", "matrix": [5, 4], "x": 4, "y": 5}, + {"label": "k55", "matrix": [5, 5], "x": 5, "y": 5}, + {"label": "k56", "matrix": [5, 6], "x": 6, "y": 5}, + {"label": "k57", "matrix": [5, 7], "x": 7, "y": 5}, + {"label": "k58", "matrix": [5, 8], "x": 8, "y": 5}, + {"label": "k59", "matrix": [5, 9], "x": 9, "y": 5}, + {"label": "k5A", "matrix": [5, 10], "x": 10, "y": 5}, + {"label": "k5B", "matrix": [5, 11], "x": 11, "y": 5}, + {"label": "k5C", "matrix": [5, 12], "x": 12, "y": 5}, + {"label": "k5D", "matrix": [5, 13], "x": 13, "y": 5}, + {"label": "k5E", "matrix": [5, 14], "x": 14, "y": 5}, + + {"label": "k60", "matrix": [6, 0], "x": 0, "y": 6}, + {"label": "k61", "matrix": [6, 1], "x": 1, "y": 6}, + {"label": "k62", "matrix": [6, 2], "x": 2, "y": 6}, + {"label": "k63", "matrix": [6, 3], "x": 3, "y": 6}, + {"label": "k64", "matrix": [6, 4], "x": 4, "y": 6}, + {"label": "k65", "matrix": [6, 5], "x": 5, "y": 6}, + {"label": "k66", "matrix": [6, 6], "x": 6, "y": 6}, + {"label": "k67", "matrix": [6, 7], "x": 7, "y": 6}, + {"label": "k68", "matrix": [6, 8], "x": 8, "y": 6}, + {"label": "k69", "matrix": [6, 9], "x": 9, "y": 6}, + {"label": "k6A", "matrix": [6, 10], "x": 10, "y": 6}, + {"label": "k6B", "matrix": [6, 11], "x": 11, "y": 6}, + {"label": "k6C", "matrix": [6, 12], "x": 12, "y": 6}, + {"label": "k6D", "matrix": [6, 13], "x": 13, "y": 6}, + {"label": "k6E", "matrix": [6, 14], "x": 14, "y": 6}, + + {"label": "k70", "matrix": [7, 0], "x": 0, "y": 7}, + {"label": "k71", "matrix": [7, 1], "x": 1, "y": 7}, + {"label": "k72", "matrix": [7, 2], "x": 2, "y": 7}, + {"label": "k73", "matrix": [7, 3], "x": 3, "y": 7}, + {"label": "k74", "matrix": [7, 4], "x": 4, "y": 7}, + {"label": "k75", "matrix": [7, 5], "x": 5, "y": 7}, + {"label": "k76", "matrix": [7, 6], "x": 6, "y": 7}, + {"label": "k77", "matrix": [7, 7], "x": 7, "y": 7}, + {"label": "k78", "matrix": [7, 8], "x": 8, "y": 7}, + {"label": "k79", "matrix": [7, 9], "x": 9, "y": 7}, + {"label": "k7A", "matrix": [7, 10], "x": 10, "y": 7}, + {"label": "k7B", "matrix": [7, 11], "x": 11, "y": 7}, + {"label": "k7C", "matrix": [7, 12], "x": 12, "y": 7}, + {"label": "k7D", "matrix": [7, 13], "x": 13, "y": 7}, + {"label": "k7E", "matrix": [7, 14], "x": 14, "y": 7}, + + {"label": "k80", "matrix": [8, 0], "x": 0, "y": 8}, + {"label": "k81", "matrix": [8, 1], "x": 1, "y": 8}, + {"label": "k82", "matrix": [8, 2], "x": 2, "y": 8}, + {"label": "k83", "matrix": [8, 3], "x": 3, "y": 8}, + {"label": "k84", "matrix": [8, 4], "x": 4, "y": 8}, + {"label": "k85", "matrix": [8, 5], "x": 5, "y": 8}, + {"label": "k86", "matrix": [8, 6], "x": 6, "y": 8}, + {"label": "k87", "matrix": [8, 7], "x": 7, "y": 8}, + {"label": "k88", "matrix": [8, 8], "x": 8, "y": 8}, + {"label": "k89", "matrix": [8, 9], "x": 9, "y": 8}, + {"label": "k8A", "matrix": [8, 10], "x": 10, "y": 8}, + {"label": "k8B", "matrix": [8, 11], "x": 11, "y": 8}, + {"label": "k8C", "matrix": [8, 12], "x": 12, "y": 8}, + {"label": "k8D", "matrix": [8, 13], "x": 13, "y": 8}, + {"label": "k8E", "matrix": [8, 14], "x": 14, "y": 8}, + + {"label": "k90", "matrix": [9, 0], "x": 0, "y": 9}, + {"label": "k91", "matrix": [9, 1], "x": 1, "y": 9}, + {"label": "k92", "matrix": [9, 2], "x": 2, "y": 9}, + {"label": "k93", "matrix": [9, 3], "x": 3, "y": 9}, + {"label": "k94", "matrix": [9, 4], "x": 4, "y": 9}, + {"label": "k95", "matrix": [9, 5], "x": 5, "y": 9}, + {"label": "k96", "matrix": [9, 6], "x": 6, "y": 9}, + {"label": "k97", "matrix": [9, 7], "x": 7, "y": 9}, + {"label": "k98", "matrix": [9, 8], "x": 8, "y": 9}, + {"label": "k99", "matrix": [9, 9], "x": 9, "y": 9}, + {"label": "k9A", "matrix": [9, 10], "x": 10, "y": 9}, + {"label": "k9B", "matrix": [9, 11], "x": 11, "y": 9}, + {"label": "k9C", "matrix": [9, 12], "x": 12, "y": 9}, + {"label": "k9D", "matrix": [9, 13], "x": 13, "y": 9}, + {"label": "k9E", "matrix": [9, 14], "x": 14, "y": 9}, + + {"label": "kA0", "matrix": [10, 0], "x": 0, "y": 10}, + {"label": "kA1", "matrix": [10, 1], "x": 1, "y": 10}, + {"label": "kA2", "matrix": [10, 2], "x": 2, "y": 10}, + {"label": "kA3", "matrix": [10, 3], "x": 3, "y": 10}, + {"label": "kA4", "matrix": [10, 4], "x": 4, "y": 10}, + {"label": "kA5", "matrix": [10, 5], "x": 5, "y": 10}, + {"label": "kA6", "matrix": [10, 6], "x": 6, "y": 10}, + {"label": "kA7", "matrix": [10, 7], "x": 7, "y": 10}, + {"label": "kA8", "matrix": [10, 8], "x": 8, "y": 10}, + {"label": "kA9", "matrix": [10, 9], "x": 9, "y": 10}, + {"label": "kAA", "matrix": [10, 10], "x": 10, "y": 10}, + {"label": "kAB", "matrix": [10, 11], "x": 11, "y": 10}, + {"label": "kAC", "matrix": [10, 12], "x": 12, "y": 10}, + {"label": "kAD", "matrix": [10, 13], "x": 13, "y": 10}, + {"label": "kAE", "matrix": [10, 14], "x": 14, "y": 10}, + + {"label": "kB0", "matrix": [11, 0], "x": 0, "y": 11}, + {"label": "kB1", "matrix": [11, 1], "x": 1, "y": 11}, + {"label": "kB2", "matrix": [11, 2], "x": 2, "y": 11}, + {"label": "kB3", "matrix": [11, 3], "x": 3, "y": 11}, + {"label": "kB4", "matrix": [11, 4], "x": 4, "y": 11}, + {"label": "kB5", "matrix": [11, 5], "x": 5, "y": 11}, + {"label": "kB6", "matrix": [11, 6], "x": 6, "y": 11}, + {"label": "kB7", "matrix": [11, 7], "x": 7, "y": 11}, + {"label": "kB8", "matrix": [11, 8], "x": 8, "y": 11}, + {"label": "kB9", "matrix": [11, 9], "x": 9, "y": 11}, + {"label": "kBA", "matrix": [11, 10], "x": 10, "y": 11}, + {"label": "kBB", "matrix": [11, 11], "x": 11, "y": 11}, + {"label": "kBC", "matrix": [11, 12], "x": 12, "y": 11}, + {"label": "kBD", "matrix": [11, 13], "x": 13, "y": 11}, + {"label": "kBE", "matrix": [11, 14], "x": 14, "y": 11}, + + {"label": "kC0", "matrix": [12, 0], "x": 0, "y": 12}, + {"label": "kC1", "matrix": [12, 1], "x": 1, "y": 12}, + {"label": "kC2", "matrix": [12, 2], "x": 2, "y": 12}, + {"label": "kC3", "matrix": [12, 3], "x": 3, "y": 12}, + {"label": "kC4", "matrix": [12, 4], "x": 4, "y": 12}, + {"label": "kC5", "matrix": [12, 5], "x": 5, "y": 12}, + {"label": "kC6", "matrix": [12, 6], "x": 6, "y": 12}, + {"label": "kC7", "matrix": [12, 7], "x": 7, "y": 12}, + {"label": "kC8", "matrix": [12, 8], "x": 8, "y": 12}, + {"label": "kC9", "matrix": [12, 9], "x": 9, "y": 12}, + {"label": "kCA", "matrix": [12, 10], "x": 10, "y": 12}, + {"label": "kCB", "matrix": [12, 11], "x": 11, "y": 12}, + {"label": "kCC", "matrix": [12, 12], "x": 12, "y": 12}, + {"label": "kCD", "matrix": [12, 13], "x": 13, "y": 12}, + {"label": "kCE", "matrix": [12, 14], "x": 14, "y": 12}, + + {"label": "kD0", "matrix": [13, 0], "x": 0, "y": 13}, + {"label": "kD1", "matrix": [13, 1], "x": 1, "y": 13}, + {"label": "kD2", "matrix": [13, 2], "x": 2, "y": 13}, + {"label": "kD3", "matrix": [13, 3], "x": 3, "y": 13}, + {"label": "kD4", "matrix": [13, 4], "x": 4, "y": 13}, + {"label": "kD5", "matrix": [13, 5], "x": 5, "y": 13}, + {"label": "kD6", "matrix": [13, 6], "x": 6, "y": 13}, + {"label": "kD7", "matrix": [13, 7], "x": 7, "y": 13}, + {"label": "kD8", "matrix": [13, 8], "x": 8, "y": 13}, + {"label": "kD9", "matrix": [13, 9], "x": 9, "y": 13}, + {"label": "kDA", "matrix": [13, 10], "x": 10, "y": 13}, + {"label": "kDB", "matrix": [13, 11], "x": 11, "y": 13}, + {"label": "kDC", "matrix": [13, 12], "x": 12, "y": 13}, + {"label": "kDD", "matrix": [13, 13], "x": 13, "y": 13}, + {"label": "kDE", "matrix": [13, 14], "x": 14, "y": 13}, + + {"label": "kE0", "matrix": [14, 0], "x": 0, "y": 14}, + {"label": "kE1", "matrix": [14, 1], "x": 1, "y": 14}, + {"label": "kE2", "matrix": [14, 2], "x": 2, "y": 14}, + {"label": "kE3", "matrix": [14, 3], "x": 3, "y": 14}, + {"label": "kE4", "matrix": [14, 4], "x": 4, "y": 14}, + {"label": "kE5", "matrix": [14, 5], "x": 5, "y": 14}, + {"label": "kE6", "matrix": [14, 6], "x": 6, "y": 14}, + {"label": "kE7", "matrix": [14, 7], "x": 7, "y": 14}, + {"label": "kE8", "matrix": [14, 8], "x": 8, "y": 14}, + {"label": "kE9", "matrix": [14, 9], "x": 9, "y": 14}, + {"label": "kEA", "matrix": [14, 10], "x": 10, "y": 14}, + {"label": "kEB", "matrix": [14, 11], "x": 11, "y": 14}, + {"label": "kEC", "matrix": [14, 12], "x": 12, "y": 14}, + {"label": "kED", "matrix": [14, 13], "x": 13, "y": 14}, + {"label": "kEE", "matrix": [14, 14], "x": 14, "y": 14} + ] } } } diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.h b/keyboards/donutcables/scrabblepad/scrabblepad.h deleted file mode 100644 index f27d990eb2..0000000000 --- a/keyboards/donutcables/scrabblepad/scrabblepad.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2021 DonutCables - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, 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, k53, k54, k55, k56, k57, k58, k59, k5A, 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, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, \ - k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, \ - k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, \ - kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, \ - kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, \ - kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE, \ - kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE, \ - kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE \ -) \ -{ \ - { 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, k53, k54, k55, k56, k57, k58, k59, k5A, 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, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A, k8B, k8C, k8D, k8E, }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A, k9B, k9C, k9D, k9E, }, \ - { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA, kAB, kAC, kAD, kAE, }, \ - { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kBA, kBB, kBC, kBD, kBE, }, \ - { kC0, kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kCA, kCB, kCC, kCD, kCE, }, \ - { kD0, kD1, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kDA, kDB, kDC, kDD, kDE, }, \ - { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, kE8, kE9, kEA, kEB, kEC, kED, kEE } \ -} diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h deleted file mode 100644 index c98c9a703a..0000000000 --- a/keyboards/doodboard/duckboard/duckboard.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020-2021 doodboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - K01, K02, K03, K04, \ - K11, K12, K13, \ - K21, K22, K23, K24, \ - K31, K32, K33, \ - K40, K41, K42, K43, K44 \ -) { \ - { KC_NO, K01, K02, K03, K04 }, \ - { KC_NO, K11, K12, K13, KC_NO }, \ - { KC_NO, K21, K22, K23, K24 }, \ - { KC_NO, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, K44 } \ -} diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json index b79348d03c..6153c3e2c0 100644 --- a/keyboards/doodboard/duckboard/info.json +++ b/keyboards/doodboard/duckboard/info.json @@ -23,29 +23,29 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "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": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 1, "h": 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": 1, "h": 2}, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - { "x": 0, "y": 4 }, - { "x": 1, "y": 4 }, - { "x": 2, "y": 4 }, - { "x": 3, "y": 4 }, - { "x": 4, "y": 3, "h": 2 } + {"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": 3, "h": 2} ] } } diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.h b/keyboards/doodboard/duckboard_r2/duckboard_r2.h deleted file mode 100644 index 1f3c462da8..0000000000 --- a/keyboards/doodboard/duckboard_r2/duckboard_r2.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020-2021 doodboard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - K01, K02, K03, K04, \ - K11, K12, K13, K14, \ - K21, K22, K23, K24, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, K44 \ -) { \ - { KC_NO, K01, K02, K03, K04 }, \ - { KC_NO, K11, K12, K13, K14 }, \ - { KC_NO, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 } \ -} diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json index bc3c8661f2..da1c3342ed 100644 --- a/keyboards/doodboard/duckboard_r2/info.json +++ b/keyboards/doodboard/duckboard_r2/info.json @@ -26,32 +26,32 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "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": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "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": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "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": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "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}, - { "x": 0, "y": 4 }, - { "x": 1, "y": 4 }, - { "x": 2, "y": 4 }, - { "x": 3, "y": 4 }, - { "x": 4, "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} ] } } diff --git a/keyboards/draytronics/daisy/daisy.h b/keyboards/draytronics/daisy/daisy.h deleted file mode 100644 index 2c47989433..0000000000 --- a/keyboards/draytronics/daisy/daisy.h +++ /dev/null @@ -1,33 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License 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 _x_ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23 \ -) { \ -{ K00, _x_, _x_, K03, }, \ -{ K10, K11, K12, K13, }, \ -{ K20, K21, K22, K23, }, \ -} diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json index c149e3e7de..51776a9a08 100644 --- a/keyboards/draytronics/daisy/info.json +++ b/keyboards/draytronics/daisy/info.json @@ -27,18 +27,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"", "x":0, "y":0}, - {"label":"", "x":3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"label":"", "x":0, "y":1}, - {"label":"", "x":1, "y":1}, - {"label":"", "x":2, "y":1}, - {"label":"", "x":3, "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}, - {"label":"", "x":0, "y":2}, - {"label":"", "x":1, "y":2}, - {"label":"", "x":2, "y":2}, - {"label":"", "x":3, "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} ] } } diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json index a3846ef5e5..84594e01af 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/info.json @@ -20,10 +20,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"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, 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, 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": [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": [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} ] } } diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c index a225a2641c..6c89edaa11 100644 --- a/keyboards/dumbpad/v0x/v0x.c +++ b/keyboards/dumbpad/v0x/v0x.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 "v0x.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v0x/v0x.h b/keyboards/dumbpad/v0x/v0x.h deleted file mode 100644 index 578250f917..0000000000 --- a/keyboards/dumbpad/v0x/v0x.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { KC_NO, k01, k02, k03, k04 }, \ - { KC_NO, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json index 6555d4ac7a..a841d9d642 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/info.json @@ -21,10 +21,25 @@ "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "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": [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}, + + {"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} ] } } diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c index 8f571ca306..6c89edaa11 100644 --- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c +++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.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 "v0x_dualencoder.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h deleted file mode 100644 index f38d398857..0000000000 --- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ -} diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json index 1b5e9e8779..d0530abd7d 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/info.json @@ -20,10 +20,26 @@ "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "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": [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}, + + {"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} ] } } diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c index c5c0d670c6..6c89edaa11 100644 --- a/keyboards/dumbpad/v0x_right/v0x_right.c +++ b/keyboards/dumbpad/v0x_right/v0x_right.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 "v0x_right.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v0x_right/v0x_right.h b/keyboards/dumbpad/v0x_right/v0x_right.h deleted file mode 100644 index 169f391e82..0000000000 --- a/keyboards/dumbpad/v0x_right/v0x_right.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO }, \ - { k10, k11, k12, k13, KC_NO }, \ - { k20, k21, k22, k23, KC_NO }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json index 989abb6dc6..f790bb80ec 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/info.json @@ -20,10 +20,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"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, 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, 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": [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": [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} ] } } diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c index 1a1eb1e9c5..f1b1d66c7f 100644 --- a/keyboards/dumbpad/v1x/v1x.c +++ b/keyboards/dumbpad/v1x/v1x.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 "v1x.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v1x/v1x.h b/keyboards/dumbpad/v1x/v1x.h deleted file mode 100644 index 578250f917..0000000000 --- a/keyboards/dumbpad/v1x/v1x.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { KC_NO, k01, k02, k03, k04 }, \ - { KC_NO, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json index 742eaabd91..ad16fa4417 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/info.json @@ -21,10 +21,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"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, 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, 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": [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": [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} ] } } diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c index 33a8679985..f1b1d66c7f 100644 --- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c +++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.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 "v1x_dualencoder.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h deleted file mode 100644 index b8bb84fe5f..0000000000 --- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { KC_NO, k01, k02, k03, k04 }, \ - { KC_NO, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json index d0362f0561..b4dd15c76b 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/info.json @@ -18,10 +18,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"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, 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, 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": [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": [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} ] } } diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.c b/keyboards/dumbpad/v1x_oled/v1x_oled.c index acc9b8bbb1..ef91d4d416 100644 --- a/keyboards/dumbpad/v1x_oled/v1x_oled.c +++ b/keyboards/dumbpad/v1x_oled/v1x_oled.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 "v1x_oled.h" +#include "quantum.h" #include char wpm_str[10]; diff --git a/keyboards/dumbpad/v1x_oled/v1x_oled.h b/keyboards/dumbpad/v1x_oled/v1x_oled.h deleted file mode 100644 index b8bb84fe5f..0000000000 --- a/keyboards/dumbpad/v1x_oled/v1x_oled.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { KC_NO, k01, k02, k03, k04 }, \ - { KC_NO, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json index ff07570f9e..55b898b701 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/info.json @@ -20,10 +20,26 @@ "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "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": [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}, + + {"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} ] } } diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c index 2a2da68d5c..f1b1d66c7f 100644 --- a/keyboards/dumbpad/v1x_right/v1x_right.c +++ b/keyboards/dumbpad/v1x_right/v1x_right.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 "v1x_right.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/dumbpad/v1x_right/v1x_right.h b/keyboards/dumbpad/v1x_right/v1x_right.h deleted file mode 100644 index 169f391e82..0000000000 --- a/keyboards/dumbpad/v1x_right/v1x_right.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 imchipwood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO }, \ - { k10, k11, k12, k13, KC_NO }, \ - { k20, k21, k22, k23, KC_NO }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json index 8e613d3f38..045fe22306 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/info.json @@ -23,10 +23,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"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, 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, 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": [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": [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} ] } } diff --git a/keyboards/dumbpad/v3x/v3x.c b/keyboards/dumbpad/v3x/v3x.c index 9a4c8f4442..d0acca1947 100644 --- a/keyboards/dumbpad/v3x/v3x.c +++ b/keyboards/dumbpad/v3x/v3x.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v3x.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = {{// Key Matrix to LED Index diff --git a/keyboards/dumbpad/v3x/v3x.h b/keyboards/dumbpad/v3x/v3x.h deleted file mode 100644 index f939b6a594..0000000000 --- a/keyboards/dumbpad/v3x/v3x.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 imchipwood && deveth0 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - { KC_NO, k01, k02, k03, k04 }, \ - { KC_NO, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ - { k30, k31, k32, k33, k34 }, \ -} diff --git a/keyboards/earth_rover/earth_rover.h b/keyboards/earth_rover/earth_rover.h deleted file mode 100644 index a0676beeb2..0000000000 --- a/keyboards/earth_rover/earth_rover.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 k.bigwheel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ -// clang-format off -#define LAYOUT( \ - k00, k01, \ - k10, k12, k13, k14, \ - k20, k22, k23, k24, \ - k30, k32, k33, k34 \ -) { \ - { KC_NO, k00, k01, KC_NO }, \ - { k10, k12, k13, k14 }, \ - { k20, k22, k23, k24 }, \ - { k30, k32, k33, k34 }, \ -} -// clang-format on diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json index 329f4d90e1..f53eb4d610 100644 --- a/keyboards/earth_rover/info.json +++ b/keyboards/earth_rover/info.json @@ -18,23 +18,23 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k10", "x": 1.25, "y": 0}, - {"label": "k20", "x": 2.25, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"label": "k01", "x": 0, "y": 1.25}, - {"label": "k11", "x": 1.25, "y": 1.25}, - {"label": "k21", "x": 2.25, "y": 1.25}, - {"label": "k31", "x": 3.5, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1.25}, + {"matrix": [1, 2], "x": 2.25, "y": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 1.25}, - {"label": "k02", "x": 0, "y": 2.25}, - {"label": "k12", "x": 1.25, "y": 2.25}, - {"label": "k22", "x": 2.25, "y": 2.25}, - {"label": "k32", "x": 3.5, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"label": "k03", "x": 0, "y": 3.25}, - {"label": "k13", "x": 1.25, "y": 3.25}, - {"label": "k23", "x": 2.25, "y": 3.25}, - {"label": "k33", "x": 3.5, "y": 3.25} + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25} ] } } diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c index 32f9f7fab8..987e816ee9 100644 --- a/keyboards/flehrad/bigswitch/bigswitch.c +++ b/keyboards/flehrad/bigswitch/bigswitch.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 "bigswitch.h" +#include "quantum.h" volatile uint8_t runonce = true; static uint16_t my_timer; diff --git a/keyboards/flehrad/bigswitch/bigswitch.h b/keyboards/flehrad/bigswitch/bigswitch.h deleted file mode 100644 index c6c2f026d5..0000000000 --- a/keyboards/flehrad/bigswitch/bigswitch.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 QMK Contributors - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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 \ -) { \ - { k00 } \ -} diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json index e19da4fb61..aa07eb114d 100644 --- a/keyboards/flehrad/bigswitch/info.json +++ b/keyboards/flehrad/bigswitch/info.json @@ -17,7 +17,9 @@ "debounce": 50, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0, "w":4, "h":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4} + ] } } } diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json index fae1349a65..8cdffd2654 100644 --- a/keyboards/frooastboard/nano/info.json +++ b/keyboards/frooastboard/nano/info.json @@ -7,26 +7,11 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Z", - "x": 0, - "y": 0 - }, - { - "label": "X", - "x": 1, - "y": 0 - }, - { - "label": "Esc", - "x": 0, - "y": 1 - }, - { - "label": "~", - "x": 1, - "y": 1 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1} ] } }, diff --git a/keyboards/frooastboard/nano/nano.h b/keyboards/frooastboard/nano/nano.h deleted file mode 100644 index 76d1a42eac..0000000000 --- a/keyboards/frooastboard/nano/nano.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021-2022 frooastside - * - * This program is free software: you can 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( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h index 5a0cd5e8fb..e23fc264f4 100644 --- a/keyboards/gboards/ergotaco/ergotaco.h +++ b/keyboards/gboards/ergotaco/ergotaco.h @@ -26,23 +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) \ - \ - /* matrix positions */ \ - { \ - {R00}, \ - {R01}, \ - {R02}, \ - {R03}, \ - {R04}, \ - {R05}, \ - {L05}, \ - {L04}, \ - {L03}, \ - {L02}, \ - {L01}, \ - {L00}, \ -} diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 8414985841..1de1f3ab85 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -13,19 +13,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0.25}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.75}, - {"x": 5, "y": 1.5}, + {"matrix": [11, 0], "x": 0, "y": 1}, + {"matrix": [10, 0], "x": 1, "y": 0.5}, + {"matrix": [9, 0], "x": 2, "y": 0.25}, + {"matrix": [8, 0], "x": 3, "y": 0}, + {"matrix": [7, 0], "x": 4, "y": 0.75}, + {"matrix": [6, 0], "x": 5, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 0.75}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.25}, - {"x": 11, "y": 0.5}, - {"x": 12, "y": 1} + {"matrix": [0, 0], "x": 7, "y": 1.5}, + {"matrix": [1, 0], "x": 8, "y": 0.75}, + {"matrix": [2, 0], "x": 9, "y": 0}, + {"matrix": [3, 0], "x": 10, "y": 0.25}, + {"matrix": [4, 0], "x": 11, "y": 0.5}, + {"matrix": [5, 0], "x": 12, "y": 1} ] } } diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index 97d2c078fe..64a752d24f 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -19,15 +19,15 @@ "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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} ] } } diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c index f2d2301ec9..05b220250f 100644 --- a/keyboards/geekboards/tester/tester.c +++ b/keyboards/geekboards/tester/tester.c @@ -1,4 +1,5 @@ -#include "tester.h" +#include "quantum.h" + const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver diff --git a/keyboards/geekboards/tester/tester.h b/keyboards/geekboards/tester/tester.h deleted file mode 100644 index 28c555f0b6..0000000000 --- a/keyboards/geekboards/tester/tester.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once -#include "quantum.h" -#define LAYOUT( \ - k00, k01, k02, k03,\ - k10, k11, k12, k13\ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 0e0aaff476..3a247c0c81 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -17,7 +17,12 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}] + "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} + ] } } } diff --git a/keyboards/grid600/press/press.h b/keyboards/grid600/press/press.h deleted file mode 100644 index ca9eac9d19..0000000000 --- a/keyboards/grid600/press/press.h +++ /dev/null @@ -1,32 +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 \ -) { \ - { K00, K01, K02, K03 } \ -} diff --git a/keyboards/handwired/2x5keypad/2x5keypad.h b/keyboards/handwired/2x5keypad/2x5keypad.h index 6284e83b72..6fcdd2128c 100644 --- a/keyboards/handwired/2x5keypad/2x5keypad.h +++ b/keyboards/handwired/2x5keypad/2x5keypad.h @@ -6,16 +6,5 @@ #define BLUE_LED B5 #define GREEN_LED B6 - -#define LAYOUT( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 } \ -} - - - void turn_off_leds(void); void turn_on_led(pin_t pin); diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json index 3679eca918..1df0ccbdee 100644 --- a/keyboards/handwired/2x5keypad/info.json +++ b/keyboards/handwired/2x5keypad/info.json @@ -18,17 +18,17 @@ "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":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} ] } } diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c index 22c766a30f..93b9477dce 100644 --- a/keyboards/handwired/6key/6key.c +++ b/keyboards/handwired/6key/6key.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 "6key.h" +#include "quantum.h" bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { return false; } diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h deleted file mode 100644 index f63abc35d2..0000000000 --- a/keyboards/handwired/6key/6key.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2020 Bratzworth - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k03, k04, k05 } \ -} diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json index fec35620a2..39c26006d6 100644 --- a/keyboards/handwired/6key/info.json +++ b/keyboards/handwired/6key/info.json @@ -18,8 +18,13 @@ "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} + {"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/handwired/6macro/6macro.h b/keyboards/handwired/6macro/6macro.h deleted file mode 100644 index c1d5005128..0000000000 --- a/keyboards/handwired/6macro/6macro.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2019 joaofbmaia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index d081a75d3e..02111f4746 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -17,7 +17,15 @@ "bootloader": "atmel-dfu", "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}] + "layout": [ + {"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": "k10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1} + ] } } } diff --git a/keyboards/handwired/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h deleted file mode 100644 index a47b064b96..0000000000 --- a/keyboards/handwired/aplx2/aplx2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 April 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( \ - K00, K01 \ -) { \ - { K00 , K01 } \ -} diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json index 76aff146f2..d3f7962fe7 100644 --- a/keyboards/handwired/aplx2/info.json +++ b/keyboards/handwired/aplx2/info.json @@ -18,8 +18,8 @@ "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} ] } } diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h deleted file mode 100644 index 489dae2a4e..0000000000 --- a/keyboards/handwired/arrow_pad/arrow_pad.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This is the 21-key keypad to 4x6 element matrix mapping -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -// This is the 21-key keypad to 2x11 element matrix mapping -#define LAYOUT_pad21( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k04, k05, k06, \ - k14, k15, k16, k07, \ - k08, k09, k0A, \ - k19, k1A, k17 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \ -} diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index 91690cf83e..b9d705f3bf 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -21,55 +21,35 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"KM_ESC", "x":0, "y":0}, - {"label":"KM_TAB", "x":1, "y":0}, - {"label":"KM_BSL", "x":2, "y":0}, - {"label":"KM_ARR", "x":3, "y":0}, - {"label":"KM_NUM", "x":0, "y":1}, - {"label":"KM_FSL", "x":1, "y":1}, - {"label":"KM_AST", "x":2, "y":1}, - {"label":"KM_MIN", "x":3, "y":1}, - {"label":"KM___7", "x":0, "y":2}, - {"label":"KM___8", "x":1, "y":2}, - {"label":"KM___9", "x":2, "y":2}, - {"label":"KM_EQU", "x":3, "y":2}, - {"label":"KM___4", "x":0, "y":3}, - {"label":"KM___5", "x":1, "y":3}, - {"label":"KM___6", "x":2, "y":3}, - {"label":"KM_PLS", "x":3, "y":3}, - {"label":"KM___1", "x":0, "y":4}, - {"label":"KM___2", "x":1, "y":4}, - {"label":"KM___3", "x":2, "y":4}, - {"label":"___ENT", "x":3, "y":4}, - {"label":"KM___0", "x":0, "y":5}, - {"label":"_____0", "x":1, "y":5}, - {"label":"KM_DOT", "x":2, "y":5}, - {"label":"KM_ENT", "x":3, "y":5} - ] - }, - "LAYOUT_pad21": { - "layout": [ - {"label":"KM_ESC", "x":0, "y":0}, - {"label":"KM_TAB", "x":1, "y":0}, - {"label":"KM_BSL", "x":2, "y":0}, - {"label":"KM_ARR", "x":3, "y":0}, - {"label":"KM_NUM", "x":0, "y":1}, - {"label":"KM_FSL", "x":1, "y":1}, - {"label":"KM_AST", "x":2, "y":1}, - {"label":"KM_MIN", "x":3, "y":1}, - {"label":"KM___7", "x":0, "y":2}, - {"label":"KM___8", "x":1, "y":2}, - {"label":"KM___9", "x":2, "y":2}, - {"label":"KM___4", "x":0, "y":3}, - {"label":"KM___5", "x":1, "y":3}, - {"label":"KM___6", "x":2, "y":3}, - {"label":"KM_PLS", "x":3, "y":2, "h":2}, - {"label":"KM___1", "x":0, "y":4}, - {"label":"KM___2", "x":1, "y":4}, - {"label":"KM___3", "x":2, "y":4}, - {"label":"KM___0", "x":0, "y":5, "w":2}, - {"label":"KM_DOT", "x":2, "y":5}, - {"label":"KM_ENT", "x":3, "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": [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}, + + {"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": [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": [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} ] } } diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c index bc940420fe..cf291c00cf 100644 --- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c @@ -2,6 +2,19 @@ #include QMK_KEYBOARD_H #include "led.h" +// This is the 21-key keypad to 2x11 element matrix mapping +#define LAYOUT_pad21( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k04, k05, k06, \ + k14, k15, k16, k07, \ + k08, k09, k0A, \ + k19, k1A, k17 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \ +} + enum layers { LAYER_BASE, LAYER_EDIT, diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h deleted file mode 100644 index 42a6da437f..0000000000 --- a/keyboards/handwired/bstk100/bstk100.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 FREE WING,Y.Sakamoto - * http://www.neko.ne.jp/~freewing/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k34, k03, k02, k13, \ - k10, k11, k12, k01, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k43 \ -) { \ - { k00, k01, k02, k03, KC_NO }, \ - { k10, k11, k12, k13, KC_NO }, \ - { k20, k21, k22, k23, KC_NO }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, KC_NO, k43, KC_NO } \ -} diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json index 4d316b4397..257203511a 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/info.json @@ -24,31 +24,31 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label": "k34", "x": 0, "y": 1}, - {"label": "k03", "x": 1, "y": 1}, - {"label": "k02", "x": 2, "y": 1}, - {"label": "k13", "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 0, "y": 1}, + {"matrix": [0, 3], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"label": "k10", "x": 0, "y": 2}, - {"label": "k11", "x": 1, "y": 2}, - {"label": "k12", "x": 2, "y": 2}, - {"label": "k01", "x": 3, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [0, 1], "x": 3, "y": 2}, - {"label": "k20", "x": 0, "y": 3}, - {"label": "k21", "x": 1, "y": 3}, - {"label": "k22", "x": 2, "y": 3}, - {"label": "k23", "x": 3, "y": 3}, + {"matrix": [2, 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}, - {"label": "k30", "x": 0, "y": 4}, - {"label": "k31", "x": 1, "y": 4}, - {"label": "k32", "x": 2, "y": 4}, - {"label": "k33", "x": 3, "y": 4, "h": 2}, + {"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, "h": 2}, - {"label": "k40", "x": 0, "y": 5}, - {"label": "k41", "x": 1, "y": 5}, - {"label": "k43", "x": 2, "y": 5} + {"matrix": [4, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 3], "x": 2, "y": 5} ] } } diff --git a/keyboards/handwired/ck4x4/ck4x4.h b/keyboards/handwired/ck4x4/ck4x4.h deleted file mode 100644 index 33c1b8dd99..0000000000 --- a/keyboards/handwired/ck4x4/ck4x4.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) {\ -{ k00, k01, k02, k03 }, \ -{ k10, k11, k12, k13 }, \ -{ k20, k21, k22, k23 }, \ -{ k30, k31, k32, k33 }, \ -} diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json index 661f4edb2a..8caf00aefd 100644 --- a/keyboards/handwired/ck4x4/info.json +++ b/keyboards/handwired/ck4x4/info.json @@ -18,25 +18,25 @@ "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "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} ] } } diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.h b/keyboards/handwired/frankie_macropad/frankie_macropad.h deleted file mode 100644 index cfd3124ba1..0000000000 --- a/keyboards/handwired/frankie_macropad/frankie_macropad.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Eric Wood - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { ___, ___, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 } \ -} diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json index 3416222269..24da71eb8d 100644 --- a/keyboards/handwired/frankie_macropad/info.json +++ b/keyboards/handwired/frankie_macropad/info.json @@ -27,18 +27,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "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}, + {"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}, - {"label": "k20", "x": 0, "y": 2}, - {"label": "k21", "x": 1, "y": 2}, - {"label": "k22", "x": 2, "y": 2}, - {"label": "k23", "x": 3, "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} ] } } diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c index 8048194bbc..25493d94c3 100644 --- a/keyboards/handwired/gamenum/gamenum.c +++ b/keyboards/handwired/gamenum/gamenum.c @@ -1,4 +1,4 @@ -#include "gamenum.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h deleted file mode 100644 index 48883b1185..0000000000 --- a/keyboards/handwired/gamenum/gamenum.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, \ - k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, XXX }, \ - { k30, k31, k32, XXX }, \ - { XXX, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json index e35fb4a4e5..bb12b3b1f7 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/info.json @@ -18,23 +18,27 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Fn", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "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":"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}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Ent", "x":3, "y":3, "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": [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": [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}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json index c265fe3cfe..0a769a43f9 100644 --- a/keyboards/handwired/leftynumpad/info.json +++ b/keyboards/handwired/leftynumpad/info.json @@ -19,29 +19,33 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"1,0", "x":1, "y":0}, - {"label":"2,0", "x":2, "y":0}, - {"label":"3,0", "x":3, "y":0}, - {"label":"4,0", "x":4, "y":0}, - {"label":"0,1", "x":0, "y":1}, - {"label":"1,1", "x":1, "y":1}, - {"label":"2,1", "x":2, "y":1}, - {"label":"3,1", "x":3, "y":1}, - {"label":"0,2", "x":0, "y":2}, - {"label":"1,2", "x":1, "y":2}, - {"label":"2,2", "x":2, "y":2}, - {"label":"3,2", "x":3, "y":2}, - {"label":"5,1", "x":4, "y":1, "h":2}, - {"label":"0,3", "x":0, "y":3}, - {"label":"1,3", "x":1, "y":3}, - {"label":"2,3", "x":2, "y":3}, - {"label":"3,3", "x":3, "y":3}, - {"label":"0,4", "x":0, "y":4}, - {"label":"1,4", "x":1, "y":4}, - {"label":"2,4", "x":2, "y":4}, - {"label":"3,4", "x":3, "y":4}, - {"label":"4,3", "x":4, "y":3, "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": [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}, + {"matrix": [2, 4], "x": 4, "y": 1, "h": 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": [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": 3, "h": 2} ] } } diff --git a/keyboards/handwired/leftynumpad/leftynumpad.h b/keyboards/handwired/leftynumpad/leftynumpad.h deleted file mode 100644 index 7f3ebb8441..0000000000 --- a/keyboards/handwired/leftynumpad/leftynumpad.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 Tom Swartz - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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( \ - K05, K15, K25, K35, K45, \ - K04, K14, K24, K34, \ - K03, K13, K23, K33, K43, \ - K02, K12, K22, K32, \ - K01, K11, K21, K31, K41 \ -) \ -{ \ - { K05, K15, K25, K35, K45 }, \ - { K04, K14, K24, K34 }, \ - { K03, K13, K23, K33, K43 }, \ - { K02, K12, K22, K32 }, \ - { K01, K11, K21, K31, K41 } \ -} diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index f5cecc75e5..945b489751 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -21,15 +21,15 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 0.5, "y": 1.25}, - {"x": 1.5, "y": 2.5}, - {"x": 2.75, "y": 3.25}, - {"x": 4, "y": 3.5}, - {"x": 5.25, "y": 3.25}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 1.25}, - {"x": 8, "y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 0.5, "y": 1.25}, + {"matrix": [0, 2], "x": 1.5, "y": 2.5}, + {"matrix": [0, 3], "x": 2.75, "y": 3.25}, + {"matrix": [0, 4], "x": 4, "y": 3.5}, + {"matrix": [0, 5], "x": 5.25, "y": 3.25}, + {"matrix": [0, 6], "x": 6.5, "y": 2.5}, + {"matrix": [0, 7], "x": 7.5, "y": 1.25}, + {"matrix": [0, 8], "x": 8, "y": 0} ] } } diff --git a/keyboards/handwired/lovelive9/lovelive9.h b/keyboards/handwired/lovelive9/lovelive9.h deleted file mode 100644 index f6fb1f94cc..0000000000 --- a/keyboards/handwired/lovelive9/lovelive9.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 } \ -} diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json index 6d751780f6..7da646d1fe 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/info.json @@ -17,7 +17,12 @@ "bootloader": "caterina", "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}] + "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} + ] } } } diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h b/keyboards/handwired/mechboards_micropad/mechboards_micropad.h deleted file mode 100644 index 9839084862..0000000000 --- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h +++ /dev/null @@ -1,33 +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 \ -) \ -{ \ - { k00, k01, k02, k03 } \ -} diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json index 94fb213025..59062f16dc 100644 --- a/keyboards/handwired/misterdeck/info.json +++ b/keyboards/handwired/misterdeck/info.json @@ -18,20 +18,20 @@ "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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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} ] } } diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h deleted file mode 100644 index 324ccb755f..0000000000 --- a/keyboards/handwired/misterdeck/misterdeck.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2021 Chris Broekema (broekema@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( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 } \ -} diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json index 15b8d4bc69..b0bcfe4829 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/keyboards/handwired/mutepad/info.json @@ -23,10 +23,10 @@ "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} + {"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/handwired/mutepad/mutepad.h b/keyboards/handwired/mutepad/mutepad.h deleted file mode 100644 index 57c317cb60..0000000000 --- a/keyboards/handwired/mutepad/mutepad.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 JoshwJB (@JoshwJB) -// 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) \ - { \ - { K00, K01, K02, K03 } \ - } diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json index 20a10a7e83..066e5b852f 100644 --- a/keyboards/handwired/nicekey/info.json +++ b/keyboards/handwired/nicekey/info.json @@ -18,7 +18,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0} ] } } diff --git a/keyboards/handwired/nicekey/nicekey.h b/keyboards/handwired/nicekey/nicekey.h deleted file mode 100644 index f008be168e..0000000000 --- a/keyboards/handwired/nicekey/nicekey.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00 \ -) { \ - { k00 } \ -} diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/info.json index be6e3a1764..bc70d64ed4 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/info.json @@ -18,15 +18,17 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":0, "y":1}, - {"label":"k04", "x":1, "y":1}, - {"label":"k05", "x":2, "y":1}, - {"label":"k06", "x":0, "y":2}, - {"label":"k07", "x":1, "y":2}, - {"label":"k08", "x":2, "y":2} + {"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/handwired/novem/novem.h b/keyboards/handwired/novem/novem.h deleted file mode 100644 index b1040094e0..0000000000 --- a/keyboards/handwired/novem/novem.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Jose I. Martinez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k03, k04, k05 }, \ - { k06, k07, k08 }, \ -} diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 5d796312cc..a4b37eec4a 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -21,10 +21,10 @@ "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} + {"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/handwired/nozbe_macro/nozbe_macro.h b/keyboards/handwired/nozbe_macro/nozbe_macro.h deleted file mode 100644 index 2c2c95091b..0000000000 --- a/keyboards/handwired/nozbe_macro/nozbe_macro.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Marcin Leon Omelan (@rozPierog) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { k00, k01, k02, k03 } \ -} diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json index fb3a11e400..5c96b7e5db 100644 --- a/keyboards/handwired/numpad20/info.json +++ b/keyboards/handwired/numpad20/info.json @@ -18,26 +18,30 @@ "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":"K10", "x":0, "y":1}, - {"label":"K11", "x":1, "y":1}, - {"label":"K12", "x":2, "y":1}, - {"label":"K13", "x":3, "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":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K33", "x":3, "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} + {"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}, + + {"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": [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} ] } } diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h deleted file mode 100644 index 03fdd6d923..0000000000 --- a/keyboards/handwired/numpad20/numpad20.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json index 6bec9fa163..001705ee72 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/info.json +++ b/keyboards/handwired/obuwunkunubi/spaget/info.json @@ -24,30 +24,36 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1.5}, - {"x":1, "y":1.5}, - {"x":2, "y":1.5}, - {"x":3, "y":1.5}, - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, - {"x":0, "y":3.5}, - {"x":1, "y":3.5}, - {"x":2, "y":3.5}, - {"x":0, "y":4.5}, - {"x":1, "y":4.5}, - {"x":2, "y":4.5}, - {"x":3, "y":3.5, "h":2}, - {"x":0, "y":5.5}, - {"x":1, "y":5.5}, - {"x":2, "y":5.5}, - {"x":0, "y":6.5, "w":2}, - {"x":2, "y":6.5}, - {"x":3, "y":5.5, "h":2} - ] + {"matrix": [2, 3], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + + {"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}, + + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.5}, + {"matrix": [1, 2], "x": 2, "y": 2.5}, + {"matrix": [1, 3], "x": 3, "y": 2.5}, + + {"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": [3, 0], "x": 0, "y": 4.5}, + {"matrix": [3, 1], "x": 1, "y": 4.5}, + {"matrix": [3, 2], "x": 2, "y": 4.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 5.5}, + {"matrix": [4, 1], "x": 1, "y": 5.5}, + {"matrix": [4, 2], "x": 2, "y": 5.5}, + + {"matrix": [5, 1], "x": 0, "y": 6.5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 6.5}, + {"matrix": [5, 3], "x": 3, "y": 5.5, "h": 2} + ] } } } diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.h b/keyboards/handwired/obuwunkunubi/spaget/spaget.h deleted file mode 100644 index 7d4b9e9dff..0000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/spaget.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 obuwunkunubi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K23, K43, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { XXX, K51, K52, K53 } \ -} diff --git a/keyboards/handwired/postageboard/info.json b/keyboards/handwired/postageboard/info.json index d15d6ef750..2f4e674d59 100644 --- a/keyboards/handwired/postageboard/info.json +++ b/keyboards/handwired/postageboard/info.json @@ -10,9 +10,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/handwired/postageboard/postageboard.h b/keyboards/handwired/postageboard/postageboard.h deleted file mode 100644 index 5bd9ceee5a..0000000000 --- a/keyboards/handwired/postageboard/postageboard.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json index 908a390c33..162f5601b5 100644 --- a/keyboards/handwired/snatchpad/info.json +++ b/keyboards/handwired/snatchpad/info.json @@ -24,16 +24,16 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, - {"x": 0, "y": 2}, - {"x": 4, "y": 2} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2} ] } } diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c index 621ba11123..89d32c036b 100644 --- a/keyboards/handwired/snatchpad/snatchpad.c +++ b/keyboards/handwired/snatchpad/snatchpad.c @@ -1,7 +1,7 @@ // Copyright 2022 xia0 (@xia0) // SPDX-License-Identifier: GPL-2.0-or-later -#include "snatchpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h deleted file mode 100644 index 07d6bd2093..0000000000 --- a/keyboards/handwired/snatchpad/snatchpad.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 xia0 (@xia0) -// 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, \ - k10, k11, k12, \ - k20, k22 \ -) { \ - { k00 , k01 , k02 }, \ - { k10 , k11 , k12 }, \ - { k20 , KC_NO , k22 } \ -} diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json index 973eebd1f9..efd82d20c4 100644 --- a/keyboards/handwired/splittest/info.json +++ b/keyboards/handwired/splittest/info.json @@ -11,8 +11,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 0} ] } } diff --git a/keyboards/handwired/splittest/splittest.h b/keyboards/handwired/splittest/splittest.h deleted file mode 100644 index 17b7081a02..0000000000 --- a/keyboards/handwired/splittest/splittest.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT(L1, R1) {{L1}, {R1}} diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json index 7733b642ec..8659152f52 100644 --- a/keyboards/handwired/sticc14/info.json +++ b/keyboards/handwired/sticc14/info.json @@ -18,20 +18,24 @@ "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}, - {"label":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K40", "x":0, "y":4, "w":2}, - {"label":"K41", "x":2, "y":4} + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4} ] } } diff --git a/keyboards/handwired/sticc14/sticc14.h b/keyboards/handwired/sticc14/sticc14.h deleted file mode 100644 index 1a5f51e41a..0000000000 --- a/keyboards/handwired/sticc14/sticc14.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 ErkHal - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - K20, K21, K22, \ - K30, K31, K32, \ - K40, K41 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ - { K40, K41} \ -} diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index a6e31cba07..0df5170fff 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -17,7 +17,20 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}] + "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": [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.5, "y": 2}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2} + ] } } } diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c index 508430ba06..0b257e0a06 100644 --- a/keyboards/handwired/tennie/tennie.c +++ b/keyboards/handwired/tennie/tennie.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 "tennie.h" +#include "quantum.h" void matrix_post_init(void) { rgblight_enable_noeeprom(); diff --git a/keyboards/handwired/tennie/tennie.h b/keyboards/handwired/tennie/tennie.h deleted file mode 100644 index 8ab0d04c52..0000000000 --- a/keyboards/handwired/tennie/tennie.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2018 Jack Hildebrandt - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, K13, \ - K20, K21, K22 \ -) \ -{ \ - { K00, K01, K02, KC_NO }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ -} diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index a1778c2220..92098b09c6 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -18,9 +18,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/handwired/trackpoint/trackpoint.h b/keyboards/handwired/trackpoint/trackpoint.h deleted file mode 100644 index a26000d521..0000000000 --- a/keyboards/handwired/trackpoint/trackpoint.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02 \ -) \ -{ \ - { k00, k01, k02} \ -} diff --git a/keyboards/hfdkb/ac001/ac001.c b/keyboards/hfdkb/ac001/ac001.c index a977f9c80d..83dbdeb628 100644 --- a/keyboards/hfdkb/ac001/ac001.c +++ b/keyboards/hfdkb/ac001/ac001.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ac001.h" +#include "quantum.h" /* 3---------------2 | | | diff --git a/keyboards/hfdkb/ac001/ac001.h b/keyboards/hfdkb/ac001/ac001.h deleted file mode 100644 index 0758584ee8..0000000000 --- a/keyboards/hfdkb/ac001/ac001.h +++ /dev/null @@ -1,26 +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 \ -) { \ - { K000, K001, K002, K003, K004 } \ -} -// clang-format on diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json index fb4974968b..a6082feb38 100644 --- a/keyboards/hfdkb/ac001/info.json +++ b/keyboards/hfdkb/ac001/info.json @@ -18,11 +18,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"@", "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} + ] } } } diff --git a/keyboards/hifumi/hifumi.h b/keyboards/hifumi/hifumi.h deleted file mode 100644 index 389ce206e0..0000000000 --- a/keyboards/hifumi/hifumi.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2019 zk-phi - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json index 0bfb7cd27f..e7b0df2d47 100644 --- a/keyboards/hifumi/info.json +++ b/keyboards/hifumi/info.json @@ -17,7 +17,15 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}] + "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/hineybush/h08_ocelot/h08_ocelot.h b/keyboards/hineybush/h08_ocelot/h08_ocelot.h deleted file mode 100644 index 92bded4558..0000000000 --- a/keyboards/hineybush/h08_ocelot/h08_ocelot.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 hineybush - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} - diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json index 439b37e379..3f3859aa84 100644 --- a/keyboards/hineybush/h08_ocelot/info.json +++ b/keyboards/hineybush/h08_ocelot/info.json @@ -17,7 +17,17 @@ "bootloader": "atmel-dfu", "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}] + "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": [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} + ] } } } diff --git a/keyboards/hub16/hub16.h b/keyboards/hub16/hub16.h deleted file mode 100755 index 36830bf5c0..0000000000 --- a/keyboards/hub16/hub16.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Josh Johnson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 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( \ - k40, k41, \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03, }, \ - { k10, k11, k12, k13, }, \ - { k20, k21, k22, k23, }, \ - { k30, k31, k32, k33, }, \ - { k40, k41, ___, ___, } \ -} - diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json index 0da7c129eb..4003e6df5b 100644 --- a/keyboards/hub16/info.json +++ b/keyboards/hub16/info.json @@ -20,24 +20,28 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mute", "x":0.5, "y":0}, - {"label":"Play / Pause", "x":2.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}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"-", "x":3, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"+", "x":3, "y":3}, - {"label":"MO(1)", "x":0, "y":4}, - {"label":"0", "x":1, "y":4}, - {"label":".", "x":2, "y":4}, - {"label":"N.ENT", "x":3, "y":4} + {"matrix": [4, 0], "x": 0.5, "y": 0}, + {"matrix": [4, 1], "x": 2.5, "y": 0}, + + {"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": [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": [2, 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": [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} ] } } diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index c1816b5e2a..061f2e1049 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -22,7 +22,9 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0.25, "y":0, "w":1.25, "h":2}] + "layout": [ + {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2} + ] } } } diff --git a/keyboards/illuminati/is0/is0.h b/keyboards/illuminati/is0/is0.h deleted file mode 100644 index a9fae5b40e..0000000000 --- a/keyboards/illuminati/is0/is0.h +++ /dev/null @@ -1,33 +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( \ - K0 \ -) \ -{ \ - { K0 } \ -} diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json index b0b1c9792c..764efa8767 100644 --- a/keyboards/jadookb/jkb2/info.json +++ b/keyboards/jadookb/jkb2/info.json @@ -17,7 +17,10 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0} + ] } } } diff --git a/keyboards/jadookb/jkb2/jkb2.h b/keyboards/jadookb/jkb2/jkb2.h deleted file mode 100644 index 1bddef45de..0000000000 --- a/keyboards/jadookb/jkb2/jkb2.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright 2021 Wizard-GG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - K01, K02 \ -) \ -{ \ - { K01, K02 }, \ -} diff --git a/keyboards/jkdlab/binary_monkey/binary_monkey.h b/keyboards/jkdlab/binary_monkey/binary_monkey.h deleted file mode 100644 index 598886b781..0000000000 --- a/keyboards/jkdlab/binary_monkey/binary_monkey.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2021 JKDLAB. - * Copyright 2021 Jaehee - * - * This program is free software: you can 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 https://www.gnu.org/licenses/. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10 \ -) { \ - { K10, K00, K01 } \ -} diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json index b7fcc584f3..43ba146854 100644 --- a/keyboards/jkdlab/binary_monkey/info.json +++ b/keyboards/jkdlab/binary_monkey/info.json @@ -21,9 +21,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "0", "x": 0, "y": 0}, - {"label": "1", "x": 1, "y": 0}, - {"label": "ENTER", "x": 0, "y": 1, "w" : 2} + {"matrix": [0, 1], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1, "w": 2} ] } } diff --git a/keyboards/kakunpc/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h deleted file mode 100644 index 9807576899..0000000000 --- a/keyboards/kakunpc/business_card/alpha/alpha.h +++ /dev/null @@ -1,35 +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( \ - k00, k01, k02, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ -} diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json index 5ec079fe7f..e2d26c506e 100644 --- a/keyboards/kakunpc/business_card/alpha/info.json +++ b/keyboards/kakunpc/business_card/alpha/info.json @@ -18,12 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":0, "y":1}, - {"label":"5", "x":1, "y":1}, - {"label":"6", "x":2, "y":1} + {"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/kakunpc/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h deleted file mode 100644 index 21a334e8a9..0000000000 --- a/keyboards/kakunpc/business_card/beta/beta.h +++ /dev/null @@ -1,37 +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( \ - k00, k01, \ - k10, k11, \ - k20, k21 \ -) \ -{ \ - { k21, k20 }, \ - { k11, k10 }, \ - { k01, k00 }, \ -} diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json index 67018ad142..0854d327ac 100644 --- a/keyboards/kakunpc/business_card/beta/info.json +++ b/keyboards/kakunpc/business_card/beta/info.json @@ -18,12 +18,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":0, "y":1}, - {"label":"4", "x":1, "y":1}, - {"label":"5", "x":0, "y":2}, - {"label":"6", "x":1, "y":2} + {"matrix": [2, 1], "x": 0, "y": 0}, + {"matrix": [2, 0], "x": 1, "y": 0}, + + {"matrix": [1, 1], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + + {"matrix": [0, 1], "x": 0, "y": 2}, + {"matrix": [0, 0], "x": 1, "y": 2} ] } } diff --git a/keyboards/keebio/bamfk4/bamfk4.c b/keyboards/keebio/bamfk4/bamfk4.c index 6a382bfaf6..52fe61e39e 100644 --- a/keyboards/keebio/bamfk4/bamfk4.c +++ b/keyboards/keebio/bamfk4/bamfk4.c @@ -1,7 +1,7 @@ // Copyright 2022 Danny Nguyen (@nooges) // SPDX-License-Identifier: GPL-2.0-or-later -#include "bamfk4.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/bamfk4/bamfk4.h b/keyboards/keebio/bamfk4/bamfk4.h deleted file mode 100644 index 0bdc2f602f..0000000000 --- a/keyboards/keebio/bamfk4/bamfk4.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2022 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03 \ -) { \ - { k00, k01, k02, k03 }, \ -} diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json index cb4728ae34..97316b8ce5 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/info.json @@ -18,10 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 2, "h": 2}, - {"x": 2, "y": 0, "w": 2, "h": 2}, - {"x": 4, "y": 0, "w": 2, "h": 2}, - {"x": 6, "y": 0, "w": 2, "h": 2} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 1], "x": 2, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 2], "x": 4, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 3], "x": 6, "y": 0, "w": 2, "h": 2} ] } } diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.h b/keyboards/keebio/bigswitchseat/bigswitchseat.h deleted file mode 100644 index 3f66c6bc3b..0000000000 --- a/keyboards/keebio/bigswitchseat/bigswitchseat.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2021 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00 \ -) { \ - { k00 } \ -} diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json index 03301a75f1..f2fe9771ed 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/info.json @@ -17,7 +17,9 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4} + ] } } } diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json index 38e2902dae..83347a74f4 100644 --- a/keyboards/keebwerk/nano_slider/info.json +++ b/keyboards/keebwerk/nano_slider/info.json @@ -22,14 +22,16 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":1.25, "h":2} + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [1, 2], "x": 0, "y": 1.25}, + {"matrix": [1, 0], "x": 1, "y": 1.25}, + {"matrix": [0, 0], "x": 2, "y": 1.25}, + + {"matrix": [0, 1], "x": 0, "y": 2.25}, + {"matrix": [0, 2], "x": 1, "y": 2.25}, + {"matrix": [0, 3], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2} ] } } diff --git a/keyboards/keebwerk/nano_slider/nano_slider.h b/keyboards/keebwerk/nano_slider/nano_slider.h deleted file mode 100644 index 31985130b0..0000000000 --- a/keyboards/keebwerk/nano_slider/nano_slider.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 Duckle - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, K10, K00, \ - K01, K02, K03, K13 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} diff --git a/keyboards/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json index f993b81f2f..c993b41ac9 100644 --- a/keyboards/keebzdotnet/wazowski/info.json +++ b/keyboards/keebzdotnet/wazowski/info.json @@ -18,20 +18,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":2}, - {"x":0, "y":2}, - {"x":2, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":1}, - {"x":1, "y":3}, - {"x":3, "y":3}, - {"x":7, "y":0}, - {"x":8, "y":1} + {"matrix": [0, 0], "x": 1, "y": 0}, + + {"matrix": [0, 1], "x": 3, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 1}, + {"matrix": [0, 3], "x": 5, "y": 1}, + + {"matrix": [0, 4], "x": 7, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 4, "y": 2}, + {"matrix": [1, 3], "x": 5, "y": 2}, + + {"matrix": [1, 4], "x": 6, "y": 1}, + + {"matrix": [2, 0], "x": 1, "y": 3}, + {"matrix": [2, 1], "x": 3, "y": 3}, + + {"matrix": [2, 3], "x": 7, "y": 0}, + + {"matrix": [2, 4], "x": 8, "y": 1} ] } } diff --git a/keyboards/keebzdotnet/wazowski/wazowski.h b/keyboards/keebzdotnet/wazowski/wazowski.h deleted file mode 100644 index 98af75a0e8..0000000000 --- a/keyboards/keebzdotnet/wazowski/wazowski.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 keebzdotnet - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k05, k06, k07, k08, k09 }, \ - { k10, k11, KC_NO, k12, k13 } \ -} diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h index ec54b59f20..0418dee767 100755 --- a/keyboards/keyhive/honeycomb/honeycomb.h +++ b/keyboards/keyhive/honeycomb/honeycomb.h @@ -17,16 +17,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(); ) - -// 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( \ - k13, k14, k15, k16, \ - k09, k10, k11, k12, \ - k05, k06, k07, k08, \ - k01, k02, k03, k04 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16 } \ -} diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json index 693b836ede..639edee28d 100644 --- a/keyboards/keyhive/honeycomb/info.json +++ b/keyboards/keyhive/honeycomb/info.json @@ -13,25 +13,25 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [0, 12], "x": 0, "y": 0}, + {"matrix": [0, 13], "x": 1, "y": 0}, + {"matrix": [0, 14], "x": 2, "y": 0}, + {"matrix": [0, 15], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"matrix": [0, 8], "x": 0, "y": 1}, + {"matrix": [0, 9], "x": 1, "y": 1}, + {"matrix": [0, 10], "x": 2, "y": 1}, + {"matrix": [0, 11], "x": 3, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"matrix": [0, 4], "x": 0, "y": 2}, + {"matrix": [0, 5], "x": 1, "y": 2}, + {"matrix": [0, 6], "x": 2, "y": 2}, + {"matrix": [0, 7], "x": 3, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"matrix": [0, 0], "x": 0, "y": 3}, + {"matrix": [0, 1], "x": 1, "y": 3}, + {"matrix": [0, 2], "x": 2, "y": 3}, + {"matrix": [0, 3], "x": 3, "y": 3} ] } } diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json index ecafbeb089..d370601b62 100644 --- a/keyboards/keyhive/navi10/info.json +++ b/keyboards/keyhive/navi10/info.json @@ -6,10 +6,5 @@ "usb": { "vid": "0xFEED", "pid": "0x0000" - }, - "layouts": { - "LAYOUT": { - "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}] - } } } diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json index c721a3f390..548d917667 100644 --- a/keyboards/keyhive/navi10/rev0/info.json +++ b/keyboards/keyhive/navi10/rev0/info.json @@ -8,5 +8,24 @@ }, "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}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } } diff --git a/keyboards/keyhive/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c index f6c1f362ca..1eefa5cd91 100644 --- a/keyboards/keyhive/navi10/rev0/rev0.c +++ b/keyboards/keyhive/navi10/rev0/rev0.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 "rev0.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/keyhive/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h deleted file mode 100644 index b162d14425..0000000000 --- a/keyboards/keyhive/navi10/rev0/rev0.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Ethan Durrant (emdarcher) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k0, k1, k2, \ - k3, k4, k5, \ - \ - k6, \ - k7, k8, k9 \ -) \ -{ \ - {k0, k1, k2}, \ - {k3, k4, k5}, \ - {KC_NO, k6, KC_NO}, \ - {k7, k8, k9}, \ -} - - diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json index a0e51a3fb8..8db97e67b7 100644 --- a/keyboards/keyhive/navi10/rev2/info.json +++ b/keyboards/keyhive/navi10/rev2/info.json @@ -8,5 +8,24 @@ }, "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}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } } diff --git a/keyboards/keyhive/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c index fed0e03897..1eefa5cd91 100644 --- a/keyboards/keyhive/navi10/rev2/rev2.c +++ b/keyboards/keyhive/navi10/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" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/keyhive/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h deleted file mode 100644 index b162d14425..0000000000 --- a/keyboards/keyhive/navi10/rev2/rev2.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Ethan Durrant (emdarcher) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k0, k1, k2, \ - k3, k4, k5, \ - \ - k6, \ - k7, k8, k9 \ -) \ -{ \ - {k0, k1, k2}, \ - {k3, k4, k5}, \ - {KC_NO, k6, KC_NO}, \ - {k7, k8, k9}, \ -} - - diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json index 704ca05e91..82df44e866 100644 --- a/keyboards/keyhive/navi10/rev3/info.json +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -8,5 +8,24 @@ }, "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}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } } diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c index 2b0355aa36..1eefa5cd91 100644 --- a/keyboards/keyhive/navi10/rev3/rev3.c +++ b/keyboards/keyhive/navi10/rev3/rev3.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 "rev3.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/keyhive/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h deleted file mode 100644 index b162d14425..0000000000 --- a/keyboards/keyhive/navi10/rev3/rev3.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Ethan Durrant (emdarcher) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k0, k1, k2, \ - k3, k4, k5, \ - \ - k6, \ - k7, k8, k9 \ -) \ -{ \ - {k0, k1, k2}, \ - {k3, k4, k5}, \ - {KC_NO, k6, KC_NO}, \ - {k7, k8, k9}, \ -} - - diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json index 2738a173f5..6e6d0a31a6 100644 --- a/keyboards/keysofkings/twokey/info.json +++ b/keyboards/keysofkings/twokey/info.json @@ -23,9 +23,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.5, "y": 0}, - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5} ] } } diff --git a/keyboards/keysofkings/twokey/twokey.h b/keyboards/keysofkings/twokey/twokey.h deleted file mode 100755 index 169bc9eb11..0000000000 --- a/keyboards/keysofkings/twokey/twokey.h +++ /dev/null @@ -1,28 +0,0 @@ - /* Copyright 2020 Keys of Kings - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00, KC_NO }, \ - { K10, K11 } \ -} - diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json index 668b4d2f0b..236cc335a2 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/info.json @@ -17,7 +17,23 @@ "bootloader": "caterina", "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":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "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": [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/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h deleted file mode 100644 index e6fb9694d2..0000000000 --- a/keyboards/kingly_keys/romac/romac.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index 5976a3ff86..abaf8e99f4 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -22,7 +22,23 @@ "bootloader": "caterina", "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":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "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": [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/kingly_keys/romac_plus/romac_plus.h b/keyboards/kingly_keys/romac_plus/romac_plus.h deleted file mode 100644 index e6fb9694d2..0000000000 --- a/keyboards/kingly_keys/romac_plus/romac_plus.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index 8aa1f12dbf..bf84afdccc 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -17,7 +17,10 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1} + ] } } } diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.h b/keyboards/kingly_keys/smd_milk/smd_milk.h deleted file mode 100644 index 8f294817f9..0000000000 --- a/keyboards/kingly_keys/smd_milk/smd_milk.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Sebastian Williams - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00 }, \ - { K01 } \ -} diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json index 16f229f043..61deb7d6e0 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/info.json @@ -22,7 +22,17 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "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":4, "y":1}] + "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": 4, "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": 4, "y": 1} + ] } } } diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h deleted file mode 100644 index 8d5eba3ad2..0000000000 --- a/keyboards/kingly_keys/soap/soap.h +++ /dev/null @@ -1,32 +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( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index b0fbe9f9ed..1cbffbd568 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -23,14 +23,16 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0, "y": 0 }, - { "label": "k01", "x": 1, "y": 0 }, - { "label": "k02", "x": 2, "y": 0 }, + {"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": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2} - { "label": "k03", "x": 0, "y": 1 }, - { "label": "k04", "x": 1, "y": 1 }, - { "label": "k05", "x": 2, "y": 1 }, - { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 } ] } } diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c deleted file mode 100644 index cc854cf139..0000000000 --- a/keyboards/kiwikeebs/macro/macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "macro.h" diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/macro/macro.h deleted file mode 100644 index ee7c6bd47d..0000000000 --- a/keyboards/kiwikeebs/macro/macro.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) { \ - { k00, k01, k02, KC_NO }, \ - { k03, k04, k05, k06 } \ -} diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 5af9357c95..efdf6d860f 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -23,14 +23,15 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0, "y": 0 }, - { "label": "k01", "x": 1, "y": 0 }, - { "label": "k02", "x": 2, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - { "label": "k03", "x": 0, "y": 1 }, - { "label": "k04", "x": 1, "y": 1 }, - { "label": "k05", "x": 2, "y": 1 }, - { "label": "k06", "x": 3, "y": 0, "h":2, "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": 0, "w": 2, "h": 2} ] } } diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c deleted file mode 100644 index dd921f290f..0000000000 --- a/keyboards/kiwikeebs/macro_v2/macro_v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "macro_v2.h" diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h deleted file mode 100644 index ee7c6bd47d..0000000000 --- a/keyboards/kiwikeebs/macro_v2/macro_v2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) { \ - { k00, k01, k02, KC_NO }, \ - { k03, k04, k05, k06 } \ -} diff --git a/keyboards/kmac_pad/info.json b/keyboards/kmac_pad/info.json index 9d07f3d45a..f41da8a452 100644 --- a/keyboards/kmac_pad/info.json +++ b/keyboards/kmac_pad/info.json @@ -12,29 +12,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":3, "y":0}, + {"matrix": [0, 0], "x": 3, "y": 0}, - {"label":"K10", "x":0, "y":1.25}, - {"label":"K11", "x":1, "y":1.25}, - {"label":"K12", "x":2, "y":1.25}, - {"label":"K13", "x":3, "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}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"label":"K20", "x":0, "y":2.25}, - {"label":"K21", "x":1, "y":2.25}, - {"label":"K22", "x":2, "y":2.25}, - {"label":"K23", "x":3, "y":2.25, "h":2}, + {"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.25, "h": 2}, - {"label":"K30", "x":0, "y":3.25}, - {"label":"K31", "x":1, "y":3.25}, - {"label":"K32", "x":2, "y":3.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}, - {"label":"K40", "x":0, "y":4.25}, - {"label":"K41", "x":1, "y":4.25}, - {"label":"K42", "x":2, "y":4.25}, - {"label":"K43", "x":3, "y":4.25, "h":2}, + {"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, "h": 2}, - {"label":"K50", "x":0, "y":5.25, "w":2}, - {"label":"K52", "x":2, "y":5.25} + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25} ] } } diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kmac_pad/kmac_pad.c index 87083668cc..3de2cb711e 100644 --- a/keyboards/kmac_pad/kmac_pad.c +++ b/keyboards/kmac_pad/kmac_pad.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 "kmac_pad.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { diff --git a/keyboards/kmac_pad/kmac_pad.h b/keyboards/kmac_pad/kmac_pad.h deleted file mode 100644 index 9979608339..0000000000 --- a/keyboards/kmac_pad/kmac_pad.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 talsu - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K41, K42, K43, \ - K50, K52 \ -) \ -{ \ - { K00, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { K40, K41, K42, K43 }, \ - { K50, KC_NO, K52, KC_NO } \ -} diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/info.json index 68cf23a41a..ed33aa4c9e 100644 --- a/keyboards/knops/mini/info.json +++ b/keyboards/knops/mini/info.json @@ -17,7 +17,15 @@ "bootloader": "atmel-dfu", "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}] + "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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1} + ] } } } diff --git a/keyboards/knops/mini/mini.h b/keyboards/knops/mini/mini.h deleted file mode 100644 index e028dea6d7..0000000000 --- a/keyboards/knops/mini/mini.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2017 Pawnerd - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "quantum.h" - -#pragma once - -// 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 \ -) { \ - { k00, k01, k02, k03, k04, k05 } \ -} diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json index 2558cb9faa..7d3a710bc5 100644 --- a/keyboards/late9/rev1/info.json +++ b/keyboards/late9/rev1/info.json @@ -18,12 +18,29 @@ "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":2}, {"x":1, "y":2}, {"x":2, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, - {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5} + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5} ] } } diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c index ffba137189..aa45141b06 100644 --- a/keyboards/late9/rev1/rev1.c +++ b/keyboards/late9/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" // OLED logo #ifdef OLED_ENABLE diff --git a/keyboards/late9/rev1/rev1.h b/keyboards/late9/rev1/rev1.h deleted file mode 100644 index 2e5bb5ec52..0000000000 --- a/keyboards/late9/rev1/rev1.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2021 rookiebwoy - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/* Matrix layout - * ,--------------. - * | 00 | 01 | 02 | - * |----|----|----| - * | 10 | 11 | 12 | - * |----|----|----| - * | 20 | 21 | 22 | - * |----|----|----| - * | 30 | 31 | 32 | - * |----|----|----| - * | 40 | 41 | 42 | - * |----|----|----| - * | 50 | 51 | 52 | - * `--------------' - */ -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22, \ - k30, k31, k32, \ - k40, k41, k42, \ - k50, k51, k52 \ -) \ -{ \ - {k00, k01, k02}, \ - {k10, k11, k12}, \ - {k20, k21, k22}, \ - {k30, k31, k32}, \ - {k40, k41, k42}, \ - {k50, k51, k52} \ -} diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json index 7766de75ae..c5a844141b 100644 --- a/keyboards/latincompass/latinpad/info.json +++ b/keyboards/latincompass/latinpad/info.json @@ -25,25 +25,28 @@ "LAYOUT": { "layout": [ - {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8}, - {"label":"/", "x":0.8, "y":0, "w":0.8, "h":0.8}, + {"matrix": [4, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8}, + {"matrix": [4, 1], "x": 0.8, "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":"+", "x":3, "y":1}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"+", "x":3, "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}, - {"label":"0", "x":0, "y":4}, - {"label":"0", "x":1, "y":4}, - {"label":".", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":4} + {"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": [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": [2, 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": [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} ] } } diff --git a/keyboards/latincompass/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c index 51826bd6a0..b476b4c238 100644 --- a/keyboards/latincompass/latinpad/latinpad.c +++ b/keyboards/latincompass/latinpad/latinpad.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 "latinpad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/latincompass/latinpad/latinpad.h b/keyboards/latincompass/latinpad/latinpad.h deleted file mode 100644 index a2c275aec3..0000000000 --- a/keyboards/latincompass/latinpad/latinpad.h +++ /dev/null @@ -1,42 +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" - -/* 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( \ - K40, K41, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, KC_NO, KC_NO } \ -} diff --git a/keyboards/lazydesigners/cassette8/cassette8.h b/keyboards/lazydesigners/cassette8/cassette8.h deleted file mode 100755 index 9b640638f6..0000000000 --- a/keyboards/lazydesigners/cassette8/cassette8.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 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( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03, }, \ - { K10, K11, K12, K13 }, \ -} diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json index 8960356ea5..7adcc62868 100755 --- a/keyboards/lazydesigners/cassette8/info.json +++ b/keyboards/lazydesigners/cassette8/info.json @@ -18,14 +18,15 @@ "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":0, "y":1}, - {"label":"6", "x":1, "y":1}, - {"label":"7", "x":2, "y":1}, - {"label":"8", "x":3, "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, 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} ] } } diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json index ac48f157aa..b964980d7d 100644 --- a/keyboards/lefty/info.json +++ b/keyboards/lefty/info.json @@ -13,38 +13,42 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"F1", "x":0.5, "y":0}, - {"label":"Escape", "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":"6", "x":8, "y":0}, - {"label":"F2", "x":0.25, "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":"F3", "x":0, "y":2}, - {"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":"Shift", "x":1.25, "y":3, "w":2.25}, - {"label":"Z", "x":3.5, "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":"Control", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":4.5, "y":4, "w":1.25}, - {"label":"Layer2", "x":5.75, "y":4, "w":2}, - {"label":"Layer3", "x":7.75, "y":4, "w":1.25} + {"matrix": [0, 0], "x": 0.5, "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": [1, 0], "x": 0.25, "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": [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": [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": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/lefty/lefty.c b/keyboards/lefty/lefty.c index a3e5301ea1..b1bea424b0 100644 --- a/keyboards/lefty/lefty.c +++ b/keyboards/lefty/lefty.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "lefty.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/lefty/lefty.h b/keyboards/lefty/lefty.h deleted file mode 100644 index 2466552353..0000000000 --- a/keyboards/lefty/lefty.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Smoll Chungus (@smollchungus) -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* 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 -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, K26, \ - K31, K32, K33, K34, K35, K36, \ - K41, K43, K44, K46 \ -) \ -{ \ - { 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 }, \ - { KC_NO, K31, K32, K33, K34, K35, K36, KC_NO }, \ - { KC_NO, K41, KC_NO, K43, K44, KC_NO, K46, KC_NO } \ -} - -#define LAYOUT LAYOUT diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json index d2eb93b0fd..a14dcbdee7 100644 --- a/keyboards/lizard_trick/tenkey_plusplus/info.json +++ b/keyboards/lizard_trick/tenkey_plusplus/info.json @@ -25,31 +25,31 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Mute", "x": 0, "y": 0, "w": 1.3}, - {"label": "MDPL", "x": 1.3, "y": 0, "w": 1.4}, - {"label": "MDNX", "x": 2.7, "y": 0, "w": 1.3}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.3}, + {"matrix": [0, 1], "x": 1.3, "y": 0, "w": 1.4}, + {"matrix": [0, 3], "x": 2.7, "y": 0, "w": 1.3}, - {"label": "Num Lock", "x": 0, "y": 1}, - {"label": "/", "x": 1, "y": 1}, - {"label": "*", "x": 2, "y": 1}, - {"label": "-", "x": 3, "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}, - {"label": "7", "x": 0, "y": 2}, - {"label": "8", "x": 1, "y": 2}, - {"label": "9", "x": 2, "y": 2}, - {"label": "+", "x": 3, "y": 2, "h": 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, "h": 2}, - {"label": "4", "x": 0, "y": 3}, - {"label": "5", "x": 1, "y": 3}, - {"label": "6", "x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"label": "1", "x": 0, "y": 4}, - {"label": "2", "x": 1, "y": 4}, - {"label": "3", "x": 2, "y": 4}, - {"label": "Enter", "x": 3, "y": 4, "h" :2}, + {"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, "h": 2}, - {"label": "0", "x": 0, "y": 5, "w": 2}, - {"label": ".", "x": 2, "y": 5} + {"matrix": [5, 1], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5} ] } } diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h deleted file mode 100644 index 72f3880652..0000000000 --- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2020 Jonathon Carstens jonathon@lizardtrick.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" - -/* 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, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K41, K42, K43, \ - K51, K52 \ -) { \ - { K00, K01, KC_NO, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { K40, K41, K42, K43 }, \ - { KC_NO, K51, K52, KC_NO } \ -} diff --git a/keyboards/m10a/info.json b/keyboards/m10a/info.json index de50593b9d..08da6e584a 100644 --- a/keyboards/m10a/info.json +++ b/keyboards/m10a/info.json @@ -22,19 +22,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - {"x":1, "y":3, "w":2} + {"matrix": [3, 2], "x": 1, "y": 3, "w": 2} ] } } diff --git a/keyboards/m10a/m10a.h b/keyboards/m10a/m10a.h deleted file mode 100644 index 2eb14b7a7f..0000000000 --- a/keyboards/m10a/m10a.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright - * 2017 Josh Black (@consolenaut) - * 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" - -#define ___ KC_NO - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22, \ - k32 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 }, \ - { ___, ___, k32 } \ -} diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json index f6532a6409..7ab42a0213 100644 --- a/keyboards/machine_industries/m4_a/info.json +++ b/keyboards/machine_industries/m4_a/info.json @@ -18,10 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0, "h":2}, - {"x":0, "y":1, "w":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0, "h": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 2} ] } } diff --git a/keyboards/machine_industries/m4_a/m4_a.h b/keyboards/machine_industries/m4_a/m4_a.h deleted file mode 100644 index 13d3010991..0000000000 --- a/keyboards/machine_industries/m4_a/m4_a.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2022 naut -// 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, k11, \ - k10 \ -) { \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json index 9abafac946..96eaf9fad6 100644 --- a/keyboards/makrosu/info.json +++ b/keyboards/makrosu/info.json @@ -26,14 +26,13 @@ "layouts": { "LAYOUT": { "layout": [ - - {"label" : "Esc", "x":0, "y":0}, - {"label" : "F1", "x":1, "y":0}, - {"label" : "F2", "x":2, "y":0}, - - {"label" : "Lower", "x":0, "y":1}, - {"label" : "Z", "x":1.5, "y":1}, - {"label" : "X", "x":2.5, "y":1} + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 5], "x": 2.5, "y": 1} ] } } diff --git a/keyboards/makrosu/makrosu.h b/keyboards/makrosu/makrosu.h deleted file mode 100644 index ee61ce1185..0000000000 --- a/keyboards/makrosu/makrosu.h +++ /dev/null @@ -1,20 +0,0 @@ -#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, \ - K00, K01, K05 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ -} - diff --git a/keyboards/maple_computing/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h deleted file mode 100644 index ef73a72053..0000000000 --- a/keyboards/maple_computing/6ball/6ball.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k05, k00, k01, \ - k04, k03, k02 \ -) { \ - { k00, k01, k02, k03, k04, k05 } \ -} diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json index 38f127cffc..bed6b1fdda 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/info.json @@ -18,13 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0}, - {"x":2, "y":0.5}, + {"matrix": [0, 5], "x": 0, "y": 0.5}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0.5}, - {"x":0, "y":1.5}, - {"x":1, "y":2}, - {"x":2, "y":1.5} + {"matrix": [0, 4], "x": 0, "y": 1.5}, + {"matrix": [0, 3], "x": 1, "y": 2}, + {"matrix": [0, 2], "x": 2, "y": 1.5} ] } } diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h deleted file mode 100644 index 68eefca6a8..0000000000 --- a/keyboards/maple_computing/christmas_tree/christmas_tree.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50 \ -) { \ - { k00 }, \ - { k10 }, \ - { k20 }, \ - { k30 }, \ - { k40 }, \ - { k50 } \ -} diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 3ef81f9fd3..0a19667957 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -19,7 +19,16 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1}, + {"matrix": [2, 0], "x": 1.5, "y": 1}, + + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 0], "x": 2, "y": 2} + ] } } } diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index e9cf604e19..3b971cb673 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -21,9 +21,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [2, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h deleted file mode 100644 index 444224d2b6..0000000000 --- a/keyboards/maple_computing/ivy/rev1/rev1.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, \ - K01, \ - K02 \ - ) \ - { \ - { K00, KC_NO, KC_NO }, \ - { KC_NO, K01, KC_NO }, \ - { KC_NO, KC_NO, K02 }, \ - } diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index 49f4c16bc9..fe882742c3 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -18,17 +18,17 @@ "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3} ] } } diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h deleted file mode 100644 index 54d72d5e54..0000000000 --- a/keyboards/maple_computing/launchpad/rev1/rev1.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, \ - k10, k11, \ - k20, k21, \ - k30, k31 \ -) { \ - { k00, k01 }, \ - { k10, k11 }, \ - { k20, k21 }, \ - { k30, k31 } \ -} diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json index fd4de0bcbf..ef80f02bfa 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/info.json @@ -17,7 +17,14 @@ "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, "w":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, "w": 2} + ] } } } diff --git a/keyboards/maple_computing/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h deleted file mode 100644 index 171d21a072..0000000000 --- a/keyboards/maple_computing/the_ruler/the_ruler.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05 ) { \ - { K00, K01, K02, K03, K04, K05 } \ -} diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json index 71fac9f31b..5100c77dc2 100644 --- a/keyboards/massdrop/thekey/info.json +++ b/keyboards/massdrop/thekey/info.json @@ -21,9 +21,9 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (D4,D2)", "x": 0, "y": 0 }, - { "label": "K01 (D4,D1)", "x": 1, "y": 0 }, - { "label": "K02 (D4,D0)", "x": 2, "y": 0 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/massdrop/thekey/thekey.h b/keyboards/massdrop/thekey/thekey.h deleted file mode 100644 index f889c973c7..0000000000 --- a/keyboards/massdrop/thekey/thekey.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Joe Maples - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00, K01, K02 }, \ -} diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json index 01604e6f2e..f1079147bc 100644 --- a/keyboards/massdrop/thekey_v2/info.json +++ b/keyboards/massdrop/thekey_v2/info.json @@ -18,9 +18,9 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (D4,D2)", "x": 0, "y": 0 }, - { "label": "K01 (D4,D1)", "x": 1, "y": 0 }, - { "label": "K02 (D4,D0)", "x": 2, "y": 0 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/massdrop/thekey_v2/thekey_v2.h b/keyboards/massdrop/thekey_v2/thekey_v2.h deleted file mode 100644 index c3b8e1a8ea..0000000000 --- a/keyboards/massdrop/thekey_v2/thekey_v2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2022 Jason Wihardja - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00, K01, K02 }, \ -} diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json index bfea52ad4d..487314f5cc 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/info.json @@ -23,13 +23,15 @@ "bootloader": "atmel-dfu", "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 } ] + "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/maxr1998/pulse4k/pulse4k.h b/keyboards/maxr1998/pulse4k/pulse4k.h index cc0a373b66..ba4514d451 100644 --- a/keyboards/maxr1998/pulse4k/pulse4k.h +++ b/keyboards/maxr1998/pulse4k/pulse4k.h @@ -19,15 +19,6 @@ #include "quantum.h" -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ -} - void encoder_one_update(bool clockwise); void encoder_two_update(bool clockwise); diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index b396b4a6af..cc3adf9d02 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -27,13 +27,42 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 1, "y": 0}, {"label": "k01", "x": 2, "y": 0}, {"label": "k02", "x": 3, "y": 0}, {"label": "k03", "x": 4, "y": 0}, - {"label": "k10", "x": 1, "y": 1}, {"label": "k11", "x": 2, "y": 1}, {"label": "k12", "x": 3, "y": 1}, {"label": "k13", "x": 4, "y": 1}, - {"label": "k20", "x": 1, "y": 2}, {"label": "k21", "x": 2, "y": 2}, {"label": "k22", "x": 3, "y": 2}, {"label": "k23", "x": 4, "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": "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": "k50", "x": 0, "y": 5}, {"label": "k51", "x": 1, "y": 5}, {"label": "k52", "x": 2, "y": 5}, {"label": "k53", "x": 3, "y": 5}, {"label": "k54", "x": 4, "y": 5}, - {"label": "BACK00", "x": 1, "y": 6}, {"label": "BACK01", "x": 2, "y": 6}, {"label": "BACK02", "x": 3, "y": 6} + {"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, 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": [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": [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": [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": [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": [0, 0], "x": 1, "y": 6}, + {"matrix": [1, 0], "x": 2, "y": 6}, + {"matrix": [2, 0], "x": 3, "y": 6} ] } } diff --git a/keyboards/mechwild/murphpad/murphpad.c b/keyboards/mechwild/murphpad/murphpad.c index ba5183f2c3..3ad6409e92 100644 --- a/keyboards/mechwild/murphpad/murphpad.c +++ b/keyboards/mechwild/murphpad/murphpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "murphpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/murphpad/murphpad.h b/keyboards/mechwild/murphpad/murphpad.h deleted file mode 100644 index 2735e22057..0000000000 --- a/keyboards/mechwild/murphpad/murphpad.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 ___ 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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, k34, \ - k40, k41, k42, k43, k44, \ - k50, k51, k52, k53, k54, \ - \ - BACK00, BACK01, BACK02 \ -\ -) { \ - { BACK00, k00, k01, k02, k03 }, \ - { BACK01, k10, k11, k12, k13 }, \ - { BACK02, k20, k21, k22, k23 }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 } \ -} diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 0d45c97d50..a002232522 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -29,21 +29,26 @@ "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":"k05", "x":5, "y":0}, - {"label":"k10", "x":0, "y":1.25}, - {"label":"k15", "x":5, "y":1.25}, - {"label":"k20", "x":0, "y":2.25}, - {"label":"k25", "x":5, "y":2.25}, - {"label":"k30", "x":0, "y":3.25}, - {"label":"k35", "x":5, "y":3.25}, - {"label":"k31", "x":1, "y":4.5}, - {"label":"k32", "x":2, "y":4.5}, - {"label":"k33", "x":3, "y":4.5}, - {"label":"k34", "x":4, "y":4.5}] + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [1, 1], "x": 2.5, "y": 0}, + {"matrix": [2, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 2], "x": 5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 2], "x": 5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 2], "x": 5, "y": 3.25}, + + {"matrix": [0, 3], "x": 1, "y": 4.5}, + {"matrix": [1, 3], "x": 2, "y": 4.5}, + {"matrix": [2, 3], "x": 3, "y": 4.5}, + {"matrix": [3, 3], "x": 4, "y": 4.5} + ] } } } diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h index 31bcad6917..294cdb1839 100644 --- a/keyboards/mechwild/puckbuddy/puckbuddy.h +++ b/keyboards/mechwild/puckbuddy/puckbuddy.h @@ -5,29 +5,6 @@ #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, k05,\ - k10, k15,\ - k20, k25,\ - k30, k35,\ - k31, k32, k33, k34 \ -) { \ - { k00, k01, k05, k31 }, \ - { k10, k02, k15, k32 }, \ - { k20, k03, k25, k33 }, \ - { k30, ___, k35, k34 } \ -} - typedef union { uint32_t raw; struct { diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index a5db1935cb..fe20e701ba 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -27,16 +27,18 @@ "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, "w":1.25, "h":2}, + {"matrix": [2, 1], "x": 0, "y": 0}, - {"x":0, "y":1}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1} + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2}, + + {"matrix": [2, 2], "x": 0, "y": 1}, + + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1} ] } } diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h deleted file mode 100644 index dfa9386449..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.h +++ /dev/null @@ -1,29 +0,0 @@ - /* Copyright 2021 duoshock - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k21, k00, k01, k02, k20, \ - k22, k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 983d4e61fc..807a8ed980 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -22,11 +22,12 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ - {"label":"0", "x":0, "y":0}, - {"label":"1", "x":1.25, "y":0}, - {"label":"2", "x":2.25, "y":0}, - {"label":"3", "x":3.25, "y":0} + "layout": [ + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 0], "x": 3.25, "y": 0} ] } } diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h deleted file mode 100644 index 84e655d1b9..0000000000 --- a/keyboards/merge/uc1/uc1.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2021 duoshock - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, k00, k01, k10 \ -) \ -{ \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json index ea42f18d30..ad7f5da8e8 100644 --- a/keyboards/mexsistor/ludmila/info.json +++ b/keyboards/mexsistor/ludmila/info.json @@ -18,12 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "SW1", "x": 0, "y": 0}, - {"label": "SW3", "x": 1, "y": 0}, - {"label": "Encoder", "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, - {"label": "SW2", "x": 0, "y": 1}, - {"label": "SW4", "x": 1, "y": 1} + {"matrix": [2, 0], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1} ] } } diff --git a/keyboards/mexsistor/ludmila/ludmila.h b/keyboards/mexsistor/ludmila/ludmila.h deleted file mode 100644 index fc95a5492e..0000000000 --- a/keyboards/mexsistor/ludmila/ludmila.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 Kevin M. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, k20, \ - k10, k11 \ -) { \ - { k00, k01, }, \ - { k10, k11, }, \ - { k20 } \ - } diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 02f10ea9a2..975c41481b 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/info.json @@ -23,19 +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": "k04", "x": 4, "y": 0}, - {"label": "k05", "x": 5, "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} + {"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": [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} ] } } diff --git a/keyboards/millipad/millipad.h b/keyboards/millipad/millipad.h deleted file mode 100644 index 35eb843d6f..0000000000 --- a/keyboards/millipad/millipad.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Jirou - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, k14, k15 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 } \ -} diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index 6731a44fad..50708462c1 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -18,11 +18,12 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5 }, - { "x": 1, "y": 1.25, "w": 0.5, "h": 0.5 }, - { "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [0, 2], "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5}, + {"matrix": [0, 3], "x": 1, "y": 1.25, "w": 0.5, "h": 0.5}, + {"matrix": [0, 4], "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5} ] } } diff --git a/keyboards/momokai/tap_duo/tap_duo.c b/keyboards/momokai/tap_duo/tap_duo.c index bd53810838..4e0bc9f42c 100644 --- a/keyboards/momokai/tap_duo/tap_duo.c +++ b/keyboards/momokai/tap_duo/tap_duo.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "tap_duo.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/momokai/tap_duo/tap_duo.h b/keyboards/momokai/tap_duo/tap_duo.h deleted file mode 100644 index 74b87dab62..0000000000 --- a/keyboards/momokai/tap_duo/tap_duo.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Momokai - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00, K01, K02, K03, K04} \ -} - diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index c0406d73ce..a45aa5c9e3 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -18,12 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (E0,E6)", "x": 0, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K01 (E0,B2)", "x": 2.25, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K02 (E0,B7)", "x": 4.5, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K03 (E0,D1)", "x": 2.25, "y": 2.5 }, - { "label": "K04 (E0,D2)", "x": 3.75, "y": 2.5 }, - { "label": "K05 (E0,D3)", "x": 5.25, "y": 2.5 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5, "h": 1.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0, "w": 1.5, "h": 1.5}, + {"matrix": [0, 2], "x": 4.5, "y": 0, "w": 1.5, "h": 1.5}, + + {"matrix": [0, 3], "x": 2.25, "y": 2.5}, + {"matrix": [0, 4], "x": 3.75, "y": 2.5}, + {"matrix": [0, 5], "x": 5.25, "y": 2.5} ] } } diff --git a/keyboards/momokai/tap_trio/tap_trio.c b/keyboards/momokai/tap_trio/tap_trio.c index 69b850e04c..73957745a9 100644 --- a/keyboards/momokai/tap_trio/tap_trio.c +++ b/keyboards/momokai/tap_trio/tap_trio.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "tap_trio.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/momokai/tap_trio/tap_trio.h b/keyboards/momokai/tap_trio/tap_trio.h deleted file mode 100644 index b2b17b3436..0000000000 --- a/keyboards/momokai/tap_trio/tap_trio.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Momokai - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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 \ -) { \ - { K00, K01, K02, K03, K04, K05 } \ -} - diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json index 61a4c20e8f..246edae947 100644 --- a/keyboards/ncc1701kb/info.json +++ b/keyboards/ncc1701kb/info.json @@ -27,15 +27,17 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"label":"Encoder", "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} + {"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/ncc1701kb/ncc1701kb.h b/keyboards/ncc1701kb/ncc1701kb.h deleted file mode 100644 index 639adc409d..0000000000 --- a/keyboards/ncc1701kb/ncc1701kb.h +++ /dev/null @@ -1,14 +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/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json index 4cc1a3d9d5..8a8f357c96 100755 --- a/keyboards/neopad/rev1/info.json +++ b/keyboards/neopad/rev1/info.json @@ -24,8 +24,13 @@ "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} + {"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/neopad/rev1/rev1.c b/keyboards/neopad/rev1/rev1.c index 665294451a..86e47c8932 100755 --- a/keyboards/neopad/rev1/rev1.c +++ b/keyboards/neopad/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" void keyboard_pre_init_kb(void) { // Set LED IO as outputs diff --git a/keyboards/neopad/rev1/rev1.h b/keyboards/neopad/rev1/rev1.h deleted file mode 100755 index 87b9405bb1..0000000000 --- a/keyboards/neopad/rev1/rev1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 rookiebwoy - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json index 51c563e37b..5b5b3abfac 100644 --- a/keyboards/nightly_boards/n2/info.json +++ b/keyboards/nightly_boards/n2/info.json @@ -17,7 +17,10 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":0, "y":1}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 0, "y": 1} + ] } } } diff --git a/keyboards/nightly_boards/n2/n2.h b/keyboards/nightly_boards/n2/n2.h deleted file mode 100644 index 10242e41d7..0000000000 --- a/keyboards/nightly_boards/n2/n2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - K11 \ -) { \ - { K00, KC_NO }, \ - { KC_NO, K11 }, \ -} diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json index 37c1a79349..8c83af0485 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/info.json @@ -18,17 +18,18 @@ "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":2}, - {"x":1, "y":2}, - {"x":2, "y":2}] + {"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/nightly_boards/n9/n9.h b/keyboards/nightly_boards/n9/n9.h deleted file mode 100644 index 6b0dbdc2e6..0000000000 --- a/keyboards/nightly_boards/n9/n9.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - K10, K11, K12, \ - K20, K21, K22 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ -} diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json index 8aa4f08043..d166f96e35 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/info.json @@ -24,23 +24,24 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - - {"x":1.25, "y":1.25}, - {"x":2.25, "y":1.25}, - {"x":3.25, "y":1.25}, - {"x":4.25, "y":1.25}, - - {"x":1.25, "y":2.25}, - {"x":2.25, "y":2.25}, - {"x":3.25, "y":2.25}, - {"x":4.25, "y":2.25} - ] + {"matrix": [2, 0], "x": 0, "y": 0}, + {"matrix": [0, 4], "x": 1, "y": 0}, + {"matrix": [2, 1], "x": 2, "y": 0}, + + {"matrix": [2, 2], "x": 3.5, "y": 0}, + {"matrix": [1, 4], "x": 4.5, "y": 0}, + {"matrix": [2, 3], "x": 5.5, "y": 0}, + + {"matrix": [0, 0], "x": 1.25, "y": 1.25}, + {"matrix": [0, 1], "x": 2.25, "y": 1.25}, + {"matrix": [0, 2], "x": 3.25, "y": 1.25}, + {"matrix": [0, 3], "x": 4.25, "y": 1.25}, + + {"matrix": [1, 0], "x": 1.25, "y": 2.25}, + {"matrix": [1, 1], "x": 2.25, "y": 2.25}, + {"matrix": [1, 2], "x": 3.25, "y": 2.25}, + {"matrix": [1, 3], "x": 4.25, "y": 2.25} + ] } } } diff --git a/keyboards/nightly_boards/octopad/octopad.h b/keyboards/nightly_boards/octopad/octopad.h index 941afd3f07..33cf8e0b68 100644 --- a/keyboards/nightly_boards/octopad/octopad.h +++ b/keyboards/nightly_boards/octopad/octopad.h @@ -18,22 +18,3 @@ #include "quantum.h" #include "encoder_action.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( \ - E00A, K04, E00B, E01A, K14, E01B, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -\ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { E00A, E00B, E01A, E01B, KC_NO } \ -} diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index 2471032f34..2cbf1c89f8 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -45,17 +45,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}] + {"matrix": [0, 4], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1.25}, + {"matrix": [0, 1], "x": 1, "y": 1.25}, + {"matrix": [0, 2], "x": 2, "y": 1.25}, + {"matrix": [0, 3], "x": 3, "y": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 2.25} + ] } } } diff --git a/keyboards/nightly_boards/octopadplus/octopadplus.h b/keyboards/nightly_boards/octopadplus/octopadplus.h deleted file mode 100644 index b32e6d8f2f..0000000000 --- a/keyboards/nightly_boards/octopadplus/octopadplus.h +++ /dev/null @@ -1,37 +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( \ - K04, K15, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -\ -) { \ - { K00, K01, K02, K03, K04, KC_NO }, \ - { K10, K11, K12, K13, KC_NO, K15 }, \ -} diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json index 2bd7d09156..5de23f5618 100644 --- a/keyboards/novelkeys/nk20/info.json +++ b/keyboards/novelkeys/nk20/info.json @@ -23,7 +23,33 @@ }, "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":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "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": [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, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "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, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5} + ] } } } diff --git a/keyboards/novelkeys/nk20/nk20.c b/keyboards/novelkeys/nk20/nk20.c index 207e2277da..23350e1037 100644 --- a/keyboards/novelkeys/nk20/nk20.c +++ b/keyboards/novelkeys/nk20/nk20.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "nk20.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/novelkeys/nk20/nk20.h b/keyboards/novelkeys/nk20/nk20.h deleted file mode 100644 index a553a1af3e..0000000000 --- a/keyboards/novelkeys/nk20/nk20.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 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 - -#define XXX KC_NO - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. - -#define LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K40, K41, K42, K43, \ - K50, K52 \ -) { \ - { K00, K01, K02, XXX }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, XXX }, \ - { K40, K41, K42, K43 }, \ - { K50, XXX, K52, XXX }, \ -} diff --git a/keyboards/np12/info.json b/keyboards/np12/info.json index 002d3cc29b..834c51f577 100644 --- a/keyboards/np12/info.json +++ b/keyboards/np12/info.json @@ -22,20 +22,23 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ - { "label": "k34", "x": 3, "y": 0 }, - { "label": "k00", "x": 0, "y": 1 }, - { "label": "k01", "x": 1, "y": 1 }, - { "label": "k02", "x": 2, "y": 1 }, - { "label": "k03", "x": 3, "y": 1 }, - { "label": "k10", "x": 0, "y": 2 }, - { "label": "k11", "x": 1, "y": 2 }, - { "label": "k12", "x": 2, "y": 2 }, - { "label": "k13", "x": 3, "y": 2 }, - { "label": "k20", "x": 0, "y": 3 }, - { "label": "k21", "x": 1, "y": 3 }, - { "label": "k22", "x": 2, "y": 3 }, - { "label": "k23", "x": 3, "y": 3 } + "layout": [ + {"matrix": [3, 4], "x": 3, "y": 0}, + + {"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": [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": [2, 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} ] } } diff --git a/keyboards/np12/np12.c b/keyboards/np12/np12.c deleted file mode 100644 index 062bd9a833..0000000000 --- a/keyboards/np12/np12.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 nut1414 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General 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 "np12.h" diff --git a/keyboards/np12/np12.h b/keyboards/np12/np12.h deleted file mode 100644 index ee82786d83..0000000000 --- a/keyboards/np12/np12.h +++ /dev/null @@ -1,31 +0,0 @@ - /* Copyright 2021 nut1414 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k34, \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { k00, k01, k02, k03, KC_NO}, \ - { k10, k11, k12, k13, KC_NO}, \ - { k20, k21, k22, k23, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, k34 } \ -} diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json index 7f0e25396d..c6c7378eea 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/info.json @@ -17,7 +17,11 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2.25}, + {"matrix": [0, 1], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [0, 2], "x": 1.25, "y": 1} + ] } } } diff --git a/keyboards/ocean/stealth/stealth.h b/keyboards/ocean/stealth/stealth.h deleted file mode 100644 index b86cd2f05f..0000000000 --- a/keyboards/ocean/stealth/stealth.h +++ /dev/null @@ -1,25 +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 \ -) \ -{ \ - { K00, K01, K02 }, \ -} diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index 97cca23a29..0a69a4a029 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -24,24 +24,27 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":1.25, "y":1}, - {"x":2.25, "y":1}, - {"x":3.25, "y":1}, - {"x":4.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":0, "y":3}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3} + {"matrix": [0, 4], "x": 1.25, "y": 0}, + {"matrix": [0, 3], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 1], "x": 4.25, "y": 0}, + + {"matrix": [1, 4], "x": 1.25, "y": 1}, + {"matrix": [1, 3], "x": 2.25, "y": 1}, + {"matrix": [1, 2], "x": 3.25, "y": 1}, + {"matrix": [1, 1], "x": 4.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 4], "x": 1.25, "y": 2}, + {"matrix": [2, 3], "x": 2.25, "y": 2}, + {"matrix": [2, 2], "x": 3.25, "y": 2}, + {"matrix": [2, 1], "x": 4.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 1], "x": 4.25, "y": 3} ] } } diff --git a/keyboards/pabile/p18/p18.h b/keyboards/pabile/p18/p18.h deleted file mode 100644 index 3be26191ce..0000000000 --- a/keyboards/pabile/p18/p18.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k01, k02, k03, k04, \ - k11, k12, k13, k14, \ - k20, k21, k22, k23, k24, \ - k30, k31, k32, k33, k34 \ -) \ -{ \ - {KC_NO, k04, k03, k02, k01}, \ - {KC_NO, k14, k13, k12, k11}, \ - {k20, k24, k23, k22, k21}, \ - {k30, k34, k33, k32, k31} \ -} diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json index f8587610df..99f43a73f2 100644 --- a/keyboards/palette1202/info.json +++ b/keyboards/palette1202/info.json @@ -24,22 +24,22 @@ "layouts": { "LAYOUT": { "layout": [ - { "label":"Tab", "x": 0, "y": 0.75 }, - { "label":"GUI + A", "x": 1, "y": 0.25 }, - { "label":"E", "x": 2, "y": 0 }, - { "label":"P", "x": 3, "y": 0.5 }, - { "label":"GUI + 0", "x": 4, "y": 0 }, + {"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.5}, + {"matrix": [0, 4], "x": 4, "y": 0}, - { "label":"Fn", "x": 0, "y": 1.75 }, - { "label":"M", "x": 1, "y": 1.25 }, - { "label":"BackSP", "x": 2, "y": 1 }, - { "label":"B", "x": 3, "y": 1.5 }, - { "label":"HYPR", "x": 4, "y": 1 }, + {"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.5}, + {"matrix": [1, 4], "x": 4, "y": 1}, - { "label":"Shift", "x": 1, "y": 2.5 }, - { "label":"LGUI", "x": 2, "y": 2.5 }, - { "label":"GUI + Z", "x": 3, "y": 2.5 }, - { "label":"Space", "x": 4, "y": 2.5, "r": 15 } + {"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, "r": 15} ] } } diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c index a193964e3e..b2712df906 100644 --- a/keyboards/palette1202/palette1202.c +++ b/keyboards/palette1202/palette1202.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 "palette1202.h" +#include "quantum.h" // initialize OLED if OLED is enabled #ifdef OLED_ENABLE diff --git a/keyboards/palette1202/palette1202.h b/keyboards/palette1202/palette1202.h deleted file mode 100644 index 737e381f73..0000000000 --- a/keyboards/palette1202/palette1202.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 niltea - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, k14, \ - k21, k22, k23, k24 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { KC_NO, k21, k22, k23, k24 }, \ -} diff --git a/keyboards/paprikman/albacore/albacore.c b/keyboards/paprikman/albacore/albacore.c index d90adce2bb..b6cf742a11 100644 --- a/keyboards/paprikman/albacore/albacore.c +++ b/keyboards/paprikman/albacore/albacore.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "albacore.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/paprikman/albacore/albacore.h b/keyboards/paprikman/albacore/albacore.h deleted file mode 100644 index b725eba8b8..0000000000 --- a/keyboards/paprikman/albacore/albacore.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 paprikman - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License 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" - -/* 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, \ - K10, K11, K12, K13 \ -) { \ - { ___, K01, K02, K03 }, \ - { K10, K11, K12, K13 } \ -} diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json index e415a587ca..23a45a6c0b 100644 --- a/keyboards/paprikman/albacore/info.json +++ b/keyboards/paprikman/albacore/info.json @@ -21,14 +21,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.75, "y": 0}, - {"x": 1.75, "y": 0}, - {"x": 2.75, "y": 0}, + {"matrix": [0, 1], "x": 0.75, "y": 0}, + {"matrix": [0, 2], "x": 1.75, "y": 0}, + {"matrix": [0, 3], "x": 2.75, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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} ] } } diff --git a/keyboards/pdxkbc/info.json b/keyboards/pdxkbc/info.json index 522d7959b0..b6d93e7de1 100644 --- a/keyboards/pdxkbc/info.json +++ b/keyboards/pdxkbc/info.json @@ -17,7 +17,16 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"reddit", "x":0, "y":0}, {"label":"discord", "x":1, "y":0}, {"label":"badge", "x":0, "y":1}, {"label":"hack", "x":1, "y":1}, {"label":"volu", "x":0, "y":2}, {"label":"vold", "x":1, "y":2}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2} + ] } } } diff --git a/keyboards/pdxkbc/pdxkbc.h b/keyboards/pdxkbc/pdxkbc.h deleted file mode 100644 index 4700252a66..0000000000 --- a/keyboards/pdxkbc/pdxkbc.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 Franklin Harding - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, \ - k20, k21 \ -) \ -{ \ - { k00, k01 }, \ - { k10, k11 }, \ - { k20, k21 }, \ -} diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json index 67fb157d8e..1ee1a11399 100644 --- a/keyboards/pimentoso/paddino02/rev1/info.json +++ b/keyboards/pimentoso/paddino02/rev1/info.json @@ -18,18 +18,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.25}, + {"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}, - {"x":0, "y":1.5}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.25}, + {"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}, - {"x":2, "y":2.75}, - {"x":3, "y":2.75} + {"matrix": [2, 2], "x": 2, "y": 2.75}, + {"matrix": [2, 3], "x": 3, "y": 2.75} ] } } diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.h b/keyboards/pimentoso/paddino02/rev1/rev1.h deleted file mode 100755 index cca4a3c263..0000000000 --- a/keyboards/pimentoso/paddino02/rev1/rev1.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K22, K23 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { KC_NO, KC_NO, K22, K23 } \ -} diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json index 5d46fbbf23..f297903f68 100644 --- a/keyboards/pimentoso/paddino02/rev2/left/info.json +++ b/keyboards/pimentoso/paddino02/rev2/left/info.json @@ -18,18 +18,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.25}, + {"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}, - {"x":0, "y":1.5}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.25}, + {"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}, - {"x":2, "y":2.75}, - {"x":3, "y":2.75} + {"matrix": [2, 2], "x": 2, "y": 2.75}, + {"matrix": [2, 3], "x": 3, "y": 2.75} ] } } diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.h b/keyboards/pimentoso/paddino02/rev2/left/left.h deleted file mode 100755 index cca4a3c263..0000000000 --- a/keyboards/pimentoso/paddino02/rev2/left/left.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K22, K23 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { KC_NO, KC_NO, K22, K23 } \ -} diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json index d7a29410b0..385ee96af9 100644 --- a/keyboards/pimentoso/paddino02/rev2/right/info.json +++ b/keyboards/pimentoso/paddino02/rev2/right/info.json @@ -18,18 +18,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.25}, - {"x":1, "y":0}, - {"x":2, "y":0.25}, - {"x":3, "y":0.5}, + {"matrix": [0, 3], "x": 0, "y": 0.25}, + {"matrix": [0, 2], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0.25}, + {"matrix": [0, 0], "x": 3, "y": 0.5}, - {"x":0, "y":1.25}, - {"x":1, "y":1}, - {"x":2, "y":1.25}, - {"x":3, "y":1.5}, + {"matrix": [1, 3], "x": 0, "y": 1.25}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 0], "x": 3, "y": 1.5}, - {"x":0, "y":2.75}, - {"x":1, "y":2.75} + {"matrix": [2, 1], "x": 0, "y": 2.75}, + {"matrix": [2, 0], "x": 1, "y": 2.75} ] } } diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.h b/keyboards/pimentoso/paddino02/rev2/right/right.h deleted file mode 100755 index ac7ed847de..0000000000 --- a/keyboards/pimentoso/paddino02/rev2/right/right.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21 \ -) { \ - { K03, K02, K01, K00 }, \ - { K13, K12, K11, K10 }, \ - { K21, K20, KC_NO, KC_NO } \ -} diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json index a4db1d1064..a45bdb9b3d 100644 --- a/keyboards/pimentoso/touhoupad/info.json +++ b/keyboards/pimentoso/touhoupad/info.json @@ -18,19 +18,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"esc", "x":5.25, "y":0}, - {"label":"enter", "x":6.25, "y":0}, + {"matrix": [0, 9], "x": 5.25, "y": 0}, + {"matrix": [0, 8], "x": 6.25, "y": 0}, - {"label":"slow", "x":0, "y":1}, - {"label":"fire", "x":1, "y":1}, - {"label":"rapid", "x":2, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, - {"label":"up", "x":6.25, "y":1.75}, - {"label":"left", "x":5.25, "y":2.75}, - {"label":"down", "x":6.25, "y":2.75}, - {"label":"right", "x":7.25, "y":2.75}, + {"matrix": [0, 7], "x": 6.25, "y": 1.75}, + {"matrix": [0, 4], "x": 5.25, "y": 2.75}, + {"matrix": [0, 5], "x": 6.25, "y": 2.75}, + {"matrix": [0, 6], "x": 7.25, "y": 2.75}, - {"label":"bomb", "x":3.25, "y":3} + {"matrix": [0, 3], "x": 3.25, "y": 3} ] } } diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h deleted file mode 100644 index 8c7bfc36e1..0000000000 --- a/keyboards/pimentoso/touhoupad/touhoupad.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Michele Ferri - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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( \ - k09, k08, \ - k00, k01, k02, \ - k07, \ - k04, k05, k06, \ - k03 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \ -} diff --git a/keyboards/psuieee/pluto12/info.json b/keyboards/psuieee/pluto12/info.json index ef7af4d3a8..d997f60cfa 100644 --- a/keyboards/psuieee/pluto12/info.json +++ b/keyboards/psuieee/pluto12/info.json @@ -23,18 +23,20 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "M1", "x": 0, "y": 0 }, - { "label": "M2", "x": 1, "y": 0 }, - { "label": "M3", "x": 2, "y": 0 }, - { "label": "M4", "x": 3, "y": 0 }, - { "label": "M5", "x": 0, "y": 1 }, - { "label": "M6", "x": 1, "y": 1 }, - { "label": "M7", "x": 2, "y": 1 }, - { "label": "M8", "x": 3, "y": 1 }, - { "label": "M9", "x": 0, "y": 2 }, - { "label": "M10", "x": 1, "y": 2 }, - { "label": "M11", "x": 2, "y": 2 }, - { "label": "M12", "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} ] } } diff --git a/keyboards/psuieee/pluto12/pluto12.h b/keyboards/psuieee/pluto12/pluto12.h deleted file mode 100644 index fc3f391156..0000000000 --- a/keyboards/psuieee/pluto12/pluto12.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2021-22 Will McGloughlin (@wymcg) -// 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, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23 \ -) { \ - {K00, K01, K02, K03}, \ - {K10, K11, K12, K13}, \ - {K20, K21, K22, K23} \ -} diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json index d5bab56bf3..25abece192 100644 --- a/keyboards/puck/info.json +++ b/keyboards/puck/info.json @@ -18,18 +18,21 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"SW1", "x":0, "y":0}, - {"label":"SW2", "x":1, "y":0}, - {"label":"SW3", "x":2, "y":0}, - {"label":"SW4", "x":0, "y":1}, - {"label":"SW5", "x":1, "y":1}, - {"label":"SW6", "x":2, "y":1}, - {"label":"SW7", "x":0, "y":2}, - {"label":"SW8", "x":1, "y":2}, - {"label":"SW9", "x":2, "y":2}, - {"label":"SW10", "x":0, "y":3}, - {"label":"SW11", "x":1, "y":3}, - {"label":"SW12", "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": 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/puck/puck.h b/keyboards/puck/puck.h deleted file mode 100644 index 31fff79555..0000000000 --- a/keyboards/puck/puck.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22, \ - k30, k31, k32 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 }, \ - { k30, k31, k32 } \ -} diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index 93d2a04323..997158c29f 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -23,7 +23,21 @@ "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":0, "y":2}, {"x":1, "y":2}, {"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": [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} + ] } } } diff --git a/keyboards/qvex/lynepad/lynepad.c b/keyboards/qvex/lynepad/lynepad.c index 33620d9da3..cc69e12240 100644 --- a/keyboards/qvex/lynepad/lynepad.c +++ b/keyboards/qvex/lynepad/lynepad.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 "lynepad.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Encoder pins diff --git a/keyboards/qvex/lynepad/lynepad.h b/keyboards/qvex/lynepad/lynepad.h deleted file mode 100644 index 2a3015ceea..0000000000 --- a/keyboards/qvex/lynepad/lynepad.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 KemoNine - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, KC_NO } \ -} diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json index 90528d1bd9..e134a31147 100644 --- a/keyboards/rad/info.json +++ b/keyboards/rad/info.json @@ -19,50 +19,20 @@ "layouts": { "LAYOUT": { "layout": [ - { - "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, 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}, + + {"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/rad/rad.h b/keyboards/rad/rad.h deleted file mode 100644 index a9d669c929..0000000000 --- a/keyboards/rad/rad.h +++ /dev/null @@ -1,29 +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 LAYOUT( \ - K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { KC_NO, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json index c52e03880a..f899e6b841 100644 --- a/keyboards/reviung/reviung5/info.json +++ b/keyboards/reviung/reviung5/info.json @@ -26,11 +26,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0.25}, - {"label": "k02", "x": 2, "y": 0.25}, - {"label": "k03", "x": 3, "y": 0.25}, - {"label": "k04", "x": 4, "y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0} ] } } diff --git a/keyboards/reviung/reviung5/reviung5.h b/keyboards/reviung/reviung5/reviung5.h deleted file mode 100644 index f58f755800..0000000000 --- a/keyboards/reviung/reviung5/reviung5.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 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 \ -) { \ - { K00, K01, K02, K03, K04 } \ -} diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json index f5dc1bea95..81af3361ad 100644 --- a/keyboards/rocketboard_16/info.json +++ b/keyboards/rocketboard_16/info.json @@ -30,28 +30,28 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 3, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "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} ] } } diff --git a/keyboards/rocketboard_16/rocketboard_16.h b/keyboards/rocketboard_16/rocketboard_16.h deleted file mode 100644 index 927e21f7e6..0000000000 --- a/keyboards/rocketboard_16/rocketboard_16.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, \ - K0E, K0F, K10, K11 \ -) { \ - { K00, KC_NO, KC_NO, K01 }, \ - { K02, K03, K04, K05 }, \ - { K06, K07, K08, K09 }, \ - { K0A, K0B, K0C, K0D }, \ - { K0E, K0F, K10, K11 } \ -} diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json index f68be3ceee..ce744d32f1 100644 --- a/keyboards/rotr/info.json +++ b/keyboards/rotr/info.json @@ -22,7 +22,11 @@ "bootloader": "caterina", "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} + ] } } } diff --git a/keyboards/rotr/rotr.c b/keyboards/rotr/rotr.c deleted file mode 100644 index 8df10909f6..0000000000 --- a/keyboards/rotr/rotr.c +++ /dev/null @@ -1 +0,0 @@ -#include "rotr.h" diff --git a/keyboards/rotr/rotr.h b/keyboards/rotr/rotr.h deleted file mode 100644 index bf2ff12929..0000000000 --- a/keyboards/rotr/rotr.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02 \ -) { \ - { K00, K01, K02 } \ -} diff --git a/keyboards/rubi/info.json b/keyboards/rubi/info.json index fec1b52ea3..d61ef34548 100644 --- a/keyboards/rubi/info.json +++ b/keyboards/rubi/info.json @@ -23,24 +23,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":3, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25, "h":2}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25, "h":2}, - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25} + {"matrix": [2, 3], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1.25}, + {"matrix": [0, 1], "x": 1, "y": 1.25}, + {"matrix": [0, 2], "x": 2, "y": 1.25}, + {"matrix": [0, 3], "x": 3, "y": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 2.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + + {"matrix": [3, 0], "x": 0, "y": 4.25}, + {"matrix": [3, 1], "x": 1, "y": 4.25}, + {"matrix": [3, 2], "x": 2, "y": 4.25}, + {"matrix": [3, 3], "x": 3, "y": 4.25, "h": 2}, + + {"matrix": [4, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 5.25} ] } } diff --git a/keyboards/rubi/rubi.h b/keyboards/rubi/rubi.h index 17454c8c79..e7c8ae137a 100644 --- a/keyboards/rubi/rubi.h +++ b/keyboards/rubi/rubi.h @@ -60,42 +60,3 @@ uint16_t handle_encoder_press(void); void calcUpdate(void); void calcInput(char input); void calcOperands(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. - */ - -/* Rubi matrix layout - * ,---------------. - * | 23| - * |---------------| - * | 00| 01| 02| 03| - * |---------------| - * | 10| 11| 12| | - * |-----------| 13| - * | 20| 21| 22| | - * |---------------| - * | 30| 31| 32| | - * |-----------| 33| - * | 41 | 42| | - * `---------------' - */ -#define LAYOUT( \ - k23, \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k33, \ - k41, k42 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { KC_NO, k41, k42, KC_NO } \ -} diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h index 52c9c3adfd..013f4c89dc 100644 --- a/keyboards/s_ol/0xc_pad/0xc_pad.h +++ b/keyboards/s_ol/0xc_pad/0xc_pad.h @@ -17,18 +17,6 @@ #include "quantum.h" -#define LAYOUT( \ - k01, k05, \ - k02, k06, k10, \ - k03, k07, k11, k15, \ - k08, k12, k16 \ -) { \ - { k01, k05, KC_NO, KC_NO }, \ - { k02, k06, k10, KC_NO }, \ - { k03, k07, k11, k15 }, \ - { KC_NO, k08, k12, k16 } \ -} - #define LED_LAYOUT( \ \ k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \ diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json index decf0ae1cb..f1c47c4623 100644 --- a/keyboards/s_ol/0xc_pad/info.json +++ b/keyboards/s_ol/0xc_pad/info.json @@ -9,18 +9,21 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0.5, "y":1}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":0.5, "y":3}, - {"x":1.5, "y":3}, - {"x":2.5, "y":3} + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "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": [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": [3, 1], "x": 0.5, "y": 3}, + {"matrix": [3, 2], "x": 1.5, "y": 3}, + {"matrix": [3, 3], "x": 2.5, "y": 3} ] } }, diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index 3cef936a33..3553928e8b 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -18,13 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mouse", "x":1, "y":0}, - {"label":"Backspace", "x":0, "y":0.5}, - {"label":"\u2191", "x":1, "y":1}, - {"label":"Browser", "x":2, "y":0.5}, - {"label":"\u2190", "x":0, "y":1.5}, - {"label":"\u2193", "x":1, "y":2}, - {"label":"\u2192", "x":2, "y":1.5} + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 0.5}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 0.5}, + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 1.5} ] } } diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h deleted file mode 100644 index 008a9c16f4..0000000000 --- a/keyboards/salicylic_acid3/nafuda/nafuda.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* - * ,-----------------. - * | | L01 | | - * |-----------------+ - * | L10 | L11 | L12 | - * |-----------------+ - * | L20 | L21 | L22 | - * |-----------------' - */ - -#define LAYOUT( \ - L01, \ - L10, L11, L12, \ - L20, L21, L22 \ - ) \ - { \ - {KC_NO, L01,KC_NO }, \ - { L10, L11, L12 }, \ - { L20, L21, L22 } \ - } diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 1ab426b2af..3911634dc0 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -18,13 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1} + {"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/sawnsprojects/satxri6key/satxri6key.c b/keyboards/sawnsprojects/satxri6key/satxri6key.c index a1b988de8d..c335e0d3ef 100644 --- a/keyboards/sawnsprojects/satxri6key/satxri6key.c +++ b/keyboards/sawnsprojects/satxri6key/satxri6key.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "satxri6key.h" +#include "quantum.h" + #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { //Key Matrix to LED Indexccxxz diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.h b/keyboards/sawnsprojects/satxri6key/satxri6key.h deleted file mode 100644 index 2f5dca0e37..0000000000 --- a/keyboards/sawnsprojects/satxri6key/satxri6key.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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,\ - K10, K11, K12\ - ) { \ - { K00, K01, K02 },\ - { K10, K11, K12 } \ -} diff --git a/keyboards/sck/gtm/gtm.h b/keyboards/sck/gtm/gtm.h deleted file mode 100644 index 47625f417f..0000000000 --- a/keyboards/sck/gtm/gtm.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, K25 \ -) { \ - { K00, K01, K02, K03, K04, KC_NO }, \ - { K10, K11, K12, K13, K14, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K25 }, \ -} diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json index c3cc44cd64..c756b02c87 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/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": [0, 4], "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": [2, 5], "x": 5.5, "y": 0.5} ] } } diff --git a/keyboards/sck/neiso/info.json b/keyboards/sck/neiso/info.json index 2f233b4066..c7b75dbbc3 100644 --- a/keyboards/sck/neiso/info.json +++ b/keyboards/sck/neiso/info.json @@ -17,7 +17,13 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0.25, "y":0, "w":2, "h":1.25}, {"x":2.75, "y":0.25, "w":1.25, "h":2}, {"x":1.5, "y":1.5}, {"x":0, "y":1.75, "w":1.25, "h":2}, {"x":1.75, "y":2.75, "w":2, "h":1.25}] + "layout": [ + {"matrix": [0, 1], "x": 0.25, "y": 0, "w": 2, "h": 1.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0.25, "w": 1.25, "h": 2}, + {"matrix": [0, 0], "x": 1.5, "y": 1.5}, + {"matrix": [0, 3], "x": 0, "y": 1.75, "w": 1.25, "h": 2}, + {"matrix": [0, 4], "x": 1.75, "y": 2.75, "w": 2, "h": 1.25} + ] } } } diff --git a/keyboards/sck/neiso/neiso.h b/keyboards/sck/neiso/neiso.h deleted file mode 100644 index 7058fab5bf..0000000000 --- a/keyboards/sck/neiso/neiso.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 jrfhoutx - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k00, \ - k03, k04 \ -) \ - { {k00, k01, k02, k03, k04} } diff --git a/keyboards/shiro/info.json b/keyboards/shiro/info.json index 919cce0741..a67261dfd2 100644 --- a/keyboards/shiro/info.json +++ b/keyboards/shiro/info.json @@ -18,21 +18,25 @@ "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": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4} + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4} ] } } diff --git a/keyboards/shiro/shiro.h b/keyboards/shiro/shiro.h deleted file mode 100644 index 9e088ba555..0000000000 --- a/keyboards/shiro/shiro.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 T.Shinohara - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k20, k21, k22, \ - k30, k31, k32, \ - k40, k41, k42 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 }, \ - { k30, k31, k32 }, \ - { k40, k41, k42 } \ -} diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index e0110579f8..9e6fb3964d 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -17,7 +17,33 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Num Lock", "x":1.5, "y":0}, {"label":"/", "x":2.5, "y":0}, {"label":"*", "x":3.5, "y":0}, {"label":"-", "x":4.5, "y":0}, {"x":0, "y":1}, {"label":"7", "x":1.5, "y":1}, {"label":"8", "x":2.5, "y":1}, {"label":"9", "x":3.5, "y":1}, {"label":"+", "x":4.5, "y":1, "h":2}, {"x":0, "y":2}, {"label":"4", "x":1.5, "y":2}, {"label":"5", "x":2.5, "y":2}, {"label":"6", "x":3.5, "y":2}, {"x":0, "y":3}, {"label":"1", "x":1.5, "y":3}, {"label":"2", "x":2.5, "y":3}, {"label":"3", "x":3.5, "y":3}, {"label":"Enter", "x":4.5, "y":3, "h":2}, {"x":0, "y":4}, {"label":"0", "x":1.5, "y":4, "w":2}, {"label":".", "x":3.5, "y":4}] + "layout": [ + {"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.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, "h": 2}, + + {"matrix": [2, 0], "x": 0, "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": [3, 0], "x": 0, "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, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 3.5, "y": 4} + ] } } } \ No newline at end of file diff --git a/keyboards/skippys_custom_pcs/roopad/roopad.h b/keyboards/skippys_custom_pcs/roopad/roopad.h deleted file mode 100644 index f520383339..0000000000 --- a/keyboards/skippys_custom_pcs/roopad/roopad.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" - -/* RooPad Keymap Definitions */ -#define LAYOUT( \ - K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K34, \ - K40, K41, K43 \ -) { \ - { KC_NO, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, KC_NO }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, KC_NO, K43, KC_NO } \ -} diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json index df601d4012..7c22c087da 100644 --- a/keyboards/soup10/info.json +++ b/keyboards/soup10/info.json @@ -21,16 +21,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K01 (D1,E6)", "x":1, "y":0}, - {"label":"K10 (D0,D7)", "x":0, "y":1}, - {"label":"K11 (D0,E6)", "x":1, "y":1}, - {"label":"K12 (D0,B4)", "x":2, "y":1}, - {"label":"K20 (D4,D7)", "x":0, "y":2}, - {"label":"K21 (D4,E6)", "x":1, "y":2}, - {"label":"K22 (D4,B4)", "x":2, "y":2}, - {"label":"K30 (C6,D7)", "x":0, "y":3}, - {"label":"K31 (C6,E6)", "x":1, "y":3}, - {"label":"K32 (C6,B4)", "x":2, "y":3} + {"matrix": [0, 1], "x": 1, "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}, + + {"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/soup10/soup10.h b/keyboards/soup10/soup10.h deleted file mode 100644 index b4a2c14568..0000000000 --- a/keyboards/soup10/soup10.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 icesoup - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { KC_NO, K01, KC_NO }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 96f523fb4b..23f3a372e5 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -25,7 +25,15 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,1", "x":0.5, "y":0}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,1", "x":1, "y":1.5}, {"label":"2,0", "x":0, "y":2.5}, {"label":"2,1", "x":1, "y":2.5}] + "layout": [ + {"matrix": [0, 1], "x": 0.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5} + ] } } } diff --git a/keyboards/swiftrax/retropad/retropad.h b/keyboards/swiftrax/retropad/retropad.h deleted file mode 100644 index e7527d5c00..0000000000 --- a/keyboards/swiftrax/retropad/retropad.h +++ /dev/null @@ -1,31 +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( \ - K001, \ - K100, K101, \ - K200, K201 \ -) { \ - { XXX, K001, }, \ - { K100, K101, }, \ - { K200, K201, } \ -} diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index d1aa7848fc..f64d385270 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -12,7 +12,17 @@ "bootloader": "caterina", "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":0, "y":1}, {"label":"6", "x":1, "y":1}, {"label":"7", "x":2, "y":1}, {"label":"8", "x":3, "y":1}] + "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": [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} + ] } } } diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h deleted file mode 100644 index f3f6992703..0000000000 --- a/keyboards/takashiski/namecard2x4/namecard2x4.h +++ /dev/null @@ -1,31 +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 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, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} diff --git a/keyboards/tempo_turtle/bradpad/bradpad.h b/keyboards/tempo_turtle/bradpad/bradpad.h deleted file mode 100644 index 69955a5da6..0000000000 --- a/keyboards/tempo_turtle/bradpad/bradpad.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2021 v3ritas -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -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, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k41, k42\ -) { \ - { k00, k01, k02, k03, }, \ - { k10, k11, k12, k13, }, \ - { k20, k21, k22, k23, }, \ - { k30, k31, k32, k33, }, \ - { KC_NO, k41, k42, KC_NO } \ -} -// clang-format on diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json index 834e0c46c4..4237f63ac9 100644 --- a/keyboards/tempo_turtle/bradpad/info.json +++ b/keyboards/tempo_turtle/bradpad/info.json @@ -18,11 +18,28 @@ "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": 0, "y":2},{"x": 1, "y":2},{"x": 2, "y":2},{"x": 3, "y":2}, - {"x": 0, "y":3},{"x": 1, "y":3},{"x": 2, "y":3},{"x": 3, "y":3}, - {"x": 0, "y":4, "w":2},{"x": 2, "y":4,"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": [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}, + + {"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": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4, "w": 2} ] } } diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index e6677abc7b..869d4f16a1 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -17,7 +17,32 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}] + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 7.25, "y": 0}, + {"matrix": [0, 3], "x": 9.5, "y": 0}, + + {"matrix": [0, 4], "x": 0, "y": 0.5}, + {"matrix": [0, 5], "x": 2, "y": 0.5}, + {"matrix": [0, 6], "x": 8.5, "y": 0.5}, + {"matrix": [0, 7], "x": 10.5, "y": 0.5}, + + {"matrix": [0, 8], "x": 3.75, "y": 1}, + {"matrix": [0, 9], "x": 6.75, "y": 1}, + + {"matrix": [1, 0], "x": 5.25, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 8.5, "y": 1.5}, + {"matrix": [1, 4], "x": 10.5, "y": 1.5}, + + {"matrix": [1, 5], "x": 1, "y": 2}, + {"matrix": [1, 7], "x": 4.25, "y": 2}, + {"matrix": [1, 8], "x": 6.25, "y": 2}, + {"matrix": [1, 9], "x": 9.5, "y": 2} + ] } } } diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.h b/keyboards/tender/macrowo_pad/macrowo_pad.h deleted file mode 100644 index b095c037a7..0000000000 --- a/keyboards/tender/macrowo_pad/macrowo_pad.h +++ /dev/null @@ -1,27 +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" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K17, K18, K19 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, KC_NO, K17, K18, K19 } \ -} diff --git a/keyboards/treasure/type9/info.json b/keyboards/treasure/type9/info.json index 95cb977fb0..cab118fc8e 100644 --- a/keyboards/treasure/type9/info.json +++ b/keyboards/treasure/type9/info.json @@ -21,7 +21,19 @@ "bootloader": "atmel-dfu", "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":2}, {"x":1, "y":2}, {"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/treasure/type9/type9.h b/keyboards/treasure/type9/type9.h deleted file mode 100644 index 6034416f16..0000000000 --- a/keyboards/treasure/type9/type9.h +++ /dev/null @@ -1,37 +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" - -/* 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, \ - k20, k21, k22 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json index 56797aac22..cdf4815504 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/info.json @@ -17,7 +17,21 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0, "w":2}, {"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}] + "layout": [ + {"matrix": [0, 2], "x": 1, "y": 0, "w": 2}, + + {"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/vagrant_10/vagrant_10.h b/keyboards/vagrant_10/vagrant_10.h deleted file mode 100755 index 1cd4d1b777..0000000000 --- a/keyboards/vagrant_10/vagrant_10.h +++ /dev/null @@ -1,39 +0,0 @@ -/** -MIT License - -Copyright (c) 2020 Shanduur & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K002, \ - K100, K101, K102, \ - K200, K201, K202, \ - K300, K301, K302 \ -) { \ - { KC_NO, KC_NO, K002 }, \ - { K100, K101, K102 }, \ - { K200, K201, K202 }, \ - { K300, K301, K302 } \ -} diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json index 36ebf71582..0d80bce8a8 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/info.json @@ -21,16 +21,19 @@ "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": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 1, "y": 3, "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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 1, "y": 3, "w": 2} ] } } diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h deleted file mode 100644 index c23a4d003c..0000000000 --- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2018 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" - -// This a shortcut to help you visually see your 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 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \ -} diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json index 6b6bd3d61b..64af4a5dcf 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/info.json @@ -17,7 +17,21 @@ "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":0, "y":1}, {"label":"0,4", "x":1, "y":1}, {"label":"0,5", "x":2, "y":1}, {"label":"0,6", "x":0, "y":2}, {"label":"0,7", "x":1, "y":2}, {"label":"0,8", "x":2, "y":2}, {"label":"0,9", "x":1, "y":3, "w":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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1}, + + {"matrix": [0, 6], "x": 0, "y": 2}, + {"matrix": [0, 7], "x": 1, "y": 2}, + {"matrix": [0, 8], "x": 2, "y": 2}, + + {"matrix": [0, 9], "x": 1, "y": 3, "w": 2} + ] } } } diff --git a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h index 382cef1a6d..24dae9d7d0 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h +++ b/keyboards/wilba_tech/rama_works_m10_c/rama_works_m10_c.h @@ -18,18 +18,3 @@ #include "quantum.h" #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h" #include "via.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 \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, \ -} diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json index 5158e7e06f..73091d3036 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/info.json +++ b/keyboards/wilba_tech/rama_works_m6_a/info.json @@ -18,12 +18,13 @@ "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 } + {"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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1} ] } } diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h deleted file mode 100644 index 0a38581450..0000000000 --- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2018 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" - -// This a shortcut to help you visually see your 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 \ -) { \ - { k00, k01, k02, k03, k04, k05 } \ -} diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json index 3a3b32d1df..4356011aae 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/info.json +++ b/keyboards/wilba_tech/rama_works_m6_b/info.json @@ -18,12 +18,13 @@ "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 } + {"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": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1} ] } } diff --git a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h b/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h deleted file mode 100644 index bd4158bcb1..0000000000 --- a/keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2018 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" - -// This a shortcut to help you visually see your 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) \ - { \ - {K00, K01, K02, K03, K04, K05}, \ - } - diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json index b462b05eeb..7de9331ffe 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/info.json @@ -17,7 +17,17 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"x", "x":0, "y":0}, {"label":"x", "x":1, "y":0}, {"label":"x", "x":2, "y":0}, {"label":"x", "x":3, "y":0}, {"label":"x", "x":0, "y":1}, {"label":"x", "x":1, "y":1}, {"label":"x", "x":2, "y":1}, {"label":"x", "x":3, "y":1}] + "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": 0, "y": 1}, + {"matrix": [0, 5], "x": 1, "y": 1}, + {"matrix": [0, 6], "x": 2, "y": 1}, + {"matrix": [0, 7], "x": 3, "y": 1} + ] } } } diff --git a/keyboards/wilba_tech/wt8_a/wt8_a.h b/keyboards/wilba_tech/wt8_a/wt8_a.h deleted file mode 100644 index 0fb754f0ab..0000000000 --- a/keyboards/wilba_tech/wt8_a/wt8_a.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2018 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" - -#define ____ KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07 ) \ - { \ - {K00, K01, K02, K03, K04, K05, K06, K07 }, \ - } diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json index 0391d278b9..afdc9f62e4 100644 --- a/keyboards/winry/winry25tc/info.json +++ b/keyboards/winry/winry25tc/info.json @@ -18,31 +18,35 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,F5)", "x":0, "y":0}, - {"label":"K01 (E6,C7)", "x":1, "y":0}, - {"label":"K02 (E6,B7)", "x":2, "y":0}, - {"label":"K03 (E6,B2)", "x":3, "y":0}, - {"label":"K04 (E6,B4)", "x":4, "y":0}, - {"label":"K10 (F0,F5)", "x":0, "y":1}, - {"label":"K11 (F0,C7)", "x":1, "y":1}, - {"label":"K12 (F0,B7)", "x":2, "y":1}, - {"label":"K13 (F0,B2)", "x":3, "y":1}, - {"label":"K14 (F0,B4)", "x":4, "y":1}, - {"label":"K20 (D6,F5)", "x":0, "y":2}, - {"label":"K21 (D6,C7)", "x":1, "y":2}, - {"label":"K22 (D6,B7)", "x":2, "y":2}, - {"label":"K23 (D6,B2)", "x":3, "y":2}, - {"label":"K24 (D6,B4)", "x":4, "y":2}, - {"label":"K30 (D2,F5)", "x":0, "y":3}, - {"label":"K31 (D2,C7)", "x":1, "y":3}, - {"label":"K32 (D2,B7)", "x":2, "y":3}, - {"label":"K33 (D2,B2)", "x":3, "y":3}, - {"label":"K34 (D2,B4)", "x":4, "y":3}, - {"label":"K40 (B6,F5)", "x":0, "y":4}, - {"label":"K41 (B6,C7)", "x":1, "y":4}, - {"label":"K42 (B6,B7)", "x":2, "y":4}, - {"label":"K43 (B6,B2)", "x":3, "y":4}, - {"label":"K44 (B6,B4)", "x":4, "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": [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": [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": [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": [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} ] } } diff --git a/keyboards/winry/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h deleted file mode 100644 index 5498dd8d6b..0000000000 --- a/keyboards/winry/winry25tc/winry25tc.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Andrzej Ressel (andrzej.ressel@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( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, K44 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 }, \ -} diff --git a/keyboards/woodkeys/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c index 6036bd9991..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/1key/1key.c +++ b/keyboards/woodkeys/bigseries/1key/1key.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 "1key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h deleted file mode 100755 index 6e5ddcc760..0000000000 --- a/keyboards/woodkeys/bigseries/1key/1key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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 \ -) { \ - { k00 } \ -} diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json index 1d0a787d9a..e6243a2844 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/info.json @@ -19,7 +19,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c index cffb71907e..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/2key/2key.c +++ b/keyboards/woodkeys/bigseries/2key/2key.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 "2key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h deleted file mode 100755 index eff82fef93..0000000000 --- a/keyboards/woodkeys/bigseries/2key/2key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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 \ -) { \ - { k00, k01 } \ -} diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json index c3a2b62eb8..1a5d5bd34d 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/info.json @@ -19,8 +19,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c index 3735c10543..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/3key/3key.c +++ b/keyboards/woodkeys/bigseries/3key/3key.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 "3key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h deleted file mode 100755 index caee1e4551..0000000000 --- a/keyboards/woodkeys/bigseries/3key/3key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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 \ -) { \ - { k00, k01, k02 } \ -} diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json index 43b99312db..fd7172fbcb 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/info.json @@ -19,9 +19,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4}, - {"x": 8, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 2], "x": 8, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h deleted file mode 100755 index 7e9ff7a793..0000000000 --- a/keyboards/woodkeys/bigseries/4key/4key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2018 Cole Markham - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You 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, \ - k10, k11 \ -) { \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json index 8fb9a9071a..d151eeea6b 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/info.json @@ -19,11 +19,11 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}, - {"x": 0, "y": 4, "w": 4, "h": 4}, - {"x": 4, "y": 4, "w": 4, "h": 4} + {"matrix": [1, 0], "x": 0, "y": 4, "w": 4, "h": 4}, + {"matrix": [1, 1], "x": 4, "y": 4, "w": 4, "h": 4} ] } } diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 00e70ab0db..4c84fb0008 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -27,19 +27,18 @@ "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": "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} ] } } diff --git a/keyboards/work_louder/loop/loop.h b/keyboards/work_louder/loop/loop.h index a7376881b3..b2cb2410fc 100644 --- a/keyboards/work_louder/loop/loop.h +++ b/keyboards/work_louder/loop/loop.h @@ -18,17 +18,3 @@ #include "quantum.h" #include "rgb_functions.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 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b } \ -} diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 798127b4c0..f24f612ca5 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -26,9 +26,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h index cc152b8ccc..04de456eca 100644 --- a/keyboards/work_louder/nano/nano.h +++ b/keyboards/work_louder/nano/nano.h @@ -18,17 +18,3 @@ #include "quantum.h" #include "rgb_functions.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 \ -) { \ - { k00, k01, k02 } \ -} diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json index e348f8af5a..3c0c0e29b8 100644 --- a/keyboards/wuque/mammoth20x/info.json +++ b/keyboards/wuque/mammoth20x/info.json @@ -26,34 +26,34 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "Pause", "x": 1, "y": 0 }, - { "label": "Delete", "x": 2, "y": 0 }, - { "label": "LeftEncode", "x": 3, "y": 0, "w": 0.5 }, - { "label": "EncoderClick", "x": 3.5, "y": 0 }, - { "label": "RightEncode", "x": 4.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": [2, 3], "x": 3, "y": 0, "w": 0.5}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [4, 3], "x": 4.5, "y": 0, "w": 0.5}, - { "label": "Num", "x": 0, "y": 1 }, - { "label": "/", "x": 1, "y": 1 }, - { "label": "*", "x": 2, "y": 1 }, - { "label": "-", "x": 3, "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}, - { "label": "7", "x": 0, "y": 2 }, - { "label": "8", "x": 1, "y": 2 }, - { "label": "9", "x": 2, "y": 2 }, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, - { "label": "4", "x": 0, "y": 3 }, - { "label": "5", "x": 1, "y": 3 }, - { "label": "6", "x": 2, "y": 3 }, - { "label": "+", "x": 3, "y": 2, "h": 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": 2, "h": 2}, - { "label": "1", "x": 0, "y": 4 }, - { "label": "2", "x": 1, "y": 4 }, - { "label": "3", "x": 2, "y": 4 }, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, - { "label": "0", "x": 0, "y": 5, "w": 2 }, - { "label": ".", "x": 2, "y": 5 }, - { "label": "Enter", "x": 3, "y": 4,"h":2 } + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 4, "h": 2} ] } } diff --git a/keyboards/wuque/mammoth20x/mammoth20x.c b/keyboards/wuque/mammoth20x/mammoth20x.c index 4619ef5dde..eeaea79c71 100644 --- a/keyboards/wuque/mammoth20x/mammoth20x.c +++ b/keyboards/wuque/mammoth20x/mammoth20x.c @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#include "mammoth20x.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/wuque/mammoth20x/mammoth20x.h b/keyboards/wuque/mammoth20x/mammoth20x.h deleted file mode 100644 index 408788bf60..0000000000 --- a/keyboards/wuque/mammoth20x/mammoth20x.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 wuquestudio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, K23, K03, K43, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K50, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, KC_NO, K52, K53 }, \ -} diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json index 6ec3f15d62..3c2e69eb83 100644 --- a/keyboards/xbows/numpad/info.json +++ b/keyboards/xbows/numpad/info.json @@ -19,34 +19,33 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Tab", "x":1, "y":0}, - {"label":"Backspace", "x":2, "y":0}, - {"label":"Fn", "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}, - {"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": [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}, - {"label":"7", "x":0, "y":2.5}, - {"label":"8", "x":1, "y":2.5}, - {"label":"9", "x":2, "y":2.5}, - {"label":"-", "x":3, "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.5}, + {"matrix": [2, 3], "x": 3, "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":3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5}, - {"label":"1", "x":0, "y":4.5}, - {"label":"2", "x":1, "y":4.5}, - {"label":"3", "x":2, "y":4.5}, - {"label":"Enter", "x":3, "y":4.5, "h":2}, - - {"label":"0", "x":0, "y":5.5, "w":2}, - {"label":".", "x":2, "y":5.5} + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.5} ] } } diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c index 4d6c256981..da20172f34 100644 --- a/keyboards/xbows/numpad/numpad.c +++ b/keyboards/xbows/numpad/numpad.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 "numpad.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/xbows/numpad/numpad.h b/keyboards/xbows/numpad/numpad.h deleted file mode 100644 index c160bff757..0000000000 --- a/keyboards/xbows/numpad/numpad.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, \ - K100, K101, K102, K103, \ - K200, K201, K202, K203, \ - K300, K301, K302, K303, \ - K400, K401, K402, K403, \ - K500, K502 \ -) \ - { \ - { K000, K001, K002, K003 }, \ - { K100, K101, K102, K103 }, \ - { K200, K201, K202, K203 }, \ - { K300, K301, K302, K303 }, \ - { K400, K401, K402, K403 }, \ - { K500, KC_NO,K502, KC_NO} \ -} diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json index d0e4b42329..98afd2252b 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/info.json @@ -19,28 +19,28 @@ "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}, + {"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}, - {"label":"k10", "x":0, "y":1}, - {"label":"k11", "x":1, "y":1}, - {"label":"k12", "x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"label":"k20", "x":0, "y":2}, - {"label":"k21", "x":1, "y":2}, - {"label":"k22", "x":2, "y":2}, - {"label":"k13", "x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"label":"k30", "x":0, "y":3}, - {"label":"k31", "x":1, "y":3}, - {"label":"k32", "x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "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":3, "h":2} + {"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": 3, "h": 2} ] } } diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c index eab218d3b9..45b0c42484 100644 --- a/keyboards/yampad/yampad.c +++ b/keyboards/yampad/yampad.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 "yampad.h" +#include "quantum.h" #if defined(OLED_ENABLE) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/yampad/yampad.h b/keyboards/yampad/yampad.h deleted file mode 100644 index 68ec98ffdd..0000000000 --- a/keyboards/yampad/yampad.h +++ /dev/null @@ -1,57 +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 ___ 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. - */ - -/* COSPAD numpad matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | | - * |----|----|----| 13 | - * | 20 | 21 | 22 | | - * |----|----|----|----| - * | 30 | 31 | 32 | | - * |----|----|----| 43 | - * | 40 | 41 | 42 | | - * `-------------------' - */ -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k42, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, ___}, \ - {k30, k31, k32, ___}, \ - {k40, k41, k42, k43} \ -} diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json index ef1402a41e..0da556eb1f 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/info.json @@ -18,19 +18,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0.5, "y":0.5}, - {"label":"0,1", "x":1.5, "y":0.175}, - {"label":"0,2", "x":2.5, "y":0}, - {"label":"0,3", "x":3.5, "y":0.5}, + {"matrix": [0, 0], "x": 0.5, "y": 0.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0.175}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0.5}, - {"label":"1,0", "x":0.5, "y":1.5}, - {"label":"1,1", "x":1.5, "y":1.175}, - {"label":"1,2", "x":2.5, "y":1}, - {"label":"1,3", "x":3.5, "y":1.5}, + {"matrix": [1, 0], "x": 0.5, "y": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.175}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, - {"label":"2,0", "x":0, "y":3}, - {"label":"2,1", "x":1, "y":2.75}, - {"label":"2,2", "x":2, "y":3} + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 3} ] } } diff --git a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h b/keyboards/yoichiro/lunakey_macro/lunakey_macro.h deleted file mode 100644 index 487b7fe208..0000000000 --- a/keyboards/yoichiro/lunakey_macro/lunakey_macro.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - k10, k11, k12, k13, \ - k20, k21, k22 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, KC_NO } \ -} diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index e5eb64db84..0a6c30f9ea 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -23,9 +23,26 @@ "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":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} + {"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": [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": [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} ] } } diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index ed9fe97097..d6fe84199b 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quick17.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h deleted file mode 100644 index 566df71069..0000000000 --- a/keyboards/yushakobo/quick17/quick17.h +++ /dev/null @@ -1,38 +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" - -/* 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, \ - k20, k21, k22, k23, k24, k25 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 } \ -} diff --git a/keyboards/yynmt/dozen0/dozen0.h b/keyboards/yynmt/dozen0/dozen0.h deleted file mode 100644 index e2ab35bcef..0000000000 --- a/keyboards/yynmt/dozen0/dozen0.h +++ /dev/null @@ -1,34 +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( \ - K00, K01, K02, K03, K04, K05, \ - K06, K07, K08, K09, K10, K11 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11 }, \ -} diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json index 0c73591326..d787dd53c6 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/info.json @@ -18,8 +18,19 @@ "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 0, "y": 1}, + {"matrix": [0, 7], "x": 1, "y": 1}, + {"matrix": [0, 8], "x": 2, "y": 1}, + {"matrix": [0, 9], "x": 3, "y": 1}, + {"matrix": [0, 10], "x": 4, "y": 1}, + {"matrix": [0, 11], "x": 5, "y": 1} ] } } diff --git a/keyboards/zfrontier/big_switch/big_switch.h b/keyboards/zfrontier/big_switch/big_switch.h deleted file mode 100644 index d12184932d..0000000000 --- a/keyboards/zfrontier/big_switch/big_switch.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 zFrontier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 \ -) \ -{ \ - { K00 } \ -} diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index 0e52f3a29d..72cf7de0c2 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -18,7 +18,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4} ] } } -- cgit v1.3.1 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- data/mappings/info_config.hjson | 3 +- data/schemas/keyboard.jsonschema | 6 +- docs/config_options.md | 4 +- docs/feature_rgb_matrix.md | 2 +- docs/feature_rgblight.md | 14 +- docs/ws2812_driver.md | 4 +- keyboards/0_sixty/underglow/config.h | 1 - keyboards/0_sixty/underglow/info.json | 3 + keyboards/0xcb/1337/config.h | 1 - keyboards/0xcb/1337/info.json | 3 + keyboards/0xcb/splaytoraid/config.h | 2 - keyboards/0xcb/splaytoraid/info.json | 3 + keyboards/0xcb/tutelpad/config.h | 1 - keyboards/0xcb/tutelpad/info.json | 3 + keyboards/10bleoledhub/config.h | 1 - keyboards/10bleoledhub/info.json | 3 + keyboards/1k/config.h | 1 - keyboards/1k/info.json | 3 + keyboards/1upkeyboards/1up60hse/config.h | 1 - keyboards/1upkeyboards/1up60hse/info.json | 3 + keyboards/1upkeyboards/1up60hte/config.h | 1 - keyboards/1upkeyboards/1up60hte/info.json | 3 + keyboards/1upkeyboards/1up60rgb/config.h | 1 - keyboards/1upkeyboards/1up60rgb/info.json | 3 + keyboards/1upkeyboards/pi40/config.h | 1 - keyboards/1upkeyboards/pi40/grid_v1_1/info.json | 1 + keyboards/1upkeyboards/pi40/mit_v1_0/info.json | 1 + keyboards/1upkeyboards/pi40/mit_v1_1/info.json | 1 + keyboards/1upkeyboards/pi60/config.h | 1 - keyboards/1upkeyboards/pi60/info.json | 1 + keyboards/1upkeyboards/pi60_hse/config.h | 1 - keyboards/1upkeyboards/pi60_hse/info.json | 1 + keyboards/1upkeyboards/pi60_rgb/config.h | 2 - keyboards/1upkeyboards/pi60_rgb/info.json | 1 + keyboards/1upkeyboards/super16/config.h | 1 - keyboards/1upkeyboards/super16/info.json | 3 + keyboards/1upkeyboards/super16v2/config.h | 1 - keyboards/1upkeyboards/super16v2/info.json | 3 + keyboards/1upkeyboards/sweet16/v1/config.h | 1 - keyboards/1upkeyboards/sweet16/v1/info.json | 3 + keyboards/1upkeyboards/sweet16v2/kb2040/config.h | 1 - keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 1 + .../1upkeyboards/sweet16v2/pro_micro/config.h | 1 - .../1upkeyboards/sweet16v2/pro_micro/info.json | 3 + keyboards/25keys/aleth42/rev0/config.h | 1 - keyboards/25keys/aleth42/rev0/info.json | 3 + keyboards/25keys/aleth42/rev1/config.h | 1 - keyboards/25keys/aleth42/rev1/info.json | 3 + keyboards/25keys/cassette42/config.h | 1 - keyboards/25keys/cassette42/info.json | 3 + keyboards/25keys/zinc/rev1/config.h | 3 - keyboards/25keys/zinc/rev1/info.json | 3 + keyboards/25keys/zinc/reva/config.h | 3 - keyboards/25keys/zinc/reva/info.json | 3 + keyboards/2key2crawl/config.h | 1 - keyboards/2key2crawl/info.json | 3 + keyboards/3keyecosystem/2key2/config.h | 1 - keyboards/3keyecosystem/2key2/info.json | 3 + .../gherkin/keymaps/itsaferbie/config.h | 4 +- .../40percentclub/gherkin/keymaps/michel/config.h | 4 +- keyboards/40percentclub/luddite/config.h | 1 - keyboards/40percentclub/luddite/info.json | 3 + keyboards/40percentclub/nano/config.h | 1 - keyboards/40percentclub/nano/info.json | 3 + keyboards/40percentclub/nori/config.h | 1 - keyboards/40percentclub/nori/info.json | 3 + keyboards/40percentclub/tomato/config.h | 1 - keyboards/40percentclub/tomato/info.json | 3 + keyboards/40percentclub/ut47/keymaps/rgb/config.h | 2 +- keyboards/4pplet/aekiso60/rev_a/config.h | 1 - keyboards/4pplet/aekiso60/rev_a/info.json | 3 + keyboards/4pplet/aekiso60/rev_b/config.h | 1 - keyboards/4pplet/aekiso60/rev_b/info.json | 3 + keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 1 - keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 1 + keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 1 - keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 3 + keyboards/4pplet/steezy60/rev_a/info.json | 4 +- keyboards/4pplet/steezy60/rev_b/info.json | 4 +- keyboards/4pplet/waffling60/rev_b/config.h | 1 - keyboards/4pplet/waffling60/rev_b/info.json | 3 + keyboards/4pplet/waffling60/rev_c/config.h | 1 - keyboards/4pplet/waffling60/rev_c/info.json | 3 + keyboards/4pplet/waffling60/rev_d/config.h | 1 - keyboards/4pplet/waffling60/rev_d/info.json | 3 + keyboards/4pplet/waffling80/rev_a/config.h | 1 - keyboards/4pplet/waffling80/rev_a/info.json | 3 + keyboards/4pplet/waffling80/rev_b/config.h | 1 - keyboards/4pplet/waffling80/rev_b/info.json | 3 + keyboards/8pack/config.h | 1 - keyboards/8pack/info.json | 3 + keyboards/9key/config.h | 3 - keyboards/9key/info.json | 3 + keyboards/abacus/config.h | 2 - keyboards/abacus/info.json | 3 + keyboards/abatskeyboardclub/nayeon/config.h | 1 - keyboards/abatskeyboardclub/nayeon/info.json | 1 + keyboards/abstract/ellipse/rev1/config.h | 1 - keyboards/abstract/ellipse/rev1/info.json | 3 + keyboards/acekeyboard/titan60/config.h | 1 - keyboards/acekeyboard/titan60/info.json | 3 + keyboards/acheron/apollo/87h/delta/config.h | 1 - keyboards/acheron/apollo/87h/delta/info.json | 3 + keyboards/acheron/apollo/87htsc/config.h | 1 - keyboards/acheron/apollo/87htsc/info.json | 3 + keyboards/acheron/apollo/88htsc/config.h | 1 - keyboards/acheron/apollo/88htsc/info.json | 3 + keyboards/acheron/athena/alpha/config.h | 1 - keyboards/acheron/athena/alpha/info.json | 3 + keyboards/acheron/athena/beta/config.h | 1 - keyboards/acheron/athena/beta/info.json | 3 + keyboards/acheron/elongate/beta/config.h | 1 - keyboards/acheron/elongate/beta/info.json | 3 + keyboards/acheron/elongate/delta/config.h | 1 - keyboards/acheron/elongate/delta/info.json | 3 + keyboards/acheron/shark/beta/config.h | 1 - keyboards/acheron/shark/beta/info.json | 3 + keyboards/ada/ada1800mini/config.h | 1 - keyboards/ada/ada1800mini/info.json | 3 + keyboards/ada/infinity81/config.h | 1 - keyboards/ada/infinity81/info.json | 3 + keyboards/adafruit/macropad/config.h | 1 - keyboards/adafruit/macropad/info.json | 1 + keyboards/adm42/info.json | 3 + keyboards/adm42/rev4/config.h | 2 - keyboards/adpenrose/akemipad/config.h | 2 - keyboards/adpenrose/akemipad/info.json | 3 + keyboards/adpenrose/kintsugi/config.h | 1 - keyboards/adpenrose/kintsugi/info.json | 3 + keyboards/adpenrose/obi/config.h | 1 - keyboards/adpenrose/obi/info.json | 3 + keyboards/aeboards/ext65/rev2/config.h | 1 - keyboards/aeboards/ext65/rev2/info.json | 1 + keyboards/ai03/polaris/config.h | 1 - keyboards/ai03/polaris/info.json | 3 + keyboards/ai03/voyager60_alps/config.h | 1 - keyboards/ai03/voyager60_alps/info.json | 3 + keyboards/aleblazer/zodiark/config.h | 2 - keyboards/aleblazer/zodiark/info.json | 3 + keyboards/alf/dc60/config.h | 1 - keyboards/alf/dc60/info.json | 3 + keyboards/alf/x11/config.h | 1 - keyboards/alf/x11/info.json | 3 + keyboards/alf/x2/config.h | 1 - keyboards/alf/x2/info.json | 3 + keyboards/alfredslab/swift65/hotswap/config.h | 1 - keyboards/alfredslab/swift65/hotswap/info.json | 3 + keyboards/alfredslab/swift65/solder/config.h | 1 - keyboards/alfredslab/swift65/solder/info.json | 3 + keyboards/alpha/config.h | 1 - keyboards/alpha/info.json | 3 + keyboards/alpine65/config.h | 1 - keyboards/alpine65/info.json | 3 + keyboards/amjkeyboard/amj40/config.h | 1 - keyboards/amjkeyboard/amj40/info.json | 3 + keyboards/amjkeyboard/amj60/config.h | 1 - keyboards/amjkeyboard/amj60/info.json | 3 + keyboards/amjkeyboard/amj96/config.h | 1 - keyboards/amjkeyboard/amj96/info.json | 3 + keyboards/amjkeyboard/amjpad/config.h | 1 - keyboards/amjkeyboard/amjpad/info.json | 3 + keyboards/an_achronism/tetromino/info.json | 4 +- keyboards/anavi/knob1/info.json | 2 +- keyboards/anavi/knobs3/info.json | 2 +- keyboards/anavi/macropad10/info.json | 2 +- keyboards/anavi/macropad8/config.h | 1 - keyboards/anavi/macropad8/info.json | 3 + keyboards/aos/tkl/config.h | 2 - keyboards/aos/tkl/info.json | 3 + keyboards/arabica37/rev1/config.h | 3 - keyboards/arabica37/rev1/info.json | 3 + keyboards/ask55/info.json | 4 +- keyboards/atlantis/ak81_ve/config.h | 2 - keyboards/atlantis/ak81_ve/info.json | 3 + keyboards/atlantis/ps17/config.h | 1 - keyboards/atlantis/ps17/info.json | 3 + keyboards/atxkb/1894/config.h | 1 - keyboards/atxkb/1894/info.json | 3 + keyboards/aurora65/config.h | 1 - keyboards/aurora65/info.json | 1 + keyboards/avalanche/v2/config.h | 2 - keyboards/avalanche/v2/info.json | 3 + keyboards/avalanche/v3/config.h | 2 - keyboards/avalanche/v3/info.json | 3 + keyboards/avalanche/v4/config.h | 1 - keyboards/avalanche/v4/info.json | 3 + keyboards/aves60/config.h | 1 - keyboards/aves60/info.json | 3 + keyboards/aves65/config.h | 1 - keyboards/aves65/info.json | 3 + keyboards/bandominedoni/config.h | 2 - keyboards/bandominedoni/info.json | 3 + keyboards/barleycorn_smd/config.h | 1 - keyboards/barleycorn_smd/info.json | 3 + keyboards/basekeys/slice/rev1_rgb/config.h | 1 - keyboards/basekeys/slice/rev1_rgb/info.json | 3 + keyboards/basekeys/trifecta/config.h | 2 - keyboards/basekeys/trifecta/info.json | 3 + .../bastardkb/charybdis/3x5/blackpill/config.h | 1 - .../bastardkb/charybdis/3x5/blackpill/info.json | 1 + .../charybdis/3x5/keymaps/drashna/config.h | 4 +- .../bastardkb/charybdis/3x5/v1/elitec/config.h | 3 - .../bastardkb/charybdis/3x5/v1/elitec/info.json | 3 + .../bastardkb/charybdis/3x5/v2/elitec/config.h | 3 - .../bastardkb/charybdis/3x5/v2/elitec/info.json | 3 + .../bastardkb/charybdis/3x5/v2/splinky_2/config.h | 3 - .../bastardkb/charybdis/3x5/v2/splinky_2/info.json | 1 + .../bastardkb/charybdis/3x5/v2/splinky_3/config.h | 3 - .../bastardkb/charybdis/3x5/v2/splinky_3/info.json | 1 + .../bastardkb/charybdis/3x5/v2/stemcell/config.h | 1 - .../bastardkb/charybdis/3x5/v2/stemcell/info.json | 1 + .../bastardkb/charybdis/3x6/blackpill/config.h | 1 - .../bastardkb/charybdis/3x6/blackpill/info.json | 1 + .../bastardkb/charybdis/3x6/v1/elitec/config.h | 3 - .../bastardkb/charybdis/3x6/v1/elitec/info.json | 3 + .../bastardkb/charybdis/3x6/v2/elitec/config.h | 3 - .../bastardkb/charybdis/3x6/v2/elitec/info.json | 3 + .../bastardkb/charybdis/3x6/v2/splinky_2/config.h | 3 - .../bastardkb/charybdis/3x6/v2/splinky_2/info.json | 1 + .../bastardkb/charybdis/3x6/v2/splinky_3/config.h | 3 - .../bastardkb/charybdis/3x6/v2/splinky_3/info.json | 1 + .../bastardkb/charybdis/3x6/v2/stemcell/config.h | 1 - .../bastardkb/charybdis/3x6/v2/stemcell/info.json | 1 + .../bastardkb/charybdis/4x6/blackpill/config.h | 1 - .../bastardkb/charybdis/4x6/blackpill/info.json | 1 + .../bastardkb/charybdis/4x6/v1/elitec/config.h | 3 - .../bastardkb/charybdis/4x6/v1/elitec/info.json | 3 + .../bastardkb/charybdis/4x6/v2/elitec/config.h | 3 - .../bastardkb/charybdis/4x6/v2/elitec/info.json | 3 + .../bastardkb/charybdis/4x6/v2/splinky_2/config.h | 3 - .../bastardkb/charybdis/4x6/v2/splinky_2/info.json | 1 + .../bastardkb/charybdis/4x6/v2/splinky_3/config.h | 3 - .../bastardkb/charybdis/4x6/v2/splinky_3/info.json | 1 + .../bastardkb/charybdis/4x6/v2/stemcell/config.h | 1 - .../bastardkb/charybdis/4x6/v2/stemcell/info.json | 1 + keyboards/bastardkb/dilemma/3x5_3/config.h | 4 - keyboards/bastardkb/dilemma/3x5_3/info.json | 1 + keyboards/bastardkb/scylla/blackpill/config.h | 1 - keyboards/bastardkb/scylla/blackpill/info.json | 1 + keyboards/bastardkb/scylla/v1/elitec/config.h | 3 - keyboards/bastardkb/scylla/v1/elitec/info.json | 3 + keyboards/bastardkb/scylla/v2/elitec/config.h | 3 - keyboards/bastardkb/scylla/v2/elitec/info.json | 3 + keyboards/bastardkb/scylla/v2/splinky_2/config.h | 3 - keyboards/bastardkb/scylla/v2/splinky_2/info.json | 1 + keyboards/bastardkb/scylla/v2/splinky_3/config.h | 3 - keyboards/bastardkb/scylla/v2/splinky_3/info.json | 1 + keyboards/bastardkb/scylla/v2/stemcell/config.h | 1 - keyboards/bastardkb/scylla/v2/stemcell/info.json | 1 + keyboards/bastardkb/skeletyl/blackpill/config.h | 1 - keyboards/bastardkb/skeletyl/blackpill/info.json | 1 + keyboards/bastardkb/skeletyl/v1/elitec/config.h | 3 - keyboards/bastardkb/skeletyl/v1/elitec/info.json | 3 + keyboards/bastardkb/skeletyl/v2/elitec/config.h | 3 - keyboards/bastardkb/skeletyl/v2/elitec/info.json | 3 + keyboards/bastardkb/skeletyl/v2/splinky_2/config.h | 3 - .../bastardkb/skeletyl/v2/splinky_2/info.json | 1 + keyboards/bastardkb/skeletyl/v2/splinky_3/config.h | 3 - .../bastardkb/skeletyl/v2/splinky_3/info.json | 1 + keyboards/bastardkb/skeletyl/v2/stemcell/config.h | 1 - keyboards/bastardkb/skeletyl/v2/stemcell/info.json | 1 + keyboards/bastardkb/tbk/config.h | 1 - keyboards/bastardkb/tbk/info.json | 3 + keyboards/bastardkb/tbkmini/blackpill/config.h | 1 - keyboards/bastardkb/tbkmini/blackpill/info.json | 1 + keyboards/bastardkb/tbkmini/v1/elitec/config.h | 3 - keyboards/bastardkb/tbkmini/v1/elitec/info.json | 3 + keyboards/bastardkb/tbkmini/v2/elitec/config.h | 3 - keyboards/bastardkb/tbkmini/v2/elitec/info.json | 3 + keyboards/bastardkb/tbkmini/v2/splinky_2/config.h | 3 - keyboards/bastardkb/tbkmini/v2/splinky_2/info.json | 1 + keyboards/bastardkb/tbkmini/v2/splinky_3/config.h | 3 - keyboards/bastardkb/tbkmini/v2/splinky_3/info.json | 1 + keyboards/bastardkb/tbkmini/v2/stemcell/config.h | 1 - keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 1 + keyboards/bbrfkr/dynamis/config.h | 1 - keyboards/bbrfkr/dynamis/info.json | 3 + keyboards/bemeier/bmek/rev1/config.h | 19 -- keyboards/bemeier/bmek/rev1/info.json | 3 + keyboards/bemeier/bmek/rev2/config.h | 18 -- keyboards/bemeier/bmek/rev2/info.json | 3 + keyboards/bemeier/bmek/rev3/config.h | 18 -- keyboards/bemeier/bmek/rev3/info.json | 3 + keyboards/biacco42/ergo42/rev1/config.h | 1 - keyboards/biacco42/ergo42/rev1/info.json | 3 + keyboards/binepad/bn006/config.h | 1 - keyboards/binepad/bn006/info.json | 3 + keyboards/bioi/f60/config.h | 1 - keyboards/bioi/f60/info.json | 3 + keyboards/bioi/g60/config.h | 1 - keyboards/bioi/g60/info.json | 3 + keyboards/bioi/g60ble/config.h | 1 - keyboards/bioi/g60ble/info.json | 3 + keyboards/bioi/morgan65/config.h | 1 - keyboards/bioi/morgan65/info.json | 3 + keyboards/bioi/s65/config.h | 1 - keyboards/bioi/s65/info.json | 3 + keyboards/black_hellebore/config.h | 1 - keyboards/black_hellebore/info.json | 1 + keyboards/blackplum/config.h | 1 - keyboards/blackplum/info.json | 3 + keyboards/blockboy/ac980mini/config.h | 1 - keyboards/blockboy/ac980mini/info.json | 3 + keyboards/blockey/config.h | 3 - keyboards/blockey/info.json | 3 + keyboards/bluebell/swoop/config.h | 1 - keyboards/bluebell/swoop/info.json | 3 + keyboards/boardrun/bizarre/config.h | 1 - keyboards/boardrun/bizarre/info.json | 3 + keyboards/boardrun/classic/config.h | 1 - keyboards/boardrun/classic/info.json | 3 + keyboards/boardsource/beiwagon/config.h | 1 - keyboards/boardsource/beiwagon/info.json | 3 + keyboards/boardsource/holiday/spooky/info.json | 4 +- keyboards/boardsource/lulu/avr/info.json | 2 +- keyboards/boardsource/lulu/rp2040/config.h | 1 - keyboards/boardsource/lulu/rp2040/info.json | 1 + keyboards/boardsource/microdox/v1/info.json | 6 +- keyboards/boardsource/microdox/v2/config.h | 1 - keyboards/boardsource/microdox/v2/info.json | 3 + keyboards/boardsource/technik_o/config.h | 1 - keyboards/boardsource/technik_o/info.json | 3 + keyboards/boardsource/technik_s/config.h | 1 - keyboards/boardsource/technik_s/info.json | 3 + keyboards/boardsource/the_mark/info.json | 4 +- keyboards/boardwalk/config.h | 1 - keyboards/boardwalk/info.json | 3 + keyboards/bolsa/bolsalice/config.h | 1 - keyboards/bolsa/bolsalice/info.json | 3 + keyboards/boston/config.h | 1 - keyboards/boston/info.json | 3 + keyboards/boston_meetup/2019/config.h | 1 - keyboards/boston_meetup/2019/info.json | 3 + keyboards/bpiphany/four_banger/config.h | 1 - keyboards/bpiphany/four_banger/info.json | 3 + keyboards/bt66tech/bt66tech60/config.h | 1 - keyboards/bt66tech/bt66tech60/info.json | 1 + keyboards/bubble75/hotswap/config.h | 1 - keyboards/bubble75/hotswap/info.json | 3 + keyboards/buildakb/potato65/config.h | 1 - keyboards/buildakb/potato65/info.json | 3 + keyboards/buildakb/potato65hs/config.h | 1 - keyboards/buildakb/potato65hs/info.json | 3 + keyboards/buildakb/potato65s/config.h | 1 - keyboards/buildakb/potato65s/info.json | 3 + keyboards/cablecardesigns/cypher/rev6/config.h | 1 - keyboards/cablecardesigns/cypher/rev6/info.json | 3 + keyboards/canary/canary60rgb/info.json | 3 + keyboards/canary/canary60rgb/v1/config.h | 1 - keyboards/cannonkeys/adelie/config.h | 1 - keyboards/cannonkeys/adelie/info.json | 3 + keyboards/cannonkeys/an_c/config.h | 1 - keyboards/cannonkeys/an_c/info.json | 1 + keyboards/cannonkeys/atlas/config.h | 1 - keyboards/cannonkeys/atlas/info.json | 1 + keyboards/cannonkeys/atlas_alps/config.h | 1 - keyboards/cannonkeys/atlas_alps/info.json | 3 + keyboards/cannonkeys/cloudline/config.h | 1 - keyboards/cannonkeys/cloudline/info.json | 1 + keyboards/cannonkeys/db60/config.h | 1 - keyboards/cannonkeys/db60/info.json | 1 + keyboards/cannonkeys/devastatingtkl/config.h | 1 - keyboards/cannonkeys/devastatingtkl/info.json | 1 + keyboards/cannonkeys/hoodrowg/config.h | 1 - keyboards/cannonkeys/hoodrowg/info.json | 3 + keyboards/cannonkeys/instant60/config.h | 1 - keyboards/cannonkeys/instant60/info.json | 1 + keyboards/cannonkeys/instant65/config.h | 1 - keyboards/cannonkeys/instant65/info.json | 1 + keyboards/cannonkeys/malicious_ergo/config.h | 1 - keyboards/cannonkeys/malicious_ergo/info.json | 1 + keyboards/cannonkeys/obliterated75/config.h | 1 - keyboards/cannonkeys/obliterated75/info.json | 1 + keyboards/cannonkeys/ortho48/config.h | 1 - keyboards/cannonkeys/ortho48/info.json | 1 + keyboards/cannonkeys/ortho60/config.h | 1 - keyboards/cannonkeys/ortho60/info.json | 1 + keyboards/cannonkeys/ortho75/config.h | 1 - keyboards/cannonkeys/ortho75/info.json | 1 + keyboards/cannonkeys/practice60/config.h | 1 - keyboards/cannonkeys/practice60/info.json | 1 + keyboards/cannonkeys/practice65/config.h | 1 - keyboards/cannonkeys/practice65/info.json | 1 + keyboards/cannonkeys/sagittarius/config.h | 1 - keyboards/cannonkeys/sagittarius/info.json | 1 + keyboards/cannonkeys/savage65/config.h | 1 - keyboards/cannonkeys/savage65/info.json | 1 + keyboards/cannonkeys/serenity/info.json | 4 +- keyboards/cannonkeys/tmov2/config.h | 1 - keyboards/cannonkeys/tmov2/info.json | 1 + keyboards/cannonkeys/tsukuyomi/config.h | 1 - keyboards/cannonkeys/tsukuyomi/info.json | 1 + keyboards/capsunlocked/cu24/config.h | 1 - keyboards/capsunlocked/cu24/info.json | 3 + keyboards/capsunlocked/cu7/config.h | 1 - keyboards/capsunlocked/cu7/info.json | 3 + keyboards/capsunlocked/cu75/config.h | 1 - keyboards/capsunlocked/cu75/info.json | 3 + keyboards/capsunlocked/cu80/v2_ansi/info.json | 4 +- keyboards/capsunlocked/cu80/v2_iso/info.json | 4 +- keyboards/catch22/config.h | 1 - keyboards/catch22/info.json | 3 + keyboards/chalice/config.h | 2 - keyboards/chalice/info.json | 3 + keyboards/charue/sunsetter_r2/config.h | 1 - keyboards/charue/sunsetter_r2/info.json | 3 + keyboards/checkerboards/axon40/config.h | 1 - keyboards/checkerboards/axon40/info.json | 3 + keyboards/checkerboards/candybar_ortho/config.h | 1 - keyboards/checkerboards/candybar_ortho/info.json | 3 + keyboards/checkerboards/nop60/config.h | 1 - keyboards/checkerboards/nop60/info.json | 3 + keyboards/checkerboards/plexus75/config.h | 1 - keyboards/checkerboards/plexus75/info.json | 3 + keyboards/checkerboards/plexus75_he/config.h | 1 - keyboards/checkerboards/plexus75_he/info.json | 3 + keyboards/checkerboards/pursuit40/config.h | 1 - keyboards/checkerboards/pursuit40/info.json | 3 + keyboards/checkerboards/quark/config.h | 1 - keyboards/checkerboards/quark/info.json | 3 + keyboards/checkerboards/quark_lp/config.h | 2 - keyboards/checkerboards/quark_lp/info.json | 3 + keyboards/checkerboards/quark_plus/config.h | 1 - keyboards/checkerboards/quark_plus/info.json | 3 + keyboards/checkerboards/quark_squared/config.h | 1 - keyboards/checkerboards/quark_squared/info.json | 3 + keyboards/checkerboards/snop60/config.h | 1 - keyboards/checkerboards/snop60/info.json | 3 + keyboards/checkerboards/ud40_ortho_alt/config.h | 1 - keyboards/checkerboards/ud40_ortho_alt/info.json | 3 + keyboards/cherrybstudio/cb1800/config.h | 1 - keyboards/cherrybstudio/cb1800/info.json | 3 + keyboards/cherrybstudio/cb65/config.h | 1 - keyboards/cherrybstudio/cb65/info.json | 3 + keyboards/cherrybstudio/cb87/config.h | 1 - keyboards/cherrybstudio/cb87/info.json | 3 + keyboards/cherrybstudio/cb87rgb/config.h | 1 - keyboards/cherrybstudio/cb87rgb/info.json | 3 + keyboards/cherrybstudio/cb87v2/config.h | 1 - keyboards/cherrybstudio/cb87v2/info.json | 3 + keyboards/cheshire/curiosity/config.h | 1 - keyboards/cheshire/curiosity/info.json | 3 + keyboards/chickenman/ciel65/info.json | 4 +- keyboards/chlx/str_merro60/config.h | 1 - keyboards/chlx/str_merro60/info.json | 3 + keyboards/chromatonemini/config.h | 3 - keyboards/chromatonemini/info.json | 3 + keyboards/cipulot/ec_23u/info.json | 4 +- keyboards/cipulot/ec_pro2/info.json | 4 +- keyboards/cipulot/ec_prox/ansi_iso/info.json | 4 +- keyboards/cipulot/ec_prox/jis/info.json | 4 +- keyboards/cipulot/kallos/config.h | 1 - keyboards/cipulot/kallos/info.json | 3 + keyboards/cipulot/rf_r1_8_9xu/info.json | 4 +- keyboards/ck60i/config.h | 1 - keyboards/ck60i/info.json | 3 + keyboards/clueboard/17/info.json | 4 +- keyboards/clueboard/2x1800/2018/info.json | 4 +- keyboards/clueboard/66/rev1/info.json | 4 +- keyboards/clueboard/66/rev2/info.json | 4 +- keyboards/clueboard/66/rev3/info.json | 4 +- keyboards/clueboard/66/rev4/info.json | 4 +- keyboards/clueboard/66_hotswap/prototype/info.json | 4 +- keyboards/clueboard/card/info.json | 4 +- keyboards/cmm_studio/fuji65/config.h | 1 - keyboards/cmm_studio/fuji65/info.json | 3 + keyboards/contender/config.h | 1 - keyboards/contender/info.json | 3 + keyboards/contra/keymaps/enigma/config.h | 2 +- keyboards/contra/keymaps/maxr1998/config.h | 2 +- keyboards/controllerworks/mini36/info.json | 10 +- keyboards/controllerworks/mini42/info.json | 10 +- keyboards/coseyfannitutti/mullet/config.h | 1 - keyboards/coseyfannitutti/mullet/info.json | 3 + keyboards/cosmo65/config.h | 1 - keyboards/cosmo65/info.json | 3 + keyboards/cozykeys/bloomer/config.h | 1 - keyboards/cozykeys/bloomer/info.json | 3 + keyboards/cozykeys/speedo/v3/config.h | 1 - keyboards/cozykeys/speedo/v3/info.json | 3 + keyboards/craftwalk/config.h | 1 - keyboards/craftwalk/info.json | 3 + keyboards/crawlpad/config.h | 1 - keyboards/crawlpad/info.json | 3 + keyboards/crazy_keyboard_68/config.h | 1 - keyboards/crazy_keyboard_68/info.json | 3 + .../crkbd/keymaps/vlukash_trackpad_right/config.h | 4 +- keyboards/crkbd/r2g/config.h | 3 - keyboards/crkbd/r2g/info.json | 3 + keyboards/crkbd/rev1/config.h | 3 - keyboards/crkbd/rev1/info.json | 3 + keyboards/crypt_macro/config.h | 1 - keyboards/crypt_macro/info.json | 1 + keyboards/custommk/evo70/info.json | 4 +- keyboards/custommk/genesis/rev1/config.h | 1 - keyboards/custommk/genesis/rev1/info.json | 3 + keyboards/custommk/genesis/rev2/config.h | 1 - keyboards/custommk/genesis/rev2/info.json | 3 + keyboards/cx60/config.h | 1 - keyboards/cx60/info.json | 3 + keyboards/cxt_studio/config.h | 1 - keyboards/cxt_studio/info.json | 3 + keyboards/dekunukem/duckypad/config.h | 1 - keyboards/dekunukem/duckypad/info.json | 3 + keyboards/delikeeb/flatbread60/config.h | 1 - keyboards/delikeeb/flatbread60/info.json | 3 + keyboards/delikeeb/vaguettelite/config.h | 1 - keyboards/delikeeb/vaguettelite/info.json | 3 + keyboards/delikeeb/vanana/rev1/config.h | 1 - keyboards/delikeeb/vanana/rev1/info.json | 3 + keyboards/delikeeb/vanana/rev2/config.h | 1 - keyboards/delikeeb/vanana/rev2/info.json | 3 + keyboards/delikeeb/waaffle/rev3/config.h | 1 - keyboards/delikeeb/waaffle/rev3/info.json | 3 + keyboards/deltasplit75/v2/config.h | 3 - keyboards/deltasplit75/v2/info.json | 3 + keyboards/demiurge/config.h | 1 - keyboards/demiurge/info.json | 3 + keyboards/deng/djam/config.h | 1 - keyboards/deng/djam/info.json | 3 + keyboards/deng/thirty/config.h | 1 - keyboards/deng/thirty/info.json | 3 + keyboards/dm9records/ergoinu/config.h | 3 - keyboards/dm9records/ergoinu/info.json | 3 + keyboards/dmqdesign/spin/config.h | 2 - keyboards/dmqdesign/spin/info.json | 3 + keyboards/do60/config.h | 2 - keyboards/do60/info.json | 3 + keyboards/doio/kb16/rev1/config.h | 1 - keyboards/doio/kb16/rev1/info.json | 3 + keyboards/doio/kb16/rev2/config.h | 1 - keyboards/doio/kb16/rev2/info.json | 3 + keyboards/doio/kb30/config.h | 1 - keyboards/doio/kb30/info.json | 3 + keyboards/doio/kb38/config.h | 1 - keyboards/doio/kb38/info.json | 3 + keyboards/doodboard/duckboard/config.h | 3 - keyboards/doodboard/duckboard/info.json | 3 + keyboards/doodboard/duckboard_r2/config.h | 3 - keyboards/doodboard/duckboard_r2/info.json | 3 + keyboards/doppelganger/config.h | 1 - keyboards/doppelganger/info.json | 3 + keyboards/doro67/rgb/config.h | 2 - keyboards/doro67/rgb/info.json | 3 + keyboards/dp60/config.h | 1 - keyboards/dp60/info.json | 3 + keyboards/dp60/keymaps/indicator/led_driver.c | 4 +- keyboards/draculad/config.h | 1 - keyboards/draculad/info.json | 3 + keyboards/draytronics/daisy/config.h | 1 - keyboards/draytronics/daisy/info.json | 3 + keyboards/draytronics/elise/config.h | 1 - keyboards/draytronics/elise/info.json | 3 + keyboards/draytronics/elise_v2/config.h | 1 - keyboards/draytronics/elise_v2/info.json | 3 + keyboards/dtisaac/dosa40rgb/config.h | 1 - keyboards/dtisaac/dosa40rgb/info.json | 3 + keyboards/duck/eagle_viper/v2/config.h | 1 - keyboards/duck/eagle_viper/v2/info.json | 3 + keyboards/duck/jetfire/config.h | 1 - keyboards/duck/jetfire/info.json | 3 + keyboards/duck/lightsaver/config.h | 1 - keyboards/duck/lightsaver/info.json | 3 + keyboards/duck/octagon/v1/config.h | 1 - keyboards/duck/octagon/v1/info.json | 3 + keyboards/duck/octagon/v2/config.h | 1 - keyboards/duck/octagon/v2/info.json | 3 + keyboards/duck/orion/v3/config.h | 1 - keyboards/duck/orion/v3/info.json | 3 + keyboards/duck/tcv3/config.h | 1 - keyboards/duck/tcv3/info.json | 3 + keyboards/dumbpad/v3x/config.h | 1 - keyboards/dumbpad/v3x/info.json | 3 + keyboards/dyz/dyz40/info.json | 4 +- keyboards/dyz/dyz60/info.json | 4 +- keyboards/dyz/dyz60_hs/info.json | 4 +- keyboards/dyz/dyz_tkl/info.json | 4 +- keyboards/dyz/selka40/info.json | 4 +- keyboards/dyz/synthesis60/info.json | 4 +- keyboards/dz60/config.h | 1 - keyboards/dz60/info.json | 3 + keyboards/dztech/bocc/config.h | 1 - keyboards/dztech/bocc/info.json | 3 + keyboards/dztech/duo_s/config.h | 1 - keyboards/dztech/duo_s/info.json | 3 + keyboards/dztech/endless80/config.h | 1 - keyboards/dztech/endless80/info.json | 3 + keyboards/ealdin/quadrant/config.h | 1 - keyboards/ealdin/quadrant/info.json | 3 + keyboards/eason/aeroboard/config.h | 1 - keyboards/eason/aeroboard/info.json | 1 + keyboards/eason/capsule65/config.h | 1 - keyboards/eason/capsule65/info.json | 3 + keyboards/ebastler/isometria_75/rev1/config.h | 1 - keyboards/ebastler/isometria_75/rev1/info.json | 1 + keyboards/eco/keymaps/bcat/config.h | 2 +- keyboards/edc40/config.h | 1 - keyboards/edc40/info.json | 3 + keyboards/edi/hardlight/mk1/config.h | 1 - keyboards/edi/hardlight/mk1/info.json | 3 + keyboards/edi/hardlight/mk2/config.h | 1 - keyboards/edi/hardlight/mk2/info.json | 1 + keyboards/edi/standaside/config.h | 1 - keyboards/edi/standaside/info.json | 3 + keyboards/edinburgh41/config.h | 1 - keyboards/edinburgh41/info.json | 3 + keyboards/eek/config.h | 1 - keyboards/eek/info.json | 3 + keyboards/ein_60/config.h | 1 - keyboards/ein_60/info.json | 3 + keyboards/elephant42/config.h | 1 - keyboards/elephant42/info.json | 3 + keyboards/ep/comsn/mollydooker/config.h | 1 - keyboards/ep/comsn/mollydooker/info.json | 3 + keyboards/ergodox_ez/config.h | 1 - keyboards/ergodox_ez/info.json | 3 + keyboards/ergoslab/rev1/config.h | 3 - keyboards/ergoslab/rev1/info.json | 3 + keyboards/ergotravel/rev1/config.h | 3 - keyboards/ergotravel/rev1/info.json | 3 + keyboards/esca/getawayvan/config.h | 1 - keyboards/esca/getawayvan/info.json | 3 + keyboards/esca/getawayvan_f042/config.h | 1 - keyboards/esca/getawayvan_f042/info.json | 3 + keyboards/eternal_keypad/config.h | 1 - keyboards/eternal_keypad/info.json | 3 + keyboards/evolv/config.h | 1 - keyboards/evolv/info.json | 3 + keyboards/evyd13/atom47/rev2/config.h | 1 - keyboards/evyd13/atom47/rev2/info.json | 3 + keyboards/evyd13/atom47/rev3/config.h | 1 - keyboards/evyd13/atom47/rev3/info.json | 3 + keyboards/evyd13/eon65/config.h | 1 - keyboards/evyd13/eon65/info.json | 3 + keyboards/evyd13/eon87/config.h | 1 - keyboards/evyd13/eon87/info.json | 3 + keyboards/evyd13/gh80_3700/keymaps/rgb/config.h | 2 +- .../evyd13/plain60/keymaps/kwerdenker/config.h | 2 +- keyboards/evyd13/plain60/keymaps/rgb/config.h | 2 +- keyboards/evyd13/ta65/config.h | 1 - keyboards/evyd13/ta65/info.json | 3 + keyboards/evyd13/wonderland/config.h | 1 - keyboards/evyd13/wonderland/info.json | 3 + keyboards/exclusive/e65/config.h | 1 - keyboards/exclusive/e65/info.json | 3 + keyboards/exclusive/e6_rgb/config.h | 1 - keyboards/exclusive/e6_rgb/info.json | 3 + keyboards/exclusive/e6v2/le/config.h | 1 - keyboards/exclusive/e6v2/le/info.json | 3 + keyboards/exclusive/e6v2/oe/config.h | 1 - keyboards/exclusive/e6v2/oe/info.json | 3 + keyboards/exclusive/e7v1/config.h | 1 - keyboards/exclusive/e7v1/info.json | 3 + keyboards/exclusive/e7v1se/config.h | 1 - keyboards/exclusive/e7v1se/info.json | 3 + keyboards/exclusive/e85/config.h | 1 - keyboards/exclusive/e85/hotswap/info.json | 3 + keyboards/exclusive/e85/soldered/info.json | 3 + keyboards/eyeohdesigns/babyv/config.h | 1 - keyboards/eyeohdesigns/babyv/info.json | 3 + keyboards/eyeohdesigns/theboulevard/config.h | 1 - keyboards/eyeohdesigns/theboulevard/info.json | 3 + keyboards/fallacy/config.h | 1 - keyboards/fallacy/info.json | 3 + keyboards/fc660c/keymaps/default_rgb/config.h | 2 +- keyboards/fc660c/keymaps/via_rgb/config.h | 2 +- keyboards/ffkeebs/puca/config.h | 2 - keyboards/ffkeebs/puca/info.json | 3 + keyboards/fjlabs/7vhotswap/config.h | 1 - keyboards/fjlabs/7vhotswap/info.json | 3 + keyboards/fjlabs/avalon/config.h | 1 - keyboards/fjlabs/avalon/info.json | 3 + keyboards/fjlabs/bks65/config.h | 1 - keyboards/fjlabs/bks65/info.json | 3 + keyboards/fjlabs/bks65solder/config.h | 1 - keyboards/fjlabs/bks65solder/info.json | 3 + keyboards/fjlabs/kf87/config.h | 1 - keyboards/fjlabs/kf87/info.json | 3 + keyboards/fjlabs/kyuu/config.h | 1 - keyboards/fjlabs/kyuu/info.json | 3 + keyboards/fjlabs/mk61rgbansi/config.h | 1 - keyboards/fjlabs/mk61rgbansi/info.json | 3 + keyboards/fjlabs/ready100/config.h | 1 - keyboards/fjlabs/ready100/info.json | 3 + keyboards/fjlabs/solanis/config.h | 1 - keyboards/fjlabs/solanis/info.json | 3 + keyboards/fjlabs/swordfish/config.h | 1 - keyboards/fjlabs/swordfish/info.json | 3 + keyboards/fjlabs/tf60ansi/config.h | 1 - keyboards/fjlabs/tf60ansi/info.json | 3 + keyboards/fjlabs/tf60v2/config.h | 1 - keyboards/fjlabs/tf60v2/info.json | 3 + keyboards/fjlabs/tf65rgbv2/config.h | 1 - keyboards/fjlabs/tf65rgbv2/info.json | 3 + keyboards/flehrad/bigswitch/config.h | 1 - keyboards/flehrad/bigswitch/info.json | 3 + keyboards/fleuron/config.h | 1 - keyboards/fleuron/info.json | 3 + keyboards/flx/virgo/config.h | 1 - keyboards/flx/virgo/info.json | 3 + keyboards/flxlb/zplit/config.h | 1 - keyboards/flxlb/zplit/info.json | 3 + keyboards/fortitude60/rev1/config.h | 1 - keyboards/fortitude60/rev1/info.json | 3 + keyboards/foxlab/key65/hotswap/config.h | 1 - keyboards/foxlab/key65/hotswap/info.json | 3 + keyboards/foxlab/key65/universal/config.h | 1 - keyboards/foxlab/key65/universal/info.json | 3 + keyboards/foxlab/leaf60/hotswap/config.h | 1 - keyboards/foxlab/leaf60/hotswap/info.json | 3 + keyboards/foxlab/leaf60/universal/config.h | 1 - keyboards/foxlab/leaf60/universal/info.json | 3 + keyboards/foxlab/time_re/hotswap/config.h | 2 - keyboards/foxlab/time_re/hotswap/info.json | 3 + keyboards/foxlab/time_re/universal/config.h | 2 - keyboards/foxlab/time_re/universal/info.json | 3 + keyboards/frooastboard/nano/config.h | 1 - keyboards/frooastboard/nano/info.json | 3 + keyboards/ft/mars65/config.h | 1 - keyboards/ft/mars65/info.json | 3 + keyboards/gami_studio/lex60/config.h | 1 - keyboards/gami_studio/lex60/info.json | 3 + keyboards/geekboards/macropad_v2/config.h | 1 - keyboards/geekboards/macropad_v2/info.json | 1 + keyboards/gh60/revc/keymaps/dbroqua/config.h | 2 +- keyboards/gh60/revc/keymaps/maxr1998/config.h | 2 +- keyboards/gh60/revc/keymaps/robotmaxtron/config.h | 2 +- keyboards/gh60/satan/config.h | 1 - keyboards/gh60/satan/info.json | 3 + keyboards/gh60/satan/keymaps/fakb/config.h | 4 +- .../gh60/satan/keymaps/iso_split_rshift/config.h | 4 +- .../gh60/satan/keymaps/olligranlund_iso/config.h | 4 +- keyboards/gh60/v1p3/config.h | 1 - keyboards/gh60/v1p3/info.json | 3 + keyboards/ghs/jem/info.json | 4 +- keyboards/ghs/rar/config.h | 1 - keyboards/ghs/rar/info.json | 3 + keyboards/giabalanai/config.h | 3 - keyboards/giabalanai/info.json | 3 + keyboards/gkeyboard/gkb_m16/config.h | 1 - keyboards/gkeyboard/gkb_m16/info.json | 3 + keyboards/gkeyboard/gpad8_2r/config.h | 1 - keyboards/gkeyboard/gpad8_2r/info.json | 1 + keyboards/gl516/j73gl/config.h | 3 - keyboards/gl516/j73gl/info.json | 3 + keyboards/gl516/n51gl/config.h | 3 - keyboards/gl516/n51gl/info.json | 3 + keyboards/gopolar/gg86/config.h | 1 - keyboards/gopolar/gg86/info.json | 3 + keyboards/gray_studio/aero75/config.h | 1 - keyboards/gray_studio/aero75/info.json | 3 + keyboards/gray_studio/apollo80/config.h | 1 - keyboards/gray_studio/apollo80/info.json | 3 + keyboards/gray_studio/cod67/config.h | 1 - keyboards/gray_studio/cod67/info.json | 3 + keyboards/gray_studio/space65/config.h | 1 - keyboards/gray_studio/space65/info.json | 3 + keyboards/gray_studio/space65r3/config.h | 1 - keyboards/gray_studio/space65r3/info.json | 3 + keyboards/gray_studio/think65/hotswap/config.h | 1 - keyboards/gray_studio/think65/hotswap/info.json | 3 + keyboards/gray_studio/think65/solder/config.h | 1 - keyboards/gray_studio/think65/solder/info.json | 3 + keyboards/grid600/press/config.h | 1 - keyboards/grid600/press/info.json | 3 + keyboards/h0oni/hotduck/config.h | 2 - keyboards/h0oni/hotduck/info.json | 3 + keyboards/hadron/ver2/config.h | 1 - keyboards/hadron/ver2/info.json | 3 + keyboards/hadron/ver3/config.h | 1 - keyboards/hadron/ver3/info.json | 3 + keyboards/halfcliff/config.h | 1 - keyboards/halfcliff/info.json | 3 + keyboards/halokeys/elemental75/config.h | 1 - keyboards/halokeys/elemental75/info.json | 3 + keyboards/handwired/6macro/config.h | 1 - keyboards/handwired/6macro/info.json | 3 + keyboards/handwired/alcor_dactyl/config.h | 1 - keyboards/handwired/alcor_dactyl/info.json | 1 + keyboards/handwired/atreus50/config.h | 1 - keyboards/handwired/atreus50/info.json | 3 + keyboards/handwired/bento/rev1/config.h | 1 - keyboards/handwired/bento/rev1/info.json | 3 + keyboards/handwired/brain/config.h | 3 - keyboards/handwired/brain/info.json | 3 + keyboards/handwired/chiron/config.h | 1 - keyboards/handwired/chiron/info.json | 3 + keyboards/handwired/co60/rev7/config.h | 1 - keyboards/handwired/co60/rev7/info.json | 1 + keyboards/handwired/colorlice/config.h | 1 - keyboards/handwired/colorlice/info.json | 3 + keyboards/handwired/concertina/64key/config.h | 1 - keyboards/handwired/concertina/64key/info.json | 3 + keyboards/handwired/consolekeyboard/18key/config.h | 1 - .../handwired/consolekeyboard/18key/info.json | 3 + keyboards/handwired/consolekeyboard/20key/config.h | 1 - .../handwired/consolekeyboard/20key/info.json | 3 + keyboards/handwired/consolekeyboard/27key/config.h | 1 - .../handwired/consolekeyboard/27key/info.json | 3 + keyboards/handwired/consolekeyboard/30key/config.h | 1 - .../handwired/consolekeyboard/30key/info.json | 3 + keyboards/handwired/croxsplit44/config.h | 1 - keyboards/handwired/croxsplit44/info.json | 3 + keyboards/handwired/cyberstar/config.h | 1 - keyboards/handwired/cyberstar/info.json | 1 + keyboards/handwired/d48/config.h | 1 - keyboards/handwired/d48/info.json | 3 + keyboards/handwired/dactyl_manuform/3x5_3/config.h | 1 - .../handwired/dactyl_manuform/3x5_3/info.json | 3 + keyboards/handwired/dactyl_manuform/4x5/config.h | 1 - keyboards/handwired/dactyl_manuform/4x5/info.json | 3 + keyboards/handwired/dactyl_manuform/4x6/config.h | 1 - keyboards/handwired/dactyl_manuform/4x6/info.json | 3 + .../dactyl_manuform/4x6/keymaps/scheikled/config.h | 4 +- .../dactyl_manuform/4x6/keymaps/scheiklp/config.h | 2 +- keyboards/handwired/dactyl_manuform/4x6_5/config.h | 1 - .../handwired/dactyl_manuform/4x6_5/info.json | 3 + keyboards/handwired/dactyl_manuform/5x6/config.h | 1 - keyboards/handwired/dactyl_manuform/5x6/info.json | 3 + .../dactyl_manuform/5x6/keymaps/squirrel/config.h | 4 +- .../5x6/keymaps/thattolleyguy/config.h | 4 +- keyboards/handwired/dactyl_manuform/5x7/config.h | 1 - keyboards/handwired/dactyl_manuform/5x7/info.json | 3 + .../dactyl_manuform/6x6/promicro/config.h | 1 - .../dactyl_manuform/6x6/promicro/info.json | 3 + keyboards/handwired/dactyl_manuform/6x6_4/config.h | 1 - .../handwired/dactyl_manuform/6x6_4/info.json | 3 + .../handwired/dactyl_manuform/6x6_kinesis/config.h | 1 - .../dactyl_manuform/6x6_kinesis/info.json | 3 + keyboards/handwired/dactyl_manuform/6x7/config.h | 1 - keyboards/handwired/dactyl_manuform/6x7/info.json | 3 + .../handwired/dactyl_manuform/dmote/62key/config.h | 1 - .../dactyl_manuform/dmote/62key/info.json | 3 + keyboards/handwired/dactyl_promicro/config.h | 3 - keyboards/handwired/dactyl_promicro/info.json | 3 + keyboards/handwired/freoduo/config.h | 1 - keyboards/handwired/freoduo/info.json | 3 + keyboards/handwired/heisenberg/config.h | 1 - keyboards/handwired/heisenberg/info.json | 3 + keyboards/handwired/hnah108/config.h | 1 - keyboards/handwired/hnah108/info.json | 3 + keyboards/handwired/hnah40rgb/config.h | 1 - keyboards/handwired/hnah40rgb/info.json | 3 + keyboards/handwired/jopr/config.h | 1 - keyboards/handwired/jopr/info.json | 3 + keyboards/handwired/lovelive9/config.h | 3 - keyboards/handwired/lovelive9/info.json | 3 + keyboards/handwired/macroboard/config.h | 1 - keyboards/handwired/macroboard/info.json | 3 + keyboards/handwired/marauder/config.h | 1 - keyboards/handwired/marauder/info.json | 3 + keyboards/handwired/minorca/keymaps/rgb/config.h | 2 +- .../handwired/onekey/blackpill_f401/info.json | 2 +- .../onekey/blackpill_f401_tinyuf2/info.json | 2 +- .../handwired/onekey/blackpill_f411/info.json | 2 +- .../onekey/blackpill_f411_tinyuf2/info.json | 2 +- keyboards/handwired/onekey/bluepill/info.json | 2 +- .../handwired/onekey/bluepill_f103c6/info.json | 2 +- .../handwired/onekey/bluepill_uf2boot/info.json | 2 +- keyboards/handwired/onekey/elite_c/info.json | 2 +- keyboards/handwired/onekey/evb_wb32f3g71/info.json | 2 +- keyboards/handwired/onekey/evb_wb32fq95/info.json | 2 +- keyboards/handwired/onekey/kb2040/info.json | 4 +- keyboards/handwired/onekey/nucleo_f446re/info.json | 2 +- keyboards/handwired/onekey/nucleo_l432kc/info.json | 2 +- keyboards/handwired/onekey/promicro/info.json | 2 +- keyboards/handwired/onekey/proton_c/info.json | 2 +- keyboards/handwired/onekey/rp2040/info.json | 2 +- .../handwired/onekey/sipeed_longan_nano/info.json | 2 +- keyboards/handwired/onekey/stm32f0_disco/info.json | 2 +- keyboards/handwired/onekey/teensy_2/info.json | 2 +- keyboards/handwired/onekey/teensy_2pp/info.json | 2 +- keyboards/handwired/owlet60/config.h | 1 - keyboards/handwired/owlet60/info.json | 3 + keyboards/handwired/p65rgb/config.h | 1 - keyboards/handwired/p65rgb/info.json | 3 + keyboards/handwired/prime_exl_plus/config.h | 1 - keyboards/handwired/prime_exl_plus/info.json | 3 + keyboards/handwired/prkl30/feather/config.h | 2 - keyboards/handwired/prkl30/feather/info.json | 3 + keyboards/handwired/prkl30/promicro/config.h | 2 - keyboards/handwired/prkl30/promicro/info.json | 3 + keyboards/handwired/promethium/config.h | 1 - keyboards/handwired/promethium/info.json | 3 + keyboards/handwired/qc60/info.json | 3 + keyboards/handwired/qc60/proto/config.h | 1 - keyboards/handwired/selene/config.h | 1 - keyboards/handwired/selene/info.json | 3 + keyboards/handwired/skakunm_dactyl/config.h | 5 - keyboards/handwired/splittest/promicro/config.h | 3 - keyboards/handwired/splittest/promicro/info.json | 3 + keyboards/handwired/splittest/teensy_2/config.h | 3 - keyboards/handwired/splittest/teensy_2/info.json | 3 + keyboards/handwired/steamvan/rev1/config.h | 1 - keyboards/handwired/steamvan/rev1/info.json | 1 + keyboards/handwired/swiftrax/bumblebee/config.h | 1 - keyboards/handwired/swiftrax/bumblebee/info.json | 3 + keyboards/handwired/swiftrax/glacier/config.h | 1 - keyboards/handwired/swiftrax/glacier/info.json | 3 + keyboards/handwired/swiftrax/walter/config.h | 1 - keyboards/handwired/swiftrax/walter/info.json | 3 + keyboards/handwired/symmetry60/config.h | 1 - keyboards/handwired/symmetry60/info.json | 3 + keyboards/handwired/tennie/config.h | 1 - keyboards/handwired/tennie/info.json | 3 + .../handwired/tractyl_manuform/4x6_right/config.h | 1 - .../handwired/tractyl_manuform/4x6_right/info.json | 3 + .../tractyl_manuform/5x6_right/elite_c/config.h | 1 - .../tractyl_manuform/5x6_right/elite_c/info.json | 3 + .../tractyl_manuform/5x6_right/f303/config.h | 1 - .../tractyl_manuform/5x6_right/f303/info.json | 1 + .../tractyl_manuform/5x6_right/f411/config.h | 1 - .../tractyl_manuform/5x6_right/f411/info.json | 1 + .../tractyl_manuform/5x6_right/teensy2pp/config.h | 1 - .../tractyl_manuform/5x6_right/teensy2pp/info.json | 3 + keyboards/handwired/traveller/config.h | 1 - keyboards/handwired/traveller/info.json | 3 + keyboards/handwired/tritium_numpad/config.h | 2 - keyboards/handwired/tritium_numpad/info.json | 3 + keyboards/handwired/tsubasa/config.h | 1 - keyboards/handwired/tsubasa/info.json | 3 + keyboards/handwired/unk/rev1/config.h | 3 - keyboards/handwired/unk/rev1/info.json | 3 + keyboards/handwired/uthol/rev2/config.h | 1 - keyboards/handwired/uthol/rev2/info.json | 3 + keyboards/handwired/uthol/rev3/config.h | 1 - keyboards/handwired/uthol/rev3/info.json | 3 + keyboards/heliotrope/config.h | 1 - keyboards/heliotrope/info.json | 3 + keyboards/helix/pico/config.h | 3 - keyboards/helix/pico/info.json | 3 + keyboards/helix/rev2/config.h | 3 - keyboards/helix/rev2/info.json | 3 + keyboards/helix/rev3_4rows/config.h | 1 - keyboards/helix/rev3_4rows/info.json | 3 + keyboards/helix/rev3_5rows/config.h | 1 - keyboards/helix/rev3_5rows/info.json | 3 + keyboards/hfdkb/ac001/config.h | 1 - keyboards/hfdkb/ac001/info.json | 3 + keyboards/hidtech/bastyl/config.h | 1 - keyboards/hidtech/bastyl/info.json | 3 + keyboards/hifumi/config.h | 1 - keyboards/hifumi/info.json | 3 + keyboards/hillside/46/0_1/info.json | 4 +- keyboards/hillside/48/0_1/info.json | 4 +- keyboards/hillside/52/0_1/info.json | 4 +- keyboards/hineybush/h08_ocelot/config.h | 1 - keyboards/hineybush/h08_ocelot/info.json | 3 + keyboards/hineybush/h60/config.h | 1 - keyboards/hineybush/h60/info.json | 3 + keyboards/hineybush/h65/config.h | 1 - keyboards/hineybush/h65/info.json | 3 + keyboards/hineybush/h65_hotswap/config.h | 1 - keyboards/hineybush/h65_hotswap/info.json | 3 + keyboards/hineybush/h660s/config.h | 1 - keyboards/hineybush/h660s/info.json | 3 + keyboards/hineybush/h75_singa/config.h | 1 - keyboards/hineybush/h75_singa/info.json | 3 + keyboards/hineybush/h87a/config.h | 1 - keyboards/hineybush/h87a/info.json | 3 + keyboards/hineybush/h88/config.h | 1 - keyboards/hineybush/h88/info.json | 3 + keyboards/hineybush/hbcp/config.h | 1 - keyboards/hineybush/hbcp/info.json | 3 + keyboards/hineybush/physix/config.h | 1 - keyboards/hineybush/physix/info.json | 3 + keyboards/hineybush/sm68/config.h | 1 - keyboards/hineybush/sm68/info.json | 3 + keyboards/hnahkb/stella/config.h | 1 - keyboards/hnahkb/stella/info.json | 3 + keyboards/hnahkb/vn66/config.h | 1 - keyboards/hnahkb/vn66/info.json | 3 + .../horrortroll/chinese_pcb/black_e65/config.h | 1 - .../horrortroll/chinese_pcb/black_e65/info.json | 3 + .../horrortroll/chinese_pcb/devil68_pro/config.h | 3 - .../horrortroll/chinese_pcb/devil68_pro/info.json | 3 + keyboards/horrortroll/handwired_k552/config.h | 3 - keyboards/horrortroll/handwired_k552/info.json | 3 + keyboards/horrortroll/lemon40/config.h | 1 - keyboards/horrortroll/lemon40/info.json | 3 + keyboards/hotdox76v2/config.h | 1 - keyboards/hotdox76v2/info.json | 3 + keyboards/hp69/config.h | 1 - keyboards/hp69/info.json | 3 + keyboards/hub16/config.h | 1 - keyboards/hub16/info.json | 3 + keyboards/hub20/config.h | 1 - keyboards/hub20/info.json | 3 + keyboards/hubble/config.h | 1 - keyboards/hubble/info.json | 3 + keyboards/ibnuda/gurindam/config.h | 1 - keyboards/ibnuda/gurindam/info.json | 3 + keyboards/idobao/id42/config.h | 1 - keyboards/idobao/id42/info.json | 3 + keyboards/idobao/id61/config.h | 2 - keyboards/idobao/id61/info.json | 3 + keyboards/idobao/id63/config.h | 2 - keyboards/idobao/id63/info.json | 3 + keyboards/idobao/id67/config.h | 3 - keyboards/idobao/id67/info.json | 3 + keyboards/idobao/id75/v1/config.h | 1 - keyboards/idobao/id75/v1/info.json | 3 + keyboards/idobao/id75/v2/config.h | 2 - keyboards/idobao/id75/v2/info.json | 3 + keyboards/idobao/id80/v2/config.h | 1 - keyboards/idobao/id80/v2/info.json | 3 + keyboards/idobao/id80/v3/ansi/config.h | 2 - keyboards/idobao/id80/v3/ansi/info.json | 3 + keyboards/idobao/id87/v1/config.h | 1 - keyboards/idobao/id87/v1/info.json | 3 + keyboards/idobao/id87/v2/config.h | 2 - keyboards/idobao/id87/v2/info.json | 3 + keyboards/idobao/id96/config.h | 1 - keyboards/idobao/id96/info.json | 3 + keyboards/idobao/montex/v1/config.h | 1 - keyboards/idobao/montex/v1/info.json | 3 + keyboards/idobao/montex/v1rgb/config.h | 2 - keyboards/idobao/montex/v1rgb/info.json | 3 + keyboards/idobao/montex/v2/config.h | 4 - keyboards/idobao/montex/v2/info.json | 3 + keyboards/idyllic/tinny50_rgb/config.h | 2 - keyboards/idyllic/tinny50_rgb/info.json | 1 + keyboards/inett_studio/sqx/hotswap/config.h | 1 - keyboards/inett_studio/sqx/hotswap/info.json | 3 + keyboards/inett_studio/sqx/universal/config.h | 1 - keyboards/inett_studio/sqx/universal/info.json | 3 + keyboards/irene/config.h | 1 - keyboards/irene/info.json | 3 + keyboards/jacky_studio/bear_65/config.h | 1 - keyboards/jacky_studio/bear_65/rev1/info.json | 3 + keyboards/jacky_studio/bear_65/rev2/info.json | 3 + keyboards/jacky_studio/piggy60/rev1/info.json | 4 +- keyboards/jacky_studio/s7_elephant/rev1/config.h | 1 - keyboards/jacky_studio/s7_elephant/rev1/info.json | 3 + keyboards/jacky_studio/s7_elephant/rev2/config.h | 1 - keyboards/jacky_studio/s7_elephant/rev2/info.json | 3 + keyboards/jadookb/jkb65/config.h | 2 - keyboards/jadookb/jkb65/info.json | 3 + keyboards/jc65/v32u4/config.h | 1 - keyboards/jc65/v32u4/info.json | 3 + keyboards/jd40/config.h | 1 - keyboards/jd40/info.json | 3 + keyboards/jels/jels88/config.h | 3 - keyboards/jels/jels88/info.json | 3 + keyboards/jian/nsrev2/config.h | 1 - keyboards/jian/nsrev2/info.json | 3 + keyboards/jian/rev1/config.h | 1 - keyboards/jian/rev1/info.json | 3 + keyboards/jian/rev2/config.h | 1 - keyboards/jian/rev2/info.json | 3 + keyboards/jiran/rev2/config.h | 1 - keyboards/jiran/rev2/info.json | 5 + keyboards/jkeys_design/gentleman65/config.h | 1 - keyboards/jkeys_design/gentleman65/info.json | 3 + keyboards/jkeys_design/gentleman65_se_s/config.h | 1 - keyboards/jkeys_design/gentleman65_se_s/info.json | 3 + keyboards/jolofsor/denial75/config.h | 1 - keyboards/jolofsor/denial75/info.json | 3 + keyboards/jones/v03/config.h | 1 - keyboards/jones/v03/info.json | 3 + keyboards/jones/v03_1/config.h | 1 - keyboards/jones/v03_1/info.json | 3 + keyboards/jones/v1/config.h | 1 - keyboards/jones/v1/info.json | 3 + keyboards/jorne/rev1/config.h | 1 - keyboards/jorne/rev1/info.json | 3 + keyboards/kabedon/kabedon78s/config.h | 1 - keyboards/kabedon/kabedon78s/info.json | 3 + keyboards/kabedon/kabedon980/config.h | 1 - keyboards/kabedon/kabedon980/info.json | 3 + keyboards/kabedon/kabedon98e/config.h | 1 - keyboards/kabedon/kabedon98e/info.json | 1 + keyboards/kagizaraya/halberd/config.h | 1 - keyboards/kagizaraya/halberd/info.json | 3 + keyboards/kagizaraya/scythe/config.h | 1 - keyboards/kagizaraya/scythe/info.json | 3 + keyboards/kakunpc/angel17/rev1/config.h | 1 - keyboards/kakunpc/angel17/rev1/info.json | 3 + keyboards/kakunpc/angel64/alpha/config.h | 1 - keyboards/kakunpc/angel64/alpha/info.json | 3 + keyboards/kakunpc/angel64/rev1/config.h | 1 - keyboards/kakunpc/angel64/rev1/info.json | 3 + keyboards/kakunpc/business_card/alpha/config.h | 1 - keyboards/kakunpc/business_card/alpha/info.json | 3 + keyboards/kakunpc/business_card/beta/config.h | 1 - keyboards/kakunpc/business_card/beta/info.json | 3 + keyboards/kakunpc/rabbit_capture_plan/config.h | 1 - keyboards/kakunpc/rabbit_capture_plan/info.json | 3 + keyboards/kakunpc/suihankey/alpha/config.h | 1 - keyboards/kakunpc/suihankey/alpha/info.json | 3 + keyboards/kakunpc/suihankey/rev1/config.h | 1 - keyboards/kakunpc/suihankey/rev1/info.json | 3 + keyboards/kakunpc/suihankey/split/alpha/config.h | 1 - keyboards/kakunpc/suihankey/split/alpha/info.json | 3 + keyboards/kakunpc/suihankey/split/rev1/config.h | 1 - keyboards/kakunpc/suihankey/split/rev1/info.json | 3 + keyboards/kakunpc/thedogkeyboard/config.h | 1 - keyboards/kakunpc/thedogkeyboard/info.json | 3 + keyboards/kamigakushi/info.json | 2 +- .../kapcave/gskt00/keymaps/default-poly/config.h | 2 +- keyboards/kapcave/paladin64/config.h | 1 - keyboards/kapcave/paladin64/info.json | 3 + keyboards/kapcave/paladinpad/rev1/config.h | 2 - keyboards/kapcave/paladinpad/rev1/info.json | 3 + keyboards/kapcave/paladinpad/rev2/config.h | 2 - keyboards/kapcave/paladinpad/rev2/info.json | 3 + keyboards/kapl/rev1/config.h | 2 - keyboards/kapl/rev1/info.json | 3 + keyboards/kb_elmo/isolation/config.h | 1 - keyboards/kb_elmo/isolation/info.json | 3 + keyboards/kb_elmo/noah_avr/config.h | 1 - keyboards/kb_elmo/noah_avr/info.json | 3 + keyboards/kbdfans/baguette66/rgb/config.h | 1 - keyboards/kbdfans/baguette66/rgb/info.json | 3 + keyboards/kbdfans/bounce/75/hotswap/config.h | 1 - keyboards/kbdfans/bounce/75/hotswap/info.json | 3 + keyboards/kbdfans/bounce/75/soldered/config.h | 1 - keyboards/kbdfans/bounce/75/soldered/info.json | 3 + keyboards/kbdfans/kbd19x/config.h | 1 - keyboards/kbdfans/kbd19x/info.json | 3 + keyboards/kbdfans/kbd4x/config.h | 1 - keyboards/kbdfans/kbd4x/info.json | 3 + keyboards/kbdfans/kbd67/hotswap/config.h | 1 - keyboards/kbdfans/kbd67/hotswap/info.json | 3 + keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 1 - keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 3 + keyboards/kbdfans/kbd67/mkiirgb_iso/config.h | 1 - keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 3 + keyboards/kbdfans/kbd67/rev1/config.h | 1 - keyboards/kbdfans/kbd67/rev1/info.json | 3 + keyboards/kbdfans/kbd67/rev2/config.h | 1 - keyboards/kbdfans/kbd67/rev2/info.json | 3 + keyboards/kbdfans/kbd6x/config.h | 1 - keyboards/kbdfans/kbd6x/info.json | 3 + keyboards/kbdfans/kbd75/config.h | 1 - keyboards/kbdfans/kbd75/rev1/info.json | 3 + keyboards/kbdfans/kbd75/rev2/info.json | 3 + keyboards/kbdfans/kbd75hs/config.h | 1 - keyboards/kbdfans/kbd75hs/info.json | 3 + keyboards/kbdfans/kbd75rgb/config.h | 1 - keyboards/kbdfans/kbd75rgb/info.json | 3 + keyboards/kbdfans/kbd8x/config.h | 1 - keyboards/kbdfans/kbd8x/info.json | 3 + keyboards/kbdfans/kbd8x_mk2/config.h | 1 - keyboards/kbdfans/kbd8x_mk2/info.json | 3 + keyboards/kbdfans/kbdpad/mk2/config.h | 1 - keyboards/kbdfans/kbdpad/mk2/info.json | 3 + keyboards/kbdfans/kbdpad/mk3/info.json | 2 +- keyboards/kbdfans/niu_mini/config.h | 1 - keyboards/kbdfans/niu_mini/info.json | 3 + keyboards/kbdfans/odin/rgb/config.h | 1 - keyboards/kbdfans/odin/rgb/info.json | 3 + keyboards/kbdfans/odin/soldered/config.h | 1 - keyboards/kbdfans/odin/soldered/info.json | 3 + keyboards/kbdfans/odin/v2/config.h | 2 - keyboards/kbdfans/odin/v2/info.json | 3 + keyboards/kbdfans/odinmini/info.json | 2 +- keyboards/kbdfans/phaseone/config.h | 1 - keyboards/kbdfans/phaseone/info.json | 3 + keyboards/kbdfans/tiger80/info.json | 4 +- keyboards/kbnordic/nordic60/rev_a/config.h | 1 - keyboards/kbnordic/nordic60/rev_a/info.json | 3 + keyboards/kc60/config.h | 1 - keyboards/kc60/info.json | 3 + keyboards/keebformom/config.h | 1 - keyboards/keebformom/info.json | 3 + keyboards/keebio/bamfk1/config.h | 1 - keyboards/keebio/bamfk1/info.json | 3 + keyboards/keebio/bamfk4/config.h | 1 - keyboards/keebio/bamfk4/info.json | 3 + keyboards/keebio/bdn9/rev1/config.h | 1 - keyboards/keebio/bdn9/rev1/info.json | 3 + keyboards/keebio/bdn9/rev2/config.h | 1 - keyboards/keebio/bdn9/rev2/info.json | 3 + keyboards/keebio/bfo9000/config.h | 1 - keyboards/keebio/bfo9000/info.json | 3 + keyboards/keebio/chocopad/config.h | 1 - keyboards/keebio/chocopad/info.json | 3 + keyboards/keebio/convolution/rev1/config.h | 1 - keyboards/keebio/convolution/rev1/info.json | 1 + keyboards/keebio/dilly/config.h | 1 - keyboards/keebio/dilly/info.json | 3 + keyboards/keebio/dsp40/rev1/config.h | 1 - keyboards/keebio/dsp40/rev1/info.json | 3 + keyboards/keebio/ergodicity/config.h | 1 - keyboards/keebio/ergodicity/info.json | 3 + keyboards/keebio/foldkb/rev1/config.h | 1 - keyboards/keebio/foldkb/rev1/info.json | 3 + keyboards/keebio/fourier/config.h | 1 - keyboards/keebio/fourier/info.json | 3 + keyboards/keebio/iris/rev1/config.h | 1 - keyboards/keebio/iris/rev1/info.json | 3 + keyboards/keebio/iris/rev1_led/config.h | 1 - keyboards/keebio/iris/rev1_led/info.json | 3 + keyboards/keebio/iris/rev2/config.h | 1 - keyboards/keebio/iris/rev2/info.json | 3 + keyboards/keebio/iris/rev3/config.h | 1 - keyboards/keebio/iris/rev3/info.json | 3 + keyboards/keebio/iris/rev4/config.h | 1 - keyboards/keebio/iris/rev4/info.json | 3 + keyboards/keebio/iris/rev5/config.h | 1 - keyboards/keebio/iris/rev5/info.json | 3 + keyboards/keebio/iris/rev6/config.h | 1 - keyboards/keebio/iris/rev6/info.json | 3 + keyboards/keebio/iris/rev6a/config.h | 1 - keyboards/keebio/iris/rev6a/info.json | 3 + keyboards/keebio/iris/rev6b/config.h | 1 - keyboards/keebio/iris/rev6b/info.json | 3 + keyboards/keebio/iris/rev7/config.h | 1 - keyboards/keebio/iris/rev7/info.json | 3 + keyboards/keebio/kbo5000/rev1/config.h | 1 - keyboards/keebio/kbo5000/rev1/info.json | 3 + keyboards/keebio/laplace/config.h | 1 - keyboards/keebio/laplace/info.json | 3 + keyboards/keebio/levinson/rev1/config.h | 1 - keyboards/keebio/levinson/rev1/info.json | 3 + keyboards/keebio/levinson/rev2/config.h | 1 - keyboards/keebio/levinson/rev2/info.json | 3 + keyboards/keebio/levinson/rev3/config.h | 1 - keyboards/keebio/levinson/rev3/info.json | 3 + keyboards/keebio/nyquist/rev1/config.h | 1 - keyboards/keebio/nyquist/rev1/info.json | 3 + keyboards/keebio/nyquist/rev2/config.h | 1 - keyboards/keebio/nyquist/rev2/info.json | 3 + keyboards/keebio/nyquist/rev3/config.h | 1 - keyboards/keebio/nyquist/rev3/info.json | 3 + keyboards/keebio/quefrency/rev1/config.h | 1 - keyboards/keebio/quefrency/rev1/info.json | 3 + keyboards/keebio/quefrency/rev2/config.h | 1 - keyboards/keebio/quefrency/rev2/info.json | 3 + keyboards/keebio/quefrency/rev3/config.h | 1 - keyboards/keebio/quefrency/rev3/info.json | 3 + keyboards/keebio/quefrency/rev4/config.h | 1 - keyboards/keebio/quefrency/rev4/info.json | 3 + keyboards/keebio/quefrency/rev5/config.h | 1 - keyboards/keebio/quefrency/rev5/info.json | 3 + keyboards/keebio/rorschach/rev1/config.h | 1 - keyboards/keebio/rorschach/rev1/info.json | 3 + keyboards/keebio/sinc/rev1/info.json | 5 +- keyboards/keebio/sinc/rev2/info.json | 4 +- keyboards/keebio/sinc/rev3/config.h | 1 - keyboards/keebio/sinc/rev3/info.json | 1 + keyboards/keebio/stick/config.h | 1 - keyboards/keebio/stick/info.json | 3 + keyboards/keebio/tukey/config.h | 1 - keyboards/keebio/tukey/info.json | 3 + keyboards/keebio/viterbi/rev1/config.h | 1 - keyboards/keebio/viterbi/rev1/info.json | 3 + keyboards/keebio/viterbi/rev2/config.h | 1 - keyboards/keebio/viterbi/rev2/info.json | 3 + keyboards/keebio/wavelet/config.h | 1 - keyboards/keebio/wavelet/info.json | 3 + keyboards/keebio/wtf60/config.h | 1 - keyboards/keebio/wtf60/info.json | 3 + keyboards/keebmonkey/kbmg68/config.h | 1 - keyboards/keebmonkey/kbmg68/info.json | 3 + keyboards/keebsforall/coarse60/config.h | 1 - keyboards/keebsforall/coarse60/info.json | 1 + keyboards/keebwerk/nano_slider/config.h | 1 - keyboards/keebwerk/nano_slider/info.json | 3 + keyboards/kegen/gboy/config.h | 1 - keyboards/kegen/gboy/info.json | 3 + keyboards/keybage/radpad/config.h | 1 - keyboards/keybage/radpad/info.json | 3 + keyboards/keybee/keybee65/config.h | 2 - keyboards/keybee/keybee65/info.json | 3 + keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h | 2 +- keyboards/keycapsss/kimiko/rev1/config.h | 3 - keyboards/keycapsss/kimiko/rev1/info.json | 3 + keyboards/keycapsss/o4l_5x12/config.h | 1 - keyboards/keycapsss/o4l_5x12/info.json | 3 + keyboards/keygem/kg60ansi/config.h | 1 - keyboards/keygem/kg60ansi/info.json | 3 + keyboards/keygem/kg65rgbv2/config.h | 1 - keyboards/keygem/kg65rgbv2/info.json | 3 + keyboards/keyhive/absinthe/config.h | 1 - keyboards/keyhive/absinthe/info.json | 3 + keyboards/keyhive/ergosaurus/config.h | 1 - keyboards/keyhive/ergosaurus/info.json | 3 + keyboards/keyhive/navi10/keymaps/devdev/config.h | 2 +- keyboards/keyhive/smallice/config.h | 1 - keyboards/keyhive/smallice/info.json | 3 + keyboards/keyhive/uno/rev1/config.h | 1 - keyboards/keyhive/uno/rev1/info.json | 3 + keyboards/keyhive/uno/rev2/config.h | 1 - keyboards/keyhive/uno/rev2/info.json | 3 + keyboards/keyhive/ut472/config.h | 1 - keyboards/keyhive/ut472/info.json | 3 + keyboards/keyquest/enclave/config.h | 1 - keyboards/keyquest/enclave/info.json | 3 + keyboards/keysofkings/twokey/config.h | 1 - keyboards/keysofkings/twokey/info.json | 3 + keyboards/keyspensory/kp60/info.json | 4 +- keyboards/keystonecaps/gameroyadvance/config.h | 1 - keyboards/keystonecaps/gameroyadvance/info.json | 3 + keyboards/kikoslab/ellora65/config.h | 1 - keyboards/kikoslab/ellora65/info.json | 3 + keyboards/kingly_keys/ave/config.h | 1 - keyboards/kingly_keys/ave/ortho/info.json | 3 + keyboards/kingly_keys/ave/staggered/info.json | 3 + keyboards/kingly_keys/little_foot/config.h | 1 - keyboards/kingly_keys/little_foot/info.json | 3 + .../kingly_keys/romac/keymaps/stanrc85/config.h | 2 +- keyboards/kingly_keys/romac_plus/config.h | 1 - keyboards/kingly_keys/romac_plus/info.json | 3 + keyboards/kingly_keys/ropro/config.h | 3 - keyboards/kingly_keys/ropro/info.json | 3 + keyboards/kingly_keys/smd_milk/config.h | 1 - keyboards/kingly_keys/smd_milk/info.json | 3 + keyboards/kingly_keys/soap/config.h | 2 - keyboards/kingly_keys/soap/info.json | 3 + keyboards/kira75/config.h | 1 - keyboards/kira75/info.json | 3 + keyboards/kiwikey/borderland/config.h | 1 - keyboards/kiwikey/borderland/info.json | 3 + keyboards/kiwikey/kawii9/config.h | 1 - keyboards/kiwikey/kawii9/info.json | 3 + keyboards/kiwikey/wanderland/config.h | 1 - keyboards/kiwikey/wanderland/info.json | 3 + keyboards/kona_classic/config.h | 1 - keyboards/kona_classic/info.json | 3 + keyboards/kopibeng/mnk88/config.h | 1 - keyboards/kopibeng/mnk88/info.json | 3 + keyboards/kopibeng/xt60/config.h | 1 - keyboards/kopibeng/xt60/info.json | 3 + keyboards/kopibeng/xt60_singa/config.h | 1 - keyboards/kopibeng/xt60_singa/info.json | 3 + keyboards/kopibeng/xt65/config.h | 1 - keyboards/kopibeng/xt65/info.json | 3 + keyboards/kopibeng/xt8x/config.h | 1 - keyboards/kopibeng/xt8x/info.json | 3 + keyboards/kprepublic/bm16a/v1/info.json | 4 +- keyboards/kprepublic/bm16a/v2/config.h | 1 - keyboards/kprepublic/bm16a/v2/info.json | 1 + keyboards/kprepublic/bm16s/config.h | 1 - keyboards/kprepublic/bm16s/info.json | 3 + keyboards/kprepublic/bm40hsrgb/config.h | 1 - keyboards/kprepublic/bm40hsrgb/info.json | 3 + keyboards/kprepublic/bm43a/config.h | 1 - keyboards/kprepublic/bm43a/info.json | 3 + keyboards/kprepublic/bm43hsrgb/config.h | 1 - keyboards/kprepublic/bm43hsrgb/info.json | 3 + keyboards/kprepublic/bm60hsrgb/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb/rev1/info.json | 3 + keyboards/kprepublic/bm60hsrgb/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb/rev2/info.json | 3 + keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json | 3 + keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json | 3 + keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json | 3 + keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json | 3 + keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h | 1 - .../kprepublic/bm60hsrgb_poker/rev1/info.json | 3 + keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h | 1 - .../kprepublic/bm60hsrgb_poker/rev2/info.json | 3 + keyboards/kprepublic/bm65hsrgb/rev1/config.h | 2 - keyboards/kprepublic/bm65hsrgb/rev1/info.json | 3 + keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h | 1 - keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json | 3 + keyboards/kprepublic/bm68hsrgb/rev1/config.h | 2 - keyboards/kprepublic/bm68hsrgb/rev1/info.json | 3 + keyboards/kprepublic/bm68hsrgb/rev2/config.h | 1 - keyboards/kprepublic/bm68hsrgb/rev2/info.json | 3 + keyboards/kprepublic/bm80hsrgb/config.h | 1 - keyboards/kprepublic/bm80hsrgb/info.json | 3 + keyboards/kprepublic/bm980hsrgb/config.h | 2 - keyboards/kprepublic/bm980hsrgb/info.json | 3 + keyboards/kprepublic/cospad/config.h | 1 - keyboards/kprepublic/cospad/info.json | 3 + keyboards/kprepublic/jj50/config.h | 1 - keyboards/ktec/daisy/config.h | 1 - keyboards/ktec/daisy/info.json | 3 + keyboards/ktec/staryu/config.h | 1 - keyboards/ktec/staryu/info.json | 3 + keyboards/kudox/columner/config.h | 3 - keyboards/kudox/columner/info.json | 3 + keyboards/kudox/rev1/config.h | 3 - keyboards/kudox/rev1/info.json | 3 + keyboards/kudox/rev2/config.h | 3 - keyboards/kudox/rev2/info.json | 3 + keyboards/kudox/rev3/config.h | 3 - keyboards/kudox/rev3/info.json | 3 + keyboards/kudox_full/rev1/config.h | 3 - keyboards/kudox_full/rev1/info.json | 3 + keyboards/kudox_game/rev1/config.h | 3 - keyboards/kudox_game/rev1/info.json | 3 + keyboards/kudox_game/rev2/config.h | 3 - keyboards/kudox_game/rev2/info.json | 3 + keyboards/kuro/kuro65/config.h | 2 - keyboards/kuro/kuro65/info.json | 3 + keyboards/labbe/labbeminiv1/keymaps/rgb/config.h | 2 +- .../labbe/labbeminiv1/keymaps/rgbmatrix/config.h | 2 +- keyboards/labyrinth75/config.h | 1 - keyboards/labyrinth75/info.json | 3 + keyboards/laser_ninja/pumpkin_pad/config.h | 1 - keyboards/laser_ninja/pumpkin_pad/info.json | 3 + keyboards/latincompass/latin17rgb/config.h | 1 - keyboards/latincompass/latin17rgb/info.json | 3 + keyboards/latincompass/latin47ble/config.h | 1 - keyboards/latincompass/latin47ble/info.json | 3 + keyboards/latincompass/latin64ble/config.h | 2 - keyboards/latincompass/latin64ble/info.json | 3 + keyboards/latincompass/latinpad/config.h | 1 - keyboards/latincompass/latinpad/info.json | 3 + keyboards/latincompass/latinpadble/config.h | 2 - keyboards/latincompass/latinpadble/info.json | 3 + keyboards/lazydesigners/bolt/config.h | 1 - keyboards/lazydesigners/bolt/info.json | 3 + keyboards/lazydesigners/cassette8/config.h | 1 - keyboards/lazydesigners/cassette8/info.json | 3 + keyboards/lazydesigners/dimple/config.h | 1 - keyboards/lazydesigners/dimple/ortho/info.json | 3 + keyboards/lazydesigners/dimple/staggered/info.json | 3 + keyboards/lazydesigners/dimpleplus/config.h | 1 - keyboards/lazydesigners/dimpleplus/info.json | 3 + keyboards/lazydesigners/the40/config.h | 1 - keyboards/lazydesigners/the40/info.json | 3 + keyboards/lazydesigners/the50/config.h | 1 - keyboards/lazydesigners/the50/info.json | 3 + keyboards/lazydesigners/the60/rev2/config.h | 1 - keyboards/lazydesigners/the60/rev2/info.json | 3 + keyboards/leafcutterlabs/bigknob/config.h | 1 - keyboards/leafcutterlabs/bigknob/info.json | 3 + keyboards/lets_split/keymaps/shaymdev/config.h | 4 +- keyboards/lets_split/keymaps/zer09/config.h | 2 +- keyboards/lets_split/rev1/config.h | 3 - keyboards/lets_split/rev1/info.json | 3 + keyboards/lets_split/rev2/config.h | 3 - keyboards/lets_split/rev2/info.json | 3 + keyboards/lets_split/sockets/config.h | 3 - keyboards/lets_split/sockets/info.json | 3 + keyboards/lfkeyboards/lfk65_hs/config.h | 1 - keyboards/lfkeyboards/lfk65_hs/info.json | 3 + keyboards/lfkeyboards/lfk78/config.h | 1 - keyboards/lfkeyboards/lfk78/revb/info.json | 3 + keyboards/lfkeyboards/lfk78/revc/info.json | 3 + keyboards/lfkeyboards/lfk78/revj/info.json | 3 + keyboards/lfkeyboards/lfk87/config.h | 1 - keyboards/lfkeyboards/lfk87/info.json | 3 + keyboards/lfkeyboards/lfkpad/config.h | 1 - keyboards/lfkeyboards/lfkpad/info.json | 3 + keyboards/lfkeyboards/mini1800/config.h | 1 - keyboards/lfkeyboards/mini1800/info.json | 3 + keyboards/lfkeyboards/smk65/revb/config.h | 1 - keyboards/lfkeyboards/smk65/revb/info.json | 3 + keyboards/lily58/glow_enc/config.h | 2 - keyboards/lily58/glow_enc/info.json | 3 + keyboards/lily58/light/config.h | 1 - keyboards/lily58/light/info.json | 3 + keyboards/lily58/r2g/config.h | 1 - keyboards/lily58/r2g/info.json | 3 + keyboards/lily58/rev1/config.h | 1 - keyboards/lily58/rev1/info.json | 3 + keyboards/linworks/fave65h/config.h | 1 - keyboards/linworks/fave65h/info.json | 3 + keyboards/linworks/fave84h/config.h | 1 - keyboards/linworks/fave84h/info.json | 3 + keyboards/linworks/fave87/config.h | 1 - keyboards/linworks/fave87/info.json | 3 + keyboards/linworks/fave87h/config.h | 1 - keyboards/linworks/fave87h/info.json | 3 + keyboards/linworks/whale75/config.h | 1 - keyboards/linworks/whale75/info.json | 1 + keyboards/littlealby/mute/config.h | 1 - keyboards/littlealby/mute/info.json | 3 + keyboards/ll3macorn/bongopad/config.h | 1 - keyboards/ll3macorn/bongopad/info.json | 3 + keyboards/lm_keyboard/lm60n/config.h | 1 - keyboards/lm_keyboard/lm60n/info.json | 3 + keyboards/loki65/config.h | 1 - keyboards/loki65/info.json | 1 + keyboards/longnald/corin/config.h | 1 - keyboards/longnald/corin/info.json | 3 + keyboards/lz/erghost/config.h | 1 - keyboards/lz/erghost/info.json | 3 + keyboards/manta60/config.h | 1 - keyboards/manta60/info.json | 3 + keyboards/manyboard/macro/config.h | 1 - keyboards/manyboard/macro/info.json | 3 + keyboards/maple_computing/6ball/config.h | 3 - keyboards/maple_computing/6ball/info.json | 3 + .../maple_computing/c39/keymaps/drashna/config.h | 2 +- .../c39/keymaps/kuchosauronad0/config.h | 2 +- .../launchpad/keymaps/brandonschlack/config.h | 4 +- .../launchpad/keymaps/default_rgb/config.h | 2 +- .../launchpad/keymaps/drashna/config.h | 4 +- keyboards/maple_computing/launchpad/rev1/config.h | 1 - keyboards/maple_computing/launchpad/rev1/info.json | 3 + .../maple_computing/lets_split_eh/eh/config.h | 1 - .../maple_computing/lets_split_eh/eh/info.json | 3 + .../minidox/keymaps/alairock/config.h | 2 +- .../minidox/keymaps/that_canadian/config.h | 2 +- .../minidox/keymaps/xyverz/config.h | 2 +- keyboards/maple_computing/the_ruler/config.h | 1 - keyboards/maple_computing/the_ruler/info.json | 3 + keyboards/marksard/leftover30/config.h | 1 - keyboards/marksard/leftover30/info.json | 3 + keyboards/marksard/rhymestone/rev1/config.h | 2 - keyboards/marksard/rhymestone/rev1/info.json | 3 + keyboards/marksard/treadstone32/lite/config.h | 1 - keyboards/marksard/treadstone32/lite/info.json | 3 + keyboards/marksard/treadstone32/rev1/config.h | 1 - keyboards/marksard/treadstone32/rev1/info.json | 3 + keyboards/marksard/treadstone48/rev1/config.h | 1 - keyboards/marksard/treadstone48/rev1/info.json | 3 + keyboards/marksard/treadstone48/rev2/config.h | 1 - keyboards/marksard/treadstone48/rev2/info.json | 3 + keyboards/massdrop/thekey/config.h | 1 - keyboards/massdrop/thekey/info.json | 3 + keyboards/massdrop/thekey_v2/config.h | 1 - keyboards/massdrop/thekey_v2/info.json | 3 + keyboards/matrix/abelx/config.h | 1 - keyboards/matrix/abelx/info.json | 3 + keyboards/matrix/cain_re/config.h | 2 - keyboards/matrix/cain_re/info.json | 3 + keyboards/matrix/falcon/config.h | 1 - keyboards/matrix/falcon/info.json | 3 + keyboards/matrix/m12og/rev1/config.h | 1 - keyboards/matrix/m12og/rev1/info.json | 3 + keyboards/matrix/m12og/rev2/config.h | 2 - keyboards/matrix/m12og/rev2/info.json | 3 + keyboards/matrix/m20add/config.h | 1 - keyboards/matrix/m20add/info.json | 3 + keyboards/matrix/me/config.h | 1 - keyboards/matrix/me/info.json | 3 + keyboards/matrix/noah/config.h | 1 - keyboards/matrix/noah/info.json | 3 + keyboards/maxr1998/phoebe/info.json | 4 +- keyboards/maxr1998/pulse4k/config.h | 1 - keyboards/maxr1998/pulse4k/info.json | 3 + keyboards/mechanickeys/undead60m/config.h | 1 - keyboards/mechanickeys/undead60m/info.json | 3 + keyboards/mechbrewery/mb65s/config.h | 1 - keyboards/mechbrewery/mb65s/info.json | 3 + keyboards/mechkeys/acr60/config.h | 1 - keyboards/mechkeys/acr60/info.json | 3 + keyboards/mechkeys/alu84/config.h | 1 - keyboards/mechkeys/alu84/info.json | 3 + keyboards/mechkeys/espectro/config.h | 1 - keyboards/mechkeys/espectro/info.json | 3 + keyboards/mechkeys/mechmini/v1/config.h | 3 - keyboards/mechkeys/mechmini/v2/config.h | 1 - keyboards/mechkeys/mechmini/v2/info.json | 3 + keyboards/mechkeys/mk60/config.h | 1 - keyboards/mechkeys/mk60/info.json | 3 + keyboards/mechllama/g35/config.h | 2 - keyboards/mechllama/g35/info.json | 3 + keyboards/mechlovin/adelais/rgb_led/rev1/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev1/info.json | 3 + keyboards/mechlovin/adelais/rgb_led/rev2/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev2/info.json | 3 + keyboards/mechlovin/adelais/rgb_led/rev3/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev3/info.json | 1 + .../mechlovin/adelais/standard_led/arm/config.h | 1 - .../mechlovin/adelais/standard_led/arm/info.json | 3 + .../adelais/standard_led/avr/rev1/config.h | 1 - .../adelais/standard_led/avr/rev1/info.json | 3 + keyboards/mechlovin/delphine/mono_led/config.h | 1 - keyboards/mechlovin/delphine/mono_led/info.json | 3 + keyboards/mechlovin/delphine/rgb_led/config.h | 1 - keyboards/mechlovin/delphine/rgb_led/info.json | 3 + keyboards/mechlovin/foundation/config.h | 1 - keyboards/mechlovin/foundation/info.json | 3 + keyboards/mechlovin/hannah60rgb/rev1/config.h | 1 - keyboards/mechlovin/hannah60rgb/rev1/info.json | 3 + keyboards/mechlovin/hannah60rgb/rev2/config.h | 1 - keyboards/mechlovin/hannah60rgb/rev2/info.json | 3 + keyboards/mechlovin/hannah910/config.h | 1 - keyboards/mechlovin/hannah910/rev1/info.json | 3 + keyboards/mechlovin/hannah910/rev2/info.json | 3 + keyboards/mechlovin/hannah910/rev3/info.json | 3 + .../mechlovin/infinity87/rev1/standard/config.h | 1 - .../mechlovin/infinity87/rev1/standard/info.json | 3 + keyboards/mechlovin/infinity87/rev2/config.h | 1 - keyboards/mechlovin/infinity87/rev2/info.json | 3 + keyboards/mechlovin/infinity875/config.h | 1 - keyboards/mechlovin/infinity875/info.json | 3 + keyboards/mechlovin/infinity88/config.h | 1 - keyboards/mechlovin/infinity88/info.json | 3 + keyboards/mechlovin/infinityce/config.h | 1 - keyboards/mechlovin/infinityce/info.json | 3 + keyboards/mechlovin/kanu/config.h | 1 - keyboards/mechlovin/kanu/info.json | 3 + keyboards/mechlovin/kay60/config.h | 1 - keyboards/mechlovin/kay60/info.json | 3 + keyboards/mechlovin/kay65/config.h | 1 - keyboards/mechlovin/kay65/info.json | 3 + keyboards/mechlovin/olly/bb/config.h | 1 - keyboards/mechlovin/olly/bb/info.json | 3 + keyboards/mechlovin/olly/jf/config.h | 1 - keyboards/mechlovin/olly/jf/info.json | 3 + keyboards/mechlovin/olly/octagon/config.h | 1 - keyboards/mechlovin/olly/octagon/info.json | 3 + keyboards/mechlovin/olly/orion/config.h | 1 - keyboards/mechlovin/olly/orion/info.json | 3 + keyboards/mechlovin/pisces/config.h | 1 - keyboards/mechlovin/pisces/info.json | 3 + keyboards/mechlovin/serratus/config.h | 1 - keyboards/mechlovin/serratus/info.json | 3 + keyboards/mechlovin/zed60/config.h | 1 - keyboards/mechlovin/zed60/info.json | 1 + keyboards/mechlovin/zed65/mono_led/config.h | 1 - keyboards/mechlovin/zed65/mono_led/info.json | 3 + .../zed65/no_backlight/wearhaus66/config.h | 1 - .../zed65/no_backlight/wearhaus66/info.json | 1 + keyboards/mechstudio/ud_40_ortho/config.h | 1 - keyboards/mechstudio/ud_40_ortho/info.json | 3 + keyboards/mechwild/bde/lefty/info.json | 4 +- keyboards/mechwild/bde/rev2/info.json | 4 +- keyboards/mechwild/bde/righty/info.json | 4 +- keyboards/mechwild/mokulua/mirrored/config.h | 1 - keyboards/mechwild/mokulua/mirrored/info.json | 3 + keyboards/mechwild/mokulua/standard/config.h | 1 - keyboards/mechwild/mokulua/standard/info.json | 3 + keyboards/mechwild/murphpad/config.h | 1 - keyboards/mechwild/murphpad/info.json | 3 + keyboards/mechwild/obe/config.h | 1 - keyboards/mechwild/obe/info.json | 3 + keyboards/mechwild/puckbuddy/config.h | 1 - keyboards/mechwild/puckbuddy/info.json | 3 + keyboards/mechwild/sugarglider/info.json | 4 +- keyboards/mechwild/waka60/config.h | 1 - keyboards/mechwild/waka60/info.json | 3 + keyboards/meletrix/zoom87/config.h | 1 - keyboards/meletrix/zoom87/info.json | 3 + keyboards/melgeek/mj6xy/rev3/config.h | 2 - keyboards/melgeek/mj6xy/rev3/info.json | 3 + keyboards/meow48/config.h | 1 - keyboards/meow48/info.json | 3 + keyboards/merge/uc1/config.h | 1 - keyboards/merge/uc1/info.json | 3 + keyboards/merge/um70/config.h | 1 - keyboards/merge/um70/info.json | 3 + keyboards/merge/um80/config.h | 1 - keyboards/merge/um80/info.json | 3 + keyboards/meson/config.h | 1 - keyboards/meson/info.json | 3 + keyboards/mexsistor/ludmila/config.h | 1 - keyboards/mexsistor/ludmila/info.json | 3 + keyboards/mincedshon/ecila/config.h | 1 - keyboards/mincedshon/ecila/info.json | 3 + keyboards/miniaxe/config.h | 1 - keyboards/miniaxe/info.json | 3 + keyboards/minimacro5/config.h | 1 - keyboards/minimacro5/info.json | 3 + keyboards/minimon/index_tab/config.h | 1 - keyboards/minimon/index_tab/info.json | 3 + keyboards/mint60/config.h | 3 - keyboards/mint60/info.json | 3 + keyboards/misonoworks/chocolatebar/config.h | 1 - keyboards/misonoworks/chocolatebar/info.json | 3 + keyboards/misonoworks/karina/config.h | 1 - keyboards/misonoworks/karina/info.json | 3 + keyboards/misterknife/knife66/config.h | 2 - keyboards/misterknife/knife66/info.json | 1 + keyboards/misterknife/knife66_iso/config.h | 2 - keyboards/misterknife/knife66_iso/info.json | 1 + keyboards/miuni32/config.h | 1 - keyboards/miuni32/info.json | 3 + keyboards/mixi/config.h | 1 - keyboards/mixi/info.json | 3 + keyboards/mk65/info.json | 4 +- keyboards/ml/gas75/config.h | 3 - keyboards/ml/gas75/info.json | 3 + keyboards/mlego/m48/rev1/config.h | 1 - keyboards/mlego/m48/rev1/info.json | 3 + keyboards/mlego/m60/rev1/config.h | 1 - keyboards/mlego/m60/rev1/info.json | 3 + keyboards/mlego/m60_split/rev1/config.h | 1 - keyboards/mlego/m60_split/rev1/info.json | 3 + keyboards/mlego/m60_split/rev2/config.h | 1 - keyboards/mlego/m60_split/rev2/info.json | 3 + keyboards/mlego/m65/rev1/config.h | 2 - keyboards/mlego/m65/rev1/info.json | 3 + keyboards/mlego/m65/rev2/config.h | 2 - keyboards/mlego/m65/rev2/info.json | 3 + keyboards/mlego/m65/rev3/config.h | 1 - keyboards/mlego/m65/rev3/info.json | 3 + keyboards/mlego/m65/rev4/config.h | 1 - keyboards/mlego/m65/rev4/info.json | 3 + keyboards/momoka_ergo/config.h | 1 - keyboards/momoka_ergo/info.json | 3 + keyboards/momokai/tap_duo/config.h | 1 - keyboards/momokai/tap_duo/info.json | 3 + keyboards/momokai/tap_trio/config.h | 1 - keyboards/momokai/tap_trio/info.json | 3 + keyboards/monstargear/xo87/rgb/config.h | 1 - keyboards/monstargear/xo87/rgb/info.json | 3 + keyboards/monstargear/xo87/solderable/config.h | 1 - keyboards/monstargear/xo87/solderable/info.json | 3 + keyboards/montsinger/rebound/rev4/config.h | 1 - keyboards/montsinger/rebound/rev4/info.json | 3 + keyboards/mschwingen/modelm/config.h | 1 - keyboards/mschwingen/modelm/info.json | 3 + keyboards/mss_studio/m63_rgb/config.h | 3 - keyboards/mss_studio/m63_rgb/info.json | 3 + keyboards/mss_studio/m64_rgb/config.h | 3 - keyboards/mss_studio/m64_rgb/info.json | 3 + keyboards/mt/blocked65/config.h | 1 - keyboards/mt/blocked65/info.json | 3 + keyboards/mt/mt40/config.h | 2 - keyboards/mt/mt64rgb/config.h | 1 - keyboards/mt/mt64rgb/info.json | 3 + keyboards/mt/mt84/config.h | 1 - keyboards/mt/mt84/info.json | 3 + keyboards/mt/mt980/config.h | 1 - keyboards/mt/mt980/info.json | 3 + keyboards/mt/ncr80/hotswap/config.h | 1 - keyboards/mt/ncr80/hotswap/info.json | 3 + keyboards/mtbkeys/mtb60/hotswap/config.h | 3 - keyboards/mtbkeys/mtb60/hotswap/info.json | 3 + keyboards/mtbkeys/mtb60/solder/config.h | 3 - keyboards/mtbkeys/mtb60/solder/info.json | 3 + keyboards/mwstudio/alicekk/config.h | 3 - keyboards/mwstudio/alicekk/info.json | 3 + keyboards/mwstudio/mw65_black/config.h | 1 - keyboards/mwstudio/mw65_black/info.json | 3 + keyboards/mwstudio/mw65_rgb/config.h | 3 - keyboards/mwstudio/mw65_rgb/info.json | 3 + keyboards/mwstudio/mw660/config.h | 2 - keyboards/mwstudio/mw660/info.json | 3 + keyboards/mwstudio/mw75/config.h | 1 - keyboards/mwstudio/mw75/info.json | 3 + keyboards/mwstudio/mw75r2/config.h | 1 - keyboards/mwstudio/mw75r2/info.json | 3 + keyboards/mwstudio/mw80/info.json | 2 +- keyboards/mxss/config.h | 1 - keyboards/mxss/info.json | 3 + keyboards/nack/config.h | 1 - keyboards/nack/info.json | 1 + keyboards/nacly/splitreus62/config.h | 3 - keyboards/nacly/splitreus62/info.json | 3 + keyboards/neito/config.h | 1 - keyboards/neito/info.json | 3 + keyboards/neokeys/g67/element_hs/config.h | 1 - keyboards/neokeys/g67/element_hs/info.json | 3 + keyboards/neokeys/g67/hotswap/config.h | 1 - keyboards/neokeys/g67/hotswap/info.json | 3 + keyboards/neokeys/g67/soldered/config.h | 1 - keyboards/neokeys/g67/soldered/info.json | 3 + keyboards/neson_design/700e/config.h | 1 - keyboards/neson_design/700e/info.json | 3 + keyboards/neson_design/n6/config.h | 1 - keyboards/neson_design/n6/info.json | 3 + keyboards/newgame40/config.h | 1 - keyboards/newgame40/info.json | 3 + keyboards/nightly_boards/adellein/config.h | 1 - keyboards/nightly_boards/adellein/info.json | 3 + keyboards/nightly_boards/alter/rev1/config.h | 1 - keyboards/nightly_boards/alter/rev1/info.json | 3 + keyboards/nightly_boards/conde60/config.h | 1 - keyboards/nightly_boards/conde60/info.json | 3 + keyboards/nightly_boards/n2/config.h | 1 - keyboards/nightly_boards/n2/info.json | 3 + keyboards/nightly_boards/n40_o/config.h | 1 - keyboards/nightly_boards/n40_o/info.json | 3 + keyboards/nightly_boards/n60_s/config.h | 1 - keyboards/nightly_boards/n60_s/info.json | 3 + keyboards/nightly_boards/n87/config.h | 1 - keyboards/nightly_boards/n87/info.json | 3 + keyboards/nightly_boards/n9/config.h | 1 - keyboards/nightly_boards/n9/info.json | 3 + keyboards/nightly_boards/octopad/config.h | 1 - keyboards/nightly_boards/octopad/info.json | 3 + keyboards/nightly_boards/octopadplus/info.json | 4 +- keyboards/ning/tiny_board/tb16_rgb/config.h | 1 - keyboards/ning/tiny_board/tb16_rgb/info.json | 3 + keyboards/nix_studio/oxalys80/config.h | 1 - keyboards/nix_studio/oxalys80/info.json | 3 + keyboards/novelkeys/nk1/config.h | 1 - keyboards/novelkeys/nk1/info.json | 3 + keyboards/novelkeys/nk20/config.h | 1 - keyboards/novelkeys/nk20/info.json | 1 + keyboards/novelkeys/nk65b/config.h | 1 - keyboards/novelkeys/nk65b/info.json | 1 + keyboards/novelkeys/nk87b/config.h | 1 - keyboards/novelkeys/nk87b/info.json | 1 + keyboards/novelkeys/novelpad/config.h | 1 - keyboards/novelkeys/novelpad/info.json | 3 + keyboards/noxary/268_2_rgb/config.h | 1 - keyboards/noxary/268_2_rgb/info.json | 3 + keyboards/noxary/x268/config.h | 1 - keyboards/noxary/x268/info.json | 3 + keyboards/nullbitsco/nibble/config.h | 1 - keyboards/nullbitsco/nibble/info.json | 3 + keyboards/nullbitsco/tidbit/config.h | 1 - keyboards/nullbitsco/tidbit/info.json | 3 + keyboards/numatreus/config.h | 3 - keyboards/numatreus/info.json | 3 + keyboards/obosob/arch_36/config.h | 1 - keyboards/obosob/arch_36/info.json | 3 + keyboards/ogre/ergo_single/config.h | 1 - keyboards/ogre/ergo_single/info.json | 3 + keyboards/ogre/ergo_split/config.h | 1 - keyboards/ogre/ergo_split/info.json | 3 + keyboards/ok60/config.h | 1 - keyboards/ok60/info.json | 3 + keyboards/om60/config.h | 3 - keyboards/om60/info.json | 3 + keyboards/omkbd/ergodash/mini/config.h | 1 - keyboards/omkbd/ergodash/mini/info.json | 3 + keyboards/omkbd/ergodash/rev1/config.h | 1 - keyboards/omkbd/ergodash/rev1/info.json | 3 + keyboards/omkbd/runner3680/3x6/config.h | 1 - keyboards/omkbd/runner3680/3x6/info.json | 3 + keyboards/omkbd/runner3680/3x7/config.h | 1 - keyboards/omkbd/runner3680/3x7/info.json | 3 + keyboards/omkbd/runner3680/3x8/config.h | 1 - keyboards/omkbd/runner3680/3x8/info.json | 3 + keyboards/omkbd/runner3680/4x6/config.h | 1 - keyboards/omkbd/runner3680/4x6/info.json | 3 + keyboards/omkbd/runner3680/4x7/config.h | 1 - keyboards/omkbd/runner3680/4x7/info.json | 3 + keyboards/omkbd/runner3680/4x8/config.h | 1 - keyboards/omkbd/runner3680/4x8/info.json | 3 + keyboards/omkbd/runner3680/5x6/config.h | 1 - keyboards/omkbd/runner3680/5x6/info.json | 3 + keyboards/omkbd/runner3680/5x6_5x8/config.h | 1 - keyboards/omkbd/runner3680/5x6_5x8/info.json | 3 + keyboards/omkbd/runner3680/5x7/config.h | 1 - keyboards/omkbd/runner3680/5x7/info.json | 3 + keyboards/omkbd/runner3680/5x8/config.h | 1 - keyboards/omkbd/runner3680/5x8/info.json | 3 + keyboards/org60/config.h | 2 - keyboards/org60/info.json | 3 + keyboards/orthocode/config.h | 1 - keyboards/orthocode/info.json | 3 + keyboards/orthodox/keymaps/drashna/config.h | 2 +- keyboards/orthodox/keymaps/shaymdev/config.h | 4 +- keyboards/owlab/jelly_epoch/hotswap/config.h | 1 - keyboards/owlab/jelly_epoch/hotswap/info.json | 3 + keyboards/owlab/jelly_epoch/soldered/config.h | 1 - keyboards/owlab/jelly_epoch/soldered/info.json | 3 + keyboards/owlab/spring/config.h | 1 - keyboards/owlab/spring/info.json | 3 + keyboards/owlab/voice65/hotswap/config.h | 1 - keyboards/owlab/voice65/hotswap/info.json | 3 + keyboards/owlab/voice65/soldered/config.h | 1 - keyboards/owlab/voice65/soldered/info.json | 3 + keyboards/p3d/glitch/config.h | 1 - keyboards/p3d/glitch/info.json | 3 + keyboards/panc40/config.h | 1 - keyboards/panc40/info.json | 3 + keyboards/paprikman/albacore/config.h | 2 - keyboards/paprikman/albacore/info.json | 3 + keyboards/pauperboards/brick/info.json | 4 +- keyboards/pearlboards/atlas/config.h | 1 - keyboards/pearlboards/atlas/info.json | 3 + keyboards/pearlboards/pandora/config.h | 1 - keyboards/pearlboards/pandora/info.json | 3 + keyboards/pearlboards/pearl/config.h | 1 - keyboards/pearlboards/pearl/info.json | 3 + keyboards/pearlboards/zeus/config.h | 1 - keyboards/pearlboards/zeus/info.json | 3 + keyboards/pearlboards/zeuspad/config.h | 1 - keyboards/pearlboards/zeuspad/info.json | 3 + keyboards/percent/booster/config.h | 1 - keyboards/percent/booster/info.json | 3 + keyboards/percent/canoe_gen2/config.h | 1 - keyboards/percent/canoe_gen2/info.json | 3 + keyboards/phage_studio/pila87/config.h | 3 - keyboards/phage_studio/pila87/info.json | 3 + keyboards/phantom/config.h | 1 - keyboards/phantom/info.json | 3 + keyboards/phase_studio/titan65/hotswap/config.h | 1 - keyboards/phase_studio/titan65/hotswap/info.json | 3 + keyboards/pica40/rev1/info.json | 4 +- keyboards/pica40/rev2/info.json | 2 +- keyboards/pico/65keys/config.h | 3 - keyboards/pico/65keys/info.json | 3 + keyboards/pico/70keys/config.h | 3 - keyboards/pico/70keys/info.json | 3 + keyboards/picolab/frusta_fundamental/config.h | 1 - keyboards/picolab/frusta_fundamental/info.json | 3 + keyboards/pimentoso/touhoupad/config.h | 1 - keyboards/pimentoso/touhoupad/info.json | 3 + keyboards/pixelspace/capsule65i/config.h | 1 - keyboards/pixelspace/capsule65i/info.json | 3 + keyboards/planck/keymaps/experimental/config.h | 2 +- keyboards/planck/keymaps/myoung34/config.h | 2 +- keyboards/planck/rev6/config.h | 1 - keyboards/planck/rev6/info.json | 1 + keyboards/planck/rev6_drop/config.h | 1 - keyboards/planck/rev6_drop/info.json | 1 + keyboards/playkbtw/ca66/config.h | 1 - keyboards/playkbtw/ca66/info.json | 3 + keyboards/playkbtw/helen80/config.h | 1 - keyboards/playkbtw/helen80/info.json | 3 + keyboards/playkbtw/pk60/config.h | 1 - keyboards/playkbtw/pk60/info.json | 3 + keyboards/playkbtw/pk64rgb/config.h | 1 - keyboards/playkbtw/pk64rgb/info.json | 3 + keyboards/ploopyco/mouse/config.h | 1 - keyboards/ploopyco/mouse/info.json | 3 + keyboards/ploopyco/trackball/rev1_005/config.h | 2 - keyboards/ploopyco/trackball/rev1_005/info.json | 3 + .../ploopyco/trackball_thumb/rev1_001/info.json | 5 +- keyboards/plume/plume65/config.h | 1 - keyboards/plume/plume65/info.json | 3 + keyboards/plut0nium/0x3e/config.h | 1 - keyboards/plut0nium/0x3e/info.json | 3 + keyboards/plywrks/allaro/info.json | 4 +- keyboards/plywrks/lune/config.h | 1 - keyboards/plywrks/lune/info.json | 3 + keyboards/pohjolaworks/louhi/config.h | 1 - keyboards/pohjolaworks/louhi/info.json | 3 + keyboards/poker87c/config.h | 1 - keyboards/poker87c/info.json | 3 + keyboards/poker87d/config.h | 1 - keyboards/poker87d/info.json | 3 + keyboards/polycarbdiet/s20/config.h | 1 - keyboards/polycarbdiet/s20/info.json | 3 + keyboards/pom_keyboards/tnln95/config.h | 1 - keyboards/pom_keyboards/tnln95/info.json | 3 + keyboards/preonic/keymaps/seph/config.h | 4 +- keyboards/preonic/rev3/config.h | 1 - keyboards/preonic/rev3/info.json | 1 + keyboards/preonic/rev3_drop/config.h | 1 - keyboards/preonic/rev3_drop/info.json | 1 + keyboards/primekb/meridian/config.h | 1 - keyboards/primekb/meridian/ktr1010/config.h | 1 - keyboards/primekb/meridian/ktr1010/info.json | 5 + keyboards/primekb/meridian/ws2812/config.h | 1 - keyboards/primekb/meridian/ws2812/info.json | 1 + keyboards/primekb/meridian_rgb/config.h | 1 - keyboards/primekb/meridian_rgb/info.json | 3 + keyboards/primekb/prime_e/rgb/config.h | 2 - keyboards/primekb/prime_e/rgb/info.json | 3 + keyboards/program_yoink/config.h | 1 - keyboards/program_yoink/ortho/info.json | 3 + keyboards/program_yoink/staggered/info.json | 3 + keyboards/projectkb/alice/rev1/config.h | 1 - keyboards/projectkb/alice/rev1/info.json | 1 + keyboards/projectkb/alice/rev2/config.h | 1 - keyboards/projectkb/alice/rev2/info.json | 1 + keyboards/protozoa/p01/config.h | 1 - keyboards/protozoa/p01/info.json | 1 + keyboards/pteron36/config.h | 1 - keyboards/pteron36/info.json | 3 + keyboards/qpockets/space_space/rev2/config.h | 1 - keyboards/qpockets/space_space/rev2/info.json | 3 + keyboards/quad_h/lb75/config.h | 1 - keyboards/quad_h/lb75/info.json | 3 + keyboards/quarkeys/z40/config.h | 1 - keyboards/quarkeys/z40/info.json | 3 + keyboards/quarkeys/z60/hotswap/config.h | 1 - keyboards/quarkeys/z60/hotswap/info.json | 3 + keyboards/quarkeys/z60/solder/config.h | 1 - keyboards/quarkeys/z60/solder/info.json | 3 + keyboards/quarkeys/z67/hotswap/config.h | 1 - keyboards/quarkeys/z67/hotswap/info.json | 3 + keyboards/quarkeys/z67/solder/config.h | 1 - keyboards/quarkeys/z67/solder/info.json | 3 + keyboards/qvex/lynepad/config.h | 1 - keyboards/qvex/lynepad/info.json | 3 + keyboards/qwertyydox/config.h | 1 - keyboards/qwertyydox/info.json | 3 + keyboards/rainkeebs/delilah/config.h | 2 - keyboards/rainkeebs/delilah/info.json | 3 + keyboards/rainkeebs/yasui/config.h | 2 - keyboards/rainkeebs/yasui/info.json | 3 + keyboards/rart/rart4x4/config.h | 1 - keyboards/rart/rart4x4/info.json | 3 + keyboards/rart/rart67/config.h | 1 - keyboards/rart/rart67/info.json | 3 + keyboards/rart/rart75hs/config.h | 1 - keyboards/rart/rart75hs/info.json | 3 + keyboards/rart/rart80/config.h | 1 - keyboards/rart/rart80/info.json | 3 + keyboards/rart/rartlice/config.h | 1 - keyboards/rart/rartlice/info.json | 1 + keyboards/rart/rartpad/config.h | 1 - keyboards/rart/rartpad/info.json | 3 + keyboards/rate/pistachio/rev1/config.h | 1 - keyboards/rate/pistachio/rev1/info.json | 3 + keyboards/rate/pistachio/rev2/config.h | 1 - keyboards/rate/pistachio/rev2/info.json | 3 + keyboards/rate/pistachio_mp/config.h | 1 - keyboards/rate/pistachio_mp/info.json | 3 + .../rationalist/ratio65_hotswap/rev_a/config.h | 1 - .../rationalist/ratio65_hotswap/rev_a/info.json | 3 + .../rationalist/ratio65_solder/rev_a/config.h | 1 - .../rationalist/ratio65_solder/rev_a/info.json | 3 + keyboards/recompile_keys/mio/config.h | 1 - keyboards/recompile_keys/mio/info.json | 3 + .../nomu30/keymaps/center_sprit/config.h | 2 +- .../nomu30/keymaps/like_jis/config.h | 2 +- keyboards/rect44/config.h | 1 - keyboards/rect44/info.json | 3 + keyboards/redox/keymaps/thattolleyguy/config.h | 4 +- keyboards/redox/rev1/base/info.json | 3 + keyboards/redox/rev1/config.h | 3 - keyboards/redox/rev1/proton_c/config.h | 4 - keyboards/redox/rev1/proton_c/info.json | 3 + keyboards/reedskeebs/alish40/info.json | 4 +- keyboards/retro_75/config.h | 1 - keyboards/retro_75/info.json | 3 + keyboards/reversestudio/decadepad/config.h | 1 - keyboards/reversestudio/decadepad/info.json | 3 + keyboards/reviung/reviung33/config.h | 1 - keyboards/reviung/reviung33/info.json | 3 + .../reviung/reviung34/keymaps/default_rgb/config.h | 2 +- .../reviung34/keymaps/default_rgb2u/config.h | 2 +- .../reviung/reviung39/keymaps/default/config.h | 2 +- .../reviung/reviung39/keymaps/default_s/config.h | 2 +- .../reviung/reviung39/keymaps/toshi0383/config.h | 2 +- keyboards/reviung/reviung41/config.h | 1 - keyboards/reviung/reviung41/info.json | 3 + keyboards/reviung/reviung5/config.h | 1 - keyboards/reviung/reviung5/info.json | 3 + keyboards/reviung/reviung53/config.h | 1 - keyboards/reviung/reviung53/info.json | 3 + .../reviung/reviung61/keymaps/default_rgb/config.h | 2 +- keyboards/rgbkb/mun/config.h | 1 - keyboards/rgbkb/mun/rev1/info.json | 1 + keyboards/rgbkb/pan/pan.c | 1 - keyboards/rgbkb/pan/rev1/32a/config.h | 19 -- keyboards/rgbkb/pan/rev1/32a/info.json | 3 + keyboards/rgbkb/pan/rev1/proton_c/config.h | 19 -- keyboards/rgbkb/pan/rev1/proton_c/info.json | 3 + keyboards/rgbkb/sol/rev1/config.h | 3 - keyboards/rgbkb/sol/rev1/info.json | 3 + keyboards/rgbkb/sol/rev2/config.h | 3 - keyboards/rgbkb/sol/rev2/info.json | 3 + keyboards/rgbkb/sol3/config.h | 1 - keyboards/rgbkb/sol3/rev1/info.json | 1 + keyboards/rgbkb/zen/rev1/config.h | 3 - keyboards/rgbkb/zen/rev1/info.json | 3 + keyboards/rgbkb/zen/rev2/config.h | 2 - keyboards/rgbkb/zen/rev2/info.json | 3 + keyboards/rgbkb/zygomorph/rev1/config.h | 2 - keyboards/rgbkb/zygomorph/rev1/info.json | 3 + keyboards/rmi_kb/squishy65/config.h | 2 - keyboards/rmi_kb/squishy65/info.json | 3 + keyboards/rmi_kb/squishyfrl/config.h | 1 - keyboards/rmi_kb/squishyfrl/info.json | 3 + keyboards/rmi_kb/squishytkl/config.h | 1 - keyboards/rmi_kb/squishytkl/info.json | 3 + keyboards/rmi_kb/tkl_ff/v2/config.h | 1 - keyboards/rmi_kb/tkl_ff/v2/info.json | 3 + keyboards/rmi_kb/wete/v1/config.h | 2 - keyboards/rmi_kb/wete/v1/info.json | 3 + keyboards/rmi_kb/wete/v2/config.h | 1 - keyboards/rmi_kb/wete/v2/info.json | 3 + keyboards/rocketboard_16/config.h | 1 - keyboards/rocketboard_16/info.json | 3 + keyboards/runes/vaengr/config.h | 1 - keyboards/runes/vaengr/info.json | 3 + keyboards/rura66/rev1/config.h | 1 - keyboards/rura66/rev1/info.json | 3 + keyboards/ryanbaekr/rb18/config.h | 1 - keyboards/ryanbaekr/rb18/info.json | 3 + keyboards/ryanbaekr/rb69/config.h | 1 - keyboards/ryanbaekr/rb69/info.json | 3 + keyboards/ryanbaekr/rb87/config.h | 1 - keyboards/ryanbaekr/rb87/info.json | 3 + keyboards/ryanskidmore/rskeys100/config.h | 2 - keyboards/ryanskidmore/rskeys100/info.json | 3 + keyboards/ryloo_studio/m0110/config.h | 1 - keyboards/ryloo_studio/m0110/info.json | 3 + keyboards/s_ol/0xc_pad/config.h | 1 - keyboards/s_ol/0xc_pad/info.json | 3 + keyboards/saevus/cor_tkl/config.h | 1 - keyboards/saevus/cor_tkl/info.json | 1 + keyboards/salicylic_acid3/7skb/rev1/config.h | 3 - keyboards/salicylic_acid3/7skb/rev1/info.json | 3 + keyboards/salicylic_acid3/7splus/config.h | 3 - keyboards/salicylic_acid3/7splus/info.json | 3 + keyboards/salicylic_acid3/ergoarrows/config.h | 3 - keyboards/salicylic_acid3/ergoarrows/info.json | 3 + keyboards/salicylic_acid3/getta25/rev1/config.h | 3 - keyboards/salicylic_acid3/getta25/rev1/info.json | 3 + keyboards/salicylic_acid3/guide68/info.json | 4 +- keyboards/salicylic_acid3/jisplit89/rev1/config.h | 3 - keyboards/salicylic_acid3/jisplit89/rev1/info.json | 3 + keyboards/salicylic_acid3/nafuda/config.h | 3 - keyboards/salicylic_acid3/nafuda/info.json | 3 + keyboards/salicylic_acid3/naked48/rev1/config.h | 3 - keyboards/salicylic_acid3/naked48/rev1/info.json | 3 + keyboards/salicylic_acid3/naked64/rev1/config.h | 3 - keyboards/salicylic_acid3/naked64/rev1/info.json | 3 + keyboards/salicylic_acid3/nknl7en/config.h | 3 - keyboards/salicylic_acid3/nknl7en/info.json | 3 + keyboards/salicylic_acid3/nknl7jp/config.h | 3 - keyboards/salicylic_acid3/nknl7jp/info.json | 3 + keyboards/salicylic_acid3/setta21/rev1/config.h | 3 - keyboards/salicylic_acid3/setta21/rev1/info.json | 3 + keyboards/sam/s80/config.h | 1 - keyboards/sam/s80/info.json | 3 + keyboards/sam/sg81m/config.h | 1 - keyboards/sam/sg81m/info.json | 3 + keyboards/sawnsprojects/amber80/solder/config.h | 1 - keyboards/sawnsprojects/amber80/solder/info.json | 3 + .../sawnsprojects/eclipse/eclipse60/info.json | 4 +- keyboards/sawnsprojects/eclipse/tinyneko/info.json | 4 +- .../sawnsprojects/krush/krush60/solder/config.h | 1 - .../sawnsprojects/krush/krush60/solder/info.json | 3 + .../sawnsprojects/krush/krush65/hotswap/config.h | 1 - .../sawnsprojects/krush/krush65/hotswap/info.json | 3 + .../sawnsprojects/krush/krush65/solder/config.h | 1 - .../sawnsprojects/krush/krush65/solder/info.json | 3 + keyboards/sawnsprojects/plaque80/info.json | 4 +- keyboards/sawnsprojects/satxri6key/config.h | 1 - keyboards/sawnsprojects/satxri6key/info.json | 3 + keyboards/sawnsprojects/vcl65/solder/config.h | 1 - keyboards/sawnsprojects/vcl65/solder/info.json | 3 + keyboards/sck/gtm/config.h | 1 - keyboards/sck/gtm/info.json | 3 + keyboards/sck/osa/config.h | 1 - keyboards/sck/osa/info.json | 3 + keyboards/sendyyeah/pix/config.h | 1 - keyboards/sendyyeah/pix/info.json | 3 + keyboards/senselessclay/ck60/config.h | 1 - keyboards/senselessclay/ck60/info.json | 3 + keyboards/senselessclay/ck65/config.h | 1 - keyboards/senselessclay/ck65/info.json | 3 + keyboards/senselessclay/gos65/config.h | 1 - keyboards/senselessclay/gos65/info.json | 3 + keyboards/sentraq/number_pad/config.h | 1 - keyboards/sentraq/number_pad/info.json | 3 + keyboards/sentraq/s60_x/rgb/config.h | 1 - keyboards/sentraq/s60_x/rgb/info.json | 3 + keyboards/sentraq/s65_plus/config.h | 1 - keyboards/sentraq/s65_plus/info.json | 3 + keyboards/sentraq/s65_x/config.h | 1 - keyboards/sentraq/s65_x/info.json | 3 + keyboards/sets3n/kk980/config.h | 1 - keyboards/sets3n/kk980/info.json | 3 + keyboards/silverbullet44/config.h | 1 - keyboards/silverbullet44/info.json | 3 + keyboards/skeletn87/hotswap/config.h | 1 - keyboards/skeletn87/hotswap/info.json | 3 + keyboards/skeletn87/soldered/config.h | 1 - keyboards/skeletn87/soldered/info.json | 3 + keyboards/skeletonkbd/skeletonnumpad/config.h | 1 - keyboards/skeletonkbd/skeletonnumpad/info.json | 3 + keyboards/skippys_custom_pcs/rooboard65/config.h | 1 - keyboards/skippys_custom_pcs/rooboard65/info.json | 3 + keyboards/skippys_custom_pcs/roopad/config.h | 1 - keyboards/skippys_custom_pcs/roopad/info.json | 3 + keyboards/skmt/15k/config.h | 1 - keyboards/skmt/15k/info.json | 1 + keyboards/smithrune/iron165r2/f072/config.h | 1 - keyboards/smithrune/iron165r2/f072/info.json | 3 + keyboards/smithrune/iron165r2/f411/config.h | 1 - keyboards/smithrune/iron165r2/f411/info.json | 1 + keyboards/smk60/config.h | 1 - keyboards/smk60/info.json | 3 + keyboards/sneakbox/aliceclonergb/config.h | 1 - keyboards/sneakbox/aliceclonergb/info.json | 3 + keyboards/sneakbox/ava/config.h | 1 - keyboards/sneakbox/ava/info.json | 3 + keyboards/soda/cherish/config.h | 1 - keyboards/soda/cherish/info.json | 3 + keyboards/soda/pocket/config.h | 2 - keyboards/soda/pocket/info.json | 3 + keyboards/sofle/keyhive/config.h | 1 - keyboards/sofle/keyhive/info.json | 3 + keyboards/sofle/keymaps/bastien-baloup_fr/config.h | 2 +- keyboards/sofle/keymaps/devdev/config.h | 2 +- keyboards/sofle/keymaps/killmaster/config.h | 2 +- keyboards/sofle/keymaps/rgb_default/config.h | 2 +- keyboards/sofle/keymaps/via/config.h | 2 +- keyboards/sowbug/68keys/config.h | 2 - keyboards/sowbug/68keys/info.json | 3 + keyboards/sowbug/ansi_tkl/config.h | 1 - keyboards/sowbug/ansi_tkl/info.json | 3 + keyboards/spaceholdings/nebula12/config.h | 1 - keyboards/spaceholdings/nebula12/info.json | 1 + keyboards/spaceholdings/nebula12b/config.h | 1 - keyboards/spaceholdings/nebula12b/info.json | 3 + keyboards/spaceholdings/nebula68/config.h | 1 - keyboards/spaceholdings/nebula68/info.json | 1 + keyboards/spaceholdings/nebula68b/config.h | 1 - keyboards/spaceholdings/nebula68b/info.json | 3 + keyboards/spaceman/2_milk/config.h | 1 - keyboards/spaceman/2_milk/info.json | 3 + keyboards/splitkb/aurora/corne/rev1/info.json | 4 +- keyboards/splitkb/aurora/lily58/rev1/info.json | 4 +- keyboards/splitkb/aurora/sweep/rev1/info.json | 4 +- keyboards/splitkb/kyria/rev1/config.h | 4 +- keyboards/splitkb/kyria/rev2/config.h | 4 +- keyboards/splitkb/kyria/rev3/info.json | 4 +- keyboards/splitkb/zima/config.h | 1 - keyboards/splitkb/zima/info.json | 3 + keyboards/star75/config.h | 2 - keyboards/star75/info.json | 3 + keyboards/stello65/hs_rev1/config.h | 1 - keyboards/stello65/hs_rev1/info.json | 3 + keyboards/stello65/sl_rev1/config.h | 1 - keyboards/stello65/sl_rev1/info.json | 3 + keyboards/stratos/config.h | 1 - keyboards/stratos/info.json | 3 + keyboards/studiokestra/bourgeau/config.h | 1 - keyboards/studiokestra/bourgeau/info.json | 3 + keyboards/studiokestra/cascade/config.h | 1 - keyboards/studiokestra/cascade/info.json | 3 + keyboards/studiokestra/frl84/config.h | 1 - keyboards/studiokestra/frl84/info.json | 3 + keyboards/studiokestra/galatea/config.h | 2 +- keyboards/studiokestra/galatea/rev2/config.h | 1 - keyboards/studiokestra/galatea/rev2/info.json | 3 + keyboards/swiftrax/retropad/config.h | 1 - keyboards/swiftrax/retropad/info.json | 3 + keyboards/switchplate/southpaw_65/config.h | 1 - keyboards/switchplate/southpaw_65/info.json | 3 + keyboards/synthlabs/060/config.h | 2 - keyboards/synthlabs/060/info.json | 3 + keyboards/system76/launch_1/config.h | 1 - keyboards/system76/launch_1/info.json | 3 + keyboards/tada68/keymaps/rgb/config.h | 2 +- keyboards/takashicompany/center_enter/config.h | 1 - keyboards/takashicompany/center_enter/info.json | 3 + keyboards/takashicompany/compacx/config.h | 1 - keyboards/takashicompany/compacx/info.json | 3 + keyboards/takashicompany/dogtag/config.h | 1 - keyboards/takashicompany/dogtag/info.json | 3 + keyboards/takashicompany/endzone34/config.h | 1 - keyboards/takashicompany/endzone34/info.json | 3 + keyboards/takashicompany/goat51/info.json | 4 +- keyboards/takashicompany/heavy_left/config.h | 1 - keyboards/takashicompany/heavy_left/info.json | 3 + keyboards/takashicompany/minizone/config.h | 1 - keyboards/takashicompany/minizone/info.json | 3 + keyboards/takashicompany/qoolee/config.h | 1 - keyboards/takashicompany/qoolee/info.json | 3 + keyboards/takashicompany/radialex/config.h | 1 - keyboards/takashicompany/radialex/info.json | 3 + keyboards/takashicompany/spreadwriter/info.json | 4 +- keyboards/takashicompany/tightwriter/info.json | 4 +- keyboards/takashiski/hecomi/alpha/config.h | 1 - keyboards/takashiski/hecomi/alpha/info.json | 3 + keyboards/takashiski/namecard2x4/rev1/config.h | 1 - keyboards/takashiski/namecard2x4/rev1/info.json | 3 + keyboards/takashiski/namecard2x4/rev2/config.h | 1 - keyboards/takashiski/namecard2x4/rev2/info.json | 3 + keyboards/taleguers/taleguers75/config.h | 2 - keyboards/taleguers/taleguers75/info.json | 3 + keyboards/tanuki/config.h | 1 - keyboards/tanuki/info.json | 3 + keyboards/tau4/info.json | 4 +- keyboards/teahouse/ayleen/config.h | 3 - keyboards/teahouse/ayleen/info.json | 5 +- keyboards/team0110/p1800fl/config.h | 1 - keyboards/team0110/p1800fl/info.json | 3 + keyboards/technika/config.h | 1 - keyboards/technika/info.json | 3 + keyboards/tenki/config.h | 1 - keyboards/tenki/info.json | 3 + keyboards/tetris/config.h | 1 - keyboards/tetris/info.json | 3 + keyboards/tg4x/config.h | 1 - keyboards/tg4x/info.json | 3 + keyboards/the_royal/liminal/config.h | 1 - keyboards/the_royal/liminal/info.json | 3 + keyboards/the_royal/schwann/config.h | 1 - keyboards/the_royal/schwann/info.json | 3 + keyboards/themadnoodle/ncc1701kb/v2/config.h | 1 - keyboards/themadnoodle/ncc1701kb/v2/info.json | 3 + keyboards/themadnoodle/noodlepad/config.h | 1 - keyboards/themadnoodle/noodlepad/info.json | 3 + keyboards/thevankeyboards/jetvan/config.h | 1 - keyboards/thevankeyboards/jetvan/info.json | 3 + keyboards/thevankeyboards/minivan/config.h | 1 - keyboards/thevankeyboards/minivan/info.json | 3 + .../minivan/keymaps/halvves/config.h | 2 +- .../minivan/keymaps/like_jis/config.h | 2 +- keyboards/tkc/godspeed75/config.h | 1 - keyboards/tkc/godspeed75/info.json | 3 + keyboards/tkc/m0lly/config.h | 1 - keyboards/tkc/m0lly/info.json | 3 + keyboards/tkc/osav2/config.h | 1 - keyboards/tkc/osav2/info.json | 3 + keyboards/tkc/tkc1800/config.h | 1 - keyboards/tkc/tkc1800/info.json | 3 + keyboards/tkc/tkl_ab87/config.h | 1 - keyboards/tkc/tkl_ab87/info.json | 3 + keyboards/tkw/grandiceps/config.h | 1 - keyboards/tkw/grandiceps/info.json | 1 + keyboards/tkw/stoutgat/v2/config.h | 1 - keyboards/tkw/stoutgat/v2/info.json | 1 + keyboards/tmo50/config.h | 1 - keyboards/tmo50/info.json | 3 + keyboards/toffee_studio/blueberry/config.h | 1 - keyboards/toffee_studio/blueberry/info.json | 3 + keyboards/tokyokeyboard/alix40/config.h | 1 - keyboards/tokyokeyboard/alix40/info.json | 3 + keyboards/tokyokeyboard/tokyo60/config.h | 1 - keyboards/tokyokeyboard/tokyo60/info.json | 3 + keyboards/tominabox1/bigboy/config.h | 2 - keyboards/tominabox1/bigboy/info.json | 3 + keyboards/tominabox1/le_chiffre/he/config.h | 21 -- keyboards/tominabox1/le_chiffre/he/info.json | 3 + keyboards/tominabox1/le_chiffre/rev1/config.h | 21 -- keyboards/tominabox1/le_chiffre/rev1/info.json | 3 + keyboards/tominabox1/le_chiffre/rev2/config.h | 21 -- keyboards/tominabox1/le_chiffre/rev2/info.json | 3 + keyboards/tominabox1/qaz/config.h | 2 - keyboards/tominabox1/qaz/info.json | 3 + keyboards/tominabox1/underscore33/rev1/config.h | 3 - keyboards/tominabox1/underscore33/rev2/config.h | 1 - keyboards/tominabox1/underscore33/rev2/info.json | 3 + keyboards/tr60w/config.h | 1 - keyboards/tr60w/info.json | 3 + keyboards/trashman/ketch/config.h | 1 - keyboards/trashman/ketch/info.json | 3 + keyboards/tszaboo/ortho4exent/config.h | 1 - keyboards/tszaboo/ortho4exent/info.json | 3 + keyboards/tunks/ergo33/config.h | 1 - keyboards/tunks/ergo33/info.json | 3 + keyboards/tw40/config.h | 1 - keyboards/tw40/info.json | 3 + keyboards/tweetydabird/lbs4/info.json | 4 +- keyboards/tweetydabird/lbs6/info.json | 4 +- keyboards/tzarc/djinn/config.h | 1 - keyboards/tzarc/djinn/info.json | 1 + keyboards/tzarc/ghoul/rev1/rp2040/config.h | 1 - keyboards/tzarc/ghoul/rev1/rp2040/info.json | 1 + keyboards/tzarc/ghoul/rev1/stm32/config.h | 1 - keyboards/tzarc/ghoul/rev1/stm32/info.json | 1 + keyboards/ubest/vn/config.h | 1 - keyboards/ubest/vn/info.json | 3 + keyboards/uk78/config.h | 1 - keyboards/uk78/info.json | 3 + keyboards/ungodly/launch_pad/config.h | 1 - keyboards/ungodly/launch_pad/info.json | 3 + keyboards/unison/v04/config.h | 1 - keyboards/unison/v04/info.json | 3 + keyboards/utd80/config.h | 1 - keyboards/utd80/info.json | 3 + keyboards/uzu42/rev1/config.h | 3 - keyboards/uzu42/rev1/info.json | 3 + keyboards/vertex/angler2/config.h | 1 - keyboards/vertex/angler2/info.json | 3 + keyboards/vertex/arc60/config.h | 1 - keyboards/vertex/arc60/info.json | 3 + keyboards/vertex/arc60h/config.h | 1 - keyboards/vertex/arc60h/info.json | 1 + keyboards/viendi8l/config.h | 1 - keyboards/viendi8l/info.json | 1 + keyboards/viktus/minne/info.json | 4 +- keyboards/viktus/osav2/info.json | 4 +- keyboards/viktus/sp_mini/config.h | 1 - keyboards/viktus/sp_mini/info.json | 3 + keyboards/vitamins_included/rev1/config.h | 3 - keyboards/vitamins_included/rev1/info.json | 3 + keyboards/vitamins_included/rev2/config.h | 3 - keyboards/vitamins_included/rev2/info.json | 3 + keyboards/waldo/config.h | 1 - keyboards/waldo/info.json | 3 + keyboards/walletburner/cajal/config.h | 1 - keyboards/walletburner/cajal/info.json | 3 + keyboards/walletburner/neuron/config.h | 2 - keyboards/walletburner/neuron/info.json | 3 + keyboards/wavtype/foundation/config.h | 1 - keyboards/wavtype/foundation/info.json | 3 + keyboards/wavtype/p01_ultra/config.h | 1 - keyboards/wavtype/p01_ultra/info.json | 3 + keyboards/weirdo/geminate60/config.h | 1 - keyboards/weirdo/geminate60/info.json | 3 + keyboards/weirdo/kelowna/rgb64/config.h | 1 - keyboards/weirdo/kelowna/rgb64/info.json | 3 + keyboards/weirdo/ls_60/config.h | 1 - keyboards/weirdo/ls_60/info.json | 3 + keyboards/weirdo/naiping/np64/config.h | 1 - keyboards/weirdo/naiping/np64/info.json | 3 + keyboards/weirdo/naiping/nphhkb/config.h | 1 - keyboards/weirdo/naiping/nphhkb/info.json | 3 + keyboards/weirdo/naiping/npminila/config.h | 1 - keyboards/weirdo/naiping/npminila/info.json | 3 + keyboards/wekey/we27/config.h | 2 - keyboards/wekey/we27/info.json | 3 + keyboards/westfoxtrot/aanzee/config.h | 1 - keyboards/westfoxtrot/aanzee/info.json | 3 + .../westfoxtrot/cypher/rev1/keymaps/kwer/config.h | 2 +- .../westfoxtrot/cypher/rev1/keymaps/kwer/readme.md | 2 +- keyboards/westfoxtrot/cypher/rev5/config.h | 1 - keyboards/westfoxtrot/cypher/rev5/info.json | 3 + keyboards/westm/westm68/rev1/config.h | 2 - keyboards/westm/westm68/rev1/info.json | 3 + keyboards/westm/westm68/rev2/config.h | 2 - keyboards/westm/westm68/rev2/info.json | 3 + keyboards/westm/westm9/rev1/config.h | 2 - keyboards/westm/westm9/rev1/info.json | 3 + keyboards/westm/westm9/rev2/config.h | 2 - keyboards/westm/westm9/rev2/info.json | 3 + keyboards/westm/westmergo/config.h | 2 - keyboards/westm/westmergo/info.json | 3 + keyboards/wilba_tech/wt70_jb/config.h | 1 - keyboards/wilba_tech/wt70_jb/info.json | 3 + .../wilba_tech/zeal60/keymaps/tusing/README.md | 2 +- .../wilba_tech/zeal60/keymaps/tusing/config.h | 2 +- keyboards/winkeys/mini_winni/config.h | 1 - keyboards/winkeys/mini_winni/info.json | 3 + keyboards/winry/winry25tc/config.h | 1 - keyboards/winry/winry25tc/info.json | 3 + keyboards/winry/winry315/config.h | 1 - keyboards/winry/winry315/info.json | 3 + keyboards/wolf/m60_b/config.h | 1 - keyboards/wolf/m60_b/info.json | 3 + keyboards/wolf/ts60/config.h | 1 - keyboards/wolf/ts60/info.json | 3 + keyboards/wolfmarkclub/wm1/config.h | 1 - keyboards/wolfmarkclub/wm1/info.json | 3 + keyboards/woodkeys/bigseries/1key/config.h | 1 - keyboards/woodkeys/bigseries/1key/info.json | 3 + keyboards/woodkeys/bigseries/2key/config.h | 1 - keyboards/woodkeys/bigseries/2key/info.json | 3 + keyboards/woodkeys/bigseries/3key/config.h | 1 - keyboards/woodkeys/bigseries/3key/info.json | 3 + keyboards/woodkeys/bigseries/4key/config.h | 1 - keyboards/woodkeys/bigseries/4key/info.json | 3 + keyboards/woodkeys/meira/config.h | 2 - keyboards/woodkeys/meira/info.json | 3 + keyboards/woodkeys/scarletbandana/config.h | 1 - keyboards/woodkeys/scarletbandana/info.json | 3 + keyboards/work_louder/loop/config.h | 1 - keyboards/work_louder/loop/info.json | 3 + keyboards/work_louder/micro/config.h | 1 - keyboards/work_louder/micro/info.json | 3 + keyboards/work_louder/nano/config.h | 1 - keyboards/work_louder/nano/info.json | 3 + keyboards/work_louder/numpad/info.json | 4 +- keyboards/work_louder/rgb_functions.c | 4 +- keyboards/work_louder/work_board/config.h | 1 - keyboards/work_louder/work_board/info.json | 3 + keyboards/wsk/alpha9/config.h | 1 - keyboards/wsk/alpha9/info.json | 3 + keyboards/wsk/g4m3ralpha/config.h | 1 - keyboards/wsk/g4m3ralpha/info.json | 3 + keyboards/wsk/gothic50/config.h | 1 - keyboards/wsk/gothic50/info.json | 3 + keyboards/wsk/gothic70/config.h | 1 - keyboards/wsk/gothic70/info.json | 3 + keyboards/wsk/houndstooth/config.h | 2 - keyboards/wsk/houndstooth/info.json | 3 + keyboards/wsk/kodachi50/config.h | 1 - keyboards/wsk/kodachi50/info.json | 3 + keyboards/wsk/pain27/config.h | 1 - keyboards/wsk/pain27/info.json | 3 + keyboards/wsk/sl40/config.h | 1 - keyboards/wsk/sl40/info.json | 3 + keyboards/wsk/tkl30/config.h | 1 - keyboards/wsk/tkl30/info.json | 3 + keyboards/wuque/creek70/config.h | 1 - keyboards/wuque/creek70/info.json | 3 + keyboards/wuque/ikki68/config.h | 1 - keyboards/wuque/ikki68/info.json | 3 + keyboards/wuque/ikki68_aurora/config.h | 1 - keyboards/wuque/ikki68_aurora/info.json | 3 + keyboards/wuque/promise87/ansi/config.h | 1 - keyboards/wuque/promise87/ansi/info.json | 3 + keyboards/wuque/promise87/wkl/config.h | 1 - keyboards/wuque/promise87/wkl/info.json | 3 + keyboards/xelus/akis/config.h | 1 - keyboards/xelus/akis/info.json | 3 + keyboards/xelus/dawn60/rev1/config.h | 1 - keyboards/xelus/dawn60/rev1/info.json | 3 + keyboards/xelus/dawn60/rev1_qmk/config.h | 1 - keyboards/xelus/dawn60/rev1_qmk/info.json | 3 + keyboards/xelus/la_plus/config.h | 2 - keyboards/xelus/la_plus/info.json | 3 + keyboards/xelus/ninjin/config.h | 1 - keyboards/xelus/ninjin/info.json | 1 + keyboards/xelus/valor/rev1/config.h | 1 - keyboards/xelus/valor/rev1/info.json | 3 + keyboards/xelus/valor/rev2/config.h | 1 - keyboards/xelus/valor/rev2/info.json | 1 + keyboards/xelus/xs60/hotswap/config.h | 1 - keyboards/xelus/xs60/hotswap/info.json | 3 + keyboards/xelus/xs60/soldered/config.h | 1 - keyboards/xelus/xs60/soldered/info.json | 3 + keyboards/xiudi/xd002/config.h | 1 - keyboards/xiudi/xd002/info.json | 3 + keyboards/xiudi/xd004/info.json | 3 + keyboards/xiudi/xd004/v1/config.h | 1 - keyboards/xiudi/xd60/rev2/config.h | 2 - keyboards/xiudi/xd60/rev2/info.json | 3 + keyboards/xiudi/xd60/rev3/config.h | 2 - keyboards/xiudi/xd60/rev3/info.json | 3 + keyboards/xiudi/xd68/config.h | 1 - keyboards/xiudi/xd68/info.json | 3 + keyboards/xiudi/xd75/config.h | 1 - keyboards/xiudi/xd75/info.json | 3 + keyboards/xiudi/xd84/config.h | 1 - keyboards/xiudi/xd84/info.json | 3 + keyboards/xiudi/xd84pro/config.h | 1 - keyboards/xiudi/xd84pro/info.json | 3 + keyboards/xiudi/xd87/config.h | 1 - keyboards/xiudi/xd87/info.json | 3 + keyboards/xiudi/xd96/config.h | 1 - keyboards/xiudi/xd96/info.json | 3 + keyboards/yampad/config.h | 1 - keyboards/yampad/info.json | 3 + keyboards/yandrstudio/buff67v3/config.h | 1 - keyboards/yandrstudio/buff67v3/info.json | 1 + keyboards/yandrstudio/eau_r2/config.h | 1 - keyboards/yandrstudio/eau_r2/info.json | 3 + keyboards/yandrstudio/nightstar75/config.h | 1 - keyboards/yandrstudio/nightstar75/info.json | 1 + keyboards/yandrstudio/nz64/config.h | 2 - keyboards/yandrstudio/nz64/info.json | 1 + keyboards/yandrstudio/nz67v2/config.h | 1 - keyboards/yandrstudio/nz67v2/info.json | 1 + keyboards/yandrstudio/tg67/config.h | 1 - keyboards/yandrstudio/tg67/info.json | 1 + keyboards/yandrstudio/yr6095/config.h | 1 - keyboards/yandrstudio/yr6095/info.json | 1 + keyboards/yandrstudio/yr80/config.h | 1 - keyboards/yandrstudio/yr80/info.json | 1 + keyboards/yanghu/unicorne/config.h | 1 - keyboards/yanghu/unicorne/info.json | 1 + keyboards/ydkb/chili/config.h | 1 - keyboards/ydkb/chili/info.json | 3 + keyboards/ydkb/grape/config.h | 1 - keyboards/ydkb/grape/info.json | 3 + keyboards/ydkb/yd68/config.h | 1 - keyboards/ydkb/yd68/info.json | 3 + keyboards/yeehaw/config.h | 1 - keyboards/yeehaw/info.json | 3 + keyboards/ymdk/melody96/config.h | 1 - keyboards/ymdk/melody96/info.json | 3 + keyboards/ymdk/np24/u4rgb6/config.h | 1 - keyboards/ymdk/np24/u4rgb6/info.json | 3 + keyboards/ymdk/wings/config.h | 1 - keyboards/ymdk/wings/info.json | 3 + keyboards/ymdk/wingshs/config.h | 1 - keyboards/ymdk/wingshs/info.json | 3 + keyboards/ymdk/yd60mq/config.h | 1 - keyboards/ymdk/yd60mq/info.json | 3 + keyboards/ymdk/ym68/config.h | 1 - keyboards/ymdk/ym68/info.json | 3 + keyboards/ymdk/ymd09/config.h | 1 - keyboards/ymdk/ymd09/info.json | 3 + keyboards/ymdk/ymd21/v2/config.h | 1 - keyboards/ymdk/ymd21/v2/info.json | 3 + keyboards/ymdk/ymd40/air40/config.h | 1 - keyboards/ymdk/ymd40/air40/info.json | 3 + keyboards/ymdk/ymd40/v2/config.h | 1 - keyboards/ymdk/ymd40/v2/info.json | 3 + keyboards/ymdk/ymd67/config.h | 1 - keyboards/ymdk/ymd67/info.json | 3 + keyboards/ymdk/ymd75/config.h | 1 - keyboards/ymdk/ymd75/info.json | 270 +++++++++++++++++++++ keyboards/ymdk/ymd96/config.h | 3 - keyboards/yncognito/batpad/config.h | 1 - keyboards/yncognito/batpad/info.json | 3 + keyboards/yoichiro/lunakey_macro/config.h | 1 - keyboards/yoichiro/lunakey_macro/info.json | 3 + keyboards/yoichiro/lunakey_mini/config.h | 1 - keyboards/yoichiro/lunakey_mini/info.json | 3 + keyboards/yoichiro/lunakey_pico/info.json | 2 +- keyboards/yosino58/rev1/config.h | 1 - keyboards/yosino58/rev1/info.json | 3 + keyboards/yushakobo/navpad/10/config.h | 1 - keyboards/yushakobo/navpad/10/info.json | 3 + keyboards/yushakobo/navpad/10_helix_r/config.h | 1 - keyboards/yushakobo/navpad/10_helix_r/info.json | 3 + keyboards/yushakobo/quick17/config.h | 1 - keyboards/yushakobo/quick17/info.json | 3 + keyboards/yushakobo/quick7/config.h | 1 - keyboards/yushakobo/quick7/info.json | 3 + keyboards/yynmt/dozen0/config.h | 1 - keyboards/yynmt/dozen0/info.json | 3 + keyboards/yynmt/kagamidget/config.h | 1 - keyboards/yynmt/kagamidget/info.json | 3 + keyboards/zfrontier/big_switch/config.h | 1 - keyboards/zfrontier/big_switch/info.json | 3 + keyboards/zj68/config.h | 1 - keyboards/zj68/info.json | 3 + keyboards/zlant/config.h | 1 - keyboards/zlant/info.json | 3 + keyboards/zoo/wampus/config.h | 1 - keyboards/zoo/wampus/info.json | 1 + keyboards/zvecr/split_blackpill/config.h | 1 - keyboards/zvecr/split_blackpill/info.json | 1 + keyboards/zvecr/zv48/config.h | 1 - keyboards/zvecr/zv48/info.json | 1 + keyboards/zykrah/fuyu/config.h | 1 - keyboards/zykrah/fuyu/info.json | 1 + layouts/community/60_iso/unxmaal/config.h | 2 +- layouts/community/ergodox/jackhumbert/config.h | 2 +- layouts/community/numpad_5x6/bjohnson/config.h | 2 +- layouts/community/numpad_5x6/drashna/config.h | 2 +- layouts/community/ortho_4x12/drashna/config.h | 2 +- layouts/community/ortho_4x12/xyverz/config.h | 2 +- layouts/community/ortho_5x12/drashna/config.h | 2 +- layouts/community/ortho_5x12/xyverz/config.h | 4 +- .../ortho_5x14/yet-another-developer/config.h | 2 +- layouts/community/split_3x6_3/drashna/config.h | 4 +- platforms/avr/drivers/ws2812_bitbang.c | 8 +- .../chibios/boards/BONSAI_C4/configs/config.h | 4 +- .../drivers/vendor/RP/RP2040/ws2812_vendor.c | 6 +- platforms/chibios/drivers/ws2812_bitbang.c | 10 +- platforms/chibios/drivers/ws2812_pwm.c | 2 +- platforms/chibios/drivers/ws2812_spi.c | 10 +- users/ishtob/config.h | 2 +- 2600 files changed, 4027 insertions(+), 1909 deletions(-) delete mode 100755 keyboards/bemeier/bmek/rev1/config.h delete mode 100755 keyboards/bemeier/bmek/rev2/config.h delete mode 100755 keyboards/bemeier/bmek/rev3/config.h create mode 100644 keyboards/jiran/rev2/info.json create mode 100644 keyboards/primekb/meridian/ktr1010/info.json delete mode 100644 keyboards/rgbkb/pan/rev1/32a/config.h delete mode 100644 keyboards/rgbkb/pan/rev1/proton_c/config.h delete mode 100644 keyboards/tominabox1/le_chiffre/he/config.h delete mode 100644 keyboards/tominabox1/le_chiffre/rev1/config.h delete mode 100644 keyboards/tominabox1/le_chiffre/rev2/config.h (limited to 'keyboards/maple_computing') diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 7c1a4ee36b..30b9b75330 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -73,7 +73,6 @@ "PS2_DATA_PIN": {"info_key": "ps2.data_pin"}, "RETRO_TAPPING": {"info_key": "tapping.retro", "value_type": "bool"}, "RETRO_TAPPING_PER_KEY": {"info_key": "tapping.retro_per_key", "value_type": "bool"}, - "RGB_DI_PIN": {"info_key": "rgblight.pin"}, "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"}, "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"}, "RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"}, @@ -120,10 +119,12 @@ "USB_MAX_POWER_CONSUMPTION": {"info_key": "usb.max_power", "value_type": "int"}, "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"}, "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"}, + "WS2812_DI_PIN": {"info_key": "ws2812.pin"}, "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"}, "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"}, // Items we want flagged in lint + "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"}, "NO_ACTION_MACRO": {"info_key": "_invalid.no_action_macro", "invalid": true}, "NO_ACTION_FUNCTION": {"info_key": "_invalid.no_action_function", "invalid": true}, "DESCRIPTION": {"info_key": "_invalid.usb_description", "invalid": true}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 6c4ff49855..d608e8f796 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -492,7 +492,10 @@ }, "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}, - "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "pin": { + "$ref": "qmk.definitions.v1#/mcu_pin", + "$comment": "Deprecated: use ws2812.pin instead" + }, "rgbw": {"type": "boolean"}, "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sleep": {"type": "boolean"}, @@ -715,6 +718,7 @@ "type": "string", "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] }, + "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } diff --git a/docs/config_options.md b/docs/config_options.md index 8ea059a352..5ea71d993e 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -214,7 +214,7 @@ If you define these options you will enable the associated feature, which may in ## RGB Light Configuration -* `#define RGB_DI_PIN D7` +* `#define WS2812_DI_PIN D7` * pin the DI on the WS2812 is hooked-up to * `#define RGBLIGHT_LAYERS` * Lets you define [lighting layers](feature_rgblight.md?id=lighting-layers) that can be toggled on or off. Great for showing the current keyboard layer or caps lock state. @@ -230,7 +230,7 @@ If you define these options you will enable the associated feature, which may in * `#define RGBLIGHT_SPLIT` * Needed if both halves of the board have RGB LEDs wired directly to the RGB output pin on the controllers instead of passing the output of the left half to the input of the right half * `#define RGBLED_SPLIT { 6, 6 }` - * number of LEDs connected that are directly wired to `RGB_DI_PIN` on each half of a split keyboard + * number of LEDs connected that are directly wired to the RGB pin on each half of a split keyboard * First value indicates number of LEDs for left half, second value is for the right half * When RGBLED_SPLIT is defined, RGBLIGHT_SPLIT is implicitly defined. * `#define RGBLIGHT_HUE_STEP 12` diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md index 8b831f010b..96c1928abd 100644 --- a/docs/feature_rgb_matrix.md +++ b/docs/feature_rgb_matrix.md @@ -361,7 +361,7 @@ Configure the hardware via your `config.h`: ```c // The pin connected to the data pin of the LEDs -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 70 ``` diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index 7a1866d44f..5131658ae1 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -33,13 +33,13 @@ RGBLIGHT_DRIVER = APA102 At minimum you must define the data pin your LED strip is connected to, and the number of LEDs in the strip, in your `config.h`. For APA102 LEDs, you must also define the clock pin. If your keyboard has onboard RGB LEDs, and you are simply creating a keymap, you usually won't need to modify these. -|Define |Description | -|---------------|---------------------------------------------------------------------------------------------------------| -|`RGB_DI_PIN` |The pin connected to the data pin of the LEDs (WS2812) | -|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102) | -|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102) | -|`RGBLED_NUM` |The number of LEDs connected | -|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half directly wired to `RGB_DI_PIN` | +|Define |Description | +|---------------|-------------------------------------------------------------------------| +|`WS2812_DI_PIN`|The pin connected to the data pin of the LEDs (WS2812) | +|`APA102_DI_PIN`|The pin connected to the data pin of the LEDs (APA102) | +|`APA102_CI_PIN`|The pin connected to the clock pin of the LEDs (APA102) | +|`RGBLED_NUM` |The number of LEDs connected | +|`RGBLED_SPLIT` |(Optional) For split keyboards, the number of LEDs connected on each half| Then you should be able to use the keycodes below to change the RGB lighting to your liking. diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md index 23a21de567..f8cad20ce0 100644 --- a/docs/ws2812_driver.md +++ b/docs/ws2812_driver.md @@ -77,7 +77,7 @@ Configure the hardware via your config.h: ``` ### SPI -Targeting STM32 boards where WS2812 support is offloaded to an SPI hardware device. The advantage is that the use of DMA offloads processing of the WS2812 protocol from the MCU. `RGB_DI_PIN` for this driver is the configured SPI MOSI pin. Due to the nature of repurposing SPI to drive the LEDs, the other SPI pins, MISO and SCK, **must** remain unused. To configure it, add this to your rules.mk: +Targeting STM32 boards where WS2812 support is offloaded to an SPI hardware device. The advantage is that the use of DMA offloads processing of the WS2812 protocol from the MCU. `WS2812_DI_PIN` for this driver is the configured SPI MOSI pin. Due to the nature of repurposing SPI to drive the LEDs, the other SPI pins, MISO and SCK, **must** remain unused. To configure it, add this to your rules.mk: ```make WS2812_DRIVER = spi @@ -183,7 +183,7 @@ This can be configured for bitbang, PWM and SPI. Note: This only applies to STM32 boards. - To configure the `RGB_DI_PIN` to open drain configuration add this to your config.h file: + To configure the `WS2812_DI_PIN` to open drain configuration add this to your config.h file: ```c #define WS2812_EXTERNAL_PULLUP ``` diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h index 8cac030cd8..3a10ea61a0 100644 --- a/keyboards/0_sixty/underglow/config.h +++ b/keyboards/0_sixty/underglow/config.h @@ -18,7 +18,6 @@ /* underglow */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 24 #define RGBLIGHT_LIMIT_VAL 185 // limit max I to 400mA #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json index 5cbbd86e61..cd4d959609 100644 --- a/keyboards/0_sixty/underglow/info.json +++ b/keyboards/0_sixty/underglow/info.json @@ -5,5 +5,8 @@ }, "features": { "rgblight": true + }, + "ws2812": { + "pin": "B6" } } diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 9d1e7ab889..9eaded2188 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index d34d7166bf..ac7db0ec13 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -21,6 +21,9 @@ "qmk_lufa_bootloader": { "led": "B0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "matrix_pins": { diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h index 01eb276069..2f2eb82fee 100644 --- a/keyboards/0xcb/splaytoraid/config.h +++ b/keyboards/0xcb/splaytoraid/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN D0 - #define RGB_MATRIX_LED_COUNT 18 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json index 7b8177df9f..f6a8061e1e 100644 --- a/keyboards/0xcb/splaytoraid/info.json +++ b/keyboards/0xcb/splaytoraid/info.json @@ -62,6 +62,9 @@ { "flags": 4, "matrix": [0, 3], "x": 163, "y": 64 } ] }, + "ws2812": { + "pin": "D0" + }, "layouts": { "LAYOUT_36": { "layout": [ diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h index cdb29e6bd1..b211d6f5f2 100644 --- a/keyboards/0xcb/tutelpad/config.h +++ b/keyboards/0xcb/tutelpad/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 // LED data pin on controller #define RGBLED_NUM 4 // Number of LEDs connected #define RGBLIGHT_HUE_STEP 10 // The number of steps to cycle through the hue by diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 646b4dc882..79fdf0af45 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -11,6 +11,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h index ee33867ec3..ae376dfa53 100644 --- a/keyboards/10bleoledhub/config.h +++ b/keyboards/10bleoledhub/config.h @@ -17,7 +17,6 @@ along with this program. If not, see .*/ #pragma once #define SSD1306OLED -#define RGB_DI_PIN B7 #define RGBLED_NUM 4 diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json index f6db49b9e6..9b536e0677 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/info.json @@ -8,6 +8,9 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["D6", "D7", "B5"], "rows": ["F0", "F5", "F4", "F6"] diff --git a/keyboards/1k/config.h b/keyboards/1k/config.h index 1e970661c0..afdc6d4baa 100644 --- a/keyboards/1k/config.h +++ b/keyboards/1k/config.h @@ -16,7 +16,6 @@ #pragma once #define RGBLED_NUM 1 -#define RGB_DI_PIN B2 // Save as much space as we can... #define LAYER_STATE_8BIT diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json index 5168b69081..121cba7d16 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "direct": [ ["B0"] diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index 7d0ad0b141..bc0d7f0c4b 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index 010a82cb5e..08b85923a3 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index 59e80d7fd0..aeda8afd33 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 383c7f6525..c609336de0 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -20,6 +20,9 @@ "caps_lock": "B6", "on_state": 0 }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index 6a83a74a89..8bbb646e40 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 5c9e72252f..7eedd1cde1 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h index ecc8d2611a..633bdfffee 100644 --- a/keyboards/1upkeyboards/pi40/config.h +++ b/keyboards/1upkeyboards/pi40/config.h @@ -10,7 +10,6 @@ #define OLED_BRIGHTNESS 128 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c" -#define RGB_DI_PIN GP0 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGBLIGHT_LIMIT_VAL 150 diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json index 2527688245..bd1e1bf065 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json @@ -14,6 +14,7 @@ "layer_count": 10 }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "features": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json index df437aae02..0de0926be1 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json @@ -14,6 +14,7 @@ "layer_count": 10 }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "features": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json index 842564f561..5192e20aa5 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json @@ -14,6 +14,7 @@ "layer_count": 10 }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "features": { diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h index 3ba6144e59..8940acb004 100644 --- a/keyboards/1upkeyboards/pi60/config.h +++ b/keyboards/1upkeyboards/pi60/config.h @@ -5,7 +5,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN GP17 #define RGB_MATRIX_LED_COUNT 21 //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index 8330ac9205..3f3871cd73 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -25,6 +25,7 @@ "rgblight": false }, "ws2812": { + "pin": "GP17", "driver": "vendor" }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h index 1bfa848547..02100955e4 100644 --- a/keyboards/1upkeyboards/pi60_hse/config.h +++ b/keyboards/1upkeyboards/pi60_hse/config.h @@ -5,7 +5,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN GP15 #define RGB_MATRIX_LED_COUNT 16 #define RGBLED_NUM 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index f2e60e34fd..c490e89f4b 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -24,6 +24,7 @@ "rgblight": false }, "ws2812": { + "pin": "GP15", "driver": "vendor" }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h index 7c05197ea2..b0747bd56d 100644 --- a/keyboards/1upkeyboards/pi60_rgb/config.h +++ b/keyboards/1upkeyboards/pi60_rgb/config.h @@ -3,8 +3,6 @@ #pragma once - -#define RGB_DI_PIN GP19 #define RGB_MATRIX_LED_COUNT 61 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json index 235728ed2d..29d31b5696 100644 --- a/keyboards/1upkeyboards/pi60_rgb/info.json +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -27,6 +27,7 @@ "rgblight": false }, "ws2812": { + "pin": "GP19", "driver": "vendor" }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h index 68701e6a58..44b20dd9d6 100644 --- a/keyboards/1upkeyboards/super16/config.h +++ b/keyboards/1upkeyboards/super16/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring # define RGB_MATRIX_LED_COUNT RGBLED_NUM # ifdef RGBLIGHT_ENABLE diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json index bd8b19eff2..de377a1030 100644 --- a/keyboards/1upkeyboards/super16/info.json +++ b/keyboards/1upkeyboards/super16/info.json @@ -8,6 +8,9 @@ "pid": "0x5516", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "F6", "F7"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index c2f738c2ff..233c898454 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -19,7 +19,6 @@ #define MOUSEKEY_MOVE_DELTA 25 -#define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 20 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index f62f4ebb53..ed56d36c6a 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -8,6 +8,9 @@ "pid": "0x5517", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["D5", "D6", "C2", "D0"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 426cd3ced7..bed2edc0a6 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -7,7 +7,6 @@ #endif /* Underglow options */ -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json index c89680ba2d..cb82e7fcfb 100644 --- a/keyboards/1upkeyboards/sweet16/v1/info.json +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -3,6 +3,9 @@ "pid": "0x0161", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h index 9d62be3bb7..88687335de 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -18,7 +18,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN GP6 #define RGB_MATRIX_LED_COUNT 20 #define RGBLED_NUM 20 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 39f7cab8c8..8be0d009e4 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -25,6 +25,7 @@ "rgblight": false }, "ws2812": { + "pin": "GP6", "driver": "vendor" }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h index 2f8c72447e..f773468d8f 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h @@ -19,7 +19,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 20 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index efdb94cd74..ec95d1b2c6 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -23,6 +23,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["F7", "D2", "B1", "C6"], "rows": ["D1", "B5", "B4", "E6"] diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h index 26a56a6373..3eebc9acf3 100644 --- a/keyboards/25keys/aleth42/rev0/config.h +++ b/keyboards/25keys/aleth42/rev0/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index cd86f9ddf8..3b2395a247 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -13,6 +13,9 @@ {"pin_a": "B5", "pin_b": "B4"} ] }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu" } diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h index af95a5657d..f384f19147 100644 --- a/keyboards/25keys/aleth42/rev1/config.h +++ b/keyboards/25keys/aleth42/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index c7e5658ec4..d3ed4d6cd0 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -13,6 +13,9 @@ {"pin_a": "F5", "pin_b": "F6"} ] }, + "ws2812": { + "pin": "B3" + }, "backlight": { "pin": "C6", "levels": 8, diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h index bc4f1ab4aa..6cbe12bb12 100644 --- a/keyboards/25keys/cassette42/config.h +++ b/keyboards/25keys/cassette42/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 2b33220ad9..31042e9a5d 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index b537056e6b..e4b0d02f75 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . //#define MASTER_RIGHT //#define EE_HANDS -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json index 3669e7d87b..46692f6e4d 100644 --- a/keyboards/25keys/zinc/rev1/info.json +++ b/keyboards/25keys/zinc/rev1/info.json @@ -8,6 +8,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index b537056e6b..e4b0d02f75 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . //#define MASTER_RIGHT //#define EE_HANDS -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json index ff3b9c930a..4db1d04910 100644 --- a/keyboards/25keys/zinc/reva/info.json +++ b/keyboards/25keys/zinc/reva/info.json @@ -8,6 +8,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h index a1bbffcef4..a4088e4925 100644 --- a/keyboards/2key2crawl/config.h +++ b/keyboards/2key2crawl/config.h @@ -8,7 +8,6 @@ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN C6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json index e5f9dc2942..1752531ba1 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/info.json @@ -18,6 +18,9 @@ {"pin_a": "D0", "pin_b": "D1", "resolution": 1} ] }, + "ws2812": { + "pin": "C6" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h index dca5d4a1ff..49bd09eb7e 100644 --- a/keyboards/3keyecosystem/2key2/config.h +++ b/keyboards/3keyecosystem/2key2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once /* RGB matrix key backlighting */ -#define RGB_DI_PIN B2 #define RGB_MATRIX_LED_COUNT 2 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json index acfb024da2..c07a2615bb 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "B7" }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h index e1477fc069..f6c6117726 100644 --- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h @@ -1,8 +1,8 @@ #pragma once -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM -#define RGB_DI_PIN D2 +#define WS2812_DI_PIN D2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/config.h b/keyboards/40percentclub/gherkin/keymaps/michel/config.h index eadbb23ce2..2105fa65b5 100644 --- a/keyboards/40percentclub/gherkin/keymaps/michel/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/michel/config.h @@ -1,8 +1,8 @@ #pragma once -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h index 2f4ce8ee17..e388bc9705 100644 --- a/keyboards/40percentclub/luddite/config.h +++ b/keyboards/40percentclub/luddite/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B4 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json index d81a6b842a..6600d6d24d 100644 --- a/keyboards/40percentclub/luddite/info.json +++ b/keyboards/40percentclub/luddite/info.json @@ -17,6 +17,9 @@ "pin": "B5", "levels": 4 }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_ansi"], diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h index 39aa83e067..8641d6a37f 100644 --- a/keyboards/40percentclub/nano/config.h +++ b/keyboards/40percentclub/nano/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json index 86c73f1943..ddcf567d83 100644 --- a/keyboards/40percentclub/nano/info.json +++ b/keyboards/40percentclub/nano/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h index 60d3b4e424..57981dd27f 100644 --- a/keyboards/40percentclub/nori/config.h +++ b/keyboards/40percentclub/nori/config.h @@ -17,7 +17,6 @@ #pragma once // enable RGB underglow -#define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json index b0d2a0083d..b58ee84edc 100644 --- a/keyboards/40percentclub/nori/info.json +++ b/keyboards/40percentclub/nori/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B5" }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4", "ortho_4x12"], diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h index 5e3bf27f3d..2199981c7c 100644 --- a/keyboards/40percentclub/tomato/config.h +++ b/keyboards/40percentclub/tomato/config.h @@ -7,7 +7,6 @@ #define PERMISSIVE_HOLD /* setup lighting */ -#define RGB_DI_PIN B5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json index e3c11a0290..c881f7c7d1 100644 --- a/keyboards/40percentclub/tomato/info.json +++ b/keyboards/40percentclub/tomato/info.json @@ -8,6 +8,9 @@ "pid": "0x546F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h index 4b5ffc4f10..8dc267380a 100644 --- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h +++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h @@ -28,5 +28,5 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D3 // The pin the LED strip is connected to +#define WS2812_DI_PIN D3 // The pin the LED strip is connected to #define RGBLED_NUM 7 // Number of LEDs in your strip diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index d922c2e10f..4ec3391a61 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index 2c5c25df4b..4225e6138e 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], "rows": ["C2", "D0", "B0", "C7", "C5"] diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 6892802218..e6f7c748a5 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP -#define RGB_DI_PIN A8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index 92cd38952a..3c49c07e6b 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,9 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "ws2812": { + "pin": "A8" + }, "matrix_pins": { "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"], "rows": ["B15", "A9", "B7", "A1", "A2"] diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 76bc9a6b4f..6114950220 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 2 /* Underglow */ -#define RGB_DI_PIN A7 #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PIN A5 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 1507956995..8fba2ee69b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "A7", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 6ecc98da2d..7c8c8a8cf2 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Underglow */ #define RGBLED_NUM 16 #define WS2812_EXTERNAL_PULLUP -#define RGB_DI_PIN A8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index b815c9bf4f..c0f9ef3126 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -23,6 +23,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "A8" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index c043e86fd5..40223b44e2 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -42,7 +42,6 @@ }, "rgblight": { "led_count": 12, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -56,6 +55,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json index 6ffe02e506..6896b37844 100644 --- a/keyboards/4pplet/steezy60/rev_b/info.json +++ b/keyboards/4pplet/steezy60/rev_b/info.json @@ -38,7 +38,6 @@ }, "rgblight": { "led_count": 12, - "pin": "A8", "animations": { "alternating": true, "breathing": true, @@ -52,6 +51,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "A8" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 85521fa3b6..2552b1e451 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 72a9ac953c..143b9c207f 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 979a022177..06e5db9090 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index d7bceba391..0f7ba079d5 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -12,6 +12,9 @@ "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] }, + "ws2812": { + "pin": "D3" + }, "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C4", diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index 91a0e7f0cd..2ba774712a 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define RGBLED_NUM 1 #define WS2812_EXTERNAL_PULLUP -#define RGB_DI_PIN A8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index 9648794a7d..18ffba5abc 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -8,6 +8,9 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "ws2812": { + "pin": "A8" + }, "matrix_pins": { "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], "rows": ["B14", "A9", "B6", "B5", "B4"] diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 063cfb1b3c..e42bb68b37 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D7 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 434b615f4a..dbb460532d 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"], "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"] diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index 5656563fa1..1bf561d74a 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define RGBLED_NUM 2 #define WS2812_EXTERNAL_PULLUP -#define RGB_DI_PIN A8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json index cc5829cb43..378478c8af 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/info.json @@ -8,6 +8,9 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "ws2812": { + "pin": "A8" + }, "matrix_pins": { "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"], "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"] diff --git a/keyboards/8pack/config.h b/keyboards/8pack/config.h index fe5d7a4982..5139d4cf69 100644 --- a/keyboards/8pack/config.h +++ b/keyboards/8pack/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 8 // number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json index 3e6b556fae..45dec97b33 100644 --- a/keyboards/8pack/info.json +++ b/keyboards/8pack/info.json @@ -11,6 +11,9 @@ "pins": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "levels": 8 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h index a5dd0856a3..bb910a4427 100644 --- a/keyboards/9key/config.h +++ b/keyboards/9key/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN F7 - #define RGBLED_NUM 1 // Number of LEDs #define TAPPING_TERM 200 diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json index 7d1538ee71..1dc9fad41a 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index df3253e700..f559702e03 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -19,8 +19,6 @@ along with this program. If not, see . #define DIP_SWITCH_PINS { D0 } -#define RGB_DI_PIN D1 - # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index b2fd151cec..2b3bfa434b 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -18,6 +18,9 @@ {"pin_a": "F1", "pin_b": "F0"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/abatskeyboardclub/nayeon/config.h b/keyboards/abatskeyboardclub/nayeon/config.h index b10c977af4..b42ece99a6 100644 --- a/keyboards/abatskeyboardclub/nayeon/config.h +++ b/keyboards/abatskeyboardclub/nayeon/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB Matrix setup */ -#define RGB_DI_PIN GP19 #define RGB_MATRIX_LED_COUNT 2 #define RGBLED_NUM 2 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json index 79970e303e..87ffc589cc 100644 --- a/keyboards/abatskeyboardclub/nayeon/info.json +++ b/keyboards/abatskeyboardclub/nayeon/info.json @@ -21,6 +21,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "GP19", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h index c0984e0297..2058825ab0 100644 --- a/keyboards/abstract/ellipse/rev1/config.h +++ b/keyboards/abstract/ellipse/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json index bf986589f0..9dfe255ba2 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -24,6 +24,9 @@ "pin": "C6", "levels": 15 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h index c3755e12e0..23f7172ea7 100644 --- a/keyboards/acekeyboard/titan60/config.h +++ b/keyboards/acekeyboard/titan60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D0 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json index 00399db841..008c2e37d9 100644 --- a/keyboards/acekeyboard/titan60/info.json +++ b/keyboards/acekeyboard/titan60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 377801604d..0798ffa70b 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define RGB_DI_PIN B15 #define RGB_MATRIX_LED_COUNT 87 #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 5e1f6f4c12..e0b190582b 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -4,6 +4,9 @@ "pid": "0x8775", "device_version": "0.0.4" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 7447e1dd29..e8dd40b32f 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define RGB_DI_PIN B15 #define RGB_MATRIX_LED_COUNT 86 #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index 7d1b238aa3..3248ada82f 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -8,6 +8,9 @@ "pid": "0x8776", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 377801604d..0798ffa70b 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define RGB_DI_PIN B15 #define RGB_MATRIX_LED_COUNT 87 #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index cbebbc42d1..4e7b86ac72 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -8,6 +8,9 @@ "pid": "0x8873", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index fba5b051cc..1f91766add 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 34 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 86212c7e6c..e72e8aece4 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -15,6 +15,9 @@ "on_state": 0, "breathing": true }, + "ws2812": { + "pin": "B15" + }, "indicators": { "caps_lock": "A10" }, diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index dc5f354876..0376a9ac2c 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 34 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 59e119a1be..b2ced072a8 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -14,6 +14,9 @@ "levels": 20, "breathing": true }, + "ws2812": { + "pin": "B15" + }, "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index a22e92e1b1..1d50a74696 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D7 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index e373bb6654..7c7c8ebf54 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,9 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], "rows": ["D3", "B7", "D5", "B5", "D6"] diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 60362ab065..082df4b497 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index 5341ab654e..ca14cff1b5 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -19,6 +19,9 @@ "breathing": true, "breathing_period": 3 }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 9a08dd1234..348b284a3f 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 62d4e568f8..504e86f4b3 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -14,6 +14,9 @@ {"pin_a": "C15", "pin_b": "C14"} ] }, + "ws2812": { + "pin": "B15" + }, "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h index f32b0075bb..9465ac1b01 100644 --- a/keyboards/ada/ada1800mini/config.h +++ b/keyboards/ada/ada1800mini/config.h @@ -17,7 +17,6 @@ #pragma once //TODO: implement RGB matrix when I get the hardware -#define RGB_DI_PIN F0 #define RGBLED_NUM 100 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index fdc7df02df..4af2c200c2 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -8,6 +8,9 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h index 8f369e4ae7..dad8639fd6 100644 --- a/keyboards/ada/infinity81/config.h +++ b/keyboards/ada/infinity81/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D0 # define RGBLED_NUM 107 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json index 6f4a6ac996..cc16b67c04 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/info.json @@ -8,6 +8,9 @@ "pid": "0x0081", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"], "rows": ["B3", "B2", "B1", "B0", "F6", "B7"] diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h index c493c487e3..fa8465128c 100644 --- a/keyboards/adafruit/macropad/config.h +++ b/keyboards/adafruit/macropad/config.h @@ -49,7 +49,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ -# define RGB_DI_PIN GP19 # define RGB_MATRIX_LED_COUNT 12 # define RGBLED_NUM 12 diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index 9eb5301226..0324d1e817 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -17,6 +17,7 @@ "matrix": [1, 2] }, "ws2812": { + "pin": "GP19", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json index 5d518c3b86..03396e96c0 100644 --- a/keyboards/adm42/info.json +++ b/keyboards/adm42/info.json @@ -9,6 +9,9 @@ "pid": "0xE873", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C7", "D5", "D3", "D2"] diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h index 73a212910a..fbf2e300ef 100644 --- a/keyboards/adm42/rev4/config.h +++ b/keyboards/adm42/rev4/config.h @@ -18,8 +18,6 @@ #define ADM42_LED E6 -#define RGB_DI_PIN B7 - #define RGB_MATRIX_LED_COUNT 42 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h index 9743566d12..5756903c66 100644 --- a/keyboards/adpenrose/akemipad/config.h +++ b/keyboards/adpenrose/akemipad/config.h @@ -11,8 +11,6 @@ #define AUDIO_ENABLE_TONE_MULTIPLEXING #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN F4 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 27 #define RGB_MATRIX_CENTER { 60, 77 } diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 80085f949e..50a0498f0e 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,9 @@ "pid": "0x0004", "vid": "0x4450" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D3", "D2", "F5", "F6", "B2"], "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 2895613932..9bfa7d996c 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 /* Underglow options: */ -#define RGB_DI_PIN F1 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index efe7d069d0..1014362503 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"], "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"] diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index 2eb0a46c99..43002ba35c 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -6,7 +6,6 @@ #define TAP_CODE_DELAY 10 /* Underglow options: */ -#define RGB_DI_PIN F7 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index 6417bf57ca..c3e8d7b43b 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,9 @@ "pid": "0x0002", "vid": "0x4450" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"], "rows": ["F4", "F5", "C7", "C6"] diff --git a/keyboards/aeboards/ext65/rev2/config.h b/keyboards/aeboards/ext65/rev2/config.h index 8f5625e2eb..0bc48fb562 100644 --- a/keyboards/aeboards/ext65/rev2/config.h +++ b/keyboards/aeboards/ext65/rev2/config.h @@ -28,7 +28,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 24 -#define RGB_DI_PIN B15 //SPI #define WS2812_SPI SPID2 diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json index cc18d5d4ee..159f8e8787 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -13,6 +13,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h index 88099b805b..5cb8d283a8 100644 --- a/keyboards/ai03/polaris/config.h +++ b/keyboards/ai03/polaris/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json index ee2f32ffae..b3970e8b5b 100644 --- a/keyboards/ai03/polaris/info.json +++ b/keyboards/ai03/polaris/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h index 7092a754a9..43225e7a75 100644 --- a/keyboards/ai03/voyager60_alps/config.h +++ b/keyboards/ai03/voyager60_alps/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index fed5542930..a0641fed37 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -8,6 +8,9 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h index 5f80ba36b4..3b4ca30314 100644 --- a/keyboards/aleblazer/zodiark/config.h +++ b/keyboards/aleblazer/zodiark/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 1 -#define RGB_DI_PIN B5 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 68 #define RGBLIGHT_SPLIT diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index ca63fd47dd..fdec486aad 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -8,6 +8,9 @@ "pid": "0xF902", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "F4"] diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h index 7a2b73ef06..b94b584df0 100644 --- a/keyboards/alf/dc60/config.h +++ b/keyboards/alf/dc60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index 1ec142f403..9b5b806929 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -17,6 +17,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "E6" + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h index d862c69cd3..467b15b1c5 100644 --- a/keyboards/alf/x11/config.h +++ b/keyboards/alf/x11/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLED_NUM 28 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index a3e18ce9b3..2eb6697f9c 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F7" + }, "indicators": { "caps_lock": "C6", "num_lock": "E6", diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 7e3e14a532..c982289a0b 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index 7c1b3b9967..7619f6ed66 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -17,6 +17,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "backlight": { "pin": "B6" }, diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 9f1b065678..8fc29553d6 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 775c580879..2e7f9bf2c2 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0xD4C4", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"], "rows": ["B1", "B2", "B3", "D6", "D4"] diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index 8acc73207e..79c1824d08 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 23f3e16fc4..79583e099c 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,9 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"], "rows": ["B1", "B2", "B3", "D4", "D6"] diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 5b87358a06..b4ab41d42c 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index 1f76cce458..d7f32ec156 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -7,6 +7,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h index 1dee90a07f..856deb07a2 100644 --- a/keyboards/alpine65/config.h +++ b/keyboards/alpine65/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 68 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json index ec59236ea5..2218f951fa 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/info.json @@ -8,6 +8,9 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"], "rows": ["C14", "C15", "C13", "A2", "A3"] diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h index f14e2fb185..9ec9dcbbeb 100755 --- a/keyboards/amjkeyboard/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* Underlight configuration */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index c92c50d7fd..a3bbb13785 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 4 }, + "ws2812": { + "pin": "D3" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 0d56015351..a6ecb26a96 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 2f322c3bb6..d6ef4175aa 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -18,6 +18,9 @@ "levels": 4, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h index 483ecc6888..86a73b0eaf 100644 --- a/keyboards/amjkeyboard/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D3 # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index eacc490221..1f36d4b0af 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -8,6 +8,9 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h index 02b595d6f7..ecd9f99ed9 100644 --- a/keyboards/amjkeyboard/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* Underlight configuration */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 05292cc53d..d5e1b042f4 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 4 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "num_lock": "D6", "on_state": 0 diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json index 19d578e463..cb2a02989a 100644 --- a/keyboards/an_achronism/tetromino/info.json +++ b/keyboards/an_achronism/tetromino/info.json @@ -21,6 +21,7 @@ "rgb_matrix": true }, "ws2812": { + "pin": "GP26", "driver": "vendor" }, "diode_direction": "COL2ROW", @@ -106,8 +107,7 @@ } }, "rgblight": { - "led_count": 70, - "pin": "GP26" + "led_count": 70 }, "rgb_matrix": { "driver": "WS2812", diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 3d9780a741..272097dd8c 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -15,7 +15,6 @@ "rgblight": true }, "rgblight": { - "pin": "GP12", "led_count": 1, "hue_steps": 10, "saturation_steps": 17, @@ -35,6 +34,7 @@ } }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "encoder": { diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json index b7bba5eddc..2500d2554e 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/info.json @@ -20,7 +20,6 @@ "rgblight": true }, "rgblight": { - "pin": "GP12", "led_count": 1, "hue_steps": 10, "saturation_steps": 17, @@ -40,6 +39,7 @@ } }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "encoder": { diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 4572655ce7..57f1d321ff 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -20,7 +20,6 @@ "rgblight": true }, "rgblight": { - "pin": "GP3", "led_count": 4, "hue_steps": 10, "saturation_steps": 17, @@ -40,6 +39,7 @@ } }, "ws2812": { + "pin": "GP3", "driver": "vendor" }, "encoder": { diff --git a/keyboards/anavi/macropad8/config.h b/keyboards/anavi/macropad8/config.h index fce7328718..2f848d551b 100644 --- a/keyboards/anavi/macropad8/config.h +++ b/keyboards/anavi/macropad8/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* ws2812B RGB LED */ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN F4 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json index b52ca5a176..9032ac5fa8 100644 --- a/keyboards/anavi/macropad8/info.json +++ b/keyboards/anavi/macropad8/info.json @@ -12,6 +12,9 @@ "pin": "D7", "breathing": true }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h index dd4a0cae4e..b84c595315 100644 --- a/keyboards/aos/tkl/config.h +++ b/keyboards/aos/tkl/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN E6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json index 9a2076079a..903079248a 100644 --- a/keyboards/aos/tkl/info.json +++ b/keyboards/aos/tkl/info.json @@ -7,6 +7,9 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"], "rows": ["D3", "D2", "B7", "F1", "C7", "D5"] diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h index 62111b4b71..07d567be65 100644 --- a/keyboards/arabica37/rev1/config.h +++ b/keyboards/arabica37/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 50 // Number of LEDs #define RGBLED_SPLIT {25, 25} /* diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json index 36ff667df1..775257c8de 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json index 7606fc1133..738203f248 100644 --- a/keyboards/ask55/info.json +++ b/keyboards/ask55/info.json @@ -38,10 +38,12 @@ "hue_steps": 8, "led_count": 8, "max_brightness": 255, - "pin": "F4", "saturation_steps": 8, "sleep": true }, + "ws2812": { + "pin": "F4" + }, "usb": { "device_version": "0.0.1", "pid": "0x3535", diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 4736c10f18..994c0fd82f 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -26,8 +26,6 @@ #define LOCKING_RESYNC_ENABLE #define FORCE_NKRO -#define RGB_DI_PIN B1 - #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_DISABLE_WHEN_USB_SUSPENDED true diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index eb731f3860..111a3cbc31 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -21,6 +21,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h index 5638e334bd..a41720aeb5 100644 --- a/keyboards/atlantis/ps17/config.h +++ b/keyboards/atlantis/ps17/config.h @@ -9,7 +9,6 @@ #define LED_INDICATOR_2_PIN D4 /* RGB matrix */ -#define RGB_DI_PIN B7 #define RGB_MATRIX_LED_COUNT 28 #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json index 5b025c83f7..a4c505ce5a 100644 --- a/keyboards/atlantis/ps17/info.json +++ b/keyboards/atlantis/ps17/info.json @@ -26,6 +26,9 @@ "cols": ["F6", "F7", "D3", "D6"], "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"] }, + "ws2812": { + "pin": "B7" + }, "encoder": { "rotary": [{ "pin_a": "D2", diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h index e52677c73f..4a65cefa90 100644 --- a/keyboards/atxkb/1894/config.h +++ b/keyboards/atxkb/1894/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/atxkb/1894/info.json b/keyboards/atxkb/1894/info.json index 69615775b4..489c3016e7 100644 --- a/keyboards/atxkb/1894/info.json +++ b/keyboards/atxkb/1894/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h index 38fa2c0881..44b15462ad 100644 --- a/keyboards/aurora65/config.h +++ b/keyboards/aurora65/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define WS2812_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#define RGB_DI_PIN B15 #define RGBLED_NUM 36 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json index c66dc05c01..fd03acb5bd 100644 --- a/keyboards/aurora65/info.json +++ b/keyboards/aurora65/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h index 1b6ce7be90..5d7c1c2047 100644 --- a/keyboards/avalanche/v2/config.h +++ b/keyboards/avalanche/v2/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_SPLIT diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index 3289a95faf..b7b7df5dff 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -18,6 +18,9 @@ {"pin_a": "B5", "pin_b": "F4", "resolution": 2} ] }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h index 699a7c88fa..c6042255e3 100644 --- a/keyboards/avalanche/v3/config.h +++ b/keyboards/avalanche/v3/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 #define RGBLED_SPLIT { 7, 7 } #define RGBLIGHT_SPLIT diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 27ae1d8a13..20337f25c1 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h index 10d9ca889a..9279289ddf 100644 --- a/keyboards/avalanche/v4/config.h +++ b/keyboards/avalanche/v4/config.h @@ -4,7 +4,6 @@ #pragma once #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN D3 # define RGBLED_NUM 64 # define RGBLED_SPLIT { 32, 32 } # define RGBLIGHT_SPLIT diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index 93207e83b1..786d11588a 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h index ac972e6763..623155f583 100644 --- a/keyboards/aves60/config.h +++ b/keyboards/aves60/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D5 #define RGBLED_NUM 9 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json index 3cb54d2180..acbd542600 100644 --- a/keyboards/aves60/info.json +++ b/keyboards/aves60/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [4, 6] }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h index 00312ff335..05d7e7fb16 100644 --- a/keyboards/aves65/config.h +++ b/keyboards/aves65/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Backlight configuration */ -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/aves65/info.json b/keyboards/aves65/info.json index c9154c0efb..38e619a0aa 100644 --- a/keyboards/aves65/info.json +++ b/keyboards/aves65/info.json @@ -17,6 +17,9 @@ "esc_input": "D4", "esc_output": "D0" }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["65_ansi", "65_ansi_split_bs", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index df9c7cf5fc..91a4eb0ae8 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -23,8 +23,6 @@ #define SPLIT_USB_DETECT -#define RGB_DI_PIN D3 - #ifdef RGB_MATRIX_ENABLE /* ws2812 RGB MATRIX */ diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index f176e18d22..32d1f03f10 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -23,6 +23,9 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h index 6dcd1d3d40..2d53b280f7 100644 --- a/keyboards/barleycorn_smd/config.h +++ b/keyboards/barleycorn_smd/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, D5, D5, D5, D5, D5, D5, D5, D5, D5 } #define PORT_EXPANDER_ADDRESS 0x20 -#define RGB_DI_PIN E6 #define RGBLED_NUM 15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json index aca993e1a5..b24bd1321e 100644 --- a/keyboards/barleycorn_smd/info.json +++ b/keyboards/barleycorn_smd/info.json @@ -11,6 +11,9 @@ "caps_lock": "B2", "num_lock": "B3" }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index 783d097ad0..5535837b98 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . /* RGB LED */ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLED_NUM 69 // Number of LEDs. backlight x69 #define RGBLED_SPLIT { 34, 35 } #define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */ diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json index 9c42a8aeec..d8791c7be5 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h index 36f691da43..6185245bd6 100644 --- a/keyboards/basekeys/trifecta/config.h +++ b/keyboards/basekeys/trifecta/config.h @@ -16,12 +16,10 @@ #pragma once -#define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 80 /* RGB LED */ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E6 #define RGBLED_NUM 80 // Number of LEDs. backlight x69 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index dfe5b680c9..d52c54dbc6 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -23,6 +23,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index 69e269a963..68901305c4 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -23,7 +23,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index 920616b45b..fec474f14d 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h index 514a153623..6d24808af2 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h @@ -39,8 +39,8 @@ along with this program. If not, see . # define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -# undef RGB_DI_PIN -# define RGB_DI_PIN A1 +# undef WS2812_DI_PIN +# define WS2812_DI_PIN A1 # undef RGB_MATRIX_MAXIMUM_BRIGHTNESS # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h index 484ccc523f..dc0c6e4e03 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h @@ -21,8 +21,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index 8cbe3d419f..ec56b88c02 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C7", "F0", "D7", "E6", "B4"], "rows": ["B7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h index 20b610172d..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h @@ -20,8 +20,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index daa5bfacad..a318e467df 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "B6", "D7", "E6", "B4"], "rows": ["F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h index f09dc72c01..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 09dfc95916..100b53fc61 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h index bb85468a86..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json index 8eb16af2f0..841975db3d 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index e01419b97a..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json index 1e12af668b..465f54b42e 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 1070dbd066..985e79fabd 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -21,7 +21,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json index 1ce1bd0e35..c46230b5a0 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h index a1d7885943..f5c54c58ae 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h @@ -20,8 +20,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json index 9dd366e1dd..b816551a3e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], "rows": ["B7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h index 20b610172d..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h @@ -20,8 +20,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index d575fdb216..e3aa2ae1bf 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "rows": ["F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h index f09dc72c01..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json index 6e06faa9a8..4fd92418b3 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h index bb85468a86..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json index 8ac1338634..7dc1bcc85f 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index e01419b97a..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 8f89d16fbe..33f416b49d 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index 69e269a963..68901305c4 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -23,7 +23,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index efd66a8c24..d70a2168d6 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h index 484ccc523f..dc0c6e4e03 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -21,8 +21,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index 5dda4a73a5..61c81c48d2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D5", "C7", "F0", "D7", "E6", "B4"], "rows": ["F1", "B7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h index 20b610172d..3b91322247 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h @@ -20,8 +20,5 @@ /* Handedness. */ #define MASTER_RIGHT -/* RGB settings. */ -#define RGB_DI_PIN D3 - /* PMW3360 settings. */ #define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json index cf70250a15..86011a1550 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "rows": ["F4", "F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h index f09dc72c01..e6e2a4f216 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP18 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 2fc078cf67..125865ee94 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index bb85468a86..ee7745d41e 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 #define SPI_SCK_PIN GP22 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json index 4806e18bec..2c9903f8be 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index e01419b97a..6aa20712f6 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json index 0f019a3651..298a111d38 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 250732dc7a..c5fa0dc192 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -21,10 +21,6 @@ #define SPLIT_HAND_PIN GP29 #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 // Per-key. -// #define RGB_DI_PIN GP10 // Underglow. - /* CRC. */ #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index d9f0f15f2c..153d3053f9 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -13,6 +13,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h index b5166aed2a..0c40ed74bc 100644 --- a/keyboards/bastardkb/scylla/blackpill/config.h +++ b/keyboards/bastardkb/scylla/blackpill/config.h @@ -23,7 +23,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json index b1b825e579..0ae5cf86a0 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h index 384e19c3d2..41b5aa1c66 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/config.h +++ b/keyboards/bastardkb/scylla/v1/elitec/config.h @@ -20,6 +20,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D2 diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json index b6a9eac7a1..b53a0f5e76 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h index 178bafa5cc..e6b7fefa66 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/config.h +++ b/keyboards/bastardkb/scylla/v2/elitec/config.h @@ -19,6 +19,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D3 diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json index f1db245dd0..5b5b152628 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "rows": ["F4", "F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h index 00f0dbf1f3..977fb0a6e8 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h +++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json index dac13322b4..0617850d34 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h index ff5d7db4ff..e496023656 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h +++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json index 159b7df27a..71177d525a 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h index 4e5b142aa3..0bbfd39aee 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/config.h +++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json index c648806b14..f8167d7b20 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h index b5166aed2a..0c40ed74bc 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/config.h +++ b/keyboards/bastardkb/skeletyl/blackpill/config.h @@ -23,7 +23,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json index 37e4a93ad9..7bc12bfd32 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h index 384e19c3d2..41b5aa1c66 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/v1/elitec/config.h @@ -20,6 +20,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D2 diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json index 7d5ea2600d..f6b828f6e2 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["E6", "C6", "B1", "B3", "B2"], "rows": ["B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h index 178bafa5cc..e6b7fefa66 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h +++ b/keyboards/bastardkb/skeletyl/v2/elitec/config.h @@ -19,6 +19,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D3 diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json index 5c40b6ae42..191b47c80e 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "B6", "D7", "E6", "B4"], "rows": ["F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h index 00f0dbf1f3..977fb0a6e8 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json index 962c155bce..ef833a414e 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h index ff5d7db4ff..e496023656 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json index 799828f43c..8f75e99afe 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h index 4e5b142aa3..0bbfd39aee 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json index ec77a5dc1a..abd96fb434 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h index 1801b70053..40a9b2cbeb 100644 --- a/keyboards/bastardkb/tbk/config.h +++ b/keyboards/bastardkb/tbk/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 38 #define RGBLED_SPLIT { 19, 19 } #define RGBLIGHT_SPLIT diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json index 43254b2804..7da2d56ad5 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/info.json @@ -5,6 +5,9 @@ "device_version": "0.0.1", "pid": "0x1828" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h index b5166aed2a..0c40ed74bc 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/config.h +++ b/keyboards/bastardkb/tbkmini/blackpill/config.h @@ -23,7 +23,6 @@ #define SPLIT_HAND_PIN A3 // High -> left, Low -> right. /* RGB settings. */ -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 2fb63a0684..fd03d551ff 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -4,6 +4,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h index 384e19c3d2..41b5aa1c66 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v1/elitec/config.h @@ -20,6 +20,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D2 diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index bc311eb815..0fe5c8655e 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h index 178bafa5cc..e6b7fefa66 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h +++ b/keyboards/bastardkb/tbkmini/v2/elitec/config.h @@ -19,6 +19,3 @@ /* Handedness. */ #define MASTER_RIGHT - -/* RGB settings. */ -#define RGB_DI_PIN D3 diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index 4e9bafbaf5..d0691aef2e 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "B6", "D7", "E6", "B4"], "rows": ["F7", "C6", "D4", "B5"] diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h index 00f0dbf1f3..977fb0a6e8 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP13 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index 852bc94072..80d8134f7e 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h index ff5d7db4ff..e496023656 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h @@ -25,9 +25,6 @@ // #define SPLIT_HAND_PIN GP15 // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. -/* RGB settings. */ -#define RGB_DI_PIN GP0 - /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index 06acfec57f..a5717988c8 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -12,6 +12,7 @@ "soft_serial_pin": "GP1" }, "ws2812": { + "pin": "GP0", "driver": "vendor" }, "processor": "RP2040", diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h index 4e5b142aa3..0bbfd39aee 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -27,7 +27,6 @@ // #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. /* RGB settings. */ -#define RGB_DI_PIN D3 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index ec8c6f4f14..cdfc6273a0 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -4,6 +4,7 @@ "device_version": "2.0.0" }, "ws2812": { + "pin": "D3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h index d449b25d86..4cad8086cd 100644 --- a/keyboards/bbrfkr/dynamis/config.h +++ b/keyboards/bbrfkr/dynamis/config.h @@ -18,7 +18,6 @@ /* rgb num */ #define RGBLED_NUM 10 -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json index 377b50f882..5c1723b16c 100644 --- a/keyboards/bbrfkr/dynamis/info.json +++ b/keyboards/bbrfkr/dynamis/info.json @@ -18,6 +18,9 @@ {"pin_a": "B7", "pin_b": "E6"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bemeier/bmek/rev1/config.h b/keyboards/bemeier/bmek/rev1/config.h deleted file mode 100755 index 2776ce7582..0000000000 --- a/keyboards/bemeier/bmek/rev1/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License 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 RGB_DI_PIN E6 - diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json index e11b7355ce..c50cae166e 100644 --- a/keyboards/bemeier/bmek/rev1/info.json +++ b/keyboards/bemeier/bmek/rev1/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"], "rows": ["D4", "D7", "B6", "B4", "B7"] diff --git a/keyboards/bemeier/bmek/rev2/config.h b/keyboards/bemeier/bmek/rev2/config.h deleted file mode 100755 index 281c50703c..0000000000 --- a/keyboards/bemeier/bmek/rev2/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License 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 RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json index 005c444cdc..1ac54f5c79 100644 --- a/keyboards/bemeier/bmek/rev2/info.json +++ b/keyboards/bemeier/bmek/rev2/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"], "rows": ["F4", "F5", "D7", "B5", "B4"] diff --git a/keyboards/bemeier/bmek/rev3/config.h b/keyboards/bemeier/bmek/rev3/config.h deleted file mode 100755 index 281c50703c..0000000000 --- a/keyboards/bemeier/bmek/rev3/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 bemeier - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License 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 RGB_DI_PIN E6 diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json index 114b603406..c951ca8e43 100644 --- a/keyboards/bemeier/bmek/rev3/info.json +++ b/keyboards/bemeier/bmek/rev3/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.3" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"], "rows": ["F1", "B4", "B5", "D6", "D7"] diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h index ae477fb0f3..8f990eb8ed 100644 --- a/keyboards/biacco42/ergo42/rev1/config.h +++ b/keyboards/biacco42/ergo42/rev1/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json index 98b4703714..e6f81d54af 100644 --- a/keyboards/biacco42/ergo42/rev1/info.json +++ b/keyboards/biacco42/ergo42/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0042", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h index 200251cd1c..41c3822655 100755 --- a/keyboards/binepad/bn006/config.h +++ b/keyboards/binepad/bn006/config.h @@ -20,7 +20,6 @@ * PLEASE NOTE: Because the BN006 only has 6 keys, not all the animations are visually viable * =========================================================================================== */ - #define RGB_DI_PIN B15 #define RGB_MATRIX_LED_COUNT 6 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json index d7be1cfa3c..dfbeb733cb 100755 --- a/keyboards/binepad/bn006/info.json +++ b/keyboards/binepad/bn006/info.json @@ -24,6 +24,9 @@ "pid": "0x426E", "device_version": "1.0.0" }, + "ws2812": { + "pin": "B15" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 173d4ca15a..7ddb779209 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B1 # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 35d18ea678..35215dc5d0 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -18,6 +18,9 @@ "levels": 8, "breathing": true }, + "ws2812": { + "pin": "B1" + }, "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index d723d4d2bd..d1039d0896 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB Underglow */ -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index e466fb0c28..46004318f0 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 12 }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 431f73e2e6..d58c58713c 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index 275bb03c19..a73df0556a 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 8 }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index df0daa52fb..93ab008b66 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB Underglow */ -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 9251d4cad7..2cd9baf665 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 12 }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index e9a0f89ab2..13f5533c9f 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB Underglow */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index 75359db964..aa57e030ee 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 12 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h index d951bb71b4..ae0bc0aedb 100644 --- a/keyboards/black_hellebore/config.h +++ b/keyboards/black_hellebore/config.h @@ -26,7 +26,6 @@ #define WS2812_DMA_STREAM STM32_DMA1_STREAM6 #define WS2812_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) - #define RGB_DI_PIN A7 // The pin connected to the data pin of the LEDs #define RGB_MATRIX_LED_COUNT 61 // The number of LEDs connected #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json index 67648e7237..63d1d9418b 100644 --- a/keyboards/black_hellebore/info.json +++ b/keyboards/black_hellebore/info.json @@ -14,6 +14,7 @@ "rgb_matrix": true }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h index 781f5a9bff..ec4300c811 100644 --- a/keyboards/blackplum/config.h +++ b/keyboards/blackplum/config.h @@ -8,7 +8,6 @@ /* ws2812 RGB LED */ -#define RGB_DI_PIN C7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/blackplum/info.json b/keyboards/blackplum/info.json index 03c46b2ea3..bc9786c09a 100644 --- a/keyboards/blackplum/info.json +++ b/keyboards/blackplum/info.json @@ -8,6 +8,9 @@ "pid": "0x4250", "device_version": "10.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"], "rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"] diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h index 6547097b7f..57ba70ec11 100644 --- a/keyboards/blockboy/ac980mini/config.h +++ b/keyboards/blockboy/ac980mini/config.h @@ -4,7 +4,6 @@ #pragma once // RGB configuration -#define RGB_DI_PIN B7 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 81 # define RGBLED_NUM 81 diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json index b26d5fa630..f2bb4beb94 100644 --- a/keyboards/blockboy/ac980mini/info.json +++ b/keyboards/blockboy/ac980mini/info.json @@ -15,6 +15,9 @@ "pid": "0x6060", "vid": "0xFEED" }, + "ws2812": { + "pin": "B7" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h index 0c254d0dba..9b796dcece 100644 --- a/keyboards/blockey/config.h +++ b/keyboards/blockey/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B1 - #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 0089490f69..27aa9f62a1 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"], "rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"] diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h index 6c9c0d59fd..23f99a7211 100644 --- a/keyboards/bluebell/swoop/config.h +++ b/keyboards/bluebell/swoop/config.h @@ -24,7 +24,6 @@ #endif // RGB underglow and per key -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 223aa9b9bc..ee671fea27 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -8,6 +8,9 @@ "pid": "0x3046", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h index 1245d9ae58..a367b59dd3 100644 --- a/keyboards/boardrun/bizarre/config.h +++ b/keyboards/boardrun/bizarre/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json index 5605fec1b7..b7add4033e 100644 --- a/keyboards/boardrun/bizarre/info.json +++ b/keyboards/boardrun/bizarre/info.json @@ -9,6 +9,9 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h index d4766283fc..a1d1a3a544 100644 --- a/keyboards/boardrun/classic/config.h +++ b/keyboards/boardrun/classic/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/boardrun/classic/info.json b/keyboards/boardrun/classic/info.json index c65db69495..74f53cf2cd 100644 --- a/keyboards/boardrun/classic/info.json +++ b/keyboards/boardrun/classic/info.json @@ -9,6 +9,9 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h index 587dda7381..75b5888bc3 100644 --- a/keyboards/boardsource/beiwagon/config.h +++ b/keyboards/boardsource/beiwagon/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_LED_COUNT 18 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json index 69ce8d96f1..dc5f8cc20f 100644 --- a/keyboards/boardsource/beiwagon/info.json +++ b/keyboards/boardsource/beiwagon/info.json @@ -10,6 +10,9 @@ "mousekey": false, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json index 393b4fd806..359b95c699 100644 --- a/keyboards/boardsource/holiday/spooky/info.json +++ b/keyboards/boardsource/holiday/spooky/info.json @@ -22,7 +22,6 @@ }, "rgblight": { "led_count": 5, - "pin": "D3", "sleep": true, "animations": { "alternating": true, @@ -37,6 +36,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "community_layouts": [ "ortho_2x3" ], diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/info.json index 2c9155f6ad..53e8f31056 100644 --- a/keyboards/boardsource/lulu/avr/info.json +++ b/keyboards/boardsource/lulu/avr/info.json @@ -10,7 +10,7 @@ "split": { "soft_serial_pin": "D2" }, - "rgblight": { + "ws2812": { "pin": "D3" }, "encoder": { diff --git a/keyboards/boardsource/lulu/rp2040/config.h b/keyboards/boardsource/lulu/rp2040/config.h index 4f50a586df..2c86e48e6f 100644 --- a/keyboards/boardsource/lulu/rp2040/config.h +++ b/keyboards/boardsource/lulu/rp2040/config.h @@ -9,4 +9,3 @@ #define I2C_DRIVER I2CD1 #define I2C1_SDA_PIN GP22 #define I2C1_SCL_PIN GP23 -#define RGB_DI_PIN GP29 diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/info.json index eb9c31316d..eb57c593b4 100644 --- a/keyboards/boardsource/lulu/rp2040/info.json +++ b/keyboards/boardsource/lulu/rp2040/info.json @@ -11,6 +11,7 @@ ] }, "ws2812": { + "pin": "GP29", "driver": "vendor" } } diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json index ba8307221a..6e47fbd2c4 100644 --- a/keyboards/boardsource/microdox/v1/info.json +++ b/keyboards/boardsource/microdox/v1/info.json @@ -13,7 +13,6 @@ "soft_serial_pin": "D2" }, "rgblight": { - "pin": "D3", "sleep": true, "led_count": 12, "split_count": [6, 6], @@ -30,5 +29,8 @@ "static_gradient": true, "twinkle": true } - } + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h index 4846bf5146..236254317a 100644 --- a/keyboards/boardsource/microdox/v2/config.h +++ b/keyboards/boardsource/microdox/v2/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGB_DI_PIN B5 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_LED_COUNT 44 #define RGB_MATRIX_SPLIT { 22, 22 } diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json index a53dfff708..9d7e25dee4 100644 --- a/keyboards/boardsource/microdox/v2/info.json +++ b/keyboards/boardsource/microdox/v2/info.json @@ -9,6 +9,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "enabled": true, "rotary": [ diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h index c6edbf1c4e..1148c13ebc 100644 --- a/keyboards/boardsource/technik_o/config.h +++ b/keyboards/boardsource/technik_o/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_LED_COUNT 58 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json index d84a976e13..af8d16a020 100644 --- a/keyboards/boardsource/technik_o/info.json +++ b/keyboards/boardsource/technik_o/info.json @@ -11,6 +11,9 @@ "nkro": true, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h index ab4d79147c..fe6518356e 100644 --- a/keyboards/boardsource/technik_s/config.h +++ b/keyboards/boardsource/technik_s/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_LED_COUNT 55 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json index 6593845e83..d55979b5c5 100644 --- a/keyboards/boardsource/technik_s/info.json +++ b/keyboards/boardsource/technik_s/info.json @@ -11,6 +11,9 @@ "nkro": true, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index 46f10affcd..f0097f8141 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -24,7 +24,6 @@ }, "rgblight": { "led_count": 24, - "pin": "C6", "sleep": true, "max_brightness": 200, "animations": { @@ -40,6 +39,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "C6" + }, "rgb_matrix": { "layout": [ { "flags": 2, "x": 224, "y": 42}, diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h index d4766283fc..a1d1a3a544 100644 --- a/keyboards/boardwalk/config.h +++ b/keyboards/boardwalk/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/boardwalk/info.json b/keyboards/boardwalk/info.json index c226f34a13..8a04fc121e 100644 --- a/keyboards/boardwalk/info.json +++ b/keyboards/boardwalk/info.json @@ -8,6 +8,9 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h index 36236ad0f7..3ced3989ef 100644 --- a/keyboards/bolsa/bolsalice/config.h +++ b/keyboards/bolsa/bolsalice/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B1 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/bolsa/bolsalice/info.json b/keyboards/bolsa/bolsalice/info.json index f201b72204..25ef2f617b 100644 --- a/keyboards/bolsa/bolsalice/info.json +++ b/keyboards/bolsa/bolsalice/info.json @@ -6,6 +6,9 @@ "vid": "0x4253", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B2", "B3", "C7", "C6", "B5"] diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 62a12b77e9..1dcbcdb5b8 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -26,7 +26,6 @@ #define LOCKING_RESYNC_ENABLE /* Define RGBLED */ -#define RGB_DI_PIN A5 #define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index 4e9e209ff6..f169d0966c 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -23,6 +23,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "A5" + }, "indicators": { "caps_lock": "A1", "num_lock": "A0", diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h index 3469e28bb9..d609409cb5 100644 --- a/keyboards/boston_meetup/2019/config.h +++ b/keyboards/boston_meetup/2019/config.h @@ -97,7 +97,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 10 -#define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json index 125914db3b..609a917b75 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/info.json @@ -12,6 +12,9 @@ {"pin_a": "B13", "pin_b": "B14"} ] }, + "ws2812": { + "pin": "B5" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h index 6eab475cf2..2dae864ddb 100644 --- a/keyboards/bpiphany/four_banger/config.h +++ b/keyboards/bpiphany/four_banger/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json index b958936ce3..ce9b4a7ec5 100644 --- a/keyboards/bpiphany/four_banger/info.json +++ b/keyboards/bpiphany/four_banger/info.json @@ -8,6 +8,9 @@ "pid": "0x2004", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B5", "B4"], "rows": ["B2", "B6"] diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h index 7bf04c9b76..6f951724f1 100644 --- a/keyboards/bt66tech/bt66tech60/config.h +++ b/keyboards/bt66tech/bt66tech60/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 9 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json index 38fc9059c1..4999eab168 100644 --- a/keyboards/bt66tech/bt66tech60/info.json +++ b/keyboards/bt66tech/bt66tech60/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h index fdee023e7d..a637e9e335 100644 --- a/keyboards/bubble75/hotswap/config.h +++ b/keyboards/bubble75/hotswap/config.h @@ -26,7 +26,6 @@ /* WS2812 RGB */ #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN B7 #define RGBLED_NUM 81 #define RGB_MATRIX_LED_COUNT 81 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json index 5de7cffae7..27dd4fb20e 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x5A4C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["F4", "F5", "F6", "F7", "C7", "F1"] diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h index 06de33c6bd..89009938e4 100644 --- a/keyboards/buildakb/potato65/config.h +++ b/keyboards/buildakb/potato65/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json index 0a20b27c41..d49362f118 100644 --- a/keyboards/buildakb/potato65/info.json +++ b/keyboards/buildakb/potato65/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h index 8af6f10258..b8cb223b0c 100644 --- a/keyboards/buildakb/potato65hs/config.h +++ b/keyboards/buildakb/potato65hs/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json index fa6285d919..466983fde8 100644 --- a/keyboards/buildakb/potato65hs/info.json +++ b/keyboards/buildakb/potato65hs/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h index 4f13c2c49e..7390e2d319 100644 --- a/keyboards/buildakb/potato65s/config.h +++ b/keyboards/buildakb/potato65s/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D5 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json index 46d8461d2a..5b81266ee3 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"], "rows": ["F5", "F4", "F6", "F0", "D2"] diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h index 139341bd7c..5be5ba8b67 100644 --- a/keyboards/cablecardesigns/cypher/rev6/config.h +++ b/keyboards/cablecardesigns/cypher/rev6/config.h @@ -7,7 +7,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D5 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json index 0e8006486c..4301e45de5 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/info.json @@ -16,6 +16,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 55e0ea0c56..c9e9224e0d 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0621", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index b205964796..c269ae5172 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN B6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h index 2dd64009a5..a401d62151 100644 --- a/keyboards/cannonkeys/adelie/config.h +++ b/keyboards/cannonkeys/adelie/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json index 5dd8a27b23..e1dc68ac8f 100644 --- a/keyboards/cannonkeys/adelie/info.json +++ b/keyboards/cannonkeys/adelie/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"], "rows": ["F4", "F1", "B1", "B0"] diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h index 3120b3167a..aced1f333c 100644 --- a/keyboards/cannonkeys/an_c/config.h +++ b/keyboards/cannonkeys/an_c/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index 07ca88e770..b6bc41de02 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h index 0ff5f383bb..1296ad8dcc 100644 --- a/keyboards/cannonkeys/atlas/config.h +++ b/keyboards/cannonkeys/atlas/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define WS2812_SPI SPID2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 22 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json index 6cd7fa15a0..6fc7724b2b 100644 --- a/keyboards/cannonkeys/atlas/info.json +++ b/keyboards/cannonkeys/atlas/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h index 52b15c350c..3854b33fab 100644 --- a/keyboards/cannonkeys/atlas_alps/config.h +++ b/keyboards/cannonkeys/atlas_alps/config.h @@ -24,7 +24,6 @@ // ws2812 options -#define RGB_DI_PIN D4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json index c5f6141fb9..913dea01c2 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/info.json @@ -8,6 +8,9 @@ "pid": "0xA7A5", "device_version": "0.1.0" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B5", "B4", "D1", "D7", "D6"] diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h index 8826d5568a..a3fc30fc3d 100644 --- a/keyboards/cannonkeys/cloudline/config.h +++ b/keyboards/cannonkeys/cloudline/config.h @@ -12,7 +12,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index c9e8c7a05c..a0b432f7ba 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h index 1bdd8995f7..20f73d95a2 100644 --- a/keyboards/cannonkeys/db60/config.h +++ b/keyboards/cannonkeys/db60/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define WS2812_SPI SPID2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 41aee2dda7..99a4425752 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -17,6 +17,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h index ab8f8fa121..947648f59e 100644 --- a/keyboards/cannonkeys/devastatingtkl/config.h +++ b/keyboards/cannonkeys/devastatingtkl/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 2e176b4751..205b4af6d7 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h index c4e3629964..043ee2908a 100644 --- a/keyboards/cannonkeys/hoodrowg/config.h +++ b/keyboards/cannonkeys/hoodrowg/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D1 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json index cd08c00354..6a3846465d 100644 --- a/keyboards/cannonkeys/hoodrowg/info.json +++ b/keyboards/cannonkeys/hoodrowg/info.json @@ -17,6 +17,9 @@ "caps_lock": "B6", "scroll_lock": "B2" }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h index 3120b3167a..aced1f333c 100644 --- a/keyboards/cannonkeys/instant60/config.h +++ b/keyboards/cannonkeys/instant60/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index de3359c1a8..7994bdd547 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h index 898aff0ff5..65ffa50103 100644 --- a/keyboards/cannonkeys/instant65/config.h +++ b/keyboards/cannonkeys/instant65/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index 4fcb8a1c77..cd98c81c6d 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index a45b992779..2c1baa101d 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index 1e52c18190..bd34061f68 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "indicators": { diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h index 898aff0ff5..65ffa50103 100644 --- a/keyboards/cannonkeys/obliterated75/config.h +++ b/keyboards/cannonkeys/obliterated75/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index 63d8af39e3..bc8d774009 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h index fd38d4677f..eaf33bbfa0 100644 --- a/keyboards/cannonkeys/ortho48/config.h +++ b/keyboards/cannonkeys/ortho48/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 9 #define WS2812_SPI SPID2 diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json index e4832540d4..dd4879b5be 100644 --- a/keyboards/cannonkeys/ortho48/info.json +++ b/keyboards/cannonkeys/ortho48/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 378e08c49d..c8c8c93e51 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define WS2812_SPI SPID2 diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index bf5b56c57f..3b672f4f6d 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h index 378e08c49d..c8c8c93e51 100644 --- a/keyboards/cannonkeys/ortho75/config.h +++ b/keyboards/cannonkeys/ortho75/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define WS2812_SPI SPID2 diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json index b9e0526ed8..dd2b78b998 100644 --- a/keyboards/cannonkeys/ortho75/info.json +++ b/keyboards/cannonkeys/ortho75/info.json @@ -24,6 +24,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h index 6e361ccf78..c766c83f65 100644 --- a/keyboards/cannonkeys/practice60/config.h +++ b/keyboards/cannonkeys/practice60/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 9 #define WS2812_SPI SPID2 diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json index 286be82e9e..7b3384a0fb 100644 --- a/keyboards/cannonkeys/practice60/info.json +++ b/keyboards/cannonkeys/practice60/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h index 1e62cd6a51..0163604ead 100644 --- a/keyboards/cannonkeys/practice65/config.h +++ b/keyboards/cannonkeys/practice65/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json index 8bf9a0f9e7..b8339846f9 100644 --- a/keyboards/cannonkeys/practice65/info.json +++ b/keyboards/cannonkeys/practice65/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h index b65cf4792b..29c78c2398 100644 --- a/keyboards/cannonkeys/sagittarius/config.h +++ b/keyboards/cannonkeys/sagittarius/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 8 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index 9d969a5aaa..ba45d388fd 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "indicators": { diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h index 97fbded3c0..6aac0aefb4 100644 --- a/keyboards/cannonkeys/savage65/config.h +++ b/keyboards/cannonkeys/savage65/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index adec89639a..540327c6b8 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index 271589a75f..ef54762328 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -32,7 +32,6 @@ }, "rgblight": { "led_count": 12, - "pin": "B15", "hue_steps": 24, "saturation_steps": 16, "brightness_steps": 16, @@ -49,6 +48,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B15" + }, "indicators": { "caps_lock": "B9", "scroll_lock": "F0", diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h index 1dfaa69473..d344ffaee6 100644 --- a/keyboards/cannonkeys/tmov2/config.h +++ b/keyboards/cannonkeys/tmov2/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 22 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index b9931edfda..25d17bd15b 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h index 97fbded3c0..6aac0aefb4 100644 --- a/keyboards/cannonkeys/tsukuyomi/config.h +++ b/keyboards/cannonkeys/tsukuyomi/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index 53b8324a99..99736d7aa5 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -19,6 +19,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F072", diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h index e6492683ee..1d8a04fe70 100644 --- a/keyboards/capsunlocked/cu24/config.h +++ b/keyboards/capsunlocked/cu24/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Glow */ -#define RGB_DI_PIN F4 // The pin the LED strip is connected to #define RGBLED_NUM 5 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index a95382d562..22ef9df89b 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h index 22cec290b1..9c55906c31 100644 --- a/keyboards/capsunlocked/cu7/config.h +++ b/keyboards/capsunlocked/cu7/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json index ba3d10471b..94eb2aea0c 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["F5", "F7", "F4"], "rows": ["D7", "F0", "F6"] diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h index c37363f63d..67f1f43c44 100644 --- a/keyboards/capsunlocked/cu75/config.h +++ b/keyboards/capsunlocked/cu75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile #define RGBLED_NUM 24 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json index 14565d0f70..5be11f6cb0 100644 --- a/keyboards/capsunlocked/cu75/info.json +++ b/keyboards/capsunlocked/cu75/info.json @@ -17,6 +17,9 @@ "driver": "custom", "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json index b911f690e9..c9d4b88926 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json @@ -39,9 +39,11 @@ "hue_steps": 8, "led_count": 87, "max_brightness": 50, - "pin": "E6", "saturation_steps": 8 }, + "ws2812": { + "pin": "E6" + }, "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json index e4c4f462d6..b7225214ba 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/info.json @@ -39,9 +39,11 @@ "hue_steps": 8, "led_count": 88, "max_brightness": 50, - "pin": "E6", "saturation_steps": 8 }, + "ws2812": { + "pin": "E6" + }, "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h index 396a5ce868..98e0780698 100644 --- a/keyboards/catch22/config.h +++ b/keyboards/catch22/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/catch22/info.json b/keyboards/catch22/info.json index 1aa4664ef5..6ffd3117af 100644 --- a/keyboards/catch22/info.json +++ b/keyboards/catch22/info.json @@ -6,6 +6,9 @@ "pid": "0xCA22", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F6" + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "B3", "B1", "F7"] diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h index 88e9e5f9c8..6bbd5af9bf 100644 --- a/keyboards/chalice/config.h +++ b/keyboards/chalice/config.h @@ -17,8 +17,6 @@ #pragma once -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 14 #define RGBLIGHT_SLEEP diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json index 4075fa42f2..af24b81ed6 100644 --- a/keyboards/chalice/info.json +++ b/keyboards/chalice/info.json @@ -8,6 +8,9 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F7", "C6", "B1", "D2", "E6", "B3", "D7"], "rows": ["F4", "D1", "D0", "F5", "D4", "F6", "B4", "B5", "B2", "B6"] diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h index 570020b306..4ef27597b3 100644 --- a/keyboards/charue/sunsetter_r2/config.h +++ b/keyboards/charue/sunsetter_r2/config.h @@ -4,7 +4,6 @@ #pragma once /* RGB */ -#define RGB_DI_PIN E6 # define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json index 4d37fcd819..8b7ea90cf0 100644 --- a/keyboards/charue/sunsetter_r2/info.json +++ b/keyboards/charue/sunsetter_r2/info.json @@ -8,6 +8,9 @@ "pid": "0x5335", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F0", "F1", "F7", "B1", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "F4", "F5", "F6"] diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h index 825d77b4ae..530fa06413 100644 --- a/keyboards/checkerboards/axon40/config.h +++ b/keyboards/checkerboards/axon40/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json index 7bc52e7b9c..b687df03fe 100644 --- a/keyboards/checkerboards/axon40/info.json +++ b/keyboards/checkerboards/axon40/info.json @@ -8,6 +8,9 @@ "pid": "0x1119", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C7", "B7", "D4", "D6", "F0", "F1", "C6", "B6", "B5", "B4", "E6", "B0"], "rows": ["D2", "D3", "D1", "D5"] diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h index 091065e483..0033db5d2b 100644 --- a/keyboards/checkerboards/candybar_ortho/config.h +++ b/keyboards/checkerboards/candybar_ortho/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/candybar_ortho/info.json b/keyboards/checkerboards/candybar_ortho/info.json index ceadcc42ad..036ea9e49b 100644 --- a/keyboards/checkerboards/candybar_ortho/info.json +++ b/keyboards/checkerboards/candybar_ortho/info.json @@ -8,6 +8,9 @@ "pid": "0x3215", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2"], "rows": ["B4", "D4", "D7", "D6", "B5", "B6", "C7", "C6"] diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h index 5d3e817aac..3c52543d25 100644 --- a/keyboards/checkerboards/nop60/config.h +++ b/keyboards/checkerboards/nop60/config.h @@ -20,7 +20,6 @@ Copyright 2021 Nathan Spears #define BACKLIGHT_PWM_DRIVER PWMD3 // ws2812 options -#define RGB_DI_PIN D2 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/nop60/info.json b/keyboards/checkerboards/nop60/info.json index c1d9d31763..5ebda17059 100644 --- a/keyboards/checkerboards/nop60/info.json +++ b/keyboards/checkerboards/nop60/info.json @@ -18,6 +18,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h index f365fe865a..50aa698524 100644 --- a/keyboards/checkerboards/plexus75/config.h +++ b/keyboards/checkerboards/plexus75/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN D3 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json index 92739951f8..c9e04c36b4 100644 --- a/keyboards/checkerboards/plexus75/info.json +++ b/keyboards/checkerboards/plexus75/info.json @@ -8,6 +8,9 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B2", "B0", "D1", "F7", "F6", "F5", "F4", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "B3", "B1", "F1", "F0"] diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h index 04b03054f1..bfa5878383 100644 --- a/keyboards/checkerboards/plexus75_he/config.h +++ b/keyboards/checkerboards/plexus75_he/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json index d977b2f5a9..071b47c797 100644 --- a/keyboards/checkerboards/plexus75_he/info.json +++ b/keyboards/checkerboards/plexus75_he/info.json @@ -8,6 +8,9 @@ "pid": "0x5339", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["C4", "C5", "D3", "C7", "B7", "B6", "B5", "B4"], "rows": ["C2", "D0", "D1", "D2", "D6", "B0", "B3", "B2", "C6", "B1"] diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h index e60a7e4d0c..6fe6785edb 100644 --- a/keyboards/checkerboards/pursuit40/config.h +++ b/keyboards/checkerboards/pursuit40/config.h @@ -39,7 +39,6 @@ //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN F0 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json index 81988112a9..d7f66ea8e6 100644 --- a/keyboards/checkerboards/pursuit40/info.json +++ b/keyboards/checkerboards/pursuit40/info.json @@ -8,6 +8,9 @@ "pid": "0x1620", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F1", "E6", "B7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D2", "D1", "F4", "F5"] diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h index 1cf03ae980..efa8f93d3e 100644 --- a/keyboards/checkerboards/quark/config.h +++ b/keyboards/checkerboards/quark/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index 8e73147b64..262cd6e60c 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -8,6 +8,9 @@ "pid": "0x5340", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"], "rows": ["C5", "C4", "C6", "C7", "B7"] diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h index ff88273648..75345075e7 100644 --- a/keyboards/checkerboards/quark_lp/config.h +++ b/keyboards/checkerboards/quark_lp/config.h @@ -24,8 +24,6 @@ #define TAPPING_TOGGLE 2 -#define RGB_DI_PIN C2 // pin the DI on the ws2812 is hooked-up to - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 51 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json index 94568a6c38..da801bd13e 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/info.json @@ -8,6 +8,9 @@ "pid": "0x5354", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C2" + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"], "rows": ["C5", "C4", "C6", "C7"] diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h index 319f588aa2..4136faaa7a 100644 --- a/keyboards/checkerboards/quark_plus/config.h +++ b/keyboards/checkerboards/quark_plus/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN C5 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json index 37360618b5..8f68d8c0c6 100644 --- a/keyboards/checkerboards/quark_plus/info.json +++ b/keyboards/checkerboards/quark_plus/info.json @@ -8,6 +8,9 @@ "pid": "0x5344", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C5" + }, "matrix_pins": { "cols": ["C6", "D1", "D5", "D4", "D3", "D2"], "rows": ["B4", "B1", "C2", "D0", "D6", "B0", "B6", "B5"] diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h index de0e84aa33..514ce68f3f 100644 --- a/keyboards/checkerboards/quark_squared/config.h +++ b/keyboards/checkerboards/quark_squared/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json index 46bfedda21..a5fb22db85 100644 --- a/keyboards/checkerboards/quark_squared/info.json +++ b/keyboards/checkerboards/quark_squared/info.json @@ -8,6 +8,9 @@ "pid": "0x5342", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B3", "C2", "B2", "D6", "D2", "D3", "D4", "D5", "B1"], "rows": ["C5", "C4", "C6", "C7", "B7"] diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h index 4ef42eeb79..d11757cc15 100644 --- a/keyboards/checkerboards/snop60/config.h +++ b/keyboards/checkerboards/snop60/config.h @@ -18,7 +18,6 @@ Copyright 2022 Nathan Spears #pragma once // ws2812 options -#define RGB_DI_PIN B1 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/info.json index 0d5392f073..ab4aabd5a4 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/info.json @@ -23,6 +23,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h index 309d6ccf54..788fbe39a9 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/config.h +++ b/keyboards/checkerboards/ud40_ortho_alt/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/checkerboards/ud40_ortho_alt/info.json b/keyboards/checkerboards/ud40_ortho_alt/info.json index 701f129163..7573cb74d8 100644 --- a/keyboards/checkerboards/ud40_ortho_alt/info.json +++ b/keyboards/checkerboards/ud40_ortho_alt/info.json @@ -8,6 +8,9 @@ "pid": "0x7030", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["B2", "B1", "F7", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F6"], "rows": ["E6", "F0", "F1", "F4"] diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h index e59d5b3101..21aeb17d77 100644 --- a/keyboards/cherrybstudio/cb1800/config.h +++ b/keyboards/cherrybstudio/cb1800/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json index ade4585e42..8be7721b0f 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/info.json @@ -19,6 +19,9 @@ "scroll_lock": "F7", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h index 4f962bc935..e463e1d6c7 100644 --- a/keyboards/cherrybstudio/cb65/config.h +++ b/keyboards/cherrybstudio/cb65/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once /* RGB Lighting */ -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index 6f29ae1dfd..8360bf3a06 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -18,6 +18,9 @@ "scroll_lock": "F4", "on_state": 0 }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h index c936f7b66e..ddb9102d36 100644 --- a/keyboards/cherrybstudio/cb87/config.h +++ b/keyboards/cherrybstudio/cb87/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json index 0a38f9151e..ac32d5f8ea 100644 --- a/keyboards/cherrybstudio/cb87/info.json +++ b/keyboards/cherrybstudio/cb87/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E6" + }, "indicators": { "caps_lock": "F0", "scroll_lock": "F4", diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h index 750ca2634c..a4643fae38 100644 --- a/keyboards/cherrybstudio/cb87rgb/config.h +++ b/keyboards/cherrybstudio/cb87rgb/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 92 #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index 5e93754cfc..bdf1fb1c27 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x8785", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "F6"] diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h index 6a8c94b70b..4c66b113e7 100644 --- a/keyboards/cherrybstudio/cb87v2/config.h +++ b/keyboards/cherrybstudio/cb87v2/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 8e7720928d..63872a922b 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -21,6 +21,9 @@ "scroll_lock": "F4", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h index d93e66215b..71b0146437 100644 --- a/keyboards/cheshire/curiosity/config.h +++ b/keyboards/cheshire/curiosity/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json index 9363276635..fa8180e5af 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/info.json @@ -7,6 +7,9 @@ "pid": "0x0FAD", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["B13", "B14", "A4", "A2", "A1"] diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json index 648a60e030..ea50a589a4 100644 --- a/keyboards/chickenman/ciel65/info.json +++ b/keyboards/chickenman/ciel65/info.json @@ -28,7 +28,6 @@ "key_lock": false }, "rgblight": { - "pin": "F0", "led_count": 14, "hue_steps": 8, "saturation_steps": 8, @@ -48,6 +47,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "F0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 1836493d9f..62b31cf95b 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index 20f8eb6681..e7ae711c7d 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -8,6 +8,9 @@ "pid": "0x0602", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"], "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"] diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h index ef83bdad8a..b5d7155516 100644 --- a/keyboards/chromatonemini/config.h +++ b/keyboards/chromatonemini/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGB_MATRIX_ENABLE /* ws2812 RGB MATRIX */ diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json index c4307fe988..ad33101816 100644 --- a/keyboards/chromatonemini/info.json +++ b/keyboards/chromatonemini/info.json @@ -17,6 +17,9 @@ "rgblight": false, "audio": false }, + "ws2812": { + "pin": "D3" + }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": [ "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6" ], diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json index e55d3b9e50..ba25a63e95 100644 --- a/keyboards/cipulot/ec_23u/info.json +++ b/keyboards/cipulot/ec_23u/info.json @@ -27,7 +27,6 @@ "processor": "STM32F401", "rgblight": { "led_count": 21, - "pin": "B5", "animations": { "alternating": true, "breathing": true, @@ -41,6 +40,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B5" + }, "url": "https://www.github.com/Cipulot/EC23U", "usb": { "device_version": "0.0.1", diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json index ae92d44e78..2f597d6bf5 100644 --- a/keyboards/cipulot/ec_pro2/info.json +++ b/keyboards/cipulot/ec_pro2/info.json @@ -24,7 +24,6 @@ "processor": "STM32F401", "rgblight": { "led_count": 22, - "pin": "B14", "animations": { "alternating": true, "breathing": true, @@ -38,6 +37,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B14" + }, "url": "https://www.github.com/Cipulot/EC-Pro-2", "usb": { "device_version": "0.0.1", diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json index df1ad3ba6b..7c26c89515 100644 --- a/keyboards/cipulot/ec_prox/ansi_iso/info.json +++ b/keyboards/cipulot/ec_prox/ansi_iso/info.json @@ -24,7 +24,6 @@ "processor": "STM32F401", "rgblight": { "led_count": 22, - "pin": "B12", "animations": { "alternating": true, "breathing": true, @@ -38,6 +37,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B12" + }, "url": "https://www.github.com/Cipulot/EC-Pro-X", "usb": { "device_version": "0.0.1", diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json index bcb5a11a12..f4e97c1e63 100644 --- a/keyboards/cipulot/ec_prox/jis/info.json +++ b/keyboards/cipulot/ec_prox/jis/info.json @@ -24,7 +24,6 @@ "processor": "STM32F401", "rgblight": { "led_count": 22, - "pin": "B12", "animations": { "alternating": true, "breathing": true, @@ -38,6 +37,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B12" + }, "url": "https://www.github.com/Cipulot/EC-Pro-X", "usb": { "device_version": "0.0.1", diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h index 62e682cd0c..bb51142311 100644 --- a/keyboards/cipulot/kallos/config.h +++ b/keyboards/cipulot/kallos/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Lightbar pin and LED count definitions*/ -#define RGB_DI_PIN D0 #define RGBLED_NUM 13 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json index a0e9aefe17..40eb07f80e 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/info.json @@ -8,6 +8,9 @@ "pid": "0x6B7A", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json index b72dee4696..579a67cf34 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/info.json +++ b/keyboards/cipulot/rf_r1_8_9xu/info.json @@ -28,7 +28,6 @@ "processor": "STM32F401", "rgblight": { "led_count": 22, - "pin": "A15", "animations": { "alternating": true, "breathing": true, @@ -42,6 +41,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "A15" + }, "url": "https://www.github.com/Cipulot/RF_R1_8-9Xu", "usb": { "device_version": "0.0.1", diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h index 1304a2fe31..3db1523344 100644 --- a/keyboards/ck60i/config.h +++ b/keyboards/ck60i/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index d99757f19b..e48f22ab49 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -23,6 +23,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json index c669255cb1..d9525e4f12 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/info.json @@ -37,9 +37,11 @@ "brightness_steps": 17, "hue_steps": 10, "led_count": 4, - "pin": "F6", "saturation_steps": 17 }, + "ws2812": { + "pin": "F6" + }, "url": "", "usb": { "device_version": "0.0.1", diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json index 8267dd983c..4517f21d1e 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/info.json @@ -42,9 +42,11 @@ "brightness_steps": 8, "hue_steps": 8, "led_count": 16, - "pin": "C6", "saturation_steps": 8 }, + "ws2812": { + "pin": "C6" + }, "usb": { "pid": "0x23A0" }, diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json index 4f9f0a1642..c460080a29 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/info.json @@ -42,9 +42,11 @@ "brightness_steps": 17, "hue_steps": 10, "led_count": 14, - "pin": "B2", "saturation_steps": 17 }, + "ws2812": { + "pin": "B2" + }, "usb": { "device_version": "0.0.1", "pid": "0x2301", diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json index ff8128627e..fc178b12ab 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/info.json @@ -42,9 +42,11 @@ "brightness_steps": 17, "hue_steps": 32, "led_count": 14, - "pin": "D7", "saturation_steps": 17 }, + "ws2812": { + "pin": "D7" + }, "usb": { "device_version": "0.0.1", "pid": "0x2320", diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json index fc655351fb..5ab4506ee4 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/info.json @@ -42,9 +42,11 @@ "brightness_steps": 17, "hue_steps": 32, "led_count": 18, - "pin": "D7", "saturation_steps": 17 }, + "ws2812": { + "pin": "D7" + }, "usb": { "device_version": "0.0.1", "pid": "0x2370", diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json index dbe3b49756..5b9239263a 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/info.json @@ -40,9 +40,11 @@ "brightness_steps": 17, "hue_steps": 32, "led_count": 18, - "pin": "D7", "saturation_steps": 17 }, + "ws2812": { + "pin": "D7" + }, "usb": { "device_version": "0.0.1", "pid": "0x2390", diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json index 7f80684d8d..b6049b5649 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/info.json @@ -42,9 +42,11 @@ "brightness_steps": 17, "hue_steps": 32, "led_count": 26, - "pin": "D7", "saturation_steps": 17 }, + "ws2812": { + "pin": "D7" + }, "usb": { "device_version": "0.0.1", "pid": "0x2390", diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json index 5b6a208c16..568185f3ee 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/info.json @@ -29,9 +29,11 @@ "brightness_steps": 17, "hue_steps": 10, "led_count": 4, - "pin": "E6", "saturation_steps": 17 }, + "ws2812": { + "pin": "E6" + }, "usb": { "device_version": "0.0.1", "pid": "0x2330", diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h index 140473a367..97f19f3ffa 100644 --- a/keyboards/cmm_studio/fuji65/config.h +++ b/keyboards/cmm_studio/fuji65/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json index 30d273318e..824213303e 100644 --- a/keyboards/cmm_studio/fuji65/info.json +++ b/keyboards/cmm_studio/fuji65/info.json @@ -8,6 +8,9 @@ "pid": "0x364D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D5", "D3", "D2", "D1", "D0"], "rows": ["B5", "B4", "D7", "D6", "B6"] diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h index 2371ec5ef1..77d7f36bcc 100644 --- a/keyboards/contender/config.h +++ b/keyboards/contender/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C6 #define RGBLED_NUM 33 #define RGBLIGHT_LED_MAP { \ 0, 1, 2, 3, \ diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json index 14692509ec..e8ef7da4a3 100644 --- a/keyboards/contender/info.json +++ b/keyboards/contender/info.json @@ -8,6 +8,9 @@ "pid": "0xC010", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["C7", "D6", "B3", "B0", "B1"], "rows": ["D4", "D3", "B5", "B7", "B4", "B2"] diff --git a/keyboards/contra/keymaps/enigma/config.h b/keyboards/contra/keymaps/enigma/config.h index da3e8250b6..4fc612e3ea 100644 --- a/keyboards/contra/keymaps/enigma/config.h +++ b/keyboards/contra/keymaps/enigma/config.h @@ -16,7 +16,7 @@ #pragma once -#define RGB_DI_PIN F7 +#define WS2812_DI_PIN F7 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_SNAKE #define RGBLED_NUM 12 diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h index 6475cc20a6..5580ffeae8 100644 --- a/keyboards/contra/keymaps/maxr1998/config.h +++ b/keyboards/contra/keymaps/maxr1998/config.h @@ -4,7 +4,7 @@ #define TAPPING_TOGGLE 2 -#define RGB_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to +#define WS2812_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json index f43918b9df..9bfb402fab 100644 --- a/keyboards/controllerworks/mini36/info.json +++ b/keyboards/controllerworks/mini36/info.json @@ -23,12 +23,10 @@ ["GP20", "GP21", "GP22", null, null] ] }, - "rgblight": { - "pin": "GP0" - }, - "ws2812": { - "driver": "vendor" - }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "split": { "enabled": true, "matrix_pins": { diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json index a13ac9dfcd..c6e0f12aed 100644 --- a/keyboards/controllerworks/mini42/info.json +++ b/keyboards/controllerworks/mini42/info.json @@ -23,12 +23,10 @@ ["GP20", "GP21", "GP22", null, null, null] ] }, - "rgblight": { - "pin": "GP0" - }, - "ws2812": { - "driver": "vendor" - }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" + }, "split": { "enabled": true, "main": "left", diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h index 9dd86992c1..760c1645b0 100644 --- a/keyboards/coseyfannitutti/mullet/config.h +++ b/keyboards/coseyfannitutti/mullet/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json index fc2f47c2c0..5e645373a3 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/info.json @@ -8,6 +8,9 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["B2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3"], "rows": ["D0", "D1", "B0", "F0", "F1"] diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h index b8a063e9ab..c97f9dbac4 100644 --- a/keyboards/cosmo65/config.h +++ b/keyboards/cosmo65/config.h @@ -16,7 +16,6 @@ along with this program. If not, see http://www.gnu.org/licenses/. /* RGB Lighting */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index b98db6c790..7495f06594 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -8,6 +8,9 @@ "pid": "0x6331", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["E6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D1", "D2", "D3", "F1", "F6"], "rows": ["D5", "D0", "F0", "F5", "F4"] diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h index 3e13941d50..7bd53ef0bd 100644 --- a/keyboards/cozykeys/bloomer/config.h +++ b/keyboards/cozykeys/bloomer/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . // Enable RGB backlight #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D7 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/cozykeys/bloomer/info.json b/keyboards/cozykeys/bloomer/info.json index ed0bb78867..96db04787e 100644 --- a/keyboards/cozykeys/bloomer/info.json +++ b/keyboards/cozykeys/bloomer/info.json @@ -6,5 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x1191" + }, + "ws2812": { + "pin": "D7" } } diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h index 85beda5e41..6943064510 100644 --- a/keyboards/cozykeys/speedo/v3/config.h +++ b/keyboards/cozykeys/speedo/v3/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index a1a3bc18e4..0632dfd52d 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -8,6 +8,9 @@ "pid": "0x1192", "device_version": "0.0.3" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F0", "F1", "C7", "D5", "B7"] diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h index 9e0f2cf8ff..f8a8dc9013 100644 --- a/keyboards/craftwalk/config.h +++ b/keyboards/craftwalk/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/craftwalk/info.json b/keyboards/craftwalk/info.json index 1f8bd3e0f7..b3f3fbbe57 100644 --- a/keyboards/craftwalk/info.json +++ b/keyboards/craftwalk/info.json @@ -8,6 +8,9 @@ "pid": "0x2E8F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B1", "F7", "F5", "F4", "B2", "E6", "B4"], "rows": ["F6", "B3", "B5"] diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h index 9a38384749..4378435471 100755 --- a/keyboards/crawlpad/config.h +++ b/keyboards/crawlpad/config.h @@ -15,7 +15,6 @@ ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/crawlpad/info.json b/keyboards/crawlpad/info.json index 45a65c6278..0d4d38d4ea 100644 --- a/keyboards/crawlpad/info.json +++ b/keyboards/crawlpad/info.json @@ -8,6 +8,9 @@ "pid": "0x6070", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "D5", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h index 1cc20d3daf..f87c8e54b6 100644 --- a/keyboards/crazy_keyboard_68/config.h +++ b/keyboards/crazy_keyboard_68/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F6 # define RGBLED_NUM 84 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/crazy_keyboard_68/info.json b/keyboards/crazy_keyboard_68/info.json index 871ddb872c..5e7416545d 100644 --- a/keyboards/crazy_keyboard_68/info.json +++ b/keyboards/crazy_keyboard_68/info.json @@ -17,6 +17,9 @@ "caps_lock": "B0", "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h index cddd09e5b6..89b58e4648 100644 --- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h +++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/config.h @@ -38,5 +38,5 @@ #define MATRIX_COL_PINS { F4, F5, F6, F7, B7, D5 } /* ws2812 RGB LED */ -#undef RGB_DI_PIN -#define RGB_DI_PIN B5 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B5 diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h index 06dc572be1..e44626739d 100644 --- a/keyboards/crkbd/r2g/config.h +++ b/keyboards/crkbd/r2g/config.h @@ -19,9 +19,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json index c74336c5cd..6440a61bf7 100644 --- a/keyboards/crkbd/r2g/info.json +++ b/keyboards/crkbd/r2g/info.json @@ -2,6 +2,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_split_3x6_3" diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 854a63a35d..2378a8637f 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 54 // Number of LEDs # define RGBLED_SPLIT \ diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json index 1226b3f69f..cadb908cf1 100644 --- a/keyboards/crkbd/rev1/info.json +++ b/keyboards/crkbd/rev1/info.json @@ -2,6 +2,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "bootloader": "caterina", "layout_aliases": { "LAYOUT": "LAYOUT_split_3x6_3" diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 665340e7af..bc7cf57dcf 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define WS2812_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#define RGB_DI_PIN B4 #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 6488f91134..59a80f4b3a 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "processor": "STM32F072", diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 1ea89ad92a..ee032bd5ee 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -30,7 +30,6 @@ }, "rgblight": { "led_count": 48, - "pin": "B2", "hue_steps": 4, "saturation_steps": 8, "brightness_steps": 4, @@ -47,6 +46,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h index f739f1abfb..2967c1a31c 100644 --- a/keyboards/custommk/genesis/rev1/config.h +++ b/keyboards/custommk/genesis/rev1/config.h @@ -18,7 +18,6 @@ #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index 7d045d078e..11ac7db8d0 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xFAB0", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F4", "F5", "D7", "B4"], "rows": ["F0", "C7", "C6", "B6", "B5"] diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h index 00b9711420..7f9e79ba2c 100644 --- a/keyboards/custommk/genesis/rev2/config.h +++ b/keyboards/custommk/genesis/rev2/config.h @@ -18,7 +18,6 @@ #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index 44d65fcd8b..f084e6411f 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0xFAB1", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F4", "F5", "D7", "B4"], "rows": ["F0", "C7", "C6", "B6", "B5", "B0"] diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h index 56f7ce0fdd..f14a164f57 100644 --- a/keyboards/cx60/config.h +++ b/keyboards/cx60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once /* RGB Underglow */ -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json index 1220b32c8a..63d72e7e01 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/info.json @@ -21,6 +21,9 @@ "caps_lock": "B5", "on_state": 0 }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h index 82a60de39b..5c60daad9d 100644 --- a/keyboards/cxt_studio/config.h +++ b/keyboards/cxt_studio/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_MATRIX_LED_COUNT 12 -#define RGB_DI_PIN F7 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json index 35e8031819..0c0dba55da 100644 --- a/keyboards/cxt_studio/info.json +++ b/keyboards/cxt_studio/info.json @@ -14,6 +14,9 @@ "encoder": true, "rgb_matrix": true }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["D4", "D7", "B4", "B5"], "rows": ["C7", "C6", "D6", "F4"] diff --git a/keyboards/dekunukem/duckypad/config.h b/keyboards/dekunukem/duckypad/config.h index cbf99d1f5d..692f679d24 100644 --- a/keyboards/dekunukem/duckypad/config.h +++ b/keyboards/dekunukem/duckypad/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A10 #define RGBLED_NUM 15 #define RGB_MATRIX_LED_COUNT 15 diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/info.json index a8dbe2e5b5..d6d971dcf4 100644 --- a/keyboards/dekunukem/duckypad/info.json +++ b/keyboards/dekunukem/duckypad/info.json @@ -8,6 +8,9 @@ "pid": "0x4450", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h index cdb8d46ac7..886685102e 100644 --- a/keyboards/delikeeb/flatbread60/config.h +++ b/keyboards/delikeeb/flatbread60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/delikeeb/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json index 466168e311..e43a3458ea 100644 --- a/keyboards/delikeeb/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["F6", "B1", "B3", "B2", "B6"] diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h index 6237b13a80..30e1cd93aa 100644 --- a/keyboards/delikeeb/vaguettelite/config.h +++ b/keyboards/delikeeb/vaguettelite/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 # define RGBLED_NUM 9 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/delikeeb/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json index aa7a1fd727..7e3623b947 100644 --- a/keyboards/delikeeb/vaguettelite/info.json +++ b/keyboards/delikeeb/vaguettelite/info.json @@ -19,6 +19,9 @@ {"pin_a": "F1", "pin_b": "F0"} ] }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index 232c6ef861..7da3d5e24c 100644 --- a/keyboards/delikeeb/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define B7_AUDIO -#define RGB_DI_PIN F0 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json index 7b5df84f67..f62481333d 100644 --- a/keyboards/delikeeb/vanana/rev1/info.json +++ b/keyboards/delikeeb/vanana/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"], "rows": ["D2", "D7", "B4", "B5", "B6"] diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index 2103fdd52f..7da3d5e24c 100644 --- a/keyboards/delikeeb/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define B7_AUDIO -#define RGB_DI_PIN C7 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json index 6b9c051a94..fb2cc4a52c 100644 --- a/keyboards/delikeeb/vanana/rev2/info.json +++ b/keyboards/delikeeb/vanana/rev2/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"], "rows": ["D1", "C6", "E6", "B4", "B5", "F5"] diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 6f51a0bbc7..22b2320f90 100644 --- a/keyboards/delikeeb/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 # define RGBLED_NUM 10 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 83690d1352..b251334154 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -8,6 +8,9 @@ "pid": "0x0012", "device_version": "0.0.3" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"] diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h index 26b7101a1d..4d2439ad3c 100644 --- a/keyboards/deltasplit75/v2/config.h +++ b/keyboards/deltasplit75/v2/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json index 40c7135717..366982d8a5 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/info.json @@ -15,6 +15,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h index de0e50da21..a627f3ec6a 100755 --- a/keyboards/demiurge/config.h +++ b/keyboards/demiurge/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 21 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json index cc7e1fbbea..c2596fee85 100644 --- a/keyboards/demiurge/info.json +++ b/keyboards/demiurge/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F4", "F6", "F7", "C7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 5896f3cd70..39ea6d6e90 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -16,7 +16,6 @@ #pragma once #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 #define RGB_MATRIX_KEYPRESSES #define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index cdba6219d4..ef1b783d96 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index e96dee185b..d80983202f 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -17,7 +17,6 @@ /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN B12 #define RGB_MATRIX_LED_COUNT 30 #define RGB_MATRIX_KEYPRESSES // #define RGB_MATRIX_KEYRELEASES diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 21254557d4..9bfcfad411 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -19,6 +19,9 @@ "levels": 5, "on_state": 0 }, + "ws2812": { + "pin": "B12" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h index cbe8f13cdf..7ca2b8cded 100644 --- a/keyboards/dm9records/ergoinu/config.h +++ b/keyboards/dm9records/ergoinu/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -/* ws2812 RGB LED */ -#define RGB_DI_PIN B6 - #define RGBLED_NUM 7 #ifndef IOS_DEVICE_ENABLE diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index 4214de3415..f6896046f9 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h index e64609c8fb..2a1bafaacf 100644 --- a/keyboards/dmqdesign/spin/config.h +++ b/keyboards/dmqdesign/spin/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -//Data pin for the 3 RGB LEDs -#define RGB_DI_PIN D3 //Number of RGB LEDs #define RGBLED_NUM 3 diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json index b7369bf331..7fbcf0db3a 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/info.json @@ -20,6 +20,9 @@ {"pin_a": "D6", "pin_b": "D4"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h index 946ad61026..21160e0a8d 100644 --- a/keyboards/do60/config.h +++ b/keyboards/do60/config.h @@ -18,9 +18,7 @@ along with this program. If not, see . #pragma once /* RGB Underglow - * F5 PIN for DO60's pre-soldered WS2812 LEDs */ -#define RGB_DI_PIN F5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json index 0f55b0bdb8..9e63293fdb 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "F5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"], diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h index c01191e869..8739474326 100644 --- a/keyboards/doio/kb16/rev1/config.h +++ b/keyboards/doio/kb16/rev1/config.h @@ -25,7 +25,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ - #define RGB_DI_PIN F6 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index 7cc263246c..f42f039846 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -20,6 +20,9 @@ {"pin_a": "D7", "pin_b": "D6"} ] }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h index a11f7c8d3a..9580435e5c 100644 --- a/keyboards/doio/kb16/rev2/config.h +++ b/keyboards/doio/kb16/rev2/config.h @@ -32,7 +32,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ - #define RGB_DI_PIN A10 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index 839708ada0..9dff8e0f6e 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -20,6 +20,9 @@ {"pin_a": "A3", "pin_b": "A4"} ] }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index c2fe07026c..a87532c459 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h @@ -36,7 +36,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ - #define RGB_DI_PIN A10 #define RGB_MATRIX_LED_COUNT 36 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json index 570d0d9ab0..f06ffab850 100644 --- a/keyboards/doio/kb30/info.json +++ b/keyboards/doio/kb30/info.json @@ -20,6 +20,9 @@ {"pin_a": "A3", "pin_b": "A4", "resolution": 2} ] }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h index 740f1baea7..ff90cbc8a7 100644 --- a/keyboards/doio/kb38/config.h +++ b/keyboards/doio/kb38/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN F6 #define RGB_MATRIX_LED_COUNT 44 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index 227511295c..352702f814 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -32,6 +32,9 @@ {"pin_a": "D6", "pin_b": "D7", "resolution": 2} ] }, + "ws2812": { + "pin": "F6" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h index 40327dbc9a..a73678faf2 100644 --- a/keyboards/doodboard/duckboard/config.h +++ b/keyboards/doodboard/duckboard/config.h @@ -19,9 +19,6 @@ /* media key slowdown for windows */ #define TAP_CODE_DELAY 20 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 8 // Number of LEDs #endif diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json index 6153c3e2c0..367a9b7d72 100644 --- a/keyboards/doodboard/duckboard/info.json +++ b/keyboards/doodboard/duckboard/info.json @@ -18,6 +18,9 @@ {"pin_a": "F5", "pin_b": "F6", "resolution": 2} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h index 40327dbc9a..a73678faf2 100644 --- a/keyboards/doodboard/duckboard_r2/config.h +++ b/keyboards/doodboard/duckboard_r2/config.h @@ -19,9 +19,6 @@ /* media key slowdown for windows */ #define TAP_CODE_DELAY 20 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 8 // Number of LEDs #endif diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json index da1c3342ed..00d0fc6452 100644 --- a/keyboards/doodboard/duckboard_r2/info.json +++ b/keyboards/doodboard/duckboard_r2/info.json @@ -18,6 +18,9 @@ {"pin_a": "F6", "pin_b": "F5", "resolution": 2} ] }, + "ws2812": { + "pin": "D3" + }, "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h index 21b4c6f146..bc64bd9001 100644 --- a/keyboards/doppelganger/config.h +++ b/keyboards/doppelganger/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . // #define USE_I2C -#define RGB_DI_PIN B4 #define RGBLED_NUM 2 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 1, 1 } diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index 5c489fe44e..831922f945 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -22,6 +22,9 @@ } } }, + "ws2812": { + "pin": "B4" + }, "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h index f9860ae4ed..cca3e4d26f 100644 --- a/keyboards/doro67/rgb/config.h +++ b/keyboards/doro67/rgb/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN B7 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 67 diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json index 3db88fcb0e..e6ad6d7476 100644 --- a/keyboards/doro67/rgb/info.json +++ b/keyboards/doro67/rgb/info.json @@ -17,6 +17,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h index 16df72781b..b1518cb5fb 100644 --- a/keyboards/dp60/config.h +++ b/keyboards/dp60/config.h @@ -34,7 +34,6 @@ //rgb light setting #define RGBLED_NUM 18 -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index 605c66bb0d..78d7a5abb6 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -8,6 +8,9 @@ "pid": "0x00BE", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/dp60/keymaps/indicator/led_driver.c b/keyboards/dp60/keymaps/indicator/led_driver.c index f4a2dcc47c..677eb8af57 100644 --- a/keyboards/dp60/keymaps/indicator/led_driver.c +++ b/keyboards/dp60/keymaps/indicator/led_driver.c @@ -14,8 +14,8 @@ along with this program. If not, see . */ -#undef RGB_DI_PIN -#define RGB_DI_PIN RGB_INDICATOR_PIN +#undef WS2812_DI_PIN +#define WS2812_DI_PIN RGB_INDICATOR_PIN #define ws2812_setleds indicator_setleds #define ws2812_setleds_pin indicator_setleds_pin #include "ws2812_bitbang.c" diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h index f1794bef02..a9f78283d0 100644 --- a/keyboards/draculad/config.h +++ b/keyboards/draculad/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define OLED_TIMEOUT 30000 #endif -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index 926b755b0c..0dfd4c1393 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -8,6 +8,9 @@ "pid": "0x1B1E", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h index fd32344d06..440abdc9f7 100644 --- a/keyboards/draytronics/daisy/config.h +++ b/keyboards/draytronics/daisy/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //Underglow -#define RGB_DI_PIN D4 // Underglow led pin #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/draytronics/daisy/info.json b/keyboards/draytronics/daisy/info.json index 51776a9a08..ae0579b667 100644 --- a/keyboards/draytronics/daisy/info.json +++ b/keyboards/draytronics/daisy/info.json @@ -19,6 +19,9 @@ {"pin_a": "D0", "pin_b": "D1"} ] }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega328p", "bootloader": "usbasploader", "layout_aliases": { diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h index 4fc60e596e..5c7b6994c9 100644 --- a/keyboards/draytronics/elise/config.h +++ b/keyboards/draytronics/elise/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/draytronics/elise/info.json b/keyboards/draytronics/elise/info.json index 838917f856..81be5cffd7 100644 --- a/keyboards/draytronics/elise/info.json +++ b/keyboards/draytronics/elise/info.json @@ -13,6 +13,9 @@ "rows": ["B2", "B3", "B1", "F0", "F1"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h index c7b5965ae9..8984b05e2c 100644 --- a/keyboards/draytronics/elise_v2/config.h +++ b/keyboards/draytronics/elise_v2/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE // ws2812 options -#define RGB_DI_PIN D1 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/draytronics/elise_v2/info.json b/keyboards/draytronics/elise_v2/info.json index a93f8ea37c..faef95cbee 100644 --- a/keyboards/draytronics/elise_v2/info.json +++ b/keyboards/draytronics/elise_v2/info.json @@ -8,6 +8,9 @@ "pid": "0x454C", "device_version": "2.0.0" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "D5"], "rows": ["B2", "B3", "B1", "F0", "F1"] diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h index 5723fc1e77..0ad383a688 100644 --- a/keyboards/dtisaac/dosa40rgb/config.h +++ b/keyboards/dtisaac/dosa40rgb/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN D0 #define RGB_MATRIX_LED_COUNT 42 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index c1a730dda8..55a40684f9 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x4973", "device_version": "0.0.4" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B7", "D7", "F1", "F0"] diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h index fa0c631603..e39099ef56 100644 --- a/keyboards/duck/eagle_viper/v2/config.h +++ b/keyboards/duck/eagle_viper/v2/config.h @@ -34,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 17 #define TAPPING_TERM 200 diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index 24821c46e1..1e31d4f0a0 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -12,6 +12,9 @@ "bootmagic": { "matrix": [4, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h index 22a5b17901..95459e67b1 100644 --- a/keyboards/duck/jetfire/config.h +++ b/keyboards/duck/jetfire/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index 50118f3c8e..4df56c164a 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -15,6 +15,9 @@ "bootmagic": { "matrix": [5, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h index 6fcad40634..cb5a419f56 100644 --- a/keyboards/duck/lightsaver/config.h +++ b/keyboards/duck/lightsaver/config.h @@ -34,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 17 #define TAPPING_TERM 200 diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index b24ac43b0d..36315c96ef 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -15,6 +15,9 @@ "bootmagic": { "matrix": [5, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index a11234e6b3..9b557edaba 100644 --- a/keyboards/duck/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h @@ -34,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 17 #define TAPPING_TERM 200 diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 6ef3f0f9c5..0224a00528 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -15,6 +15,9 @@ "bootmagic": { "matrix": [5, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index 7fca9239be..2530cedc0f 100644 --- a/keyboards/duck/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h @@ -34,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 17 #define TAPPING_TERM 200 diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index c5e580607c..7f5dbb1579 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -15,6 +15,9 @@ "bootmagic": { "matrix": [5, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h index eda7aec4ec..e8d87e0719 100644 --- a/keyboards/duck/orion/v3/config.h +++ b/keyboards/duck/orion/v3/config.h @@ -34,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 18 #define TAPPING_TERM 200 diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 47e1dbccfd..588d14003b 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [4, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h index 4cb83d43fa..13f2d76139 100644 --- a/keyboards/duck/tcv3/config.h +++ b/keyboards/duck/tcv3/config.h @@ -34,5 +34,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 17 diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index 9b8b20e80e..f1e29d8d99 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -11,6 +11,9 @@ "bootmagic": { "matrix": [5, 10] }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h index 7050460d34..b8cd4c2788 100644 --- a/keyboards/dumbpad/v3x/config.h +++ b/keyboards/dumbpad/v3x/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define LED_01 B3 #define LED_02 B6 -#define RGB_DI_PIN D1 #define RGB_MATRIX_LED_COUNT 16 // Cleanup RGB diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json index 045fe22306..e380528744 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/info.json @@ -18,6 +18,9 @@ "bootmagic": { "matrix": [3, 0] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json index f1a4bc3f16..09f7e8e700 100644 --- a/keyboards/dyz/dyz40/info.json +++ b/keyboards/dyz/dyz40/info.json @@ -15,7 +15,6 @@ }, "rgblight": { "led_count": 13, - "pin": "B7", "hue_steps": 10, "saturation_steps": 10, "brightness_steps": 10, @@ -32,6 +31,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B7" + }, "usb": { "vid": "0xD772", "pid": "0x000B", diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json index 413e0ac379..d900e74541 100644 --- a/keyboards/dyz/dyz60/info.json +++ b/keyboards/dyz/dyz60/info.json @@ -10,7 +10,6 @@ }, "rgblight": { "led_count": 16, - "pin": "B7", "hue_steps": 10, "saturation_steps": 10, "brightness_steps": 10, @@ -27,6 +26,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B7" + }, "usb": { "vid": "0xD772", "pid": "0x000A", diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json index 77e194c4c7..0000d1bcde 100644 --- a/keyboards/dyz/dyz60_hs/info.json +++ b/keyboards/dyz/dyz60_hs/info.json @@ -10,7 +10,6 @@ }, "rgblight": { "led_count": 16, - "pin": "B7", "hue_steps": 10, "saturation_steps": 10, "brightness_steps": 10, @@ -27,6 +26,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B7" + }, "indicators": { "caps_lock": "F1" }, diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json index e870a8fbb9..c44e9b585c 100644 --- a/keyboards/dyz/dyz_tkl/info.json +++ b/keyboards/dyz/dyz_tkl/info.json @@ -10,7 +10,6 @@ }, "rgblight": { "led_count": 25, - "pin": "D1", "animations": { "alternating": true, "breathing": true, @@ -24,6 +23,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D1" + }, "usb": { "vid": "0xD772", "pid": "0x000C", diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json index 7f3d04417c..d60240f9dd 100644 --- a/keyboards/dyz/selka40/info.json +++ b/keyboards/dyz/selka40/info.json @@ -10,7 +10,6 @@ }, "rgblight": { "led_count": 14, - "pin": "B4", "hue_steps": 10, "saturation_steps": 10, "brightness_steps": 10, @@ -27,6 +26,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B4" + }, "usb": { "vid": "0xD772", "pid": "0x0012", diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json index a6e7fb0291..0c0078fb5e 100644 --- a/keyboards/dyz/synthesis60/info.json +++ b/keyboards/dyz/synthesis60/info.json @@ -25,7 +25,6 @@ }, "rgblight": { "led_count": 19, - "pin": "B7", "hue_steps": 10, "saturation_steps": 10, "brightness_steps": 10, @@ -42,6 +41,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B7" + }, "usb": { "vid": "0xD772", "pid": "0x0017", diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h index 9340d17a1a..98673bdef0 100644 --- a/keyboards/dz60/config.h +++ b/keyboards/dz60/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN E2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json index 61012ae752..5ef2ccf692 100644 --- a/keyboards/dz60/info.json +++ b/keyboards/dz60/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"], diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index 53e997559c..ba8626e95c 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN E2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index eaed62fef5..11f157a0a7 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 0f6db721ce..4685510d8b 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 1ca1a20e22..9c61c0303a 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -8,6 +8,9 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], "rows": ["A15", "B3", "B4", "B5", "B11"] diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index eca064ab96..eb512c52de 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index 090ba39d20..df23b681e8 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -17,6 +17,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"], diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h index 59b20b1110..fd41a6969d 100644 --- a/keyboards/ealdin/quadrant/config.h +++ b/keyboards/ealdin/quadrant/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json index 1e180f8328..eec8bc9579 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/info.json @@ -18,6 +18,9 @@ {"pin_a": "D5", "pin_b": "F1"} ] }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h index c8c69d2ee0..6c9312eafb 100644 --- a/keyboards/eason/aeroboard/config.h +++ b/keyboards/eason/aeroboard/config.h @@ -13,7 +13,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json index de3cd9deff..5eb135c953 100644 --- a/keyboards/eason/aeroboard/info.json +++ b/keyboards/eason/aeroboard/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h index 0048707fd2..cfe3e84fda 100644 --- a/keyboards/eason/capsule65/config.h +++ b/keyboards/eason/capsule65/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json index 607c0da1d6..6496a6be71 100644 --- a/keyboards/eason/capsule65/info.json +++ b/keyboards/eason/capsule65/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "F6" }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h index 42a4a77d69..68f54a8014 100644 --- a/keyboards/ebastler/isometria_75/rev1/config.h +++ b/keyboards/ebastler/isometria_75/rev1/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. /* Underglow */ -#define RGB_DI_PIN B3 #define RGBLED_NUM 17 #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 diff --git a/keyboards/ebastler/isometria_75/rev1/info.json b/keyboards/ebastler/isometria_75/rev1/info.json index 5758d1fe31..f279d22543 100644 --- a/keyboards/ebastler/isometria_75/rev1/info.json +++ b/keyboards/ebastler/isometria_75/rev1/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B3", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/eco/keymaps/bcat/config.h b/keyboards/eco/keymaps/bcat/config.h index 2a986f903b..1a3fd81199 100644 --- a/keyboards/eco/keymaps/bcat/config.h +++ b/keyboards/eco/keymaps/bcat/config.h @@ -19,7 +19,7 @@ #define BCAT_ORTHO_LAYERS /* WS2812B RGB LED strip hand wired to Elite-C. */ -#define RGB_DI_PIN B7 +#define WS2812_DI_PIN B7 #define RGBLED_NUM 15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h index a04bd1e5f7..55d7cb23a7 100644 --- a/keyboards/edc40/config.h +++ b/keyboards/edc40/config.h @@ -17,4 +17,3 @@ #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN C6 diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json index 6d2506331d..7b77ddc934 100644 --- a/keyboards/edc40/info.json +++ b/keyboards/edc40/info.json @@ -13,6 +13,9 @@ "rows": ["D4", "D6", "D7", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "C6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h index 273c65f800..6677c4587e 100644 --- a/keyboards/edi/hardlight/mk1/config.h +++ b/keyboards/edi/hardlight/mk1/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* * Enable RGB Underlighting */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json index 9df49db14c..d7275dfa70 100644 --- a/keyboards/edi/hardlight/mk1/info.json +++ b/keyboards/edi/hardlight/mk1/info.json @@ -11,6 +11,9 @@ "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 847660514c..3ea34c53ee 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* RGB Underglow */ -#define RGB_DI_PIN A10 #define RGBLED_NUM 32 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index d200bb0863..63ca3aa15d 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -7,6 +7,7 @@ "device_version": "0.0.7" }, "ws2812": { + "pin": "A10", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h index 16354b4b55..e59dbc15e6 100644 --- a/keyboards/edi/standaside/config.h +++ b/keyboards/edi/standaside/config.h @@ -10,7 +10,6 @@ /* * Enable RGB Underlighting */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json index b418f9b202..0c8bb289b0 100644 --- a/keyboards/edi/standaside/info.json +++ b/keyboards/edi/standaside/info.json @@ -13,6 +13,9 @@ "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/edinburgh41/config.h b/keyboards/edinburgh41/config.h index 16cca4e830..f37d43dd2f 100644 --- a/keyboards/edinburgh41/config.h +++ b/keyboards/edinburgh41/config.h @@ -5,7 +5,6 @@ // Underglow LED settings -#define RGB_DI_PIN D0 #define RGBLED_NUM 10 // Thumbstick settings diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json index 5c7ac53a85..3c75c899fb 100644 --- a/keyboards/edinburgh41/info.json +++ b/keyboards/edinburgh41/info.json @@ -10,6 +10,9 @@ "pid": "0x0000", "vid": "0xFEED" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D1", "D4", "C6", "D7", "E6", "B4"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h index 73004cc215..814af857d5 100644 --- a/keyboards/eek/config.h +++ b/keyboards/eek/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGB_DI_PIN D3 #define RGBLED_NUM 36 #define RGBLIGHT_HUE_STEP 4 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json index d2d1935a74..bf909b607e 100644 --- a/keyboards/eek/info.json +++ b/keyboards/eek/info.json @@ -13,6 +13,9 @@ "rows": ["D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h index d59cc7f724..63e6683f8c 100644 --- a/keyboards/ein_60/config.h +++ b/keyboards/ein_60/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . # define AUDIO_DAC_SAMPLE_MAX 4095U #endif -#define RGB_DI_PIN E7 # define RGBLED_NUM 38 # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json index 35cc35828d..95f448a476 100644 --- a/keyboards/ein_60/info.json +++ b/keyboards/ein_60/info.json @@ -19,6 +19,9 @@ {"pin_a": "C5", "pin_b": "C4"} ] }, + "ws2812": { + "pin": "E7" + }, "processor": "at90usb1286", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h index 0346bc6f74..a4d471f2c5 100644 --- a/keyboards/elephant42/config.h +++ b/keyboards/elephant42/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_SPLIT { 27, 27 } # define RGBLED_NUM 54 // backlight x42 + underglow x12 # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index f4838e803c..3c1e3ce737 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h index a2b530e002..a00c6cd354 100644 --- a/keyboards/ep/comsn/mollydooker/config.h +++ b/keyboards/ep/comsn/mollydooker/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json index 52038e9455..a1355ce5a1 100644 --- a/keyboards/ep/comsn/mollydooker/info.json +++ b/keyboards/ep/comsn/mollydooker/info.json @@ -12,6 +12,9 @@ "rows": ["F4", "F5", "F6", "F7", "D2"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index bb91701044..3adcd0198b 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -68,7 +68,6 @@ along with this program. If not, see . #define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI) /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index b4b5522140..a6877bc630 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -6,6 +6,9 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "processor": "atmega32u4", "bootloader": "halfkay", "debounce": 30, diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h index 0fcd2e74ae..414de0ed15 100644 --- a/keyboards/ergoslab/rev1/config.h +++ b/keyboards/ergoslab/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 2 // Number of LEDs // FIXME this following line should enable our layer status LEDs to work on both // sides without need to wire them into a chain. It doesn't though. Uncommenting diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json index 77a215f130..5f00b666d1 100644 --- a/keyboards/ergoslab/rev1/info.json +++ b/keyboards/ergoslab/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h index f36740aa93..326a8f8ffe 100644 --- a/keyboards/ergotravel/rev1/config.h +++ b/keyboards/ergotravel/rev1/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json index e86f675385..7c6ed69ce3 100644 --- a/keyboards/ergotravel/rev1/info.json +++ b/keyboards/ergotravel/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "bootloader": "caterina", "processor": "atmega32u4", "layouts": { diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h index 5306309c5b..2c76ce9c8d 100644 --- a/keyboards/esca/getawayvan/config.h +++ b/keyboards/esca/getawayvan/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 51 #define RGBLIGHT_HUE_STEP 20 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json index d57891bf6c..78294f441a 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/info.json @@ -13,6 +13,9 @@ "rows": ["A9", "A8", "A3", "A5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h index 5306309c5b..2c76ce9c8d 100644 --- a/keyboards/esca/getawayvan_f042/config.h +++ b/keyboards/esca/getawayvan_f042/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 51 #define RGBLIGHT_HUE_STEP 20 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json index 6b112210f0..0311159bf0 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/info.json @@ -13,6 +13,9 @@ "rows": ["A9", "A8", "A3", "A5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B15" + }, "processor": "STM32F042", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h index 2e8dcc0ad3..6eaf9220c7 100644 --- a/keyboards/eternal_keypad/config.h +++ b/keyboards/eternal_keypad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 8 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json index c66bf46084..35a5a543a4 100644 --- a/keyboards/eternal_keypad/info.json +++ b/keyboards/eternal_keypad/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h index a857240c81..62e21e0caa 100644 --- a/keyboards/evolv/config.h +++ b/keyboards/evolv/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json index a6fe24f12a..097dfb43cb 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/info.json @@ -18,6 +18,9 @@ {"pin_a": "B3", "pin_b": "A15", "resolution": 2} ] }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h index bb61a6c852..352b89dad9 100644 --- a/keyboards/evyd13/atom47/rev2/config.h +++ b/keyboards/evyd13/atom47/rev2/config.h @@ -22,5 +22,4 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D0 // The pin the LED strip is connected to #define RGBLED_NUM 1 // Number of LEDs in your strip diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 8ac2fa2f2e..cdc0a9a000 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -18,6 +18,9 @@ "levels": 4, "breathing": true }, + "ws2812": { + "pin": "D0" + }, "qmk_lufa_bootloader": { "esc_input": "B7", "esc_output": "D7", diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h index 27a5e7ca66..5f37dc519b 100644 --- a/keyboards/evyd13/atom47/rev3/config.h +++ b/keyboards/evyd13/atom47/rev3/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F5 // The pin the LED strip is connected to #define RGBLED_NUM 6 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index fd0f4fa3a8..2dd1ca5015 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "F5" + }, "qmk_lufa_bootloader": { "esc_input": "B0", "esc_output": "B7", diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h index 5b471d6d5e..abfa0fe63d 100644 --- a/keyboards/evyd13/eon65/config.h +++ b/keyboards/evyd13/eon65/config.h @@ -16,7 +16,6 @@ #pragma once - #define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json index 76cc6b08fc..26ff4e2af3 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/info.json @@ -13,6 +13,9 @@ "rows": ["D3", "D5", "B1", "B2", "B3"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_iso", "65_iso_blocker"], diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h index a5b74985e8..04247c7e73 100644 --- a/keyboards/evyd13/eon87/config.h +++ b/keyboards/evyd13/eon87/config.h @@ -16,7 +16,6 @@ #pragma once - #define RGB_DI_PIN D0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json index 4eab744fb1..fc134b502f 100644 --- a/keyboards/evyd13/eon87/info.json +++ b/keyboards/evyd13/eon87/info.json @@ -13,6 +13,9 @@ "rows": ["B1", "B2", "B3", "D4", "D1", "D5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h index 4c83b485f4..c0a6bf5976 100644 --- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h +++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h @@ -16,7 +16,7 @@ #pragma once -#define RGB_DI_PIN B2 +#define WS2812_DI_PIN B2 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h index af01276208..420b2e80a1 100644 --- a/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h +++ b/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once /* RGB Underglow */ -#define RGB_DI_PIN B7 +#define WS2812_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h index 9b05207b42..e34715a773 100644 --- a/keyboards/evyd13/plain60/keymaps/rgb/config.h +++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h @@ -1,6 +1,6 @@ #pragma once -#define RGB_DI_PIN B0 +#define WS2812_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h index 77d5e5bd4e..e17b637a1e 100644 --- a/keyboards/evyd13/ta65/config.h +++ b/keyboards/evyd13/ta65/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Backlight configuration */ -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index 7b3a3acf81..d1195a597b 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -18,6 +18,9 @@ {"pin_a": "B2", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "E6" + }, "qmk_lufa_bootloader": { "esc_input": "B4", "esc_output": "D2", diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h index 2c33be09c6..1f7440aa20 100644 --- a/keyboards/evyd13/wonderland/config.h +++ b/keyboards/evyd13/wonderland/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Backlight configuration */ -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 8722c5e037..621be94232 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -18,6 +18,9 @@ "esc_output": "F0", "led": "B1" }, + "ws2812": { + "pin": "B7" + }, "indicators": { "caps_lock": "B2", "num_lock": "B1", diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h index 9e6e361cfd..9d31e13dcb 100644 --- a/keyboards/exclusive/e65/config.h +++ b/keyboards/exclusive/e65/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json index 64ba681066..1c48f1e48c 100644 --- a/keyboards/exclusive/e65/info.json +++ b/keyboards/exclusive/e65/info.json @@ -21,6 +21,9 @@ "caps_lock": "B6", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h index 56fd4db25d..c6acec2658 100644 --- a/keyboards/exclusive/e6_rgb/config.h +++ b/keyboards/exclusive/e6_rgb/config.h @@ -6,7 +6,6 @@ //rgb light setting #define RGBLED_NUM 6 -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json index 39e9940732..0f3c69f9f5 100644 --- a/keyboards/exclusive/e6_rgb/info.json +++ b/keyboards/exclusive/e6_rgb/info.json @@ -13,6 +13,9 @@ "rows": ["F1", "F4", "F5", "F6", "D6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h index 7929919544..8c0ffda30b 100644 --- a/keyboards/exclusive/e6v2/le/config.h +++ b/keyboards/exclusive/e6v2/le/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json index c5184493fa..de3d009057 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/info.json @@ -23,6 +23,9 @@ "caps_lock": "B7", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h index 027e59246d..6e9255bebb 100644 --- a/keyboards/exclusive/e6v2/oe/config.h +++ b/keyboards/exclusive/e6v2/oe/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json index d16df07cc6..cb5b0e95fb 100644 --- a/keyboards/exclusive/e6v2/oe/info.json +++ b/keyboards/exclusive/e6v2/oe/info.json @@ -19,6 +19,9 @@ "breathing": true, "breathing_period": 3 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h index d0eaefef13..896eb97b25 100644 --- a/keyboards/exclusive/e7v1/config.h +++ b/keyboards/exclusive/e7v1/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json index 908371e891..42ec77a9fb 100644 --- a/keyboards/exclusive/e7v1/info.json +++ b/keyboards/exclusive/e7v1/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 6 }, + "ws2812": { + "pin": "E6" + }, "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h index 0225067acb..04ef2b92d8 100644 --- a/keyboards/exclusive/e7v1se/config.h +++ b/keyboards/exclusive/e7v1se/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index a473dc818e..f91568a28c 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h index 7558ddd829..06591ce442 100644 --- a/keyboards/exclusive/e85/config.h +++ b/keyboards/exclusive/e85/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json index e86c11ad09..8db1f0fb01 100644 --- a/keyboards/exclusive/e85/hotswap/info.json +++ b/keyboards/exclusive/e85/hotswap/info.json @@ -18,6 +18,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json index 3003d16c4b..30860de5a7 100644 --- a/keyboards/exclusive/e85/soldered/info.json +++ b/keyboards/exclusive/e85/soldered/info.json @@ -18,6 +18,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h index a8cca9403d..9df626ae72 100644 --- a/keyboards/eyeohdesigns/babyv/config.h +++ b/keyboards/eyeohdesigns/babyv/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index 3555fef3b2..b530951376 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h index 6a06240552..6b392b99e1 100644 --- a/keyboards/eyeohdesigns/theboulevard/config.h +++ b/keyboards/eyeohdesigns/theboulevard/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F6 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json index 8f739f0fce..f1a09875c5 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/info.json @@ -18,6 +18,9 @@ {"pin_a": "F5", "pin_b": "F4", "resolution": 2} ] }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h index 08b197cbff..4e5ad26583 100755 --- a/keyboards/fallacy/config.h +++ b/keyboards/fallacy/config.h @@ -30,7 +30,6 @@ */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index ec13666e68..d782d2d0fb 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -12,6 +12,9 @@ "rows": ["B1", "B2", "B3", "C6", "C7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h index 592c6beca0..23745f3190 100644 --- a/keyboards/fc660c/keymaps/default_rgb/config.h +++ b/keyboards/fc660c/keymaps/default_rgb/config.h @@ -20,7 +20,7 @@ /*RGB*/ /*Repurpose Insert LED */ -#define RGB_DI_PIN B5 +#define WS2812_DI_PIN B5 #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h index 592c6beca0..23745f3190 100644 --- a/keyboards/fc660c/keymaps/via_rgb/config.h +++ b/keyboards/fc660c/keymaps/via_rgb/config.h @@ -20,7 +20,7 @@ /*RGB*/ /*Repurpose Insert LED */ -#define RGB_DI_PIN B5 +#define WS2812_DI_PIN B5 #define RGBLED_NUM 16 #define RGBLIGHT_DEFAULT_HUE 127 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h index d87c5bfac9..23a2f15d99 100644 --- a/keyboards/ffkeebs/puca/config.h +++ b/keyboards/ffkeebs/puca/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D4 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ffkeebs/puca/info.json b/keyboards/ffkeebs/puca/info.json index 6abad1adb7..cc98fed5ef 100644 --- a/keyboards/ffkeebs/puca/info.json +++ b/keyboards/ffkeebs/puca/info.json @@ -18,6 +18,9 @@ {"pin_a": "F4", "pin_b": "F5"} ] }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h index a658b20356..f66eda9bba 100644 --- a/keyboards/fjlabs/7vhotswap/config.h +++ b/keyboards/fjlabs/7vhotswap/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json index c7fca42cdc..6e026ecc58 100644 --- a/keyboards/fjlabs/7vhotswap/info.json +++ b/keyboards/fjlabs/7vhotswap/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "F4", "F1", "F7", "F6", "F5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h index d21494f77b..77b127f06e 100644 --- a/keyboards/fjlabs/avalon/config.h +++ b/keyboards/fjlabs/avalon/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN D6 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json index c99511977d..69f4066f98 100644 --- a/keyboards/fjlabs/avalon/info.json +++ b/keyboards/fjlabs/avalon/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "D6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h index f3a0775a81..3b205ce76f 100644 --- a/keyboards/fjlabs/bks65/config.h +++ b/keyboards/fjlabs/bks65/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json index d7c9d2b9a5..7b468da941 100644 --- a/keyboards/fjlabs/bks65/info.json +++ b/keyboards/fjlabs/bks65/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h index f3a0775a81..3b205ce76f 100644 --- a/keyboards/fjlabs/bks65solder/config.h +++ b/keyboards/fjlabs/bks65solder/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json index a439c75370..27c3ece3ba 100644 --- a/keyboards/fjlabs/bks65solder/info.json +++ b/keyboards/fjlabs/bks65solder/info.json @@ -13,6 +13,9 @@ "rows": ["F4", "F1", "F7", "F6", "F5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h index d3ed772dae..9d09aa6716 100644 --- a/keyboards/fjlabs/kf87/config.h +++ b/keyboards/fjlabs/kf87/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB */ -#define RGB_DI_PIN C2 #define RGBLED_NUM 87 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json index 0dee43dfdc..308438e0ce 100644 --- a/keyboards/fjlabs/kf87/info.json +++ b/keyboards/fjlabs/kf87/info.json @@ -17,6 +17,9 @@ "caps_lock": "C4", "scroll_lock": "C6" }, + "ws2812": { + "pin": "C2" + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h index 5c93dd25f9..5fa5e84acd 100644 --- a/keyboards/fjlabs/kyuu/config.h +++ b/keyboards/fjlabs/kyuu/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define Badge RGB */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json index 056110e56e..058cb4ea23 100644 --- a/keyboards/fjlabs/kyuu/info.json +++ b/keyboards/fjlabs/kyuu/info.json @@ -13,6 +13,9 @@ "rows": ["F4", "F1", "F7", "F6", "F5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h index d148935ab0..291cc75824 100644 --- a/keyboards/fjlabs/mk61rgbansi/config.h +++ b/keyboards/fjlabs/mk61rgbansi/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index 3dece0ae3f..a05a01cb9e 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h index 0ec13eda5f..a7d4e33245 100644 --- a/keyboards/fjlabs/ready100/config.h +++ b/keyboards/fjlabs/ready100/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json index 1187608433..30c46c550f 100644 --- a/keyboards/fjlabs/ready100/info.json +++ b/keyboards/fjlabs/ready100/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h index d3d15d09d4..abb13aa778 100644 --- a/keyboards/fjlabs/solanis/config.h +++ b/keyboards/fjlabs/solanis/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB */ -#define RGB_DI_PIN B7 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json index 5dd97927e5..d645a1fd25 100644 --- a/keyboards/fjlabs/solanis/info.json +++ b/keyboards/fjlabs/solanis/info.json @@ -13,6 +13,9 @@ "rows": ["B4", "B5", "B6", "C0", "E1", "E0"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B7" + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h index 38e9c023ee..aceaf3cd5b 100644 --- a/keyboards/fjlabs/swordfish/config.h +++ b/keyboards/fjlabs/swordfish/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json index 7ffb7aab6e..98fb7f6f49 100644 --- a/keyboards/fjlabs/swordfish/info.json +++ b/keyboards/fjlabs/swordfish/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "C7", "C6", "B6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h index d148935ab0..291cc75824 100644 --- a/keyboards/fjlabs/tf60ansi/config.h +++ b/keyboards/fjlabs/tf60ansi/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json index 964545c5e2..02c089926f 100644 --- a/keyboards/fjlabs/tf60ansi/info.json +++ b/keyboards/fjlabs/tf60ansi/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h index d148935ab0..291cc75824 100644 --- a/keyboards/fjlabs/tf60v2/config.h +++ b/keyboards/fjlabs/tf60v2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json index 7b0b3b6f95..50f9f8a311 100644 --- a/keyboards/fjlabs/tf60v2/info.json +++ b/keyboards/fjlabs/tf60v2/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi_arrow"], diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h index f8b5ae2db6..9e6239f67f 100644 --- a/keyboards/fjlabs/tf65rgbv2/config.h +++ b/keyboards/fjlabs/tf65rgbv2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json index e4e7db422b..77d9b04af5 100644 --- a/keyboards/fjlabs/tf65rgbv2/info.json +++ b/keyboards/fjlabs/tf65rgbv2/info.json @@ -13,6 +13,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h index e288eb343b..ddf4546bbb 100644 --- a/keyboards/flehrad/bigswitch/config.h +++ b/keyboards/flehrad/bigswitch/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json index aa07eb114d..095f8284e4 100644 --- a/keyboards/flehrad/bigswitch/info.json +++ b/keyboards/flehrad/bigswitch/info.json @@ -7,6 +7,9 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B6"], "rows": ["B5"] diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h index fe496a65ed..34197c8578 100644 --- a/keyboards/fleuron/config.h +++ b/keyboards/fleuron/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN E6 // The pin the LED strip is connected to #define RGBLED_NUM 18 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index d4bb44cd89..5f98a46967 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -12,6 +12,9 @@ "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h index 77888f89ed..963824b82c 100644 --- a/keyboards/flx/virgo/config.h +++ b/keyboards/flx/virgo/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLED_NUM 0 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index 213f439287..3a022fcf37 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h index 52d687fc10..55edfade82 100644 --- a/keyboards/flxlb/zplit/config.h +++ b/keyboards/flxlb/zplit/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 16 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} #define RGBLED_SPLIT { 8, 8 } diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json index 29689aa5fe..544bd4e385 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/info.json @@ -18,6 +18,9 @@ {"pin_a": "B0", "pin_b": "D2"} ] }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h index 1d69f62e70..d13ea1c845 100644 --- a/keyboards/fortitude60/rev1/config.h +++ b/keyboards/fortitude60/rev1/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . /* ws2812 RGB LED */ #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN B5 #define RGBLED_NUM 18 // Number of LEDs */ #endif /* diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json index 19215647ab..21774d1e82 100644 --- a/keyboards/fortitude60/rev1/info.json +++ b/keyboards/fortitude60/rev1/info.json @@ -17,6 +17,9 @@ "pin": "B5", "levels": 9 }, + "ws2812": { + "pin": "B5" + }, "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h index 35adcaa8b9..41bd1c1ce3 100644 --- a/keyboards/foxlab/key65/hotswap/config.h +++ b/keyboards/foxlab/key65/hotswap/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json index 427f7e7653..96a1f0f3b9 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "scroll_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h index 6672972dc7..23f868d2ac 100644 --- a/keyboards/foxlab/key65/universal/config.h +++ b/keyboards/foxlab/key65/universal/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json index 624cb36b96..ef7c4386c8 100644 --- a/keyboards/foxlab/key65/universal/info.json +++ b/keyboards/foxlab/key65/universal/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "scroll_lock": "E6", "on_state": 0 diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h index e5dbe79cf4..a7b28ae1db 100644 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ b/keyboards/foxlab/leaf60/hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json index f69a16c100..487bf007eb 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/info.json @@ -22,6 +22,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h index e5dbe79cf4..a7b28ae1db 100644 --- a/keyboards/foxlab/leaf60/universal/config.h +++ b/keyboards/foxlab/leaf60/universal/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json index f8173b5b3e..a14d795573 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/info.json @@ -21,6 +21,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h index b444fee611..83929a1c3d 100644 --- a/keyboards/foxlab/time_re/hotswap/config.h +++ b/keyboards/foxlab/time_re/hotswap/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 - #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json index 056700c31e..1204298a1b 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/hotswap/info.json @@ -20,6 +20,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h index b444fee611..83929a1c3d 100644 --- a/keyboards/foxlab/time_re/universal/config.h +++ b/keyboards/foxlab/time_re/universal/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 - #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json index 056700c31e..4632d8c359 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/universal/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h index 1c168e0433..82fab4da29 100644 --- a/keyboards/frooastboard/nano/config.h +++ b/keyboards/frooastboard/nano/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B4 #define RGBLED_NUM 8 #define RGBLIGHT_SLEEP diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json index 8cdffd2654..d1a77d256d 100644 --- a/keyboards/frooastboard/nano/info.json +++ b/keyboards/frooastboard/nano/info.json @@ -24,6 +24,9 @@ "pid": "0x6F21", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4" + }, "bootmagic": { "matrix": [1, 1] }, diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index 94c7425276..d13d66431e 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index 198374cf48..fd4a9ac167 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h index f7e36e63eb..ba2a345045 100644 --- a/keyboards/gami_studio/lex60/config.h +++ b/keyboards/gami_studio/lex60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D1 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index 62ac3b40bf..bd0c2240aa 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -8,6 +8,9 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"], "rows": ["D5", "D4", "B0", "D2", "D3"] diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index eb01b1ad13..344ccf3fff 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -18,7 +18,6 @@ #define RGBLED_NUM 42 #define RGB_MATRIX_LED_COUNT 42 -#define RGB_DI_PIN A7 // PWM RGB Underglow Defines #define WS2812_PWM_DRIVER PWMD3 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index a774981530..0b8704885c 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "processor": "STM32F072", diff --git a/keyboards/gh60/revc/keymaps/dbroqua/config.h b/keyboards/gh60/revc/keymaps/dbroqua/config.h index 82775a83a4..a65ca08e65 100644 --- a/keyboards/gh60/revc/keymaps/dbroqua/config.h +++ b/keyboards/gh60/revc/keymaps/dbroqua/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLED_NUM 11 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/gh60/revc/keymaps/maxr1998/config.h b/keyboards/gh60/revc/keymaps/maxr1998/config.h index 3013308bb2..bc926a289f 100644 --- a/keyboards/gh60/revc/keymaps/maxr1998/config.h +++ b/keyboards/gh60/revc/keymaps/maxr1998/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "../../config.h" -#define RGB_DI_PIN F4 // pin the DI on the WS2812B is hooked-up to +#define WS2812_DI_PIN F4 // pin the DI on the WS2812B is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h index 4ffa701ab8..cef899ee12 100644 --- a/keyboards/gh60/revc/keymaps/robotmaxtron/config.h +++ b/keyboards/gh60/revc/keymaps/robotmaxtron/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index 3e9a6d3a1c..1fbb35b3a2 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Underglow configuration */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 9a3b190d54..76b1af9f06 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 4 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/gh60/satan/keymaps/fakb/config.h b/keyboards/gh60/satan/keymaps/fakb/config.h index f7314a8671..5ca8aa1da5 100644 --- a/keyboards/gh60/satan/keymaps/fakb/config.h +++ b/keyboards/gh60/satan/keymaps/fakb/config.h @@ -12,5 +12,5 @@ #define MOUSEKEY_WHEEL_MAX_SPEED 1 #define MOUSEKEY_WHEEL_TIME_TO_MAX 255 -#undef RGB_DI_PIN -#define RGB_DI_PIN B2 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B2 diff --git a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h index 27c1372da1..6795cf6c97 100644 --- a/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h +++ b/keyboards/gh60/satan/keymaps/iso_split_rshift/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . #include "../../config.h" // only change -#undef RGB_DI_PIN -#define RGB_DI_PIN B2 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B2 #endif diff --git a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h index 30269196f3..75c1632908 100644 --- a/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h +++ b/keyboards/gh60/satan/keymaps/olligranlund_iso/config.h @@ -3,8 +3,8 @@ #define BACKLIGHT_LEVELS 10 // Underlight configuration -#undef RGB_DI_PIN -#define RGB_DI_PIN B2 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B2 #undef RGBLED_NUM #define RGBLED_NUM 16 // Number of LEDs #undef RGBLIGHT_HUE_STEP diff --git a/keyboards/gh60/v1p3/config.h b/keyboards/gh60/v1p3/config.h index 52fab19b7e..7b5012a4c0 100644 --- a/keyboards/gh60/v1p3/config.h +++ b/keyboards/gh60/v1p3/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gh60/v1p3/info.json b/keyboards/gh60/v1p3/info.json index 648a98e37c..afdcf9cd74 100644 --- a/keyboards/gh60/v1p3/info.json +++ b/keyboards/gh60/v1p3/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 15 }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"], diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json index d35f86c4da..44b80ce9a4 100644 --- a/keyboards/ghs/jem/info.json +++ b/keyboards/ghs/jem/info.json @@ -28,7 +28,6 @@ }, "rgblight": { "led_count": 22, - "pin": "F4", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -43,6 +42,9 @@ "alternating": true } }, + "ws2812": { + "pin": "F4" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index efc9f5f3f5..9cd6e7be5a 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D0 #define RGBLED_NUM 17 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index b97ee064fd..e932a3ac3a 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index c18e61b967..f058b3afc4 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . // for "Generic" Promicro to be detected correctly as lefthand side (slave) #define SPLIT_USB_DETECT -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 123 diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index eba0da004c..094c02af09 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -27,6 +27,9 @@ "encoder": { "rotary": [] }, + "ws2812": { + "pin": "D3" + }, "split": { "enabled": true, "soft_serial_pin": "D2", diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 7be3421eeb..b05a0d33b4 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index c48e04ac11..ebf5ee8845 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -8,6 +8,9 @@ "pid": "0x4201", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "D5", "D6", "D7"] diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h index e3a0340f19..0691d106b7 100644 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -5,7 +5,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 8 -#define RGB_DI_PIN GP19 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json index 448493d318..4dc9ca9dee 100644 --- a/keyboards/gkeyboard/gpad8_2r/info.json +++ b/keyboards/gkeyboard/gpad8_2r/info.json @@ -62,6 +62,7 @@ ] }, "ws2812": { + "pin": "GP19", "driver": "vendor" }, "layouts": { diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h index 8cd2c1fe6c..49205e59d1 100644 --- a/keyboards/gl516/j73gl/config.h +++ b/keyboards/gl516/j73gl/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 73 #endif diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index 42f6d368bb..56bb01dc84 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -8,6 +8,9 @@ "pid": "0xE8D0", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h index 276e6f6c6d..cd919a72c4 100644 --- a/keyboards/gl516/n51gl/config.h +++ b/keyboards/gl516/n51gl/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 15 #endif diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index eaaf6e69dd..bb42d48981 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -8,6 +8,9 @@ "pid": "0xE8CF", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "encoder": { "rotary": [ {"pin_a": "D7", "pin_b": "E6", "resolution": 3} diff --git a/keyboards/gopolar/gg86/config.h b/keyboards/gopolar/gg86/config.h index 86fc4cef7f..065010fa52 100644 --- a/keyboards/gopolar/gg86/config.h +++ b/keyboards/gopolar/gg86/config.h @@ -24,7 +24,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 100 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 68169417c2..7dd7696eb7 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"], "rows": ["B0", "B1", "B2", "B3", "B7", "D5"] diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h index 932b259288..addd25292b 100644 --- a/keyboards/gray_studio/aero75/config.h +++ b/keyboards/gray_studio/aero75/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define RGBLED_NUM 1 diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index aaf8cf8dfd..5451c0284c 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -8,6 +8,9 @@ "pid": "0x3075", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B10" + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"], "rows": ["A7", "A6", "B12", "A2", "A1", "A0"] diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h index 0b9d6bc1c0..f8a03ebf49 100644 --- a/keyboards/gray_studio/apollo80/config.h +++ b/keyboards/gray_studio/apollo80/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index 5fc332b465..c764ad6582 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -8,6 +8,9 @@ "pid": "0x3001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] diff --git a/keyboards/gray_studio/cod67/config.h b/keyboards/gray_studio/cod67/config.h index fb5934be40..2daace057d 100644 --- a/keyboards/gray_studio/cod67/config.h +++ b/keyboards/gray_studio/cod67/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B2 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 06de4b4f4b..64f95a66a4 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -8,6 +8,9 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h index 26718866d0..4cc46acbbb 100644 --- a/keyboards/gray_studio/space65/config.h +++ b/keyboards/gray_studio/space65/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gray_studio/space65/info.json b/keyboards/gray_studio/space65/info.json index 9a13c8205d..8bcd90705a 100644 --- a/keyboards/gray_studio/space65/info.json +++ b/keyboards/gray_studio/space65/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h index c0a4304abe..1603a2b3be 100644 --- a/keyboards/gray_studio/space65r3/config.h +++ b/keyboards/gray_studio/space65r3/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0 #pragma once -#define RGB_DI_PIN B10 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define RGBLED_NUM 5 diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json index 1cb8e8d2ae..286538e203 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/keyboards/gray_studio/space65r3/info.json @@ -8,6 +8,9 @@ "pid":"0x3003", "device_version": "0.0.3", }, + "ws2812": { + "pin": "B10" + }, "matrix_pins": { "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"], "rows": ["A6", "B12", "A2", "A0", "A1"] diff --git a/keyboards/gray_studio/think65/hotswap/config.h b/keyboards/gray_studio/think65/hotswap/config.h index 354b981ec2..54038d807b 100644 --- a/keyboards/gray_studio/think65/hotswap/config.h +++ b/keyboards/gray_studio/think65/hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gray_studio/think65/hotswap/info.json b/keyboards/gray_studio/think65/hotswap/info.json index 23aba1f5dc..10f0710b94 100644 --- a/keyboards/gray_studio/think65/hotswap/info.json +++ b/keyboards/gray_studio/think65/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x4001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index 354b981ec2..54038d807b 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/gray_studio/think65/solder/info.json b/keyboards/gray_studio/think65/solder/info.json index afdf806bcb..3b7da2920d 100644 --- a/keyboards/gray_studio/think65/solder/info.json +++ b/keyboards/gray_studio/think65/solder/info.json @@ -8,6 +8,9 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/grid600/press/config.h b/keyboards/grid600/press/config.h index 82d7c06c48..7fc3580dca 100644 --- a/keyboards/grid600/press/config.h +++ b/keyboards/grid600/press/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 3a247c0c81..9061f77620 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -12,6 +12,9 @@ "cols": ["F1", "F4", "F5", "F6"], "rows": ["F0"] }, + "ws2812": { + "pin": "B6" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h index 8f2d8bbc54..9891423e3f 100644 --- a/keyboards/h0oni/hotduck/config.h +++ b/keyboards/h0oni/hotduck/config.h @@ -17,9 +17,7 @@ #pragma once /* RGB Underglow - * F4 PIN for pre-soldered WS2812 LEDs */ -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json index cb1147aae6..d91854494c 100644 --- a/keyboards/h0oni/hotduck/info.json +++ b/keyboards/h0oni/hotduck/info.json @@ -13,6 +13,9 @@ "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h index d897f2840d..7b7acf32b6 100644 --- a/keyboards/hadron/ver2/config.h +++ b/keyboards/hadron/ver2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define OLED_UPDATE_INTERVAL 33 // ~30fps /* ws2812 RGB LED*/ -#define RGB_DI_PIN D4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json index 0c4d8c6820..612d3af50a 100644 --- a/keyboards/hadron/ver2/info.json +++ b/keyboards/hadron/ver2/info.json @@ -7,6 +7,9 @@ "rows": ["D7", "E6", "B4", "B5", "B6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h index 69aede865f..02e4116bb6 100644 --- a/keyboards/hadron/ver3/config.h +++ b/keyboards/hadron/ver3/config.h @@ -119,7 +119,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 10 -#define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT RGBLED_NUM // #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json index dbe98c593c..cb2654387b 100644 --- a/keyboards/hadron/ver3/info.json +++ b/keyboards/hadron/ver3/info.json @@ -12,6 +12,9 @@ {"pin_a": "B13", "pin_b": "B14"} ] }, + "ws2812": { + "pin": "B5" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h index d477fb01e8..6f237a5352 100644 --- a/keyboards/halfcliff/config.h +++ b/keyboards/halfcliff/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 } #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 } - #define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 5, 5 } diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index aa97f81a73..6b86e69a1f 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h index fd3d1d5b67..fed1b7c458 100644 --- a/keyboards/halokeys/elemental75/config.h +++ b/keyboards/halokeys/elemental75/config.h @@ -17,7 +17,6 @@ #define TAP_CODE_DELAY 10 // tap_code function delay for register and unregister -#define RGB_DI_PIN A10 #define RGBLED_NUM 22 #define RGBLIGHT_LIMIT_VAL 225 // value set lower than 255 since current draw is too high #define RGBLIGHT_SLEEP diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json index 89c693a7ac..d2434896d7 100644 --- a/keyboards/halokeys/elemental75/info.json +++ b/keyboards/halokeys/elemental75/info.json @@ -18,6 +18,9 @@ {"pin_a": "B6", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h index e93fe5511f..abbe9f5c9d 100644 --- a/keyboards/handwired/6macro/config.h +++ b/keyboards/handwired/6macro/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 10 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index 02111f4746..8c9b3e832f 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -8,6 +8,9 @@ "pid": "0x0037", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B0", "B1", "B2"], "rows": ["B3", "B4"] diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h index ddf705fc95..cf2dd7aa8c 100644 --- a/keyboards/handwired/alcor_dactyl/config.h +++ b/keyboards/handwired/alcor_dactyl/config.h @@ -25,7 +25,6 @@ #define SERIAL_USART_FULL_DUPLEX #define SERIAL_USART_TX_PIN GP10 #define SERIAL_USART_RX_PIN GP9 -#define RGB_DI_PIN GP16 #define RGB_MATRIX_LED_COUNT 2 #define RGB_MATRIX_SPLIT { 1, 1 } #define EE_HANDS diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json index 005424dbda..b5a872bfca 100644 --- a/keyboards/handwired/alcor_dactyl/info.json +++ b/keyboards/handwired/alcor_dactyl/info.json @@ -34,6 +34,7 @@ ] }, "ws2812": { + "pin": "GP16", "driver": "vendor" }, "layouts": { diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h index 9876e14fd3..89532fd32b 100644 --- a/keyboards/handwired/atreus50/config.h +++ b/keyboards/handwired/atreus50/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN C6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json index 4b12ba33d4..70cb5aa1f2 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/info.json @@ -8,6 +8,9 @@ "pid": "0x040D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h index e23bcab286..2743c75877 100644 --- a/keyboards/handwired/bento/rev1/config.h +++ b/keyboards/handwired/bento/rev1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json index 5f7e673306..778a9a0412 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xDAD3", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D0"} diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 6ab3491141..7f7a49ed93 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -42,9 +42,6 @@ along with this program. If not, see . /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 28 // Number of LEDs diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index aad4662d72..042d38046b 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [0, 6] }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0", "bootmagic": { diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index 5a01accc73..677804cbe9 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -23,5 +23,4 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index e737e8428c..e5c076a77c 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index d31fe37783..8cafa3c6f3 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 16 -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 0732acb438..3d520b5284 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -13,6 +13,7 @@ "breathing": true }, "ws2812": { + "pin": "A7", "driver": "spi" }, "processor": "STM32F303", diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h index 36417b4a7b..5c52df9ffa 100644 --- a/keyboards/handwired/colorlice/config.h +++ b/keyboards/handwired/colorlice/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* RGB LEDs */ -#define RGB_DI_PIN B1 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 29783d211c..11ac235065 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -8,6 +8,9 @@ "pid": "0x0302", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h index 29473a1720..b315e309ae 100644 --- a/keyboards/handwired/concertina/64key/config.h +++ b/keyboards/handwired/concertina/64key/config.h @@ -17,7 +17,6 @@ #pragma once /* LEDs are not used in the standard 64key configuration. */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 0 #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json index 86a5a1326c..0e4542af9d 100644 --- a/keyboards/handwired/concertina/64key/info.json +++ b/keyboards/handwired/concertina/64key/info.json @@ -8,6 +8,9 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h index 5ada7d8564..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/18key/config.h +++ b/keyboards/handwired/consolekeyboard/18key/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index a7c04ae242..f4b99ed3f7 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -8,6 +8,9 @@ "pid": "0x3332", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], "rows": ["D1", "D0"] diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h index 5ada7d8564..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/20key/config.h +++ b/keyboards/handwired/consolekeyboard/20key/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json index 4d99a74d5b..c62b02259c 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/info.json @@ -8,6 +8,9 @@ "pid": "0x3432", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], "rows": ["D1", "D0"] diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h index 5ada7d8564..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/27key/config.h +++ b/keyboards/handwired/consolekeyboard/27key/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json index 0f17682dc6..854fe37e30 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/info.json @@ -8,6 +8,9 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], "rows": ["D1", "D0", "F7"] diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h index d08d7e3c1a..226fee299f 100644 --- a/keyboards/handwired/consolekeyboard/30key/config.h +++ b/keyboards/handwired/consolekeyboard/30key/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json index 0c53a6fa9c..fe08b20b28 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/info.json @@ -8,6 +8,9 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], "rows": ["D1", "D0", "F7"] diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h index ffb07b649f..5703448756 100644 --- a/keyboards/handwired/croxsplit44/config.h +++ b/keyboards/handwired/croxsplit44/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C4 #define RGBLED_NUM 42 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json index fc8279c820..817f2fe85a 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/info.json @@ -8,6 +8,9 @@ "pid": "0x6146", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C4" + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"], "rows": ["D4", "D5", "D6", "D7"] diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h index befd720cc3..869f4c9ba7 100644 --- a/keyboards/handwired/cyberstar/config.h +++ b/keyboards/handwired/cyberstar/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define WS2812_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#define RGB_DI_PIN B4 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index 0da0497e15..6e3cb6de3f 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h index c793057a92..64364451ff 100644 --- a/keyboards/handwired/d48/config.h +++ b/keyboards/handwired/d48/config.h @@ -2,7 +2,6 @@ /* RGB Underglow */ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A15 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index 08c9e6a1f8..2c426cd9a5 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A15" + }, "matrix_pins": { "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"], "rows": ["B8", "B9", "B1", "B2", "B4"] diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h index ddae773bad..d84e9b6440 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGB_MATRIX_LED_COUNT 36 #define RGB_MATRIX_SPLIT { 18, 18 } #define RGB_MATRIX_CENTER { 133, 54 } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index f6309cba46..13aee1eaaf 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -8,6 +8,9 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x5/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 0f47f25afa..ddb96923f4 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -8,6 +8,9 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 7f89885c89..61d420c3a5 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -8,6 +8,9 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h index a73cac9ed6..a68c21b215 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h @@ -9,9 +9,9 @@ #define SPLIT_HAND_PIN F6 // WS2812 RGB LED strip input and number of LEDs -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLED_NUM 52 #define RGBLED_SPLIT {26, 26} #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h index bfce275567..2db9052799 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h @@ -7,7 +7,7 @@ #define USE_I2C #define SPLIT_HAND_PIN F6 -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM #define DEBOUNCE 5 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index 93f4ec5bc1..871572c142 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -8,6 +8,9 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index 532a1746d0..f5d6f8177d 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -8,6 +8,9 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h index 44c4234c9b..e97810f8bc 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h @@ -31,8 +31,8 @@ along with this program. If not, see . #define MOUSEKEY_WHEEL_MAX_SPEED 3 // RGB backlight -#undef RGB_DI_PIN -#define RGB_DI_PIN D3 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN D3 #undef RGBLED_NUM #define RGBLED_NUM 30 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h index 5d740986fb..0d3e3d88d2 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h @@ -23,8 +23,8 @@ along with this program. If not, see . #define EE_HANDS // Rows are doubled-up -#undef RGB_DI_PIN -#define RGB_DI_PIN F5 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN F5 #undef SOFT_SERIAL_PIN #define SOFT_SERIAL_PIN D0 diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/config.h +++ b/keyboards/handwired/dactyl_manuform/5x7/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 6e3b62e218..e5c3b5af86 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -8,6 +8,9 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h index 85aee07d82..1da1cb9590 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h @@ -17,5 +17,4 @@ #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json index 32c81a5f93..2b542a15da 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json @@ -7,6 +7,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index b2da174b5a..2d5dbd2351 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json index 190acc1848..9bf6f6f8bd 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h index fbff478bed..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/config.h +++ b/keyboards/handwired/dactyl_manuform/6x7/config.h @@ -19,5 +19,4 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index 5f774715a0..b289804d36 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h index c7f20b1103..41af664c25 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h @@ -5,6 +5,5 @@ #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 #define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1 -#define RGB_DI_PIN D1 #define RGBLED_NUM 6 // Used when chaining strips #define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json index 4e86c8b3a6..4d50af4668 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json @@ -10,6 +10,9 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h index 00548e339c..ab6beb807f 100644 --- a/keyboards/handwired/dactyl_promicro/config.h +++ b/keyboards/handwired/dactyl_promicro/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json index 48202d90cd..10b7d4364a 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h index 16acada5e7..232d5638eb 100644 --- a/keyboards/handwired/freoduo/config.h +++ b/keyboards/handwired/freoduo/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #if !defined(RGBLED_NUM) # define RGBLED_NUM 30 # define RGBLIGHT_SPLIT diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index aaa5a77193..90b34f29d4 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, +"ws2812": { + "pin": "D4" +}, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 3, diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h index 345e1da87a..3999283535 100644 --- a/keyboards/handwired/heisenberg/config.h +++ b/keyboards/handwired/heisenberg/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D4 #define RGBLED_NUM 6 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json index a839fe711b..e92e0f7b4b 100644 --- a/keyboards/handwired/heisenberg/info.json +++ b/keyboards/handwired/heisenberg/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h index 875f441b12..bfa158713d 100644 --- a/keyboards/handwired/hnah108/config.h +++ b/keyboards/handwired/hnah108/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 30 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 6fdf6a699a..5f43b185cf 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -23,6 +23,9 @@ "levels": 4, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h index c964590d80..7b61de013b 100644 --- a/keyboards/handwired/hnah40rgb/config.h +++ b/keyboards/handwired/hnah40rgb/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 50 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index 743a0bbecd..89ac784207 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B7", "D7", "F1", "F0"] diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h index e12034a6b8..5d5233ca99 100644 --- a/keyboards/handwired/jopr/config.h +++ b/keyboards/handwired/jopr/config.h @@ -9,7 +9,6 @@ #define NO_ACTION_ONESHOT #define TAPPING_TOGGLE 3 -#define RGB_DI_PIN F4 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 1 #define RGBLIGHT_SAT_STEP 1 diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json index 3e0ce0ab5f..0dae7b010c 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/info.json @@ -8,6 +8,9 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"], "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"] diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h index d960bc9b2a..e6499e9111 100644 --- a/keyboards/handwired/lovelive9/config.h +++ b/keyboards/handwired/lovelive9/config.h @@ -2,9 +2,6 @@ #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 9 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index 945b489751..25dc85704d 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -16,6 +16,9 @@ "backlight": { "breathing_period": 2 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 5da6e9ac53..c9a2077f41 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B9 #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json index 5de694fbef..66dd82d144 100644 --- a/keyboards/handwired/macroboard/info.json +++ b/keyboards/handwired/macroboard/info.json @@ -8,6 +8,9 @@ "pid": "0x2137", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B9" + }, "layouts": { "LAYOUT_ortho_5x6": { "layout": [ diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h index 6c9be12a17..10f0d75ea9 100644 --- a/keyboards/handwired/marauder/config.h +++ b/keyboards/handwired/marauder/config.h @@ -18,7 +18,6 @@ #define LAYER_STATE_8BIT -#define RGB_DI_PIN D3 #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json index 059cc1dd33..eba81459ef 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"], "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"] diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h index 6050bcf11d..4bee6b205d 100644 --- a/keyboards/handwired/minorca/keymaps/rgb/config.h +++ b/keyboards/handwired/minorca/keymaps/rgb/config.h @@ -1,7 +1,7 @@ #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D5 +#define WS2812_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json index 6d75c549ce..69a7ea87a7 100644 --- a/keyboards/handwired/onekey/blackpill_f401/info.json +++ b/keyboards/handwired/onekey/blackpill_f401/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json index 8d558c4254..ed9435c740 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json index 8ff55f5587..5ee8ec3d5e 100644 --- a/keyboards/handwired/onekey/blackpill_f411/info.json +++ b/keyboards/handwired/onekey/blackpill_f411/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json index 4bdbc5241a..8e8b52080a 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json index 21de1b7696..5f1fecc95b 100644 --- a/keyboards/handwired/onekey/bluepill/info.json +++ b/keyboards/handwired/onekey/bluepill/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json index 9a21daf322..9460b43f5f 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/info.json +++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json index 3e874e8532..65174155b3 100644 --- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json +++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" }, "apa102": { diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json index 4726c87053..b8532cbec0 100644 --- a/keyboards/handwired/onekey/elite_c/info.json +++ b/keyboards/handwired/onekey/elite_c/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" }, "apa102": { diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json index 0bc9001321..dfb57df2b3 100644 --- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json +++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" }, "apa102": { diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json index 7fcc3d4ebd..8a94f5e8b1 100644 --- a/keyboards/handwired/onekey/evb_wb32fq95/info.json +++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" }, "apa102": { diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json index cb5176e3cd..5c0c92ef5d 100644 --- a/keyboards/handwired/onekey/kb2040/info.json +++ b/keyboards/handwired/onekey/kb2040/info.json @@ -5,10 +5,8 @@ "cols": ["GP4"], "rows": ["GP5"] }, - "rgblight": { - "pin": "GP17" - }, "ws2812": { + "pin": "GP17", "driver": "vendor" } } diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json index 2438c6e482..26de66e198 100644 --- a/keyboards/handwired/onekey/nucleo_f446re/info.json +++ b/keyboards/handwired/onekey/nucleo_f446re/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" }, "apa102": { diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json index 43a4b27992..f6af0826fb 100644 --- a/keyboards/handwired/onekey/nucleo_l432kc/info.json +++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" }, "apa102": { diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json index 84d2fba131..178e6185de 100644 --- a/keyboards/handwired/onekey/promicro/info.json +++ b/keyboards/handwired/onekey/promicro/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" }, "apa102": { diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json index 833f7cbf2a..93dbc4c30d 100644 --- a/keyboards/handwired/onekey/proton_c/info.json +++ b/keyboards/handwired/onekey/proton_c/info.json @@ -8,7 +8,7 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" }, "apa102": { diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json index 32bde911bb..40eb896232 100644 --- a/keyboards/handwired/onekey/rp2040/info.json +++ b/keyboards/handwired/onekey/rp2040/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "GP25" }, - "rgblight": { + "ws2812": { "pin": "GP25" } } diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json index b37219bbc3..28aa8a2fdc 100644 --- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json +++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json @@ -10,7 +10,7 @@ "backlight": { "pin": "A1" }, - "rgblight": { + "ws2812": { "pin": "A2" }, "apa102": { diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json index 993003373a..41210a3bbb 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/info.json +++ b/keyboards/handwired/onekey/stm32f0_disco/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "C8" }, - "rgblight": { + "ws2812": { "pin": "B15" }, "apa102": { diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json index e62fc69ce7..d7720a01d3 100644 --- a/keyboards/handwired/onekey/teensy_2/info.json +++ b/keyboards/handwired/onekey/teensy_2/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" }, "apa102": { diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json index 6e134d4506..f7de463fca 100644 --- a/keyboards/handwired/onekey/teensy_2pp/info.json +++ b/keyboards/handwired/onekey/teensy_2pp/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" }, "apa102": { diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h index 4cb293cf88..bacb8449f2 100644 --- a/keyboards/handwired/owlet60/config.h +++ b/keyboards/handwired/owlet60/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D0 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index c8be456104..cc607adc71 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -8,6 +8,9 @@ "pid": "0xDA19", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 9, diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h index ced8197ddb..b224411da4 100644 --- a/keyboards/handwired/p65rgb/config.h +++ b/keyboards/handwired/p65rgb/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B4 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 82e433527a..78b630e512 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x75B4", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], "rows": ["C7", "C6", "B6", "B5", "D5"] diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h index 1b683fdce9..a660e0ddfa 100644 --- a/keyboards/handwired/prime_exl_plus/config.h +++ b/keyboards/handwired/prime_exl_plus/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D4 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json index 0d6d19bf5a..8acde1a159 100644 --- a/keyboards/handwired/prime_exl_plus/info.json +++ b/keyboards/handwired/prime_exl_plus/info.json @@ -8,6 +8,9 @@ "pid": "0x6579", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"], "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"] diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h index f8d36fe894..bb71df9c64 100644 --- a/keyboards/handwired/prkl30/feather/config.h +++ b/keyboards/handwired/prkl30/feather/config.h @@ -16,8 +16,6 @@ #pragma once /* RGB Light Configuration */ - -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json index 5a3e21d8f1..08c6e107dd 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"], "rows": ["F4", "F1", "F0", "D2"] diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h index f8d36fe894..bb71df9c64 100644 --- a/keyboards/handwired/prkl30/promicro/config.h +++ b/keyboards/handwired/prkl30/promicro/config.h @@ -16,8 +16,6 @@ #pragma once /* RGB Light Configuration */ - -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json index ddec0f8eeb..fcfffc6f02 100644 --- a/keyboards/handwired/prkl30/promicro/info.json +++ b/keyboards/handwired/prkl30/promicro/info.json @@ -3,6 +3,9 @@ "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6"] }, + "ws2812": { + "pin": "D1" + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h index 09a981afe1..342411a6b2 100644 --- a/keyboards/handwired/promethium/config.h +++ b/keyboards/handwired/promethium/config.h @@ -154,7 +154,6 @@ enum led_sequence { LED_TOTAL }; -# define RGB_DI_PIN B5 # define RGBSPS_NUM LED_TOTAL #endif diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index 8735f12f78..83f2477b3e 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -8,6 +8,9 @@ "pid": "0x6048", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json index 286df2173b..735c811451 100644 --- a/keyboards/handwired/qc60/info.json +++ b/keyboards/handwired/qc60/info.json @@ -8,6 +8,9 @@ "pid": "0x0C60", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"], "rows": ["F4", "F5", "C6", "D7", "E6"] diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h index 209a5ea30d..a64c4ebeec 100644 --- a/keyboards/handwired/qc60/proto/config.h +++ b/keyboards/handwired/qc60/proto/config.h @@ -1,5 +1,4 @@ #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 1 // Number of LEDs diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h index c346b07623..7ee210aa84 100644 --- a/keyboards/handwired/selene/config.h +++ b/keyboards/handwired/selene/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN A3 #define RGBLED_NUM 50 #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index 2ce960ed20..8c617b015b 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A3" + }, "matrix_pins": { "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h index 3e57cd2e76..8b04fcdc71 100644 --- a/keyboards/handwired/skakunm_dactyl/config.h +++ b/keyboards/handwired/skakunm_dactyl/config.h @@ -19,11 +19,6 @@ /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -//#define RGB_DI_PIN D3 - -//#define RGBLED_NUM 12 // Number of LEDs - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h index f0fd3dfc85..4458ddaffe 100644 --- a/keyboards/handwired/splittest/promicro/config.h +++ b/keyboards/handwired/splittest/promicro/config.h @@ -21,6 +21,3 @@ #define USE_I2C #define SPLIT_HAND_PIN F6 - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json index a99bc3ea13..f376520765 100644 --- a/keyboards/handwired/splittest/promicro/info.json +++ b/keyboards/handwired/splittest/promicro/info.json @@ -7,6 +7,9 @@ "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h index 6b52516807..20672a381f 100644 --- a/keyboards/handwired/splittest/teensy_2/config.h +++ b/keyboards/handwired/splittest/teensy_2/config.h @@ -22,8 +22,5 @@ #define SPLIT_HAND_PIN F0 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - // teensy has vbus detection issues - use usb detection instead #define SPLIT_USB_DETECT diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json index f6fd6faf33..72e9d022b9 100644 --- a/keyboards/handwired/splittest/teensy_2/info.json +++ b/keyboards/handwired/splittest/teensy_2/info.json @@ -7,6 +7,9 @@ "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index 9885c0737c..ffd061fa17 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 16 -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index a9197852df..054f1845ff 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -18,6 +18,7 @@ "breathing": true }, "ws2812": { + "pin": "A7", "driver": "spi" }, "processor": "STM32F303", diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h index 48211c215f..4fe6fb4428 100644 --- a/keyboards/handwired/swiftrax/bumblebee/config.h +++ b/keyboards/handwired/swiftrax/bumblebee/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB Indicators */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 3 /* Solenid Pin */ diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index ad779c155b..c96702e68c 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -8,6 +8,9 @@ "pid": "0xE881", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"] diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h index cdc4c78084..4bff062d6c 100644 --- a/keyboards/handwired/swiftrax/glacier/config.h +++ b/keyboards/handwired/swiftrax/glacier/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 3 /* RGB */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json index 993f4ca040..9609101901 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/info.json @@ -8,6 +8,9 @@ "pid": "0xE890", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"], "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"] diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h index 5af5a9ff81..5fdda201e0 100644 --- a/keyboards/handwired/swiftrax/walter/config.h +++ b/keyboards/handwired/swiftrax/walter/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json index 41ee872fcd..a52a0470e7 100644 --- a/keyboards/handwired/swiftrax/walter/info.json +++ b/keyboards/handwired/swiftrax/walter/info.json @@ -8,6 +8,9 @@ "pid": "0xE964", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B2", "B1", "F4", "F1", "F0"] diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h index 0f33d65386..c92944a48f 100644 --- a/keyboards/handwired/symmetry60/config.h +++ b/keyboards/handwired/symmetry60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json index 5841b607da..54d58d8b7f 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index 2f4d7d4ad8..40fbd33f9d 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGBW -#define RGB_DI_PIN D1 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index 0df5170fff..da74d9b80a 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -8,6 +8,9 @@ "pid": "0x1313", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["C6", "D4", "D0"] diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index 971e75680e..a1cbfedc0c 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN E7 #define RGB_MATRIX_LED_COUNT 62 #define RGB_MATRIX_SPLIT { 32, 30 } #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index e0123bb019..55d17ee09b 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -17,6 +17,9 @@ "matrix": [4, 5] } }, + "ws2812": { + "pin": "E7" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index b472107f42..428ecf02d7 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 20 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index 7300efd02b..ae256b4e5d 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -13,6 +13,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index 5ca6f5d958..2d05b71c92 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN A6 #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 1 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index 9b2dd813ca..0e0e020ddf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "COL2ROW", "ws2812": { + "pin": "A6", "driver": "pwm" }, "encoder": { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index d562a2a41c..2ab49de9fa 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 214fb44125..671e3746c6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -6,6 +6,7 @@ }, "diode_direction": "COL2ROW", "ws2812": { + "pin": "A1", "driver": "pwm" }, "encoder": { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index 069b6e876c..c917e37b4c 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN E7 #define RGBLED_NUM 20 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index facf346943..9b65179678 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -13,6 +13,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "E7" + }, "processor": "at90usb1286", "bootloader": "halfkay" } diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h index c09d1503d9..8ac92c300c 100644 --- a/keyboards/handwired/traveller/config.h +++ b/keyboards/handwired/traveller/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B2 # define RGBLED_NUM 1 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json index 9c7270c6de..b6598be8e8 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"], "rows": ["D0", "D1", "D3", "D2"] diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index e2db822d67..838776b5eb 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/config.h @@ -24,8 +24,6 @@ along with this program. If not, see . /* Underlight configuration */ - -#define RGB_DI_PIN D2 #define RGBLED_NUM 4 // Number of LEDs /* diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index ccbeae4d2a..e6c9010bfd 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -21,6 +21,9 @@ "num_lock": "D5", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4", "ortho_6x4"], diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h index 7f21279edf..40f43d94c2 100644 --- a/keyboards/handwired/tsubasa/config.h +++ b/keyboards/handwired/tsubasa/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define MASTER_RIGHT -#define RGB_DI_PIN D2 # define RGBLED_NUM 12 # define RGBLIGHT_SPLIT # define RGBLED_SPLIT {6, 6} diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json index 1e5ba1eb8e..c78a1532a7 100644 --- a/keyboards/handwired/tsubasa/info.json +++ b/keyboards/handwired/tsubasa/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h index 177ad60ecd..de1208a7ec 100644 --- a/keyboards/handwired/unk/rev1/config.h +++ b/keyboards/handwired/unk/rev1/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json index 1faa61b706..da8c72203f 100644 --- a/keyboards/handwired/unk/rev1/info.json +++ b/keyboards/handwired/unk/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B2", "B6", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "B1", "F6", "B3", "F7"] diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h index 744e66d948..bf9b590421 100644 --- a/keyboards/handwired/uthol/rev2/config.h +++ b/keyboards/handwired/uthol/rev2/config.h @@ -18,6 +18,5 @@ #pragma once //RGB Stuff -#define RGB_DI_PIN E6 #define RGBLED_NUM 39 #define RGBLIGHT_DEFAULT_HUE 201 diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json index bcefbb4956..7c46269579 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/keyboards/handwired/uthol/rev2/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"], "rows": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h index d7829f2fdc..dd7ef6a5a9 100644 --- a/keyboards/handwired/uthol/rev3/config.h +++ b/keyboards/handwired/uthol/rev3/config.h @@ -35,7 +35,6 @@ #define PERMISSIVE_HOLD // RGB Stuff -#define RGB_DI_PIN B0 #define RGBLED_NUM 39 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index 34c0a3503a..5ba12dc846 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.3" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"], "rows": ["A4", "A3", "A2", "A1", "A0"] diff --git a/keyboards/heliotrope/config.h b/keyboards/heliotrope/config.h index 0c9708ab73..15d1d77276 100644 --- a/keyboards/heliotrope/config.h +++ b/keyboards/heliotrope/config.h @@ -19,7 +19,6 @@ #ifdef RGB_MATRIX_ENABLE - #define RGB_DI_PIN A4 // The pin connected to the data pin of the LEDs #define RGB_MATRIX_LED_COUNT 61 // The number of LEDs connected #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/info.json index 0bac228567..88998edd65 100644 --- a/keyboards/heliotrope/info.json +++ b/keyboards/heliotrope/info.json @@ -24,6 +24,9 @@ "pid": "0x4466", "vid": "0x3141" }, + "ws2812": { + "pin": "A4" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h index 77048b5a0f..cf4e9f4ffe 100644 --- a/keyboards/helix/pico/config.h +++ b/keyboards/helix/pico/config.h @@ -48,9 +48,6 @@ along with this program. If not, see . #define AUDIO_PIN B5 #endif -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - //#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h // Helix keyboard RGB LED support diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json index 51c5e3c9e3..0b4c933ffa 100644 --- a/keyboards/helix/pico/info.json +++ b/keyboards/helix/pico/info.json @@ -11,6 +11,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index b4103d407c..491675d45d 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h @@ -54,9 +54,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - //#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h // Helix keyboard RGB LED support diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json index 0ffce4f17a..3924af33aa 100644 --- a/keyboards/helix/rev2/info.json +++ b/keyboards/helix/rev2/info.json @@ -11,6 +11,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h index 97b4ed3f48..9af8d14d10 100644 --- a/keyboards/helix/rev3_4rows/config.h +++ b/keyboards/helix/rev3_4rows/config.h @@ -46,7 +46,6 @@ along with this program. If not, see . /* Dip switch on matrix grid */ #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} } -#define RGB_DI_PIN D3 #define RGBLED_NUM 50 // Number of LEDs #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json index 45945f8871..091e6a988f 100644 --- a/keyboards/helix/rev3_4rows/info.json +++ b/keyboards/helix/rev3_4rows/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h index a047bd7d87..4f7ca7480c 100644 --- a/keyboards/helix/rev3_5rows/config.h +++ b/keyboards/helix/rev3_5rows/config.h @@ -46,7 +46,6 @@ along with this program. If not, see . /* Dip switch on matrix grid */ #define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} } -#define RGB_DI_PIN D3 #define RGBLED_NUM 64 // Number of LEDs #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index 9709708d68..1fd410ee22 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h index 93cfd37632..ee03dd1e17 100644 --- a/keyboards/hfdkb/ac001/config.h +++ b/keyboards/hfdkb/ac001/config.h @@ -21,7 +21,6 @@ #define TAP_CODE_DELAY 5 /* ws2812 RGB LED */ -#define RGB_DI_PIN A1 #define RGB_MATRIX_LED_COUNT 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json index a6082feb38..1ce034931b 100644 --- a/keyboards/hfdkb/ac001/info.json +++ b/keyboards/hfdkb/ac001/info.json @@ -13,6 +13,9 @@ "rows": ["B15"] }, "diode_direction": "ROW2COL", + "ws2812": { + "pin": "A1" + }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h index 15f2170a04..48ac76c74b 100644 --- a/keyboards/hidtech/bastyl/config.h +++ b/keyboards/hidtech/bastyl/config.h @@ -18,7 +18,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 38 #define RGBLIGHT_SPLIT #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json index dc831abe04..794d7cc183 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h index 71cc73befd..5331556a41 100644 --- a/keyboards/hifumi/config.h +++ b/keyboards/hifumi/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_HUE_STEP 5 diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json index e7b0df2d47..a4aeccf83a 100644 --- a/keyboards/hifumi/info.json +++ b/keyboards/hifumi/info.json @@ -13,6 +13,9 @@ "rows": ["D4", "C6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index f18bd158cc..24ed9aa668 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -37,10 +37,12 @@ "rgblight": { "led_count": 4, - "pin": "D3", "split": true, "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8 + }, + "ws2812": { + "pin": "D3" } } diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index aa03a7a4f9..27f26a1d80 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -38,10 +38,12 @@ "rgblight": { "led_count": 5, - "pin": "D3", "split": true, "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8 + }, + "ws2812": { + "pin": "D3" } } diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index e803ed52be..de6c4e0a80 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -37,10 +37,12 @@ "rgblight": { "led_count": 5, - "pin": "D3", "split": true, "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8 + }, + "ws2812": { + "pin": "D3" } } diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h index 88fbf86297..b7094a0212 100644 --- a/keyboards/hineybush/h08_ocelot/config.h +++ b/keyboards/hineybush/h08_ocelot/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 # define RGBLED_NUM 7 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json index 3f3859aa84..4305081010 100644 --- a/keyboards/hineybush/h08_ocelot/info.json +++ b/keyboards/hineybush/h08_ocelot/info.json @@ -13,6 +13,9 @@ "rows": ["B4", "B6"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h index 27e25fba40..c9c59d1942 100644 --- a/keyboards/hineybush/h60/config.h +++ b/keyboards/hineybush/h60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h60/info.json b/keyboards/hineybush/h60/info.json index 7defbee93c..e88411115f 100644 --- a/keyboards/hineybush/h60/info.json +++ b/keyboards/hineybush/h60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 12 }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"], diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h index df9fd8dee6..3fb9460932 100644 --- a/keyboards/hineybush/h65/config.h +++ b/keyboards/hineybush/h65/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json index 5bcf9095a7..dba8541b99 100644 --- a/keyboards/hineybush/h65/info.json +++ b/keyboards/hineybush/h65/info.json @@ -20,6 +20,9 @@ "indicators": { "caps_lock": "E6" }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h index df9fd8dee6..3fb9460932 100644 --- a/keyboards/hineybush/h65_hotswap/config.h +++ b/keyboards/hineybush/h65_hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json index 7634d3acf8..a4c09e02da 100644 --- a/keyboards/hineybush/h65_hotswap/info.json +++ b/keyboards/hineybush/h65_hotswap/info.json @@ -20,6 +20,9 @@ "indicators": { "caps_lock": "E6" }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h index f63efa630a..55c1faf44f 100644 --- a/keyboards/hineybush/h660s/config.h +++ b/keyboards/hineybush/h660s/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h660s/info.json b/keyboards/hineybush/h660s/info.json index b6274a41bf..c6f8275add 100644 --- a/keyboards/hineybush/h660s/info.json +++ b/keyboards/hineybush/h660s/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h index 4581ff80f0..083b7c29f5 100644 --- a/keyboards/hineybush/h75_singa/config.h +++ b/keyboards/hineybush/h75_singa/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/h75_singa/info.json b/keyboards/hineybush/h75_singa/info.json index 3114f46d35..c8dba88dfb 100644 --- a/keyboards/hineybush/h75_singa/info.json +++ b/keyboards/hineybush/h75_singa/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h index cf128b7009..80a861a23e 100644 --- a/keyboards/hineybush/h87a/config.h +++ b/keyboards/hineybush/h87a/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/hineybush/h87a/info.json b/keyboards/hineybush/h87a/info.json index c672728687..a10dc4a773 100644 --- a/keyboards/hineybush/h87a/info.json +++ b/keyboards/hineybush/h87a/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h index bd734e3303..0eb28d50c1 100644 --- a/keyboards/hineybush/h88/config.h +++ b/keyboards/hineybush/h88/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/hineybush/h88/info.json b/keyboards/hineybush/h88/info.json index 4566cc15f9..7c78582c76 100644 --- a/keyboards/hineybush/h88/info.json +++ b/keyboards/hineybush/h88/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h index 678eacc21c..5fe30d87e5 100644 --- a/keyboards/hineybush/hbcp/config.h +++ b/keyboards/hineybush/hbcp/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //EITHERWAY is supported through a custom matrix //#define DIODE_DIRECTION EITHERWAY -#define RGB_DI_PIN B0 #define RGBLED_NUM 27 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json index 0e31272ed4..72364cce8b 100644 --- a/keyboards/hineybush/hbcp/info.json +++ b/keyboards/hineybush/hbcp/info.json @@ -12,6 +12,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B0" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h index d5d533c627..91a587046a 100644 --- a/keyboards/hineybush/physix/config.h +++ b/keyboards/hineybush/physix/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 26 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json index 597beceb54..be4e1b676a 100644 --- a/keyboards/hineybush/physix/info.json +++ b/keyboards/hineybush/physix/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h index 7fcccd170f..9a1c6fa284 100644 --- a/keyboards/hineybush/sm68/config.h +++ b/keyboards/hineybush/sm68/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D0 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hineybush/sm68/info.json b/keyboards/hineybush/sm68/info.json index 1e78344c53..6029c4faf9 100644 --- a/keyboards/hineybush/sm68/info.json +++ b/keyboards/hineybush/sm68/info.json @@ -13,6 +13,9 @@ "rows": ["B2", "B1", "B0", "D4", "D1"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h index 6ca9acf258..3589952afb 100644 --- a/keyboards/hnahkb/stella/config.h +++ b/keyboards/hnahkb/stella/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 14 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/hnahkb/stella/info.json b/keyboards/hnahkb/stella/info.json index e65681f548..0c002b22c4 100644 --- a/keyboards/hnahkb/stella/info.json +++ b/keyboards/hnahkb/stella/info.json @@ -22,6 +22,9 @@ "scroll_lock": "B7", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h index c489d1bb88..7f4d268cf4 100644 --- a/keyboards/hnahkb/vn66/config.h +++ b/keyboards/hnahkb/vn66/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hnahkb/vn66/info.json b/keyboards/hnahkb/vn66/info.json index 71d165e17d..aca0104810 100644 --- a/keyboards/hnahkb/vn66/info.json +++ b/keyboards/hnahkb/vn66/info.json @@ -27,6 +27,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["66_ansi", "66_iso"], diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/config.h b/keyboards/horrortroll/chinese_pcb/black_e65/config.h index 64aebdefe2..3b5cf84cbd 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/config.h +++ b/keyboards/horrortroll/chinese_pcb/black_e65/config.h @@ -21,7 +21,6 @@ #ifdef RGBLIGHT_ENABLE /* RGB Lighting config */ - #define RGB_DI_PIN E2 #define RGBLED_NUM 24 /* RGB Lighting effect */ diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/info.json index 37711a8007..11b53d695c 100644 --- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json +++ b/keyboards/horrortroll/chinese_pcb/black_e65/info.json @@ -20,6 +20,9 @@ "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h index d62ef3c41e..266cc0ea78 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h @@ -26,9 +26,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - /* RGB Matrix config */ - #define RGB_DI_PIN E6 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json index a27f49d8dd..e721a68e79 100644 --- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json +++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json @@ -13,6 +13,9 @@ "rows": ["B7", "B3", "B2", "F6", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h index 563ce20ad6..cae7c8b11a 100644 --- a/keyboards/horrortroll/handwired_k552/config.h +++ b/keyboards/horrortroll/handwired_k552/config.h @@ -52,9 +52,6 @@ #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS - /* RGB Matrix config */ - #define RGB_DI_PIN C14 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json index 8801dd215d..d3d2cd5940 100644 --- a/keyboards/horrortroll/handwired_k552/info.json +++ b/keyboards/horrortroll/handwired_k552/info.json @@ -8,6 +8,9 @@ "pid": "0x5104", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C14" + }, "matrix_pins": { "cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"], "rows": ["C12", "C10", "A10", "A8", "C8", "C9"] diff --git a/keyboards/horrortroll/lemon40/config.h b/keyboards/horrortroll/lemon40/config.h index 93d89532e6..14ae995d43 100644 --- a/keyboards/horrortroll/lemon40/config.h +++ b/keyboards/horrortroll/lemon40/config.h @@ -23,7 +23,6 @@ #ifdef RGBLIGHT_ENABLE /* RGB light pin */ - #define RGB_DI_PIN F4 #define RGBLED_NUM 15 /* RGB light effect */ diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index 327131ab8b..1413fd2add 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/keyboards/horrortroll/lemon40/info.json @@ -8,6 +8,9 @@ "pid": "0x2434", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["F5", "F6", "B1", "B3", "B2", "B6", "F7"], "rows": ["D7", "E6", "B4", "B5", "D4", "C6", "D2", "D3"] diff --git a/keyboards/hotdox76v2/config.h b/keyboards/hotdox76v2/config.h index bb7a6324d3..f469aa475f 100644 --- a/keyboards/hotdox76v2/config.h +++ b/keyboards/hotdox76v2/config.h @@ -23,7 +23,6 @@ #define RGB_MATRIX_SPLIT \ { 43, 43 } -#define RGB_DI_PIN D3 #define RGB_MATRIX_LED_COUNT 86 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json index e0f9ed5f26..5e9bf9a87f 100644 --- a/keyboards/hotdox76v2/info.json +++ b/keyboards/hotdox76v2/info.json @@ -23,6 +23,9 @@ "enabled": true, "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "url": "https://github.com/Oh-My-Mechanical-Keyboard", "usb": { diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h index 7c72c3437a..cb64849d06 100644 --- a/keyboards/hp69/config.h +++ b/keyboards/hp69/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A3 #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json index 812cb14cb3..2bcf69f19e 100644 --- a/keyboards/hp69/info.json +++ b/keyboards/hp69/info.json @@ -17,6 +17,9 @@ "caps_lock": "A6", "scroll_lock": "A7" }, + "ws2812": { + "pin": "A3" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h index 8eb865e9b3..aec0c87bb5 100755 --- a/keyboards/hub16/config.h +++ b/keyboards/hub16/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D1 #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json index 4003e6df5b..4d8161d28d 100644 --- a/keyboards/hub16/info.json +++ b/keyboards/hub16/info.json @@ -14,6 +14,9 @@ {"pin_a": "B5", "pin_b": "B4"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 20, diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h index 879d8b947f..5fc99ecbf5 100644 --- a/keyboards/hub20/config.h +++ b/keyboards/hub20/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 27 #define RGB_MATRIX_LED_COUNT 27 diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json index a577b70f6b..b8356e6f77 100644 --- a/keyboards/hub20/info.json +++ b/keyboards/hub20/info.json @@ -19,6 +19,9 @@ {"pin_a": "A8", "pin_b": "A9"} ] }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h index b084d0ea31..ad5e772c74 100644 --- a/keyboards/hubble/config.h +++ b/keyboards/hubble/config.h @@ -5,7 +5,6 @@ /* rgb */ -#define RGB_DI_PIN D2 #define RGBLED_NUM 7 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json index 2677927194..3d06f3c9f7 100644 --- a/keyboards/hubble/info.json +++ b/keyboards/hubble/info.json @@ -14,6 +14,9 @@ "rgblight": true, "velocikey": true }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F5", "F6", "B4", "E6", "D7", "C6", "D4", "D0"], "rows": ["D1", "F4", "F7", "B5", "B1", "B3", "B6", "B2"] diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index 2521d16e8c..dc525a111d 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 3fd6dfe21a..f8acee360f 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,9 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h index b588cc2bf0..6f43a71054 100755 --- a/keyboards/idobao/id42/config.h +++ b/keyboards/idobao/id42/config.h @@ -17,7 +17,6 @@ /* LED Matrix & Animations */ #ifdef RGB_MATRIX_ENABLE - #define RGB_DI_PIN B3 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json index 16670715f3..4733c8230a 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"], "rows": ["D5", "C6", "B6", "E6"] diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h index 2824a91000..5513787c4e 100644 --- a/keyboards/idobao/id61/config.h +++ b/keyboards/idobao/id61/config.h @@ -8,8 +8,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN F0 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json index 62b6f03f52..03d0649d9f 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h index f3a8c7a3e9..214fb6ba6d 100644 --- a/keyboards/idobao/id63/config.h +++ b/keyboards/idobao/id63/config.h @@ -10,8 +10,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN B7 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json index 0d05c05eb3..74aed63503 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["B0", "B1", "B2", "E6", "F7"] diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h index 6e6b15e076..7834bd33bb 100644 --- a/keyboards/idobao/id67/config.h +++ b/keyboards/idobao/id67/config.h @@ -5,9 +5,6 @@ #pragma once - -#define RGB_DI_PIN F0 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) #ifndef ID67_DISABLE_UNDERGLOW diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json index 34cec9b931..490921f457 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 21f3ca0cc8..2174e39bd2 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index 3777bf03e0..1407d02c80 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -12,6 +12,9 @@ "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] }, + "ws2812": { + "pin": "F0" + }, "diode_direction": "COL2ROW", "backlight": { "pin": "B7", diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index 707f040992..54d74c8da5 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -16,8 +16,6 @@ #pragma once -#undef RGB_DI_PIN -#define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/ // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 540ecc006a..5273a7227d 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index 34f8b57fa9..aa409bc487 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index c8ee450e44..247c3cb113 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -15,6 +15,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h index 515f2d8cfa..afe880fa8a 100644 --- a/keyboards/idobao/id80/v3/ansi/config.h +++ b/keyboards/idobao/id80/v3/ansi/config.h @@ -7,8 +7,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json index 9797c60dfe..c121ff8e3d 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/info.json @@ -25,6 +25,9 @@ "pid": "0x0380", "device_version": "3.0.0" }, + "ws2812": { + "pin": "E2" + }, "bootmagic": { "matrix": [0, 5] }, diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index f856e51c82..9b7459de6c 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index b520de2d4d..2a7b4a9bf9 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -19,6 +19,9 @@ "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h index 02b62fc61f..17b63471fa 100644 --- a/keyboards/idobao/id87/v2/config.h +++ b/keyboards/idobao/id87/v2/config.h @@ -8,8 +8,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index 6272c02d96..7f21832a03 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 41471a4e97..a857f49125 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -24,7 +24,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 5acdaba228..f9a1a003f4 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -18,6 +18,9 @@ "levels": 7, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 85cbcfcc14..87ed689f66 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index 7d437655bb..666ffbdf89 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index e405e2059f..789479de05 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN B1 - #if defined(RGB_MATRIX_ENABLE) // The number of LEDs connected diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 08f427d967..9860f7193a 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -10,6 +10,9 @@ "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] }, + "ws2812": { + "pin": "B1" + }, "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index a7527d4bb7..a7cd0d6114 100755 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -3,10 +3,6 @@ #pragma once - -/* LED Matrix & Animations */ -#define RGB_DI_PIN B1 - #if defined(RGB_MATRIX_ENABLE) #ifndef ID27_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json index 55b330609f..71c92c3331 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] diff --git a/keyboards/idyllic/tinny50_rgb/config.h b/keyboards/idyllic/tinny50_rgb/config.h index 1cc4a1db93..15e1a6ff5c 100644 --- a/keyboards/idyllic/tinny50_rgb/config.h +++ b/keyboards/idyllic/tinny50_rgb/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 6 #ifdef RGB_MATRIX_ENABLE -/* The pin connected to the data pin of the LEDs */ -#define RGB_DI_PIN GP10 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 7/8 diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json index 35edd181c5..dcac3b712b 100644 --- a/keyboards/idyllic/tinny50_rgb/info.json +++ b/keyboards/idyllic/tinny50_rgb/info.json @@ -30,6 +30,7 @@ "driver": "WS2812" }, "ws2812": { + "pin": "GP10", "driver": "vendor" }, "layouts": { diff --git a/keyboards/inett_studio/sqx/hotswap/config.h b/keyboards/inett_studio/sqx/hotswap/config.h index a194f0e444..6b7e3970f5 100644 --- a/keyboards/inett_studio/sqx/hotswap/config.h +++ b/keyboards/inett_studio/sqx/hotswap/config.h @@ -33,7 +33,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 128 #define RGBLED_NUM 18 -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json index 54c18859f2..daeabe72ae 100644 --- a/keyboards/inett_studio/sqx/hotswap/info.json +++ b/keyboards/inett_studio/sqx/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], "rows": ["F0", "F1", "F4", "B7", "D6"] diff --git a/keyboards/inett_studio/sqx/universal/config.h b/keyboards/inett_studio/sqx/universal/config.h index 21929f17f3..11549b9ad9 100644 --- a/keyboards/inett_studio/sqx/universal/config.h +++ b/keyboards/inett_studio/sqx/universal/config.h @@ -33,7 +33,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 128 #define RGBLED_NUM 18 -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/inett_studio/sqx/universal/info.json b/keyboards/inett_studio/sqx/universal/info.json index fa6fa373f9..f0b25a78c9 100644 --- a/keyboards/inett_studio/sqx/universal/info.json +++ b/keyboards/inett_studio/sqx/universal/info.json @@ -8,6 +8,9 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "F6", "F5", "E6", "B0", "D2", "D4", "D5", "D3"], "rows": ["F0", "F1", "F4", "B7", "D6"] diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h index fb7a568062..7163def47d 100644 --- a/keyboards/irene/config.h +++ b/keyboards/irene/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 # define RGBLED_NUM 23 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index e8461df3b1..cce2ab7316 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -8,6 +8,9 @@ "pid": "0x3000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B0", "F0", "C7", "B4", "B7"] diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 2f282d4c30..2303086f2e 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -9,7 +9,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_DEFAULT_VAL 50 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index c5ae580453..5d50328335 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -18,6 +18,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 26e7ee3f33..3377f36d6b 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -18,6 +18,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/jacky_studio/piggy60/rev1/info.json b/keyboards/jacky_studio/piggy60/rev1/info.json index de22bead9e..8f3ebcf347 100644 --- a/keyboards/jacky_studio/piggy60/rev1/info.json +++ b/keyboards/jacky_studio/piggy60/rev1/info.json @@ -27,7 +27,6 @@ }, "rgblight": { "led_count": 14, - "pin": "E2", "animations": { "alternating": true, "breathing": true, @@ -41,5 +40,8 @@ "twinkle": true }, "sleep": true + }, + "ws2812": { + "pin": "E2" } } diff --git a/keyboards/jacky_studio/s7_elephant/rev1/config.h b/keyboards/jacky_studio/s7_elephant/rev1/config.h index fa1b028939..e2d6aed274 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/jacky_studio/s7_elephant/rev1/info.json b/keyboards/jacky_studio/s7_elephant/rev1/info.json index 685504afb1..e024b49bdb 100644 --- a/keyboards/jacky_studio/s7_elephant/rev1/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h index a14efa38ca..5c6eeaf844 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/config.h +++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json index dac233ecc1..148086c0e6 100644 --- a/keyboards/jacky_studio/s7_elephant/rev2/info.json +++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json @@ -12,6 +12,9 @@ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B0", "B1", "B2", "B3", "B7"] }, + "ws2812": { + "pin": "E2" + }, "diode_direction": "ROW2COL", "backlight": { "pin": "B6", diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index 2ef7a6cf7b..a54e1e1fd3 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN F0 - #define RGB_MATRIX_LED_COUNT 67 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index b0565d2a1b..a5da35516e 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -6,6 +6,9 @@ "vid": "0x4A4B", "pid": "0xEF6A" }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index 56fe657427..35107f1518 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index e9d3e2b897..0d278b55ae 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h index 36c2f16578..cec546538a 100644 --- a/keyboards/jd40/config.h +++ b/keyboards/jd40/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json index 924122544e..215e32f5d0 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"], "rows": ["F0", "F1", "F5", "B4"] diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h index 3eec23b214..9ba31d626d 100644 --- a/keyboards/jels/jels88/config.h +++ b/keyboards/jels/jels88/config.h @@ -16,9 +16,6 @@ #pragma once -/* ws2812b RGB LEDs */ -#define RGB_DI_PIN B6 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 20 // Number of LEDs #define RGBLIGHT_SLEEP diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json index 6542e29a08..568b363360 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 5eda1a6724..5bd79d3ce0 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define PHYSICAL_LEDS_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json index e7ec688b88..955fc517de 100644 --- a/keyboards/jian/nsrev2/info.json +++ b/keyboards/jian/nsrev2/info.json @@ -13,6 +13,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D4" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "D3" diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index a00830b7f7..11b99cc739 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -72,7 +72,6 @@ along with this program. If not, see . #endif // SCROLL_NMOSFET /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json index 0f1efc95b3..af1ae29d0d 100644 --- a/keyboards/jian/rev1/info.json +++ b/keyboards/jian/rev1/info.json @@ -12,6 +12,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 92b15fab65..147c2cf147 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define IOS_DEVICE_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json index 3f04339046..7fecaed1f0 100644 --- a/keyboards/jian/rev2/info.json +++ b/keyboards/jian/rev2/info.json @@ -12,6 +12,9 @@ "pin": "C6", "levels": 5 }, + "ws2812": { + "pin": "D4" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "D3" diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h index 0dd0f63195..d810f3e395 100644 --- a/keyboards/jiran/rev2/config.h +++ b/keyboards/jiran/rev2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json new file mode 100644 index 0000000000..fd406420c6 --- /dev/null +++ b/keyboards/jiran/rev2/info.json @@ -0,0 +1,5 @@ +{ + "ws2812": { + "pin": "B6" + } +} diff --git a/keyboards/jkeys_design/gentleman65/config.h b/keyboards/jkeys_design/gentleman65/config.h index a0012f33b5..1b66b1bb25 100644 --- a/keyboards/jkeys_design/gentleman65/config.h +++ b/keyboards/jkeys_design/gentleman65/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json index 85f73603ae..a77db31f0d 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/info.json @@ -8,6 +8,9 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"], "rows": ["D3", "D2", "D1", "F7", "F1"] diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h index 532bf95acb..1b66b1bb25 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/config.h +++ b/keyboards/jkeys_design/gentleman65_se_s/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index 3a389231a4..d50dde9ed3 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -8,6 +8,9 @@ "pid": "0x2322", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/jolofsor/denial75/config.h b/keyboards/jolofsor/denial75/config.h index b53df6cf7f..02f94c8bd5 100644 --- a/keyboards/jolofsor/denial75/config.h +++ b/keyboards/jolofsor/denial75/config.h @@ -25,7 +25,6 @@ /* RGB Definitions */ -#define RGB_DI_PIN D2 #define RGBLED_NUM 84 #define RGBLIGHT_MAX_LAYERS 32 #define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json index 7b8a2ad030..c0381a5f84 100644 --- a/keyboards/jolofsor/denial75/info.json +++ b/keyboards/jolofsor/denial75/info.json @@ -12,6 +12,9 @@ "cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"], "rows": ["B0", "F6", "F5", "F4", "F1", "F0"] }, + "ws2812": { + "pin": "D2" + }, "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h index 11ea425f18..9b93ea9e3c 100644 --- a/keyboards/jones/v03/config.h +++ b/keyboards/jones/v03/config.h @@ -48,7 +48,6 @@ along with this program. If not, see . #define AUDIO_CLICKY #endif -#define RGB_DI_PIN B7 #define RGBLED_NUM 6 // Left(4) + Right(2) #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/info.json index 388c0fb9ef..ca87554f1f 100644 --- a/keyboards/jones/v03/info.json +++ b/keyboards/jones/v03/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h index fe7a5efa9e..f7183265d8 100644 --- a/keyboards/jones/v03_1/config.h +++ b/keyboards/jones/v03_1/config.h @@ -48,7 +48,6 @@ along with this program. If not, see . #define AUDIO_CLICKY #endif -#define RGB_DI_PIN F0 #define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8) #define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/info.json index 45e7b8022f..96b10e8ac1 100644 --- a/keyboards/jones/v03_1/info.json +++ b/keyboards/jones/v03_1/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index c4707355dd..92801acea7 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #endif /* RGBLIGHT */ -#define RGB_DI_PIN F1 #define RGBLED_NUM 4 // Left(2) + Right(2) #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index fc690aa6cd..be2d9e64c9 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -12,6 +12,9 @@ "cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"], "rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"] }, + "ws2812": { + "pin": "F1" + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 77316af07c..73e2d8219b 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGB_DI_PIN D3 #define RGBLED_SPLIT { 28, 28 } #define RGBLED_NUM 56 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index b4bbb6748a..7076f980cf 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kabedon/kabedon78s/config.h b/keyboards/kabedon/kabedon78s/config.h index c9f6428730..37a897c479 100644 --- a/keyboards/kabedon/kabedon78s/config.h +++ b/keyboards/kabedon/kabedon78s/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json index f2fe41a517..3d99357320 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/info.json @@ -8,6 +8,9 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0", "C7", "D7", "B5", "B2", "E6"], "rows": ["D0", "D2", "F7", "B1", "B0", "D6"] diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h index 552a23568d..a028845956 100644 --- a/keyboards/kabedon/kabedon980/config.h +++ b/keyboards/kabedon/kabedon980/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 3 -#define RGB_DI_PIN B7 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json index fa57ad12db..5c49682917 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/info.json @@ -8,6 +8,9 @@ "pid": "0x3938", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0"], "rows": ["D0", "D2", "F7", "B1", "B0", "D6", "C7", "D7", "B5", "B2"] diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index 597b290f93..8988d940e1 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/keyboards/kabedon/kabedon98e/config.h @@ -17,7 +17,6 @@ #define FORCE_NKRO -#define RGB_DI_PIN B4 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json index 9e81ff3860..929fd1a439 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/keyboards/kabedon/kabedon98e/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h index f7bf067a74..9b42731f84 100644 --- a/keyboards/kagizaraya/halberd/config.h +++ b/keyboards/kagizaraya/halberd/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json index a56a2993db..b6540cc780 100644 --- a/keyboards/kagizaraya/halberd/info.json +++ b/keyboards/kagizaraya/halberd/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"], "rows": ["D6", "D4", "D5", "E6"] diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h index f581bee9a4..96e9669046 100644 --- a/keyboards/kagizaraya/scythe/config.h +++ b/keyboards/kagizaraya/scythe/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once #define RGBLIGHT_SPLIT 1 -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index 5fbdf4c1d5..a4731bae00 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -19,6 +19,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h index 759a25915b..f3471e71e4 100644 --- a/keyboards/kakunpc/angel17/rev1/config.h +++ b/keyboards/kakunpc/angel17/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 17 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json index 8e0df61513..9454cc5ffd 100644 --- a/keyboards/kakunpc/angel17/rev1/info.json +++ b/keyboards/kakunpc/angel17/rev1/info.json @@ -3,6 +3,9 @@ "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] }, + "ws2812": { + "pin": "D3" + }, "diode_direction": "COL2ROW", "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h index b8f4396d69..b4d1467a6b 100644 --- a/keyboards/kakunpc/angel64/alpha/config.h +++ b/keyboards/kakunpc/angel64/alpha/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define RGB_DI_PIN D3 #define RGBLED_NUM 64 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json index 0fe4f0f5ab..fd2fbb736b 100644 --- a/keyboards/kakunpc/angel64/alpha/info.json +++ b/keyboards/kakunpc/angel64/alpha/info.json @@ -8,6 +8,9 @@ "pid": "0x0A64", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h index b8f4396d69..b4d1467a6b 100644 --- a/keyboards/kakunpc/angel64/rev1/config.h +++ b/keyboards/kakunpc/angel64/rev1/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define RGB_DI_PIN D3 #define RGBLED_NUM 64 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json index 77d034baeb..c30614b640 100644 --- a/keyboards/kakunpc/angel64/rev1/info.json +++ b/keyboards/kakunpc/angel64/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0A64", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h index 9c35d57bca..719781fad5 100644 --- a/keyboards/kakunpc/business_card/alpha/config.h +++ b/keyboards/kakunpc/business_card/alpha/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json index e2d26c506e..17fda49030 100644 --- a/keyboards/kakunpc/business_card/alpha/info.json +++ b/keyboards/kakunpc/business_card/alpha/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["E6", "B4", "B5"], "rows": ["B2", "B6"] diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h index 9c35d57bca..719781fad5 100644 --- a/keyboards/kakunpc/business_card/beta/config.h +++ b/keyboards/kakunpc/business_card/beta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json index 0854d327ac..9886b2aa6c 100644 --- a/keyboards/kakunpc/business_card/beta/info.json +++ b/keyboards/kakunpc/business_card/beta/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B4", "B5"], "rows": ["B3", "B2", "B6"] diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h index 9167b2345e..3cdc282329 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/config.h +++ b/keyboards/kakunpc/rabbit_capture_plan/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_SPLIT {32, 37} # define RGBLED_NUM 69 # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json index 263656554c..02ac7d54b7 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/info.json @@ -8,6 +8,9 @@ "pid": "0xEB59", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h index 825d820ed6..09038071c2 100644 --- a/keyboards/kakunpc/suihankey/alpha/config.h +++ b/keyboards/kakunpc/suihankey/alpha/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json index 3bdc353644..2f60036d35 100644 --- a/keyboards/kakunpc/suihankey/alpha/info.json +++ b/keyboards/kakunpc/suihankey/alpha/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h index 825d820ed6..09038071c2 100644 --- a/keyboards/kakunpc/suihankey/rev1/config.h +++ b/keyboards/kakunpc/suihankey/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json index 6129a83f6c..b2a6c36716 100644 --- a/keyboards/kakunpc/suihankey/rev1/info.json +++ b/keyboards/kakunpc/suihankey/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index 59d95deb8d..09befa3a58 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/alpha/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json index fa44995dbd..72aaf72967 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/info.json +++ b/keyboards/kakunpc/suihankey/split/alpha/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index b71d359f01..1398e13f82 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/rev1/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D2 -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json index 071d876c1a..2c414b3116 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/info.json +++ b/keyboards/kakunpc/suihankey/split/rev1/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h index 4297ca3d0b..6b9c95516d 100644 --- a/keyboards/kakunpc/thedogkeyboard/config.h +++ b/keyboards/kakunpc/thedogkeyboard/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 } #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } -#define RGB_DI_PIN D3 #define RGBLED_NUM 111 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json index 26b320083c..f511fbc77e 100644 --- a/keyboards/kakunpc/thedogkeyboard/info.json +++ b/keyboards/kakunpc/thedogkeyboard/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kamigakushi/info.json b/keyboards/kamigakushi/info.json index 4e30f47b06..dc7b54ad54 100644 --- a/keyboards/kamigakushi/info.json +++ b/keyboards/kamigakushi/info.json @@ -18,7 +18,6 @@ "on_state": 1 }, "rgblight": { - "pin": "GP25", "led_count": 2, "hue_steps": 8, "saturation_steps": 8, @@ -38,6 +37,7 @@ } }, "ws2812": { + "pin": "GP25", "driver": "vendor" }, "matrix_pins": { diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h index 8a23e16f19..64135cabcd 100644 --- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h +++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #define ENCODERS_PAD_A { D5 } #define ENCODERS_PAD_B { D3 } -#define RGB_DI_PIN D0 +#define WS2812_DI_PIN D0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h index 3d22c45494..93d67ee100 100755 --- a/keyboards/kapcave/paladin64/config.h +++ b/keyboards/kapcave/paladin64/config.h @@ -78,7 +78,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json index 0f851cba86..e280220217 100644 --- a/keyboards/kapcave/paladin64/info.json +++ b/keyboards/kapcave/paladin64/info.json @@ -8,6 +8,9 @@ "pid": "0x5036", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"], "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"] diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h index b2cfbb1057..386e4b0a0c 100644 --- a/keyboards/kapcave/paladinpad/rev1/config.h +++ b/keyboards/kapcave/paladinpad/rev1/config.h @@ -16,8 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D0 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json index 5568345bd3..0fec9260a9 100644 --- a/keyboards/kapcave/paladinpad/rev1/info.json +++ b/keyboards/kapcave/paladinpad/rev1/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D4", "D5", "D3", "B7"], "rows": ["C7", "B6", "B4", "D7", "D6"] diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h index 35167881f9..239a873384 100644 --- a/keyboards/kapcave/paladinpad/rev2/config.h +++ b/keyboards/kapcave/paladinpad/rev2/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -#define RGB_DI_PIN D0 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json index f8d1864f8e..699cdde82d 100644 --- a/keyboards/kapcave/paladinpad/rev2/info.json +++ b/keyboards/kapcave/paladinpad/rev2/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["F7", "F5", "D3", "B7"], "rows": ["F4", "F6", "D7", "B4", "D6"] diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h index 155c94909f..387e26aa73 100644 --- a/keyboards/kapl/rev1/config.h +++ b/keyboards/kapl/rev1/config.h @@ -5,8 +5,6 @@ /* Select hand configuration */ #define MASTER_LEFT - -#define RGB_DI_PIN D4 #define RGBLED_NUM 88 #define RGBLED_SPLIT { 44, 44 } #define RGBLIGHT_SPLIT diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json index 02779825f1..af54d39db7 100644 --- a/keyboards/kapl/rev1/info.json +++ b/keyboards/kapl/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h index 4cf7eed2cd..0299a8ab1f 100644 --- a/keyboards/kb_elmo/isolation/config.h +++ b/keyboards/kb_elmo/isolation/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB backlight */ -#define RGB_DI_PIN B2 # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index 6d108299d0..6b7f531eda 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -8,6 +8,9 @@ "pid": "0x4EE6", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega328p", "bootloader": "usbasploader", "matrix_pins": { diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h index 6aafdcded9..08501c982b 100644 --- a/keyboards/kb_elmo/noah_avr/config.h +++ b/keyboards/kb_elmo/noah_avr/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB */ -#define RGB_DI_PIN B5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json index cd8e087387..8db5edb6b6 100644 --- a/keyboards/kb_elmo/noah_avr/info.json +++ b/keyboards/kb_elmo/noah_avr/info.json @@ -8,6 +8,9 @@ "pid": "0x1DB0", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D4", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "F1", "B3", "B2", "B1", "B0"], "rows": ["B4", "B6", "D7", "D5", "D0"] diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h index 0888a3d3a7..ee3574ac9c 100644 --- a/keyboards/kbdfans/baguette66/rgb/config.h +++ b/keyboards/kbdfans/baguette66/rgb/config.h @@ -19,7 +19,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 -#define RGB_DI_PIN E6 #define RGBLED_NUM 66 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index bee4eb8c08..77277441da 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -7,6 +7,9 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "B6"] diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 0d43c4783d..29f510620b 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index 4adafc1e09..9bd8aa1c27 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -16,6 +16,9 @@ "caps_lock": "C6", "on_state": 0 }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index ef5e9ca782..29f510620b 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index aff015ce0f..cb202cd173 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -17,6 +17,9 @@ "caps_lock": "C6", "on_state": 0 }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 51aeb2bf03..b18438ab4e 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index 563fddf7b8..217eebe92e 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -22,6 +22,9 @@ "scroll_lock": "B1", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index 2e644f4d60..d08ecf7f98 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 07ec04645d..21d1428f0d 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -17,6 +17,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 084f366ac3..c71b396ecd 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B4 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index 6900c542c2..6ab178520e 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index ff0970af2e..8b79d929d6 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -18,7 +18,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define RGB_DI_PIN C7 #define RGBLED_NUM 68 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index 8a63ac9f10..4276e8ef93 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -4,6 +4,9 @@ "pid": "0x1227", "device_version": "0.0.4" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B1", "F1", "B2", "B3", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h index 3dd332212e..ede122f3f2 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h @@ -18,7 +18,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define RGB_DI_PIN C7 #define RGB_MATRIX_LED_COUNT 68 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index d5582f1e21..5e8a3f00d5 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0105", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B1", "F1", "B2", "B3", "C6"] diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 5ab0791004..c1b23fe4db 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index 7679f474c8..c8e08a0157 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 4b631cf615..9e8ab831eb 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index 047d5f03d9..b360acf4fc 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -20,6 +20,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 30a1e61130..d29b1e494a 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 1c1b40f8cd..97868ebe1d 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F0" + }, "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index f22102c361..38d9bacad9 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -9,7 +9,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 7ffe140277..ab56fc90d1 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 46ed7b1bea..11eb19b729 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 09990d1cfc..c6e7db6bcd 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -18,7 +18,6 @@ #define FORCE_NKRO -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index 16a27a8c9d..452caa9aa8 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -15,6 +15,9 @@ "indicators": { "caps_lock": "C6" }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index c30cb3a505..6d1273875d 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -19,7 +19,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 -#define RGB_DI_PIN C7 #define RGBLED_NUM 84 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index 385352f3d7..9452fabd9e 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "B0", "B1", "B2", "C6"] diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index 1f7a62b929..655b83f0e3 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 3ce40afe27..eeda61ac35 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -22,6 +22,9 @@ "num_lock": "B1", "scroll_lock": "B2" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index ae7eadad0d..d2a014a204 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 6e7405109f..2f284ea937 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B3" + }, "indicators": { "caps_lock": "E6", "scroll_lock": "B2", diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 5ea4fba8e2..caaf4ef9b1 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B5 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 424771ae3d..8279ac4e81 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "B5" + }, "indicators": { "num_lock": "B4", "on_state": 0 diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json index ec522cc82c..b42a70c9ab 100644 --- a/keyboards/kbdfans/kbdpad/mk3/info.json +++ b/keyboards/kbdfans/kbdpad/mk3/info.json @@ -46,7 +46,7 @@ ], "max_brightness": 128 }, - "rgblight": { + "ws2812": { "pin": "F5" }, "usb": { diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index 616fc639af..fb154031a0 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index f866a95c9f..f41f1105b2 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 4 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12", "planck_mit"], diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h index 5c0d856986..54794e66be 100644 --- a/keyboards/kbdfans/odin/rgb/config.h +++ b/keyboards/kbdfans/odin/rgb/config.h @@ -18,7 +18,6 @@ #define RGBLED_NUM 104 #define RGB_MATRIX_LED_COUNT 104 -#define RGB_DI_PIN B15 #ifdef RGB_MATRIX_ENABLE #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json index f776104754..5b25de9f49 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0102", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], "rows": ["A10", "A9", "A8", "B14", "B13", "A2"] diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index 49c3ab9233..6fa6d5651b 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index fa7a390c08..b073fc9fb7 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -18,6 +18,9 @@ "num_lock": "B9", "on_state": 0 }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "debounce": 15, diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index d156ae5103..fe645e42a3 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN B15 - #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 8421ab3b47..4fc091358b 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -18,6 +18,9 @@ "num_lock": "B9", "on_state": 0 }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json index cf59cdc4ce..d5a2e7ce76 100644 --- a/keyboards/kbdfans/odinmini/info.json +++ b/keyboards/kbdfans/odinmini/info.json @@ -41,11 +41,11 @@ "hue_steps": 8, "led_count": 4, "max_brightness": 180, - "pin": "GP12", "saturation_steps": 8, "sleep": true }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "usb": { diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index 68fc32caaa..a8e7f41e17 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -20,7 +20,6 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index e04c8641e5..0b4bf2e19f 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -18,6 +18,9 @@ "num_lock": "D7", "on_state": 0 }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 4f81e3693a..1f23e0860e 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -29,7 +29,6 @@ "brightness_steps": 10, "hue_steps": 10, "led_count": 20, - "pin": "B3", "saturation_steps": 10, "sleep": true, "animations": { @@ -45,6 +44,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B3" + }, "url": "", "usb": { "device_version": "0.0.1", diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h index a47daa75a0..5298868bcf 100644 --- a/keyboards/kbnordic/nordic60/rev_a/config.h +++ b/keyboards/kbnordic/nordic60/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/kbnordic/nordic60/rev_a/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json index 6668549524..6332fcb02f 100644 --- a/keyboards/kbnordic/nordic60/rev_a/info.json +++ b/keyboards/kbnordic/nordic60/rev_a/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"], "rows": ["C2", "D0", "B0", "D6", "D5"] diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h index eae2b0da6e..ff58f5a208 100644 --- a/keyboards/kc60/config.h +++ b/keyboards/kc60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F5 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kc60/info.json b/keyboards/kc60/info.json index e257d0cef9..4e10acaf9e 100644 --- a/keyboards/kc60/info.json +++ b/keyboards/kc60/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "F5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/keebformom/config.h b/keyboards/keebformom/config.h index 190f88658f..c71d25efd8 100644 --- a/keyboards/keebformom/config.h +++ b/keyboards/keebformom/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 40 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebformom/info.json b/keyboards/keebformom/info.json index a6dfb384d6..9ddf1af1de 100644 --- a/keyboards/keebformom/info.json +++ b/keyboards/keebformom/info.json @@ -8,6 +8,9 @@ "pid": "0x14E2", "device_version": "1.0.0" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1"] diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 901a26fe8d..0eaff206f0 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -11,7 +11,6 @@ #define ENCODERS_CW_KEY { { 1, 1 }, { 3, 1 } } #define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } } -#define RGB_DI_PIN D3 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index c647eec514..d070398c65 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -8,6 +8,9 @@ "pid": "0x1111", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "B5"}, diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h index 426bde52b1..80c50f13da 100644 --- a/keyboards/keebio/bamfk4/config.h +++ b/keyboards/keebio/bamfk4/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 32 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json index 97316b8ce5..9fd3a09dde 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/info.json @@ -8,6 +8,9 @@ "pid": "0x1114", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["E6", "D5", "B6", "B7"], "rows": ["F0"] diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h index 22d7643005..43a6e7f5f2 100644 --- a/keyboards/keebio/bdn9/rev1/config.h +++ b/keyboards/keebio/bdn9/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json index 8e7b01b794..4a346fd564 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/info.json @@ -15,6 +15,9 @@ "pin": "B5", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h index 30c53e2f86..193715119a 100644 --- a/keyboards/keebio/bdn9/rev2/config.h +++ b/keyboards/keebio/bdn9/rev2/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN B15 # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json index c23acbc27f..de3aeda439 100644 --- a/keyboards/keebio/bdn9/rev2/info.json +++ b/keyboards/keebio/bdn9/rev2/info.json @@ -4,6 +4,9 @@ "pid": "0x2133", "device_version": "2.0.0" }, + "ws2812": { + "pin": "B15" + }, "encoder": { "rotary": [ {"pin_a": "A8", "pin_b": "A4"}, diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h index 894f7fbe62..48fd0aaf0c 100644 --- a/keyboards/keebio/bfo9000/config.h +++ b/keyboards/keebio/bfo9000/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B4 #define RGBLED_NUM 20 // Number of LEDs #define RGBLED_SPLIT { 10, 10 } diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json index f578783905..d9dde626f2 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h index 3dc169cf79..14c93278a6 100644 --- a/keyboards/keebio/chocopad/config.h +++ b/keyboards/keebio/chocopad/config.h @@ -19,5 +19,4 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 diff --git a/keyboards/keebio/chocopad/info.json b/keyboards/keebio/chocopad/info.json index 7befd0a0d7..44d846da74 100644 --- a/keyboards/keebio/chocopad/info.json +++ b/keyboards/keebio/chocopad/info.json @@ -17,6 +17,9 @@ "pin": "B5", "levels": 6 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x4"], diff --git a/keyboards/keebio/convolution/rev1/config.h b/keyboards/keebio/convolution/rev1/config.h index 35a7d5b00d..b46ba583d7 100644 --- a/keyboards/keebio/convolution/rev1/config.h +++ b/keyboards/keebio/convolution/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once // RGB Matrix -#define RGB_DI_PIN GP26 #define RGB_MATRIX_LED_COUNT 16 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json index a23c92de8c..9a5d4f7f63 100644 --- a/keyboards/keebio/convolution/rev1/info.json +++ b/keyboards/keebio/convolution/rev1/info.json @@ -25,6 +25,7 @@ ] }, "ws2812": { + "pin": "GP26", "driver": "vendor" }, "rgb_matrix": { diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h index 1b80f5bfd1..b2727f1ab2 100644 --- a/keyboards/keebio/dilly/config.h +++ b/keyboards/keebio/dilly/config.h @@ -19,6 +19,5 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGB_DI_PIN D3 #define RGBLED_NUM 10 diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/info.json index 8f68587770..29322a8044 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B5" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_3x10"], diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h index 3f722a5801..3d715a473b 100644 --- a/keyboards/keebio/dsp40/rev1/config.h +++ b/keyboards/keebio/dsp40/rev1/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json index 524bb51372..efb1bc9551 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/info.json @@ -22,6 +22,9 @@ "pin": "A6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h index dd4726a35d..f5867889de 100644 --- a/keyboards/keebio/ergodicity/config.h +++ b/keyboards/keebio/ergodicity/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B2 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json index 1bb55ed4ee..ca3b20c1e0 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/info.json @@ -18,6 +18,9 @@ "levels": 7, "breathing": true }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keebio/foldkb/rev1/config.h b/keyboards/keebio/foldkb/rev1/config.h index 3dd11100d6..30154273b7 100644 --- a/keyboards/keebio/foldkb/rev1/config.h +++ b/keyboards/keebio/foldkb/rev1/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index a3b12965ec..dba0395842 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -24,6 +24,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h index 0f2d67caaa..904658ff8a 100644 --- a/keyboards/keebio/fourier/config.h +++ b/keyboards/keebio/fourier/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index dbe60ec677..48b04f122e 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -22,6 +22,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/keebio/iris/rev1/config.h b/keyboards/keebio/iris/rev1/config.h index c6fa1b9512..7fd5c0ff95 100644 --- a/keyboards/keebio/iris/rev1/config.h +++ b/keyboards/keebio/iris/rev1/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index ba412159e2..0fa11194c1 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev1_led/config.h b/keyboards/keebio/iris/rev1_led/config.h index c6fa1b9512..7fd5c0ff95 100644 --- a/keyboards/keebio/iris/rev1_led/config.h +++ b/keyboards/keebio/iris/rev1_led/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index 816b2fe390..1d51067d52 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev2/config.h b/keyboards/keebio/iris/rev2/config.h index 698827a767..59867e6ef9 100644 --- a/keyboards/keebio/iris/rev2/config.h +++ b/keyboards/keebio/iris/rev2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index f85f82a627..447c1cfddf 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/keebio/iris/rev3/config.h b/keyboards/keebio/iris/rev3/config.h index a84d0c02e4..c7a7222fdc 100644 --- a/keyboards/keebio/iris/rev3/config.h +++ b/keyboards/keebio/iris/rev3/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index 15dd75e680..ecee0bc87e 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -18,6 +18,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "F7" + }, "qmk_lufa_bootloader": { "esc_input": "D2", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev4/config.h b/keyboards/keebio/iris/rev4/config.h index 7af2b5fd94..eaeca3a4b9 100644 --- a/keyboards/keebio/iris/rev4/config.h +++ b/keyboards/keebio/iris/rev4/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D6 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index 464a7b2d43..db7dd32ae5 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -18,6 +18,9 @@ "pin": "B5", "levels": 5 }, + "ws2812": { + "pin": "D6" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index 77825d3c1c..12ff3a2a4d 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/keyboards/keebio/iris/rev5/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define BACKLIGHT_DEFAULT_LEVEL 3 /* ws2812 RGB LED */ -#define RGB_DI_PIN D6 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 2df637509b..92bea8d83f 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -18,6 +18,9 @@ "pin": "B5", "levels": 5 }, + "ws2812": { + "pin": "D6" + }, "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "F1", diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index 0ed1cb78eb..3d30d023ac 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/keyboards/keebio/iris/rev6/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index f4bb81a81a..ab2842c08f 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "matrix_pins": { diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index fe802cef2e..4031dac790 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json index 2f5d8cb655..e20b2a00c3 100644 --- a/keyboards/keebio/iris/rev6a/info.json +++ b/keyboards/keebio/iris/rev6a/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "matrix_pins": { diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index fe802cef2e..4031dac790 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index 9327bf0678..5f3fef008d 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -14,6 +14,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "matrix_pins": { diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h index f7599e3e4d..0ccdc1d748 100644 --- a/keyboards/keebio/iris/rev7/config.h +++ b/keyboards/keebio/iris/rev7/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 # define RGBLED_NUM 68 # define RGBLED_SPLIT { 34, 34 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json index e68af28df1..1ceb00ef7a 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/info.json @@ -15,6 +15,9 @@ {"pin_a": "F6", "pin_b": "F7"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "matrix_pins": { diff --git a/keyboards/keebio/kbo5000/rev1/config.h b/keyboards/keebio/kbo5000/rev1/config.h index 5f765e89a5..f02c15c4a7 100644 --- a/keyboards/keebio/kbo5000/rev1/config.h +++ b/keyboards/keebio/kbo5000/rev1/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json index 2e54dc2920..ee8c9313c9 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/info.json @@ -21,6 +21,9 @@ "backlight": { "pin": "B5" }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "encoder": { diff --git a/keyboards/keebio/laplace/config.h b/keyboards/keebio/laplace/config.h index cce01b488e..93ef4c9130 100644 --- a/keyboards/keebio/laplace/config.h +++ b/keyboards/keebio/laplace/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* WS2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json index c0ee05d92a..7af53b4489 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/info.json @@ -8,6 +8,9 @@ "pid": "0x1147", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"] diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h index 9efacf6599..b1922fb9c3 100644 --- a/keyboards/keebio/levinson/rev1/config.h +++ b/keyboards/keebio/levinson/rev1/config.h @@ -25,6 +25,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json index faad88b20e..ad795db098 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/info.json @@ -16,6 +16,9 @@ "pin": "C6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "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}] diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h index 9efacf6599..b1922fb9c3 100644 --- a/keyboards/keebio/levinson/rev2/config.h +++ b/keyboards/keebio/levinson/rev2/config.h @@ -25,6 +25,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json index 984b06c946..fb6fd084c7 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/info.json @@ -16,6 +16,9 @@ "pin": "B5", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "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}] diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h index d8a0366f14..d2e19703c1 100644 --- a/keyboards/keebio/levinson/rev3/config.h +++ b/keyboards/keebio/levinson/rev3/config.h @@ -27,6 +27,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json index b31f71533d..e5e479ba7a 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/info.json @@ -22,6 +22,9 @@ "pin": "B6", "levels": 7 }, + "ws2812": { + "pin": "D7" + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h index e0e8582286..ab1c967e70 100644 --- a/keyboards/keebio/nyquist/rev1/config.h +++ b/keyboards/keebio/nyquist/rev1/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json index 869d3d9780..975fff8569 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/info.json @@ -12,6 +12,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h index e0e8582286..ab1c967e70 100644 --- a/keyboards/keebio/nyquist/rev2/config.h +++ b/keyboards/keebio/nyquist/rev2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json index 0810473ac7..489ee6bd29 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/info.json @@ -13,6 +13,9 @@ "pin": "B6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h index dfb8f79aaa..7b014e4fc5 100644 --- a/keyboards/keebio/nyquist/rev3/config.h +++ b/keyboards/keebio/nyquist/rev3/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json index fceda141b1..eb17350d63 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layout_aliases": { diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index 5842393aa2..83fcd1fe0a 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/info.json index ee616bb0fe..7fb5ca8153 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x1257", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], "rows": ["F4", "D4", "D7", "E6", "B4", "C6"] diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index 0d7e9f8a30..e7774432df 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define CAPS_LOCK_LED_PIN B6 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 16 // Number of LEDs #define RGBLED_SPLIT { 8, 8 } #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/info.json index 62e69fb659..d73c1af308 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/info.json @@ -21,6 +21,9 @@ "backlight": { "pin": "B5" }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "encoder": { diff --git a/keyboards/keebio/quefrency/rev3/config.h b/keyboards/keebio/quefrency/rev3/config.h index 0d7e9f8a30..e7774432df 100644 --- a/keyboards/keebio/quefrency/rev3/config.h +++ b/keyboards/keebio/quefrency/rev3/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define CAPS_LOCK_LED_PIN B6 /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 16 // Number of LEDs #define RGBLED_SPLIT { 8, 8 } #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/info.json index e469c41115..fb204ab910 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/info.json @@ -21,6 +21,9 @@ "backlight": { "pin": "B5" }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "encoder": { diff --git a/keyboards/keebio/quefrency/rev4/config.h b/keyboards/keebio/quefrency/rev4/config.h index e3adf83576..b27ba56d53 100644 --- a/keyboards/keebio/quefrency/rev4/config.h +++ b/keyboards/keebio/quefrency/rev4/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 16 // Number of LEDs #define RGBLED_SPLIT { 8, 8 } #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json index 1883430c3f..55fb4adda4 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/info.json @@ -18,6 +18,9 @@ {"pin_a": "F5", "pin_b": "F6"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "encoder": { diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h index e3adf83576..b27ba56d53 100644 --- a/keyboards/keebio/quefrency/rev5/config.h +++ b/keyboards/keebio/quefrency/rev5/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 16 // Number of LEDs #define RGBLED_SPLIT { 8, 8 } #define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json index 24e2ebb197..78a44dfc80 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/info.json @@ -18,6 +18,9 @@ {"pin_a": "F5", "pin_b": "F6"} ] }, + "ws2812": { + "pin": "E6" + }, "split": { "soft_serial_pin": "D0", "encoder": { diff --git a/keyboards/keebio/rorschach/rev1/config.h b/keyboards/keebio/rorschach/rev1/config.h index 73161d7a99..979899d547 100644 --- a/keyboards/keebio/rorschach/rev1/config.h +++ b/keyboards/keebio/rorschach/rev1/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* WS2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 0a117cc944..6b2c9244c0 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -17,6 +17,9 @@ "pin": "B5", "levels": 5 }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json index 51a8e3b410..72845ac510 100644 --- a/keyboards/keebio/sinc/rev1/info.json +++ b/keyboards/keebio/sinc/rev1/info.json @@ -48,7 +48,6 @@ "pin": "B5" }, "rgblight": { - "pin": "E6", "led_count" : 16, "split_count": [8, 8], "animations": { @@ -64,7 +63,9 @@ "twinkle": true } }, - + "ws2812": { + "pin": "E6" + }, "layouts": { "LAYOUT_75": { "layout": [ diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json index 6b5e536080..d8d4d2e016 100644 --- a/keyboards/keebio/sinc/rev2/info.json +++ b/keyboards/keebio/sinc/rev2/info.json @@ -48,7 +48,6 @@ "pin": "B5" }, "rgblight": { - "pin": "E6", "led_count" : 16, "split_count": [8, 8], "animations": { @@ -64,6 +63,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "E6" + }, "layouts": { "LAYOUT_75": { "layout": [ diff --git a/keyboards/keebio/sinc/rev3/config.h b/keyboards/keebio/sinc/rev3/config.h index 9b27501d3c..fda33076c9 100644 --- a/keyboards/keebio/sinc/rev3/config.h +++ b/keyboards/keebio/sinc/rev3/config.h @@ -68,7 +68,6 @@ along with this program. If not, see . #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -#define RGB_DI_PIN GP18 #define RGB_MATRIX_LED_COUNT 113 #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json index cb062f38ad..2c7c2e9536 100644 --- a/keyboards/keebio/sinc/rev3/info.json +++ b/keyboards/keebio/sinc/rev3/info.json @@ -40,6 +40,7 @@ ] }, "ws2812": { + "pin": "GP18", "driver": "vendor" }, "rgb_matrix": { diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h index f8582148f9..a05b8a33f2 100644 --- a/keyboards/keebio/stick/config.h +++ b/keyboards/keebio/stick/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* WS2812 RGB LED */ -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json index 028332b5f4..a398786853 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/info.json @@ -14,6 +14,9 @@ {"pin_a": "D4", "pin_b": "C6"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h index e93b57b8e7..bfe597511e 100644 --- a/keyboards/keebio/tukey/config.h +++ b/keyboards/keebio/tukey/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json index 3f34d8e604..47908438ed 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/info.json @@ -8,6 +8,9 @@ "pid": "0x1112", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/keebio/viterbi/rev1/config.h b/keyboards/keebio/viterbi/rev1/config.h index a31e17e1ab..1dfed1a82f 100644 --- a/keyboards/keebio/viterbi/rev1/config.h +++ b/keyboards/keebio/viterbi/rev1/config.h @@ -23,6 +23,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 14 #define RGBLED_SPLIT { 7, 7 } diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/info.json index b1a35d2886..b28ea246ff 100644 --- a/keyboards/keebio/viterbi/rev1/info.json +++ b/keyboards/keebio/viterbi/rev1/info.json @@ -7,6 +7,9 @@ "pid": "0x1157", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/viterbi/rev2/config.h b/keyboards/keebio/viterbi/rev2/config.h index d455adcba8..56151a0028 100644 --- a/keyboards/keebio/viterbi/rev2/config.h +++ b/keyboards/keebio/viterbi/rev2/config.h @@ -25,6 +25,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 14 #define RGBLED_SPLIT { 7, 7 } diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/info.json index 92206ebc41..10f36652ab 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/info.json @@ -16,6 +16,9 @@ "pin": "B6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/wavelet/config.h b/keyboards/keebio/wavelet/config.h index 846d9b2da2..b6d4d64719 100644 --- a/keyboards/keebio/wavelet/config.h +++ b/keyboards/keebio/wavelet/config.h @@ -25,5 +25,4 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/info.json index 57532fb7ad..c40265fc5b 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/info.json @@ -17,6 +17,9 @@ "pin": "B5", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/keebio/wtf60/config.h b/keyboards/keebio/wtf60/config.h index 34869d5107..99fc98b86b 100644 --- a/keyboards/keebio/wtf60/config.h +++ b/keyboards/keebio/wtf60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 -#define RGB_DI_PIN E6 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/info.json index 33fd15d6c6..687b9de46a 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/info.json @@ -8,6 +8,9 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keebmonkey/kbmg68/config.h b/keyboards/keebmonkey/kbmg68/config.h index 2342941340..7f996ecc17 100644 --- a/keyboards/keebmonkey/kbmg68/config.h +++ b/keyboards/keebmonkey/kbmg68/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 68 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json index 15893e45c6..89bb9f7690 100644 --- a/keyboards/keebmonkey/kbmg68/info.json +++ b/keyboards/keebmonkey/kbmg68/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B1", "B2", "B3", "B4", "B5"] diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h index b23c9a9d38..20493f173c 100644 --- a/keyboards/keebsforall/coarse60/config.h +++ b/keyboards/keebsforall/coarse60/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json index 5962d918eb..ce1ab219bb 100644 --- a/keyboards/keebsforall/coarse60/info.json +++ b/keyboards/keebsforall/coarse60/info.json @@ -24,6 +24,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "indicators": { diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h index 92023404ec..3c9e54680b 100644 --- a/keyboards/keebwerk/nano_slider/config.h +++ b/keyboards/keebwerk/nano_slider/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define SLIDER_PIN D4 -#define RGB_DI_PIN F6 # define RGBLED_NUM 4 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/info.json index 83347a74f4..7c067c6f99 100644 --- a/keyboards/keebwerk/nano_slider/info.json +++ b/keyboards/keebwerk/nano_slider/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h index c34099cfa8..2b008e5ca7 100644 --- a/keyboards/kegen/gboy/config.h +++ b/keyboards/kegen/gboy/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json index 39b15a1a8a..d85041de71 100644 --- a/keyboards/kegen/gboy/info.json +++ b/keyboards/kegen/gboy/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 15 }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index e8a729c95f..5146b6ee13 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 927e68f6ef..7b3d0c9ea4 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -22,6 +22,9 @@ "bootmagic": { "matrix": [1, 3] }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h index f4ad38a15e..fae3a58249 100644 --- a/keyboards/keybee/keybee65/config.h +++ b/keyboards/keybee/keybee65/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN B0 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 68 // Limit the Brithness of the LEDs diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json index 5fa1ea78d9..4367a8fb31 100644 --- a/keyboards/keybee/keybee65/info.json +++ b/keyboards/keybee/keybee65/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["E6", "D1", "D5", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D3", "D2", "D0", "B0", "F0"] diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h index f85a8eee55..2fd384b986 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h +++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h @@ -31,7 +31,7 @@ #ifdef RGB_MATRIX_ENABLE // The pin connected to the data pin of the LEDs -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 60 #define RGBLED_NUM 60 diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 6e82a2cc6f..27049500bc 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -16,9 +16,6 @@ #pragma once -/* SK6812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 60 // Total number of LEDs # define RGBLED_SPLIT { 30, 30 } // LEDs per side diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 95215542a9..160c7517e0 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index fc78e6bb03..6acf662823 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 4 diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 81afec7334..0766e0a2e4 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -8,6 +8,9 @@ "pid": "0x0512", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "F6", "F5", "F4"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h index 03303df60e..8c5567387e 100644 --- a/keyboards/keygem/kg60ansi/config.h +++ b/keyboards/keygem/kg60ansi/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json index 48413f586e..31972fe773 100644 --- a/keyboards/keygem/kg60ansi/info.json +++ b/keyboards/keygem/kg60ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h index 670537b461..eb799efc53 100644 --- a/keyboards/keygem/kg65rgbv2/config.h +++ b/keyboards/keygem/kg65rgbv2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json index 7b4475bd40..8551f905b8 100644 --- a/keyboards/keygem/kg65rgbv2/info.json +++ b/keyboards/keygem/kg65rgbv2/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keyhive/absinthe/config.h b/keyboards/keyhive/absinthe/config.h index ded3dc8236..72df685e63 100644 --- a/keyboards/keyhive/absinthe/config.h +++ b/keyboards/keyhive/absinthe/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 32 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keyhive/absinthe/info.json b/keyboards/keyhive/absinthe/info.json index c57f0ef84e..a6f70196b4 100644 --- a/keyboards/keyhive/absinthe/info.json +++ b/keyboards/keyhive/absinthe/info.json @@ -8,6 +8,9 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3", "D0"], "rows": ["D2", "D1", "B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keyhive/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h index aded22bc7e..1d63f46b12 100644 --- a/keyboards/keyhive/ergosaurus/config.h +++ b/keyboards/keyhive/ergosaurus/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN B6 #define RGBLED_NUM 32 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json index afd25e2785..ae3c684aae 100644 --- a/keyboards/keyhive/ergosaurus/info.json +++ b/keyboards/keyhive/ergosaurus/info.json @@ -7,6 +7,9 @@ "pid": "0xE590", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["D7", "C6", "D0", "D1", "F7", "B1", "B3", "B2"], "rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"] diff --git a/keyboards/keyhive/navi10/keymaps/devdev/config.h b/keyboards/keyhive/navi10/keymaps/devdev/config.h index dba45a5f24..8d8a6df8c9 100644 --- a/keyboards/keyhive/navi10/keymaps/devdev/config.h +++ b/keyboards/keyhive/navi10/keymaps/devdev/config.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define TAPPING_TERM 220 #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D3 + #define WS2812_DI_PIN D3 #define RGBLED_NUM 3 #define RGBLIGHT_LIMIT_VAL 120 diff --git a/keyboards/keyhive/smallice/config.h b/keyboards/keyhive/smallice/config.h index a770d8e47d..97f15c940a 100644 --- a/keyboards/keyhive/smallice/config.h +++ b/keyboards/keyhive/smallice/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json index 476411a004..b3134b1771 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/info.json @@ -8,6 +8,9 @@ "pid": "0x5341", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "F1", "D4", "D6", "D7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "B6", "B5", "B4"] diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h index b706f26ce2..414590f643 100644 --- a/keyboards/keyhive/uno/rev1/config.h +++ b/keyboards/keyhive/uno/rev1/config.h @@ -19,6 +19,5 @@ #define RGBLIGHT_EFFECT_RAINBOW_MOOD #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN F6 #define RGBLED_NUM 1 #endif diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json index 2fc258ee42..69fe9afd77 100644 --- a/keyboards/keyhive/uno/rev1/info.json +++ b/keyboards/keyhive/uno/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h index e940f5fa05..414590f643 100644 --- a/keyboards/keyhive/uno/rev2/config.h +++ b/keyboards/keyhive/uno/rev2/config.h @@ -19,6 +19,5 @@ #define RGBLIGHT_EFFECT_RAINBOW_MOOD #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D1 #define RGBLED_NUM 1 #endif diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json index 66e0ca20e0..0af41bab77 100644 --- a/keyboards/keyhive/uno/rev2/info.json +++ b/keyboards/keyhive/uno/rev2/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "D1" + }, "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} diff --git a/keyboards/keyhive/ut472/config.h b/keyboards/keyhive/ut472/config.h index c007f92fe7..5ab9348126 100644 --- a/keyboards/keyhive/ut472/config.h +++ b/keyboards/keyhive/ut472/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN C6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keyhive/ut472/info.json b/keyboards/keyhive/ut472/info.json index 26aa44379b..9755bd6569 100644 --- a/keyboards/keyhive/ut472/info.json +++ b/keyboards/keyhive/ut472/info.json @@ -8,6 +8,9 @@ "pid": "0x0472", "device_version": "0.0.2" }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["C4", "C5", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5"], "rows": ["D1", "D2", "D3", "D4"] diff --git a/keyboards/keyquest/enclave/config.h b/keyboards/keyquest/enclave/config.h index 94e709e18a..406f38124a 100644 --- a/keyboards/keyquest/enclave/config.h +++ b/keyboards/keyquest/enclave/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once /* RGB light setup*/ -#define RGB_DI_PIN B5 #define RGBLED_NUM 2 #define RGBLIGHT_SLEEP #define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/keyquest/enclave/info.json b/keyboards/keyquest/enclave/info.json index 02a845423f..fa0aef8b79 100644 --- a/keyboards/keyquest/enclave/info.json +++ b/keyboards/keyquest/enclave/info.json @@ -7,6 +7,9 @@ "pid": "0x0E0E", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["B4", "B7", "C7"], "rows": ["D6", "B6", "F5"] diff --git a/keyboards/keysofkings/twokey/config.h b/keyboards/keysofkings/twokey/config.h index 231ead1f33..6fea0e2cb6 100755 --- a/keyboards/keysofkings/twokey/config.h +++ b/keyboards/keysofkings/twokey/config.h @@ -23,7 +23,6 @@ #define LOCKING_RESYNC_ENABLE #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keysofkings/twokey/info.json b/keyboards/keysofkings/twokey/info.json index 6e6d0a31a6..8040b94fac 100644 --- a/keyboards/keysofkings/twokey/info.json +++ b/keyboards/keysofkings/twokey/info.json @@ -8,6 +8,9 @@ "pid": "0xAE12", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B3", "B2"], "rows": ["B4", "B5"] diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/info.json index b066b8767b..05a6f5c8f8 100644 --- a/keyboards/keyspensory/kp60/info.json +++ b/keyboards/keyspensory/kp60/info.json @@ -28,7 +28,6 @@ }, "rgblight": { "led_count": 8, - "pin": "F0", "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, @@ -45,6 +44,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/keystonecaps/gameroyadvance/config.h b/keyboards/keystonecaps/gameroyadvance/config.h index 20abd283ee..adca3366f2 100644 --- a/keyboards/keystonecaps/gameroyadvance/config.h +++ b/keyboards/keystonecaps/gameroyadvance/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN C7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json index 8307f061da..19df3b7916 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/info.json @@ -18,6 +18,9 @@ {"pin_a": "B5", "pin_b": "B4"} ] }, + "ws2812": { + "pin": "C7" + }, "split": { "soft_serial_pin": "D2", "encoder": { diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h index 1369ec04d7..c6fba5ebcf 100644 --- a/keyboards/kikoslab/ellora65/config.h +++ b/keyboards/kikoslab/ellora65/config.h @@ -18,5 +18,4 @@ along with this program. If not, see . #pragma once /*RGB TINGS*/ -#define RGB_DI_PIN E6 #define RGBLED_NUM 12 diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json index 0b78709509..8b8c83fbbc 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/info.json @@ -18,6 +18,9 @@ {"pin_a": "B0", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "E6" + }, "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h index 22a7e65e04..af9ffae03d 100644 --- a/keyboards/kingly_keys/ave/config.h +++ b/keyboards/kingly_keys/ave/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN B7 #if defined(RGBLIGHT_ENABLE) # define RGBLED_NUM 2 # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json index 6950a84a44..0de5b82bdd 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/info.json @@ -18,6 +18,9 @@ {"pin_a": "B2", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json index 4b2c92fd86..b975a4aa68 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/info.json @@ -18,6 +18,9 @@ {"pin_a": "B2", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h index dea4456dd4..719f192955 100644 --- a/keyboards/kingly_keys/little_foot/config.h +++ b/keyboards/kingly_keys/little_foot/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN F4 #define RGBLED_NUM 10 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json index d2206c066c..3b23bead52 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F6", "B6", "B2", "B3", "B1"] diff --git a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h index a8da1ae072..c2bd34ed27 100644 --- a/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h +++ b/keyboards/kingly_keys/romac/keymaps/stanrc85/config.h @@ -1,7 +1,7 @@ #undef RGBLED_NUM #define RGBLED_NUM 16 -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h index 21095a7358..2d715dbe51 100644 --- a/keyboards/kingly_keys/romac_plus/config.h +++ b/keyboards/kingly_keys/romac_plus/config.h @@ -7,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 4 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index abaf8e99f4..96c097db5f 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -18,6 +18,9 @@ {"pin_a": "B3", "pin_b": "B2"} ] }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h index 67ac57d54c..3dba502238 100644 --- a/keyboards/kingly_keys/ropro/config.h +++ b/keyboards/kingly_keys/ropro/config.h @@ -22,9 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json index 2afcd7dc59..51db685d50 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/info.json @@ -18,6 +18,9 @@ {"pin_a": "B7", "pin_b": "D5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h index ada89746af..3982ef54e6 100644 --- a/keyboards/kingly_keys/smd_milk/config.h +++ b/keyboards/kingly_keys/smd_milk/config.h @@ -24,7 +24,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B3 #define RGBLED_NUM 4 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json index bf84afdccc..2fee4b2603 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/info.json @@ -8,6 +8,9 @@ "pid": "0xB195", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["D3"], "rows": ["C5", "D2"] diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h index ef8911b082..682f1a7531 100644 --- a/keyboards/kingly_keys/soap/config.h +++ b/keyboards/kingly_keys/soap/config.h @@ -20,8 +20,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED --- DIN Pin Routed to VIA on main PCB marked "RGB" */ -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json index 61deb7d6e0..b10260aa0b 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.4" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "D5"], "rows": ["C7", "C6"] diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h index 6fa39cf9e6..b51a90cb7e 100644 --- a/keyboards/kira75/config.h +++ b/keyboards/kira75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json index 9b691efd2c..a8b6a76ffb 100644 --- a/keyboards/kira75/info.json +++ b/keyboards/kira75/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h index 92436e41fb..1676967490 100644 --- a/keyboards/kiwikey/borderland/config.h +++ b/keyboards/kiwikey/borderland/config.h @@ -5,7 +5,6 @@ #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN B2 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json index 56f5367bd1..30f8ccc048 100644 --- a/keyboards/kiwikey/borderland/info.json +++ b/keyboards/kiwikey/borderland/info.json @@ -18,6 +18,9 @@ {"pin_a": "F5", "pin_b": "F6"} ] }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h index 13374ee337..ee2c509f2a 100644 --- a/keyboards/kiwikey/kawii9/config.h +++ b/keyboards/kiwikey/kawii9/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 // Ver1: F0, Ver2: D3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json index 4844dd9701..7537e7fe8a 100644 --- a/keyboards/kiwikey/kawii9/info.json +++ b/keyboards/kiwikey/kawii9/info.json @@ -8,6 +8,9 @@ "pid": "0x0303", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["B6", "B5", "B4"] diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h index 337277fadc..dd9288a183 100644 --- a/keyboards/kiwikey/wanderland/config.h +++ b/keyboards/kiwikey/wanderland/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json index a220d57687..eb41a349d0 100644 --- a/keyboards/kiwikey/wanderland/info.json +++ b/keyboards/kiwikey/wanderland/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F7" + }, "indicators": { "caps_lock": "B6", "num_lock": "C6", diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h index 7e634bd2b3..dd6631f545 100644 --- a/keyboards/kona_classic/config.h +++ b/keyboards/kona_classic/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underlight configuration */ -#define RGB_DI_PIN B2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kona_classic/info.json b/keyboards/kona_classic/info.json index d1097921ed..37aef5bd09 100644 --- a/keyboards/kona_classic/info.json +++ b/keyboards/kona_classic/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "cols": ["F0", "F4", "B5", "B4", "D7", "D6", "B0", "B1", "B3", "D2", "B7", "D0", "D1", "D3", "C6", "C7"], "rows": ["F1", "F5", "F6", "F7", "B6"] diff --git a/keyboards/kopibeng/mnk88/config.h b/keyboards/kopibeng/mnk88/config.h index 45ad8961c6..0dc3925db3 100644 --- a/keyboards/kopibeng/mnk88/config.h +++ b/keyboards/kopibeng/mnk88/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN A10 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kopibeng/mnk88/info.json b/keyboards/kopibeng/mnk88/info.json index 5a3b0e6611..de492844c9 100644 --- a/keyboards/kopibeng/mnk88/info.json +++ b/keyboards/kopibeng/mnk88/info.json @@ -8,6 +8,9 @@ "pid": "0x8800", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A10" + }, "matrix_pins": { "cols": ["A2", "A1", "A0", "B11", "B10", "B2", "F1", "B1", "B0", "A7", "A6", "A5", "F0", "A4", "C15", "C14", "C13"], "rows": ["A8", "B15", "A9", "B12", "A3", "B14"] diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h index 269ad00f60..62ad0b5f82 100644 --- a/keyboards/kopibeng/xt60/config.h +++ b/keyboards/kopibeng/xt60/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F6 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json index b6b27ee2fd..f4bee2fc16 100644 --- a/keyboards/kopibeng/xt60/info.json +++ b/keyboards/kopibeng/xt60/info.json @@ -8,6 +8,9 @@ "pid": "0x0600", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F6" + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt60_singa/config.h b/keyboards/kopibeng/xt60_singa/config.h index 269ad00f60..62ad0b5f82 100644 --- a/keyboards/kopibeng/xt60_singa/config.h +++ b/keyboards/kopibeng/xt60_singa/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F6 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json index 6024919cbf..d91224f9af 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/info.json @@ -8,6 +8,9 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F6" + }, "matrix_pins": { "cols": ["C7", "F5", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1"], "rows": ["F7", "F4", "D0", "B3", "B7"] diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h index 9e5acfa2e0..dd2830d020 100644 --- a/keyboards/kopibeng/xt65/config.h +++ b/keyboards/kopibeng/xt65/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D5 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kopibeng/xt65/info.json b/keyboards/kopibeng/xt65/info.json index 730ea16cf1..ccb3fff9e2 100644 --- a/keyboards/kopibeng/xt65/info.json +++ b/keyboards/kopibeng/xt65/info.json @@ -17,6 +17,9 @@ "pin": "B1", "levels": 5 }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/kopibeng/xt8x/config.h b/keyboards/kopibeng/xt8x/config.h index 4210713a65..68270ad5a3 100644 --- a/keyboards/kopibeng/xt8x/config.h +++ b/keyboards/kopibeng/xt8x/config.h @@ -18,7 +18,6 @@ #define INDICATOR_PIN_0 B13 -#define RGB_DI_PIN A10 #define RGBLED_NUM 19 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json index c2985e4fc3..fbd96c2edc 100644 --- a/keyboards/kopibeng/xt8x/info.json +++ b/keyboards/kopibeng/xt8x/info.json @@ -17,6 +17,9 @@ "caps_lock": "B3", "scroll_lock": "A15" }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/info.json index 6c700b37b8..9e99832b3e 100644 --- a/keyboards/kprepublic/bm16a/v1/info.json +++ b/keyboards/kprepublic/bm16a/v1/info.json @@ -31,7 +31,6 @@ "levels": 5 }, "rgblight": { - "pin": "E2", "led_count": 4, "animations": { "breathing": true, @@ -46,6 +45,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "E2" + }, "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h index f4ac9e7a3b..4f8f76b6b8 100644 --- a/keyboards/kprepublic/bm16a/v2/config.h +++ b/keyboards/kprepublic/bm16a/v2/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B9 #define RGB_MATRIX_LED_COUNT 16 #define WS2812_PWM_DRIVER PWMD4 diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/info.json index 927601c448..60d5034931 100644 --- a/keyboards/kprepublic/bm16a/v2/info.json +++ b/keyboards/kprepublic/bm16a/v2/info.json @@ -14,6 +14,7 @@ "rgb_matrix": true }, "ws2812": { + "pin": "B9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/kprepublic/bm16s/config.h b/keyboards/kprepublic/bm16s/config.h index 26be1e8187..fb73fedb04 100755 --- a/keyboards/kprepublic/bm16s/config.h +++ b/keyboards/kprepublic/bm16s/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json index 40d24a05d8..262ce39fba 100644 --- a/keyboards/kprepublic/bm16s/info.json +++ b/keyboards/kprepublic/bm16s/info.json @@ -8,6 +8,9 @@ "pid": "0x016B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F7", "F6", "D4", "D6"], "rows": ["D1", "D0", "D3", "D2"] diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h index 60324e48b1..f6b358d2bb 100755 --- a/keyboards/kprepublic/bm40hsrgb/config.h +++ b/keyboards/kprepublic/bm40hsrgb/config.h @@ -21,7 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 53 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json index 68a9803759..02c02cf6a5 100644 --- a/keyboards/kprepublic/bm40hsrgb/info.json +++ b/keyboards/kprepublic/bm40hsrgb/info.json @@ -8,6 +8,9 @@ "pid": "0x3430", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "B2", "E6", "B5"] diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h index fc549b862d..d48bc690b1 100644 --- a/keyboards/kprepublic/bm43a/config.h +++ b/keyboards/kprepublic/bm43a/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json index 9bb98c34ab..60d6373b30 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h index 151488c516..3e8def8541 100755 --- a/keyboards/kprepublic/bm43hsrgb/config.h +++ b/keyboards/kprepublic/bm43hsrgb/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 53 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json index c9f0fd458a..5e2fb50983 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"], "rows": ["E6", "B6", "B4", "B5"] diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h index df94a6d357..8f4ab997f4 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 69 # define RGBLED_NUM 69 # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json index 4df7872080..5b28d04f14 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF8C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h index bc48c2ec34..dcb7dfcd00 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h @@ -18,7 +18,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json index 9fe0adf4f4..4c0f4e11af 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x1121", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h index bf7208c547..a11d579239 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 69 #define RGBLED_NUM 69 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json index e90e82c48d..4554cd6bf8 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF9C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h index c7426a407a..eada5a6c85 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h @@ -18,7 +18,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json index 579048eb09..4dadcc450c 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x1124", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h index bbfeb14e39..62008d679a 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 70 # define RGBLED_NUM 70 # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json index ab1e8a496b..5511d3d00b 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF8C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h index c1beccdeab..29e89da4d4 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h @@ -20,7 +20,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index 4433cc0cc8..9699a7d3c3 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x1123", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h index 5382f10e8c..a831ee9a7d 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 67 #define RGBLED_NUM 67 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json index 2714ccd654..230f141f22 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF8D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index 9a43993d23..ce593d1605 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -18,7 +18,6 @@ //rgb light setting #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index 9e99df16ad..4320fb9295 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x1122", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h index 9bd8375e25..e2522723fc 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN E2 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 73 #define RGBLED_NUM 73 diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json index ff1251cd5d..c5f617d281 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF6E", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h index 501e7d6a52..5fb9ee0e98 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Force NKRO */ #define FORCE_NKRO -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 74 #define RGBLED_NUM 74 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json index 89946b8f2a..97b0acfbd4 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0653", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h index ee7d425a76..c7b27fab46 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN E2 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 74 # define RGBLED_NUM 74 diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json index 35d2b1b6bf..3a1c8ff16c 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xEF6F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h index 3f1d379135..2810b2096e 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h @@ -20,7 +20,6 @@ #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json index a8a2679ae3..9f2cc9266d 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x1131", "device_version": "0.0.2" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D6", "D4", "D5", "D3", "F6"] diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h index 8ae02d0c63..a9ba033fb0 100644 --- a/keyboards/kprepublic/bm80hsrgb/config.h +++ b/keyboards/kprepublic/bm80hsrgb/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 87 diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json index fa9b724724..93ca1c86d8 100644 --- a/keyboards/kprepublic/bm80hsrgb/info.json +++ b/keyboards/kprepublic/bm80hsrgb/info.json @@ -8,6 +8,9 @@ "pid": "0xEF83", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"], "rows": ["B3", "B2", "B1", "B0", "C6", "C7"] diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h index fa4093651f..7ecc626803 100644 --- a/keyboards/kprepublic/bm980hsrgb/config.h +++ b/keyboards/kprepublic/bm980hsrgb/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 - // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 98 # define RGBLED_NUM 98 diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json index 3856b0b681..7993c49e30 100644 --- a/keyboards/kprepublic/bm980hsrgb/info.json +++ b/keyboards/kprepublic/bm980hsrgb/info.json @@ -19,6 +19,9 @@ "scroll_lock": "E2", "on_state": 0 }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h index 250391e5e0..f6154f76d4 100644 --- a/keyboards/kprepublic/cospad/config.h +++ b/keyboards/kprepublic/cospad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F6 #define RGBLED_NUM 4 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json index 1e93359aac..1814b50464 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/info.json @@ -17,6 +17,9 @@ "pin": "F7", "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "indicators": { "num_lock": "B2", "on_state": 0 diff --git a/keyboards/kprepublic/jj50/config.h b/keyboards/kprepublic/jj50/config.h index 0b5a4ea80e..3220fd6477 100644 --- a/keyboards/kprepublic/jj50/config.h +++ b/keyboards/kprepublic/jj50/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h index 716b36a6e8..2c6034f7be 100644 --- a/keyboards/ktec/daisy/config.h +++ b/keyboards/ktec/daisy/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 12 # define RGBLIGHT_SAT_STEP 25 diff --git a/keyboards/ktec/daisy/info.json b/keyboards/ktec/daisy/info.json index 7ab279ba6a..db1711eacb 100644 --- a/keyboards/ktec/daisy/info.json +++ b/keyboards/ktec/daisy/info.json @@ -21,6 +21,9 @@ "caps_lock": "C6", "on_state": 0 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h index 23c362c0aa..a76ebef341 100755 --- a/keyboards/ktec/staryu/config.h +++ b/keyboards/ktec/staryu/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN C6 #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 02189fecf7..041cd63cf9 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -15,6 +15,9 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "C6" + }, "processor": "atmega32u2", "bootloader": "lufa-dfu", "matrix_pins": { diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h index 789626b6da..7506090b1e 100644 --- a/keyboards/kudox/columner/config.h +++ b/keyboards/kudox/columner/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json index eaf29de641..75d5c77bc8 100644 --- a/keyboards/kudox/columner/info.json +++ b/keyboards/kudox/columner/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h index 9b6ab4664d..80ac84c64f 100644 --- a/keyboards/kudox/rev1/config.h +++ b/keyboards/kudox/rev1/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json index 8a3496f111..c5a9427933 100644 --- a/keyboards/kudox/rev1/info.json +++ b/keyboards/kudox/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h index 9b6ab4664d..80ac84c64f 100644 --- a/keyboards/kudox/rev2/config.h +++ b/keyboards/kudox/rev2/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json index f6070be58e..858f28988d 100644 --- a/keyboards/kudox/rev2/info.json +++ b/keyboards/kudox/rev2/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h index 789626b6da..7506090b1e 100644 --- a/keyboards/kudox/rev3/config.h +++ b/keyboards/kudox/rev3/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json index 143c8736fc..d3abd78b62 100644 --- a/keyboards/kudox/rev3/info.json +++ b/keyboards/kudox/rev3/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h index f277e60187..84d08bce54 100644 --- a/keyboards/kudox_full/rev1/config.h +++ b/keyboards/kudox_full/rev1/config.h @@ -8,9 +8,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json index cad4c708e1..98e109e24c 100644 --- a/keyboards/kudox_full/rev1/info.json +++ b/keyboards/kudox_full/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h index 28bfb4a71c..5fddd8102a 100644 --- a/keyboards/kudox_game/rev1/config.h +++ b/keyboards/kudox_game/rev1/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json index ea3c15bd64..d9fdf0ae35 100644 --- a/keyboards/kudox_game/rev1/info.json +++ b/keyboards/kudox_game/rev1/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h index 7f699d18d8..7b6ef67bd9 100644 --- a/keyboards/kudox_game/rev2/config.h +++ b/keyboards/kudox_game/rev2/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json index 5957916420..23e30a71c5 100644 --- a/keyboards/kudox_game/rev2/info.json +++ b/keyboards/kudox_game/rev2/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h index 115201c753..f782e9069b 100644 --- a/keyboards/kuro/kuro65/config.h +++ b/keyboards/kuro/kuro65/config.h @@ -19,8 +19,6 @@ /* RGB Matrix defines*/ #ifdef RGB_MATRIX_ENABLE -// The pin connected to the data pin of the LEDs -# define RGB_DI_PIN E6 // The number of LEDs connected # define RGB_MATRIX_LED_COUNT 69 diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 648e1f9abb..d878152e9e 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -31,6 +31,9 @@ "key_lock": false, "rgb_matrix": true }, + "ws2812": { + "pin": "E6" + }, "community_layouts": [ "65_iso" ], "layouts": { "LAYOUT_65_iso": { diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h index 7261bdb1d1..0a7038363d 100644 --- a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h +++ b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h @@ -16,7 +16,7 @@ #pragma once // ws2812 options -#define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to +#define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 4 // number of LEDs #define RGBLIGHT_DEFAULT_MODE 6 // set the rainbow mode diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h index a4f340ba5f..a06078bce1 100644 --- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h +++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h @@ -16,7 +16,7 @@ #pragma once // ws2812 options -#define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to +#define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to #define RGBLED_NUM 4 // number of LEDs #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h index 69d0ac691c..ce01f7a3ea 100644 --- a/keyboards/labyrinth75/config.h +++ b/keyboards/labyrinth75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 //D5 could also be the other pin maybe #define RGBLED_NUM 6 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json index 74741317f7..eb5f59869f 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [0, 2] }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/laser_ninja/pumpkin_pad/config.h b/keyboards/laser_ninja/pumpkin_pad/config.h index f8743ddbc0..f42e9c1025 100644 --- a/keyboards/laser_ninja/pumpkin_pad/config.h +++ b/keyboards/laser_ninja/pumpkin_pad/config.h @@ -18,7 +18,6 @@ #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN A10 # define RGB_MATRIX_LED_COUNT 28 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define ENABLE_RGB_MATRIX_ALPHAS_MODS diff --git a/keyboards/laser_ninja/pumpkin_pad/info.json b/keyboards/laser_ninja/pumpkin_pad/info.json index 8756d34e49..d02445d588 100644 --- a/keyboards/laser_ninja/pumpkin_pad/info.json +++ b/keyboards/laser_ninja/pumpkin_pad/info.json @@ -26,6 +26,9 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A10" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h index ac78eb6330..8b64704638 100644 --- a/keyboards/latincompass/latin17rgb/config.h +++ b/keyboards/latincompass/latin17rgb/config.h @@ -85,7 +85,6 @@ # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) #endif -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json index d4caabc507..91fb684f9b 100644 --- a/keyboards/latincompass/latin17rgb/info.json +++ b/keyboards/latincompass/latin17rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x7C97", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h index 13c9d76aa1..f702d60979 100644 --- a/keyboards/latincompass/latin47ble/config.h +++ b/keyboards/latincompass/latin47ble/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json index a76e893f9b..d52f51352d 100644 --- a/keyboards/latincompass/latin47ble/info.json +++ b/keyboards/latincompass/latin47ble/info.json @@ -13,6 +13,9 @@ "rows": ["D0", "D1", "D2", "D3"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["planck_mit"], diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h index 3a4b3ef671..01a956c30c 100644 --- a/keyboards/latincompass/latin64ble/config.h +++ b/keyboards/latincompass/latin64ble/config.h @@ -15,8 +15,6 @@ along with this program. If not, see .*/ #pragma once -#define RGB_DI_PIN B7 - #define RGBLED_NUM 2 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json index 24a7581686..06e1345ea2 100644 --- a/keyboards/latincompass/latin64ble/info.json +++ b/keyboards/latincompass/latin64ble/info.json @@ -8,6 +8,9 @@ "pid": "0x6C71", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"], "rows": ["D0", "D1", "D2", "D3", "D6", "D7", "B5", "B6"] diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h index 8059b4d070..d166baebc7 100644 --- a/keyboards/latincompass/latinpad/config.h +++ b/keyboards/latincompass/latinpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see .*/ #pragma once #define SSD1306OLED -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json index c5a844141b..6c5bfe720e 100644 --- a/keyboards/latincompass/latinpad/info.json +++ b/keyboards/latincompass/latinpad/info.json @@ -19,6 +19,9 @@ {"pin_a": "B5", "pin_b": "B6"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h index b21508ce4d..56c80f7295 100644 --- a/keyboards/latincompass/latinpadble/config.h +++ b/keyboards/latincompass/latinpadble/config.h @@ -21,8 +21,6 @@ along with this program. If not, see .*/ // #define NO_ACTION_TAPPING // #define NO_ACTION_ONESHOT -#define RGB_DI_PIN B7 - #define RGBLED_NUM 4 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json index bb0dee70ba..19b0604f80 100644 --- a/keyboards/latincompass/latinpadble/info.json +++ b/keyboards/latincompass/latinpadble/info.json @@ -18,6 +18,9 @@ {"pin_a": "C7", "pin_b": "F7"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h index 53f60d653f..218631d1d5 100644 --- a/keyboards/lazydesigners/bolt/config.h +++ b/keyboards/lazydesigners/bolt/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RBG underglow */ -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json index 9ce7c22aba..4a6755f5d5 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/info.json @@ -8,6 +8,9 @@ "pid": "0x0041", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "C6", "B3", "B7", "D0", "D3", "D2", "D1"], "rows": ["F0", "C7", "B6", "D5"] diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h index 467bd22735..23284233ef 100755 --- a/keyboards/lazydesigners/cassette8/config.h +++ b/keyboards/lazydesigners/cassette8/config.h @@ -17,7 +17,6 @@ #pragma once /* RBG underglow */ -#define RGB_DI_PIN C2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json index 7adcc62868..d01080fabf 100755 --- a/keyboards/lazydesigners/cassette8/info.json +++ b/keyboards/lazydesigners/cassette8/info.json @@ -8,6 +8,9 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C2" + }, "matrix_pins": { "cols": ["B5", "B4", "B1", "B0"], "rows": ["B3", "B2"] diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h index 4f129374cd..0dc7502eac 100644 --- a/keyboards/lazydesigners/dimple/config.h +++ b/keyboards/lazydesigners/dimple/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* RBG underglow */ -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index 886f86ef2d..a5fc41c143 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -13,6 +13,9 @@ "rows": ["D0", "D1", "D2", "D3"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json index e15b6fe207..a9b5b8751a 100644 --- a/keyboards/lazydesigners/dimple/staggered/info.json +++ b/keyboards/lazydesigners/dimple/staggered/info.json @@ -8,6 +8,9 @@ "pid": "0x0040", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h index d5722dd113..828667122d 100644 --- a/keyboards/lazydesigners/dimpleplus/config.h +++ b/keyboards/lazydesigners/dimpleplus/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RBG underglow */ -#define RGB_DI_PIN D2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json index 8327b8a853..cf05ed2c9b 100644 --- a/keyboards/lazydesigners/dimpleplus/info.json +++ b/keyboards/lazydesigners/dimpleplus/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h index c2a827ca3e..8a326c3ba0 100644 --- a/keyboards/lazydesigners/the40/config.h +++ b/keyboards/lazydesigners/the40/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json index 8562a87aec..78c020d65b 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h index b69bb222b6..366d9d3325 100644 --- a/keyboards/lazydesigners/the50/config.h +++ b/keyboards/lazydesigners/the50/config.h @@ -6,6 +6,5 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E6 #define RGBLED_NUM 1 #define RGBLIGHT_SLEEP diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index e9f722d9a6..3b8f808e4d 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 6 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h index 41dc029181..19bd7fbb1f 100755 --- a/keyboards/lazydesigners/the60/rev2/config.h +++ b/keyboards/lazydesigners/the60/rev2/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN D1 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json index dbb27a4ea2..62eddefa13 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h index 3c6bf4e8a9..d8b9a4fa0b 100644 --- a/keyboards/leafcutterlabs/bigknob/config.h +++ b/keyboards/leafcutterlabs/bigknob/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN C7 //D3 - underglow C7 - backlight #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json index 55d5fe13ee..bce699e5c7 100644 --- a/keyboards/leafcutterlabs/bigknob/info.json +++ b/keyboards/leafcutterlabs/bigknob/info.json @@ -13,6 +13,9 @@ {"pin_a": "D0", "pin_b": "D2"} ] }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index 2135f04351..a54a63fd48 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -25,8 +25,8 @@ along with this program. If not, see . // #define _MASTER_RIGHT // #define EE_HANDS -#undef RGB_DI_PIN -#define RGB_DI_PIN D3 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN D3 #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/lets_split/keymaps/zer09/config.h b/keyboards/lets_split/keymaps/zer09/config.h index 36d94824d5..6cdb6dd8b4 100644 --- a/keyboards/lets_split/keymaps/zer09/config.h +++ b/keyboards/lets_split/keymaps/zer09/config.h @@ -45,7 +45,7 @@ along with this program. If not, see . /* ws2812 RGB LED */ #undef RGBLED_NUM -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 50 #endif diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index 7846c3d013..a7b7c4843e 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 16 // Number of LEDs /* diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/info.json index 62f23348ef..3c9cea5e5e 100644 --- a/keyboards/lets_split/rev1/info.json +++ b/keyboards/lets_split/rev1/info.json @@ -14,6 +14,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index 8ae5b7143d..a30fed6078 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/lets_split/rev2/info.json b/keyboards/lets_split/rev2/info.json index 98f0b50965..0cbada3605 100644 --- a/keyboards/lets_split/rev2/info.json +++ b/keyboards/lets_split/rev2/info.json @@ -14,6 +14,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "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}] diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h index 735d76e96d..3655ec19c5 100644 --- a/keyboards/lets_split/sockets/config.h +++ b/keyboards/lets_split/sockets/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D4 - #define RGBLED_NUM 12 // Number of LEDs /* Audio settings */ diff --git a/keyboards/lets_split/sockets/info.json b/keyboards/lets_split/sockets/info.json index 3a80767886..7ff2deb91c 100644 --- a/keyboards/lets_split/sockets/info.json +++ b/keyboards/lets_split/sockets/info.json @@ -14,6 +14,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D4" + }, "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}] diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h index db11cabd45..ae682e447f 100644 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ b/keyboards/lfkeyboards/lfk65_hs/config.h @@ -4,7 +4,6 @@ #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} -#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile #define RGBLED_NUM 20 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index a45b0ff788..bc92cf80fc 100644 --- a/keyboards/lfkeyboards/lfk65_hs/info.json +++ b/keyboards/lfkeyboards/lfk65_hs/info.json @@ -16,6 +16,9 @@ "backlight": { "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h index 021f187638..5748d29987 100644 --- a/keyboards/lfkeyboards/lfk78/config.h +++ b/keyboards/lfkeyboards/lfk78/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define AUDIO_PIN C6 #define AUDIO_VOICES -#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_VAL_STEP 17 diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json index 80f734a658..cfc1baf28c 100644 --- a/keyboards/lfkeyboards/lfk78/revb/info.json +++ b/keyboards/lfkeyboards/lfk78/revb/info.json @@ -17,6 +17,9 @@ "driver": "custom", "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json index 9ce1fbff5b..d1062dee05 100644 --- a/keyboards/lfkeyboards/lfk78/revc/info.json +++ b/keyboards/lfkeyboards/lfk78/revc/info.json @@ -17,6 +17,9 @@ "driver": "custom", "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json index 78c63c82de..34c703f6a6 100644 --- a/keyboards/lfkeyboards/lfk78/revj/info.json +++ b/keyboards/lfkeyboards/lfk78/revj/info.json @@ -17,6 +17,9 @@ "driver": "custom", "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h index 3120a184e6..7d583ed3ea 100644 --- a/keyboards/lfkeyboards/lfk87/config.h +++ b/keyboards/lfkeyboards/lfk87/config.h @@ -42,7 +42,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} -#define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json index 9ba48f7b29..be984e0eea 100644 --- a/keyboards/lfkeyboards/lfk87/info.json +++ b/keyboards/lfkeyboards/lfk87/info.json @@ -12,6 +12,9 @@ "driver": "custom", "levels": 10 }, + "ws2812": { + "pin": "F4" + }, "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h index 80bfbee9d1..5393e47b39 100644 --- a/keyboards/lfkeyboards/lfkpad/config.h +++ b/keyboards/lfkeyboards/lfkpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile # define RGBLED_NUM 28 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/info.json index 0a41696cdc..d4abb0abdd 100644 --- a/keyboards/lfkeyboards/lfkpad/info.json +++ b/keyboards/lfkeyboards/lfkpad/info.json @@ -8,6 +8,9 @@ "pid": "0x3231", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["F1", "F0", "D4", "D6"], "rows": ["D5", "F4", "F6", "F7", "C7", "C6"] diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h index f1af54183d..c367ad95c3 100644 --- a/keyboards/lfkeyboards/mini1800/config.h +++ b/keyboards/lfkeyboards/mini1800/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} -#define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json index 4328a52883..84fe6bd472 100644 --- a/keyboards/lfkeyboards/mini1800/info.json +++ b/keyboards/lfkeyboards/mini1800/info.json @@ -17,6 +17,9 @@ "driver": "custom", "levels": 10 }, + "ws2812": { + "pin": "F4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index b746d90232..af7f6b17b8 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -33,7 +33,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} -#define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile #define RGBLED_NUM 20 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json index 9acfb814aa..57e53e809b 100644 --- a/keyboards/lfkeyboards/smk65/revb/info.json +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -5,6 +5,9 @@ "backlight": { "levels": 8 }, + "ws2812": { + "pin": "C7" + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h index 70ab0030c4..0f78f92d72 100644 --- a/keyboards/lily58/glow_enc/config.h +++ b/keyboards/lily58/glow_enc/config.h @@ -20,8 +20,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 - #define RGBLED_NUM 72 // Number of LEDs #define RGBLED_SPLIT { 36, 36 } diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 47911a04a2..3f3e9e8e94 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -34,6 +34,9 @@ } } }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h index 08ee5dcd82..91934e61c0 100644 --- a/keyboards/lily58/light/config.h +++ b/keyboards/lily58/light/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_SPLIT { 35, 35 } #define RGBLED_NUM 70 #define RGBLIGHT_SPLIT diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index fcbae26163..4db30403f7 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -35,6 +35,9 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/lily58/r2g/config.h b/keyboards/lily58/r2g/config.h index 9770e28a53..dc6cee3af7 100644 --- a/keyboards/lily58/r2g/config.h +++ b/keyboards/lily58/r2g/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN D3 # define RGB_MATRIX_LED_COUNT 74 # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_LED_FLUSH_LIMIT 16 diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json index 909cc78f18..a5041a62a5 100644 --- a/keyboards/lily58/r2g/info.json +++ b/keyboards/lily58/r2g/info.json @@ -24,6 +24,9 @@ "enabled": true, "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 8417a2ee2a..8e94f9f62b 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index a484904923..4ce69ea5f5 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -20,6 +20,9 @@ "enabled": true, "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/linworks/fave65h/config.h b/keyboards/linworks/fave65h/config.h index 580504616a..2c8d4845b1 100644 --- a/keyboards/linworks/fave65h/config.h +++ b/keyboards/linworks/fave65h/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* Define RGB */ #define RGBLED_NUM 67 #define RGB_MATRIX_LED_COUNT 67 -#define RGB_DI_PIN B0 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json index ab777aa504..bc53e4cb0f 100644 --- a/keyboards/linworks/fave65h/info.json +++ b/keyboards/linworks/fave65h/info.json @@ -13,6 +13,9 @@ "rows": ["D1", "D0", "D2", "D3", "D5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h index 516f30e96f..5ce329db0a 100644 --- a/keyboards/linworks/fave84h/config.h +++ b/keyboards/linworks/fave84h/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 126 -#define RGB_DI_PIN D2 #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index 95df89fd4e..7d19a24cb1 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -15,6 +15,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"], "rows": ["B1", "B2", "B3", "D3", "D1", "D0"] diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h index b0d41d41df..fb227ca802 100644 --- a/keyboards/linworks/fave87/config.h +++ b/keyboards/linworks/fave87/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define FORCE_NKRO /* Underglow */ -#define RGB_DI_PIN E2 #define RGBLED_NUM 40 #define RGBLIGHT_SLEEP // Turns LEDs off if the PC goes to sleep/shutdown #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index 72649cc331..2694d09930 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -16,6 +16,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h index 8c842171fb..ef57446100 100644 --- a/keyboards/linworks/fave87h/config.h +++ b/keyboards/linworks/fave87h/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* Define RGB */ #define RGBLED_NUM 87 #define RGB_MATRIX_LED_COUNT 87 -#define RGB_DI_PIN D2 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json index ca4de53de9..e1d679d05c 100644 --- a/keyboards/linworks/fave87h/info.json +++ b/keyboards/linworks/fave87h/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"], "rows": ["B1", "B2", "B3", "D3", "D1", "D0"] diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index f6ba28fd80..66c5212371 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_OUTPUT_FREQUENCY 1000 // Increases backlight PWM freq if compiled with an unmerged PR. Does no harm without it. /* Underglow */ -#define RGB_DI_PIN B9 #define WS2812_EXTERNAL_PULLUP // This board uses a pull-up + 5 V tolerant GPIO in open drain config ro generate a 5 V signal #define RGBLED_NUM 18 /* section for PWM WS2812 driver */ diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index eae4cbea5d..c95cffb9c9 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -8,6 +8,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h index 343830cf87..bd2aa9c26b 100644 --- a/keyboards/littlealby/mute/config.h +++ b/keyboards/littlealby/mute/config.h @@ -18,6 +18,5 @@ #define USB_MAX_POWER_CONSUMPTION 100 #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B6 #define RGBLED_NUM 1 #endif diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json index 8837e60778..9d2a172116 100644 --- a/keyboards/littlealby/mute/info.json +++ b/keyboards/littlealby/mute/info.json @@ -8,6 +8,9 @@ "pid": "0x4D55", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h index c6118b9baf..b4d4367f1d 100644 --- a/keyboards/ll3macorn/bongopad/config.h +++ b/keyboards/ll3macorn/bongopad/config.h @@ -3,7 +3,6 @@ #pragma once /* rgb underglow */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 6 /* misc */ diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json index 9d5e1fd5d5..ff276547ea 100644 --- a/keyboards/ll3macorn/bongopad/info.json +++ b/keyboards/ll3macorn/bongopad/info.json @@ -21,6 +21,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h index 50b7e405d2..b4b2fc9f9e 100644 --- a/keyboards/lm_keyboard/lm60n/config.h +++ b/keyboards/lm_keyboard/lm60n/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 41 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/lm_keyboard/lm60n/info.json b/keyboards/lm_keyboard/lm60n/info.json index 386a527553..73d8a51372 100644 --- a/keyboards/lm_keyboard/lm60n/info.json +++ b/keyboards/lm_keyboard/lm60n/info.json @@ -17,6 +17,9 @@ "caps_lock": "C7", "num_lock": "B7" }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h index fcdb393a03..00fde9ed33 100644 --- a/keyboards/loki65/config.h +++ b/keyboards/loki65/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define WS2812_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#define RGB_DI_PIN A9 #define RGBLED_NUM 37 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/loki65/info.json b/keyboards/loki65/info.json index 71f21a78f3..183cb85a43 100644 --- a/keyboards/loki65/info.json +++ b/keyboards/loki65/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/longnald/corin/config.h b/keyboards/longnald/corin/config.h index 7ad280d763..ed18cd96b9 100644 --- a/keyboards/longnald/corin/config.h +++ b/keyboards/longnald/corin/config.h @@ -18,7 +18,6 @@ #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 64 # define RGBLIGHT_HUE_STEP 20 # define RGBLIGHT_SAT_STEP 20 diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json index 6706662cd0..f639adb39a 100644 --- a/keyboards/longnald/corin/info.json +++ b/keyboards/longnald/corin/info.json @@ -8,6 +8,9 @@ "pid": "0x1024", "device_version": "0.0.4" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F7", "F6", "F1", "F5", "B1", "E6", "D4", "B7", "D1", "D2", "D0", "B4", "B6", "C6", "C7"], "rows": ["F4", "F0", "B2", "B3", "D5"] diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h index 0f9730066e..d8dd76c62d 100644 --- a/keyboards/lz/erghost/config.h +++ b/keyboards/lz/erghost/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 28 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json index 0ba1055fe3..b1e4ea8f29 100644 --- a/keyboards/lz/erghost/info.json +++ b/keyboards/lz/erghost/info.json @@ -12,6 +12,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "D6", "num_lock": "D7", diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h index d7722de7c2..918edbdbb0 100644 --- a/keyboards/manta60/config.h +++ b/keyboards/manta60/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 1 -#define RGB_DI_PIN D3 # define RGBLED_NUM 68 # define RGBLIGHT_SPLIT # define RGBLED_SPLIT { 34, 34 } diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json index 15594fe13c..2802f75821 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index dab95cea0e..3d4d25aad3 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -18,6 +18,5 @@ along with this program. If not, see . #pragma once /* RGB Pins */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 2 #define RGBLIGHT_LIMIT_VAL 10 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index e0ed26f010..ad7bf1e556 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -18,6 +18,9 @@ {"pin_a": "C6", "pin_b": "C7"} ] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h index 6f4decad61..59679e2753 100644 --- a/keyboards/maple_computing/6ball/config.h +++ b/keyboards/maple_computing/6ball/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN F7 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json index bed6b1fdda..b799baa28c 100644 --- a/keyboards/maple_computing/6ball/info.json +++ b/keyboards/maple_computing/6ball/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F4", "D4", "B5", "B6", "B2", "F6"], "rows": ["F5"] diff --git a/keyboards/maple_computing/c39/keymaps/drashna/config.h b/keyboards/maple_computing/c39/keymaps/drashna/config.h index e48bc46ca8..5b4f82c9b1 100644 --- a/keyboards/maple_computing/c39/keymaps/drashna/config.h +++ b/keyboards/maple_computing/c39/keymaps/drashna/config.h @@ -24,7 +24,7 @@ #define MATRIX_ROW_PINS \ { B7, B1, B0 } -#define RGB_DI_PIN B10 +#define WS2812_DI_PIN B10 #define RGBLED_NUM 15 #define SOLENOID_PIN B11 diff --git a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h index 33bb381a4e..bc77f77e49 100644 --- a/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h +++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h @@ -29,6 +29,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN D0 +# define WS2812_DI_PIN D0 # define RGBLED_NUM 4 #endif // !RGBLIGHT_ENABLE diff --git a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h index b68a1ee51e..6b65e2dcc3 100644 --- a/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h @@ -16,8 +16,8 @@ #pragma once /* Underlight Configuration */ - #undef RGB_DI_PIN - #define RGB_DI_PIN F4 + #undef WS2812_DI_PIN + #define WS2812_DI_PIN F4 #undef RGBLED_NUM #define RGBLED_NUM 2 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h index 3ee1ec3013..3d47ae41e7 100644 --- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h @@ -1,7 +1,7 @@ #pragma once /* Underlight Configuration */ -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h index 7329440ee1..fb64366e6f 100644 --- a/keyboards/maple_computing/launchpad/keymaps/drashna/config.h +++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h @@ -17,8 +17,8 @@ #pragma once /* Underlight Configuration */ -#undef RGB_DI_PIN -#define RGB_DI_PIN F5 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN F5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index aecb3f02bd..7cf73259b4 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGBLED_NUM 10 -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index fe882742c3..81c23850ec 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F6" + }, "matrix_pins": { "cols": ["D2", "F7"], "rows": ["C6", "B1", "B3", "D7"] diff --git a/keyboards/maple_computing/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h index 0a12b77265..c64be02975 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/eh/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN B2 #define RGBLED_NUM 12 // Number of LEDs (each hand) #define RGBLED_SPLIT { 6, 6 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index 73a0f5651f..1908f56eeb 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "B2" + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/maple_computing/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h index e51d11b241..6780e524ab 100644 --- a/keyboards/maple_computing/minidox/keymaps/alairock/config.h +++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h @@ -27,7 +27,7 @@ along with this program. If not, see . #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h index 91ef94841e..d0f15e7d19 100644 --- a/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h +++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h index 023781e111..fe4212d6c4 100644 --- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h +++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h @@ -26,7 +26,7 @@ along with this program. If not, see . #define EE_HANDS /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h index d6c805d7c5..e3b34d1bf0 100644 --- a/keyboards/maple_computing/the_ruler/config.h +++ b/keyboards/maple_computing/the_ruler/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN E6 // The pin your RGB strip is wired to #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json index ef80f02bfa..336d48af4c 100644 --- a/keyboards/maple_computing/the_ruler/info.json +++ b/keyboards/maple_computing/the_ruler/info.json @@ -8,6 +8,9 @@ "pid": "0x6007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "C6"], "rows": ["C7"] diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h index 81456d8caa..5de3d8b15d 100644 --- a/keyboards/marksard/leftover30/config.h +++ b/keyboards/marksard/leftover30/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index 7aca7e75df..e6d482fcde 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json @@ -18,6 +18,9 @@ {"pin_a": "F4", "pin_b": "F5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index e8d681ff7f..32927c4506 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE #define RGBLED_NUM 40 #define RGBLED_SPLIT {20, 20} diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json index 376101c642..6bb2d54887 100644 --- a/keyboards/marksard/rhymestone/rev1/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x10"], diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index 3524cb7f45..22435108df 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index a66783b8c9..0ab62d9cde 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.1.5" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6"], "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "F4", "F5"] diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index 36f4dce58d..1f3a9ec168 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index f7b19c63fa..6e75600e8e 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "device_version": "0.1.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7"], "rows": ["F1", "F0", "E6", "B2", "B4", "D7", "D6", "D4"] diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index 169c09cc0a..5379417262 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #ifndef RS_EXTRA_LED #define RGBLED_NUM 12 #define RGBLED_SPLIT {12, 0} diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json index 7d36463643..6b24cc27e3 100644 --- a/keyboards/marksard/treadstone48/rev1/info.json +++ b/keyboards/marksard/treadstone48/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h index 4919c1072e..a605380716 100644 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ b/keyboards/marksard/treadstone48/rev2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index 403cd17ebe..223fff5818 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0xDFA3", "device_version": "0.2.0" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h index d5aefdcdd3..31d395f570 100644 --- a/keyboards/massdrop/thekey/config.h +++ b/keyboards/massdrop/thekey/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B1 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json index 5100c77dc2..73b640b11c 100644 --- a/keyboards/massdrop/thekey/info.json +++ b/keyboards/massdrop/thekey/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/massdrop/thekey_v2/config.h b/keyboards/massdrop/thekey_v2/config.h index d26d586264..82744c137c 100644 --- a/keyboards/massdrop/thekey_v2/config.h +++ b/keyboards/massdrop/thekey_v2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B1 #define RGBLED_NUM 5 #define RGBLIGHT_LED_MAP {4, 0, 1, 2, 3} #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/massdrop/thekey_v2/info.json b/keyboards/massdrop/thekey_v2/info.json index f1079147bc..b54cec2268 100644 --- a/keyboards/massdrop/thekey_v2/info.json +++ b/keyboards/massdrop/thekey_v2/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D2", "D1", "D0"], "rows": ["D4"] diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h index ba603684a5..a1eaecf36e 100644 --- a/keyboards/matrix/abelx/config.h +++ b/keyboards/matrix/abelx/config.h @@ -91,7 +91,6 @@ // rgb light setting #define RGBLED_NUM 9 -#define RGB_DI_PIN B4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/abelx/info.json b/keyboards/matrix/abelx/info.json index c76da33292..60a272dc1f 100644 --- a/keyboards/matrix/abelx/info.json +++ b/keyboards/matrix/abelx/info.json @@ -8,6 +8,9 @@ "pid": "0xAB87", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/matrix/cain_re/config.h b/keyboards/matrix/cain_re/config.h index 70e5bca590..017961460c 100644 --- a/keyboards/matrix/cain_re/config.h +++ b/keyboards/matrix/cain_re/config.h @@ -19,8 +19,6 @@ #pragma once -#define RGB_DI_PIN E6 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/info.json index b5020cb3db..f97a28bfbc 100644 --- a/keyboards/matrix/cain_re/info.json +++ b/keyboards/matrix/cain_re/info.json @@ -8,6 +8,9 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"], "rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"] diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h index 21177855ec..d817e8b6f2 100644 --- a/keyboards/matrix/falcon/config.h +++ b/keyboards/matrix/falcon/config.h @@ -28,7 +28,6 @@ //rgb light setting #define RGBLED_NUM 4 -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json index c692e1c4ee..7aa9a28373 100644 --- a/keyboards/matrix/falcon/info.json +++ b/keyboards/matrix/falcon/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "E2" }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h index 7388b0ccd8..f0ad633575 100644 --- a/keyboards/matrix/m12og/rev1/config.h +++ b/keyboards/matrix/m12og/rev1/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW /* RGB */ -#define RGB_DI_PIN B8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json index 434b28fbf2..37eadece52 100644 --- a/keyboards/matrix/m12og/rev1/info.json +++ b/keyboards/matrix/m12og/rev1/info.json @@ -12,6 +12,9 @@ "caps_lock": "B6", "scroll_lock": "B5" }, + "ws2812": { + "pin": "B8" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/matrix/m12og/rev2/config.h b/keyboards/matrix/m12og/rev2/config.h index 8494950e6d..7fb34f5001 100644 --- a/keyboards/matrix/m12og/rev2/config.h +++ b/keyboards/matrix/m12og/rev2/config.h @@ -4,8 +4,6 @@ #pragma once -#define RGB_DI_PIN B3 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/info.json index ffe6abc9f7..7ebf087c0a 100644 --- a/keyboards/matrix/m12og/rev2/info.json +++ b/keyboards/matrix/m12og/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x8712", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"], "rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"] diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index d7b846cbcf..421773affc 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -79,7 +79,6 @@ #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 // rgb light setting -#define RGB_DI_PIN B4 // reserved pin for future usage #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/matrix/m20add/info.json b/keyboards/matrix/m20add/info.json index e73397c9b8..7d88bb81f5 100644 --- a/keyboards/matrix/m20add/info.json +++ b/keyboards/matrix/m20add/info.json @@ -8,6 +8,9 @@ "pid": "0x20AD", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4" + }, "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h index 487bdb7dea..8ee1b57bde 100644 --- a/keyboards/matrix/me/config.h +++ b/keyboards/matrix/me/config.h @@ -28,7 +28,6 @@ //rgb light setting #define RGBLED_NUM 4 -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json index 6052c5f77f..e7b9265b18 100644 --- a/keyboards/matrix/me/info.json +++ b/keyboards/matrix/me/info.json @@ -17,6 +17,9 @@ "caps_lock": "E6", "scroll_lock": "D2" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/matrix/noah/config.h b/keyboards/matrix/noah/config.h index d5e609918f..5a74ab5206 100644 --- a/keyboards/matrix/noah/config.h +++ b/keyboards/matrix/noah/config.h @@ -76,7 +76,6 @@ /* indicator rgb */ #define RGBLED_NUM 7 -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json index ed5536c067..232ea0a9ca 100644 --- a/keyboards/matrix/noah/info.json +++ b/keyboards/matrix/noah/info.json @@ -8,6 +8,9 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json index 38e6cb69b8..e277b1c266 100644 --- a/keyboards/maxr1998/phoebe/info.json +++ b/keyboards/maxr1998/phoebe/info.json @@ -117,7 +117,9 @@ ] }, "rgblight": { - "led_count": 8, + "led_count": 8 + }, + "ws2812": { "pin": "F0" } } diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h index 3bc544746e..5da4e44855 100644 --- a/keyboards/maxr1998/pulse4k/config.h +++ b/keyboards/maxr1998/pulse4k/config.h @@ -22,7 +22,6 @@ #define COMBO_TERM 150 /* RGB LED Setup */ -#define RGB_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json index 487314f5cc..2d3b6e8a4b 100644 --- a/keyboards/maxr1998/pulse4k/info.json +++ b/keyboards/maxr1998/pulse4k/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["B7", "B3", "F0"], "rows": ["B4", "E6"] diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h index 6b153b0c78..9388d3da68 100644 --- a/keyboards/mechanickeys/undead60m/config.h +++ b/keyboards/mechanickeys/undead60m/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json index 92593c3bfc..1821fbdbaf 100644 --- a/keyboards/mechanickeys/undead60m/info.json +++ b/keyboards/mechanickeys/undead60m/info.json @@ -8,6 +8,9 @@ "pid": "0x3C4D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3", "B2"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mechbrewery/mb65s/config.h b/keyboards/mechbrewery/mb65s/config.h index c806fd05c7..ede35e4bab 100644 --- a/keyboards/mechbrewery/mb65s/config.h +++ b/keyboards/mechbrewery/mb65s/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json index 2a5ac6b178..4943f4f9a2 100644 --- a/keyboards/mechbrewery/mb65s/info.json +++ b/keyboards/mechbrewery/mb65s/info.json @@ -17,6 +17,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": [ diff --git a/keyboards/mechkeys/acr60/config.h b/keyboards/mechkeys/acr60/config.h index 71131d32ac..8f261b69f2 100644 --- a/keyboards/mechkeys/acr60/config.h +++ b/keyboards/mechkeys/acr60/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mechkeys/acr60/info.json b/keyboards/mechkeys/acr60/info.json index 71287af893..67d28157c5 100644 --- a/keyboards/mechkeys/acr60/info.json +++ b/keyboards/mechkeys/acr60/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/mechkeys/alu84/config.h b/keyboards/mechkeys/alu84/config.h index 9908ffa03e..16e5930364 100755 --- a/keyboards/mechkeys/alu84/config.h +++ b/keyboards/mechkeys/alu84/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/mechkeys/alu84/info.json b/keyboards/mechkeys/alu84/info.json index 3a8b7dcfba..5251bc600b 100644 --- a/keyboards/mechkeys/alu84/info.json +++ b/keyboards/mechkeys/alu84/info.json @@ -17,6 +17,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/mechkeys/espectro/config.h b/keyboards/mechkeys/espectro/config.h index feec17629e..a7436fb00c 100755 --- a/keyboards/mechkeys/espectro/config.h +++ b/keyboards/mechkeys/espectro/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 diff --git a/keyboards/mechkeys/espectro/info.json b/keyboards/mechkeys/espectro/info.json index b12beb60ff..8fec453c53 100644 --- a/keyboards/mechkeys/espectro/info.json +++ b/keyboards/mechkeys/espectro/info.json @@ -23,6 +23,9 @@ "scroll_lock": "B1", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h index 7d6fc121ce..f76d0f01e1 100644 --- a/keyboards/mechkeys/mechmini/v1/config.h +++ b/keyboards/mechkeys/mechmini/v1/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once /* RGB underglow */ -// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards. -// The same pin is used on the JJ40, at least. #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,4 +29,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN E2 diff --git a/keyboards/mechkeys/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h index 0b6a0e6760..9517f6a731 100755 --- a/keyboards/mechkeys/mechmini/v2/config.h +++ b/keyboards/mechkeys/mechmini/v2/config.h @@ -21,7 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json index 34e410008d..53f60637f9 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h index 810f25652a..a66af811bb 100644 --- a/keyboards/mechkeys/mk60/config.h +++ b/keyboards/mechkeys/mk60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json index 07eb87850c..0e79cae73e 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/info.json @@ -22,6 +22,9 @@ "caps_lock": "B7", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index 4eeeb96c19..e3e2bf2fa1 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 - #define FORCE_NKRO diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index ae29c4bfbd..310cf6367f 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -7,6 +7,9 @@ "vid": "0xCEEB", "pid": "0x0035" }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index 658e29ccf3..909bc7f83a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT 91 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index 92ff0d8952..249d85c084 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -16,6 +16,9 @@ "num_lock": "C15", "scroll_lock": "B9" }, + "ws2812": { + "pin": "A7" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index ac91d0f950..1e549f9a89 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN A15 #define RGBLED_NUM 23 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 16e0ea109d..2d71c2b5f9 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -13,6 +13,9 @@ {"pin_a": "A4", "pin_b": "A3"} ] }, + "ws2812": { + "pin": "A15" + }, "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index d3e4fc6ba1..c4f801b40d 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A7 #define WS2812_SPI SPID1 // default: SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5 #define RGBLED_NUM 23 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 8fa908858d..9639ad3c1c 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -21,6 +21,7 @@ "scroll_lock": "C15" }, "ws2812": { + "pin": "A7", "driver": "spi" }, "layout_aliases": { diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index fc7e2ad9b6..1ba9c573b1 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 -#define RGB_DI_PIN A7 #define RGBLED_NUM 23 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index 2c4386a862..9c6bd46a70 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -9,6 +9,9 @@ "pin": "B0", "breathing": true }, + "ws2812": { + "pin": "A7" + }, "indicators": { "caps_lock": "B2", "num_lock": "C15", diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index 831642126b..da42bf05d2 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define RGB_DI_PIN E2 #define RGBLED_NUM 23 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json index 5ac0db3260..31de7de957 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -14,6 +14,9 @@ "pin": "B5", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h index b1ef0e072a..5b9d874128 100644 --- a/keyboards/mechlovin/delphine/mono_led/config.h +++ b/keyboards/mechlovin/delphine/mono_led/config.h @@ -2,7 +2,6 @@ #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 13 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json index ce88a638a9..7f775f8c36 100644 --- a/keyboards/mechlovin/delphine/mono_led/info.json +++ b/keyboards/mechlovin/delphine/mono_led/info.json @@ -3,6 +3,9 @@ "pid": "0xDEF1", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "backlight": { "pin": "B6" } diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h index 0f91dd6efa..c813d4fa12 100644 --- a/keyboards/mechlovin/delphine/rgb_led/config.h +++ b/keyboards/mechlovin/delphine/rgb_led/config.h @@ -1,7 +1,6 @@ #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 13 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json index 0a8f1ab220..0255aae44a 100644 --- a/keyboards/mechlovin/delphine/rgb_led/info.json +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0xDEF2", "device_version": "0.0.1" + }, + "ws2812": { + "pin": "E2" } } diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index bc6d0e564c..d366188f76 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 # define RGBLED_NUM 22 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 5fac5b9aa6..c1c871a199 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -22,6 +22,9 @@ "caps_lock": "A1", "on_state": 0 }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layout_aliases": { diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h index 9033ee59b2..08006aa996 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN A15 #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 72 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index f0e2f9a41a..6d5223a32a 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A15" + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h index aff3a43340..81335f31be 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h @@ -1,7 +1,6 @@ #pragma once #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN A15 # define RGBLED_NUM 18 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index f66b378aae..2074fceb8b 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A15" + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index 0b9d78276a..362a7fc459 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 3ddc706922..9a554f3b52 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index 3700d3acf0..43f6ab51a1 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index d2c4a684bb..d6b606913d 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h index f154c344b3..7b3e497cdf 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/config.h +++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN A15 #define RGBLED_NUM 26 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json index 29597cce3f..cd4cf76b35 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json @@ -8,6 +8,9 @@ "pid": "0x8701", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A15" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index 178374c1e7..2d6fb7bc2b 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -35,7 +35,6 @@ #define DIODE_DIRECTION ROW2COL #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index d75dd051bc..b85416b9b2 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -17,6 +17,9 @@ "num_lock": "D7", "scroll_lock": "B4" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h index 697ef34ccb..eee31e69ef 100644 --- a/keyboards/mechlovin/infinity875/config.h +++ b/keyboards/mechlovin/infinity875/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index 2a33c4a839..d85cccbe36 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -12,6 +12,9 @@ "caps_lock": "D6", "scroll_lock": "B4" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index 1fda2d3097..dd0f9e4f30 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 -#define RGB_DI_PIN A15 #define RGBLED_NUM 26 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 05b575181e..fdbb45a7d6 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/keyboards/mechlovin/infinity88/info.json @@ -21,6 +21,9 @@ "caps_lock": "A4", "num_lock": "A3" }, + "ws2812": { + "pin": "A15" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/infinityce/config.h b/keyboards/mechlovin/infinityce/config.h index a8a1936209..db2ba4b78e 100644 --- a/keyboards/mechlovin/infinityce/config.h +++ b/keyboards/mechlovin/infinityce/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 31 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json index 332be74aff..b5e1da8d58 100644 --- a/keyboards/mechlovin/infinityce/info.json +++ b/keyboards/mechlovin/infinityce/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/kanu/config.h b/keyboards/mechlovin/kanu/config.h index bb94525e06..bfa2908890 100644 --- a/keyboards/mechlovin/kanu/config.h +++ b/keyboards/mechlovin/kanu/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json index 86e12521b1..fabaf33380 100644 --- a/keyboards/mechlovin/kanu/info.json +++ b/keyboards/mechlovin/kanu/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"], diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h index 5643462b8a..68e6d62c48 100644 --- a/keyboards/mechlovin/kay60/config.h +++ b/keyboards/mechlovin/kay60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 22 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json index 39c7083afd..48ca04815b 100644 --- a/keyboards/mechlovin/kay60/info.json +++ b/keyboards/mechlovin/kay60/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "B0" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/kay65/config.h b/keyboards/mechlovin/kay65/config.h index e6064163fd..af8fb5765c 100644 --- a/keyboards/mechlovin/kay65/config.h +++ b/keyboards/mechlovin/kay65/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json index 1ee82b43c5..fbd556217c 100644 --- a/keyboards/mechlovin/kay65/info.json +++ b/keyboards/mechlovin/kay65/info.json @@ -17,6 +17,9 @@ "caps_lock": "D6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h index 0f9a61426e..3aa97fd207 100644 --- a/keyboards/mechlovin/olly/bb/config.h +++ b/keyboards/mechlovin/olly/bb/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS {D6, A5, A4, A3, A6} #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B3 #define RGBLED_NUM 24 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index 887e32d9a5..4bb73904d0 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -12,6 +12,9 @@ "pin": "D4", "breathing": true }, + "ws2812": { + "pin": "B3" + }, "indicators": { "caps_lock": "B0", "num_lock": "B1", diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h index 2b42e66edc..5e1321bc8b 100644 --- a/keyboards/mechlovin/olly/jf/config.h +++ b/keyboards/mechlovin/olly/jf/config.h @@ -37,7 +37,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -#define RGB_DI_PIN B3 #define RGBLED_NUM 27 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index 86de2f1bfe..ba324e6f3e 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -17,6 +17,9 @@ "num_lock": "B1", "scroll_lock": "B2" }, + "ws2812": { + "pin": "B3" + }, "bootmagic": { "matrix": [1, 14] }, diff --git a/keyboards/mechlovin/olly/octagon/config.h b/keyboards/mechlovin/olly/octagon/config.h index a193206552..a1127f6aad 100644 --- a/keyboards/mechlovin/olly/octagon/config.h +++ b/keyboards/mechlovin/olly/octagon/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A7 #define RGBLED_NUM 26 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 117239c476..0e1054a1fb 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,6 +8,9 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A7" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B0", "B12", "A6", "A5", "A4", "A3"] diff --git a/keyboards/mechlovin/olly/orion/config.h b/keyboards/mechlovin/olly/orion/config.h index 44e13fa7f2..efb5f91189 100644 --- a/keyboards/mechlovin/olly/orion/config.h +++ b/keyboards/mechlovin/olly/orion/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN B15 # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json index c682df91eb..ad792e81af 100644 --- a/keyboards/mechlovin/olly/orion/info.json +++ b/keyboards/mechlovin/olly/orion/info.json @@ -18,6 +18,9 @@ "num_lock": "A13", "scroll_lock": "A14" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h index 7771a968a4..06dc10ad91 100644 --- a/keyboards/mechlovin/pisces/config.h +++ b/keyboards/mechlovin/pisces/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json index 133bbbea7a..3159cc500b 100644 --- a/keyboards/mechlovin/pisces/info.json +++ b/keyboards/mechlovin/pisces/info.json @@ -19,6 +19,9 @@ "indicators": { "caps_lock": "B2" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h index abfafffd0d..4b064e3676 100644 --- a/keyboards/mechlovin/serratus/config.h +++ b/keyboards/mechlovin/serratus/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json index e5125314cb..ca23ddecf3 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/info.json @@ -17,6 +17,9 @@ "num_lock": "D7", "scroll_lock": "B4" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/zed60/config.h b/keyboards/mechlovin/zed60/config.h index 36be5c04ca..b3a4876ba0 100644 --- a/keyboards/mechlovin/zed60/config.h +++ b/keyboards/mechlovin/zed60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A7 #define RGBLED_NUM 22 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json index 0e2a2f5625..6ee5954db4 100644 --- a/keyboards/mechlovin/zed60/info.json +++ b/keyboards/mechlovin/zed60/info.json @@ -17,6 +17,7 @@ "caps_lock": "A4" }, "ws2812": { + "pin": "A7", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/mechlovin/zed65/mono_led/config.h b/keyboards/mechlovin/zed65/mono_led/config.h index 917a3a9fc8..3bbf0bb2e6 100644 --- a/keyboards/mechlovin/zed65/mono_led/config.h +++ b/keyboards/mechlovin/zed65/mono_led/config.h @@ -61,7 +61,6 @@ along with this program. If not, see . #define VIA_QMK_LED_MATRIX_ENABLE #endif -#define RGB_DI_PIN A7 # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index b1b2ad523a..e0debf3cc5 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -8,6 +8,9 @@ "pid": "0x6503", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A7" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B12", "A6", "A5", "A4", "A3"] diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h index 39b8dcb84a..6a0f857d25 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 24 #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json index 094da9bde7..fb00050ed8 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json @@ -17,6 +17,7 @@ "caps_lock": "C14" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "layout_aliases": { diff --git a/keyboards/mechstudio/ud_40_ortho/config.h b/keyboards/mechstudio/ud_40_ortho/config.h index 5c82ff9eb7..48bffd7f7f 100644 --- a/keyboards/mechstudio/ud_40_ortho/config.h +++ b/keyboards/mechstudio/ud_40_ortho/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index f3193fec27..2b81a900db 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -17,6 +17,9 @@ "esc_input": "B7", "esc_output": "F0" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u2", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json index 5aa4ac1e80..6def1c9fbe 100644 --- a/keyboards/mechwild/bde/lefty/info.json +++ b/keyboards/mechwild/bde/lefty/info.json @@ -11,7 +11,6 @@ "diode_direction": "ROW2COL", "rgblight": { "led_count": 16, - "pin": "D2", "animations": { "alternating": true, "breathing": true, @@ -25,6 +24,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json index 4d27c53895..a50d2abaa5 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/info.json @@ -16,7 +16,6 @@ "diode_direction": "COL2ROW", "rgblight": { "led_count": 8, - "pin": "B6", "animations": { "rainbow_swirl": true }, @@ -24,6 +23,9 @@ "saturation_steps": 8, "brightness_steps": 8 }, + "ws2812": { + "pin": "B6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json index af23e6e293..0cf78b35a6 100644 --- a/keyboards/mechwild/bde/righty/info.json +++ b/keyboards/mechwild/bde/righty/info.json @@ -11,7 +11,6 @@ "diode_direction": "ROW2COL", "rgblight": { "led_count": 16, - "pin": "D2", "animations": { "alternating": true, "breathing": true, @@ -25,6 +24,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index a326faf710..dd67669e92 100644 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ b/keyboards/mechwild/mokulua/mirrored/config.h @@ -17,7 +17,6 @@ #define SPLIT_OLED_ENABLE /* RGB options */ -#define RGB_DI_PIN B6 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index e3e7308a19..2ef17fd3aa 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index ed5eb12a66..4312b373ac 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/standard/config.h @@ -17,7 +17,6 @@ #define SPLIT_OLED_ENABLE /* RGB options */ -#define RGB_DI_PIN B6 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index c3b9ea2120..18594c39ed 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index d9b0f0fa8d..ce04115635 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c" -#define RGB_DI_PIN F4 # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index cc3adf9d02..29247492ca 100644 --- a/keyboards/mechwild/murphpad/info.json +++ b/keyboards/mechwild/murphpad/info.json @@ -22,6 +22,9 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index bebb1126e9..b01fcda5ef 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 /* RGB settings, uncomment this define to enable RGB */ -#define RGB_DI_PIN A0 # define RGBLED_NUM 10 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index b8c5642b08..853d7ebcc3 100644 --- a/keyboards/mechwild/obe/info.json +++ b/keyboards/mechwild/obe/info.json @@ -25,6 +25,9 @@ "bootmagic": { "matrix": [5, 4] }, + "ws2812": { + "pin": "A0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index eb1674aadd..4bb69498e9 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -32,7 +32,6 @@ #define TAP_CODE_DELAY 10 /* RGB settings, uncomment this define to enable RGB */ -#define RGB_DI_PIN A3 # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index a002232522..b8e653be6b 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -23,6 +23,9 @@ "caps_lock": "C13", "on_state": 0 }, + "ws2812": { + "pin": "A3" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401", diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 9d9ee27eb5..084331d669 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -24,7 +24,6 @@ "diode_direction": "COL2ROW", "rgblight": { "led_count": 10, - "pin": "B5", "max_brightness": 255, "hue_steps": 8, "saturation_steps": 8, @@ -42,6 +41,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ { "pin_a": "B0", "pin_b": "A2", "resolution": 4 }, diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index 3babce4a10..5be535ab1e 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 /* RGB settings, uncomment this define to enable RGB */ -#define RGB_DI_PIN A1 # define RGBLED_NUM 3 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json index 1bed5452b0..1f41cf4617 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -8,6 +8,9 @@ "pid": "0x1709", "device_version": "1.0.1" }, + "ws2812": { + "pin": "A1" + }, "matrix_pins": { "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"], "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"] diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h index 4c3bb24d3e..c8fe7f9a31 100644 --- a/keyboards/meletrix/zoom87/config.h +++ b/keyboards/meletrix/zoom87/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json index 7127ade841..25a61b89f2 100644 --- a/keyboards/meletrix/zoom87/info.json +++ b/keyboards/meletrix/zoom87/info.json @@ -17,6 +17,9 @@ "caps_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index a5a8d8883f..dbe73b7e3d 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN C6 - # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json index 1c36053897..5dd66001c5 100644 --- a/keyboards/melgeek/mj6xy/rev3/info.json +++ b/keyboards/melgeek/mj6xy/rev3/info.json @@ -8,5 +8,8 @@ "driver": "software", "pin": "B7", "levels": 10 + }, + "ws2812": { + "pin": "C6" } } diff --git a/keyboards/meow48/config.h b/keyboards/meow48/config.h index f214ffbbf6..5965ca253d 100644 --- a/keyboards/meow48/config.h +++ b/keyboards/meow48/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define OLED_BRIGHTNESS 100 -#define RGB_DI_PIN D3 #define RGBLED_NUM 48 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json index c219c14a1e..d0b9810fcd 100644 --- a/keyboards/meow48/info.json +++ b/keyboards/meow48/info.json @@ -8,6 +8,9 @@ "pid": "0xF048", "vid": "0xF048" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"] diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index dec57f0dbd..7f80333ad3 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 807a8ed980..95de5a2e20 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,9 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["B3", "B4"], "rows": ["B1", "B2"] diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 4ee40b4071..57c2dcb6fb 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -20,7 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 83 #define RGBLED_SPLIT { 39, 44 } diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index a8816d8dd0..fd566ab395 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index ed66f143c0..f267fa3670 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -20,7 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 100 #define RGBLED_SPLIT { 48, 52 } diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index f67817659b..9b7e73b2da 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h index 1ca066fcf9..9e64ab48a6 100644 --- a/keyboards/meson/config.h +++ b/keyboards/meson/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define USE_I2C -#define RGB_DI_PIN B5 #define RGBLED_NUM 10 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 5, 5 } diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json index 7bcd3acbac..41e3a6b4a2 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/info.json @@ -15,6 +15,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mexsistor/ludmila/config.h b/keyboards/mexsistor/ludmila/config.h index 208e11fc1c..8d8aaed5c7 100644 --- a/keyboards/mexsistor/ludmila/config.h +++ b/keyboards/mexsistor/ludmila/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D1 #define RGBLED_NUM 4 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/info.json index ad7f5da8e8..fcfecd0fd7 100644 --- a/keyboards/mexsistor/ludmila/info.json +++ b/keyboards/mexsistor/ludmila/info.json @@ -13,6 +13,9 @@ {"pin_a": "F6", "pin_b": "F5"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mincedshon/ecila/config.h b/keyboards/mincedshon/ecila/config.h index 9c7e498de3..976c62c659 100644 --- a/keyboards/mincedshon/ecila/config.h +++ b/keyboards/mincedshon/ecila/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json index 9cd5ed61e1..6b277ce590 100644 --- a/keyboards/mincedshon/ecila/info.json +++ b/keyboards/mincedshon/ecila/info.json @@ -7,6 +7,9 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "bootloader": "atmel-dfu", "features": { "bootmagic": true, diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h index ffc36b1c0b..8d0955d769 100644 --- a/keyboards/miniaxe/config.h +++ b/keyboards/miniaxe/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Uncomment below if use underglow */ -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json index 292f69085a..4847749582 100644 --- a/keyboards/miniaxe/info.json +++ b/keyboards/miniaxe/info.json @@ -11,6 +11,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h index 272c37ff50..317e150935 100644 --- a/keyboards/minimacro5/config.h +++ b/keyboards/minimacro5/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TAPPING_TERM 200 /* ws2812 RGB LED */ -#define RGB_DI_PIN B5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json index 7c6748c574..134b50f017 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/info.json @@ -8,6 +8,9 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "F5", "resolution": 2}, diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 49328d78ba..1d1616ee25 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_SLEEP diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index e4ce639e24..c386795024 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -9,6 +9,9 @@ "pid": "0x1306", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"], "rows": ["D3", "B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h index 051193bd9f..41c0f7e8eb 100644 --- a/keyboards/mint60/config.h +++ b/keyboards/mint60/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 8 #define RGBLIGHT_SPLIT diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json index b2b795b4a8..90b5236d43 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h index 04a746121b..c50e01bbe0 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define FORCE_NKRO -#define RGB_DI_PIN B1 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index fd64d9fa14..ce4f796b88 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -8,6 +8,9 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"], "rows": ["B0", "B7", "D2", "D3"] diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index 88500712e7..0b1dbb4c57 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D1 #define RGBLED_NUM 19 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index c7cb97c0b3..803f31a18e 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -8,6 +8,9 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["D2", "D3", "D5", "F0"] diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h index 188bfaa7c1..db7e1b66da 100644 --- a/keyboards/misterknife/knife66/config.h +++ b/keyboards/misterknife/knife66/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A9 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/misterknife/knife66/info.json b/keyboards/misterknife/knife66/info.json index 499bbebc9d..e1ca5dc060 100644 --- a/keyboards/misterknife/knife66/info.json +++ b/keyboards/misterknife/knife66/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h index 3d9141e11e..beddc04724 100644 --- a/keyboards/misterknife/knife66_iso/config.h +++ b/keyboards/misterknife/knife66_iso/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A9 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/misterknife/knife66_iso/info.json b/keyboards/misterknife/knife66_iso/info.json index 47a01a44c9..2906899b16 100644 --- a/keyboards/misterknife/knife66_iso/info.json +++ b/keyboards/misterknife/knife66_iso/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h index 1e01cae3a3..76fa3df3f4 100644 --- a/keyboards/miuni32/config.h +++ b/keyboards/miuni32/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN D0 // The pin your RGB strip is wired to #define RGBLED_NUM 17 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/miuni32/info.json b/keyboards/miuni32/info.json index d795c19592..0c1c5d7c44 100644 --- a/keyboards/miuni32/info.json +++ b/keyboards/miuni32/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F1", "E6", "B7", "B3", "B2", "B1", "B0"], "rows": ["F0", "F4", "D7"] diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index b96eeed91c..cddab38dbc 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B5 #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json index 3af1d02f47..cd8e02195e 100644 --- a/keyboards/mixi/info.json +++ b/keyboards/mixi/info.json @@ -8,6 +8,9 @@ "pid": "0x4D49", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "D7", "pin_b": "E6"}, diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json index 84cd0fbca1..7a0aaa4ffd 100644 --- a/keyboards/mk65/info.json +++ b/keyboards/mk65/info.json @@ -33,7 +33,6 @@ "key_lock": false }, "rgblight": { - "pin": "B0", "led_count": 7, "hue_steps": 8, "saturation_steps": 8, @@ -53,6 +52,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ml/gas75/config.h b/keyboards/ml/gas75/config.h index c95e4a5a95..96516121d3 100644 --- a/keyboards/ml/gas75/config.h +++ b/keyboards/ml/gas75/config.h @@ -25,9 +25,6 @@ #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGB_MATRIX_KEYPRESSES - /* RGB Matrix config */ - #define RGB_DI_PIN D0 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json index 1b2255ae99..4f9f61ed46 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/info.json @@ -18,6 +18,9 @@ {"pin_a": "F0", "pin_b": "F1"} ] }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index b872354f60..303b7ae5b5 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json index 1e5a70aa92..4ccf9ede92 100644 --- a/keyboards/mlego/m48/rev1/info.json +++ b/keyboards/mlego/m48/rev1/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 426e65609d..dc6c4c225d 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS #define RGBLED_NUM 20 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json index 4af7c4b11d..bbe9f86112 100644 --- a/keyboards/mlego/m60/rev1/info.json +++ b/keyboards/mlego/m60/rev1/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 3dc80b50ef..88a208b8f4 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -24,7 +24,6 @@ #define SERIAL_USART_SPEED 921600 #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_SPLIT #define RGBLIGHT_LAYERS diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index f33c5d04dd..d316d64105 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "split": { "bootmagic": { "matrix": [5, 0] diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index 9d5cd08e3e..cfcb26edc1 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -26,7 +26,6 @@ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_SPLIT #define RGBLIGHT_LAYERS #define RGBLED_NUM 16 diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json index 5ab7696dbe..40718aa647 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "split": { "bootmagic": { "matrix": [5, 0] diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index 83380e9aa4..2ed846b170 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 - #define RGBLIGHT_LAYERS #undef RGBLED_NUM diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index a638ec0b99..3c939ef4c2 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index 2d595fc4be..791b73e2f6 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 - #define RGBLIGHT_LAYERS #undef RGBLED_NUM diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 00263c47f5..64df0a2ba6 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F103", // GD32F303CCT6 "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index d535b8c229..81f02bc411 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS #undef RGBLED_NUM #define RGBLED_NUM 20 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index 7118b12af0..b72b706587 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index 69bdff7cdd..942f360688 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS #undef RGBLED_NUM #define RGBLED_NUM 20 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index 1cfe298f8f..d671845e62 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -18,6 +18,9 @@ "num_lock": "B12", "scroll_lock": "B13" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F401", "bootloader": "tinyuf2", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h index a8482aaef1..014b1f93a5 100644 --- a/keyboards/momoka_ergo/config.h +++ b/keyboards/momoka_ergo/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 5 -#define RGB_DI_PIN C7 #define RGBLED_NUM 22 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json index e362a3fa92..fbba58a840 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3, diff --git a/keyboards/momokai/tap_duo/config.h b/keyboards/momokai/tap_duo/config.h index d366b2ec11..f3ad54d153 100644 --- a/keyboards/momokai/tap_duo/config.h +++ b/keyboards/momokai/tap_duo/config.h @@ -30,7 +30,6 @@ //TODO: implement RGB Matrix -#define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 4 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index 50708462c1..6af5a806f5 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["E6", "B2", "D1", "D2", "D3"], "rows": ["E0"] diff --git a/keyboards/momokai/tap_trio/config.h b/keyboards/momokai/tap_trio/config.h index c3d1ebab68..b60152e21c 100644 --- a/keyboards/momokai/tap_trio/config.h +++ b/keyboards/momokai/tap_trio/config.h @@ -17,7 +17,6 @@ #pragma once //TODO: implement RGB Matrix -#define RGB_DI_PIN F0 // #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index a45aa5c9e3..f0ee7646e3 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["E6", "B2", "B7", "D1", "D2", "D3"], "rows": ["E0"] diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h index 4b4bad4056..80d0b4fda3 100644 --- a/keyboards/monstargear/xo87/rgb/config.h +++ b/keyboards/monstargear/xo87/rgb/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 110 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json index 47d3bd5ec7..fc81a7b7ef 100644 --- a/keyboards/monstargear/xo87/rgb/info.json +++ b/keyboards/monstargear/xo87/rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x584F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h index 347f14488f..f8e73dccb8 100644 --- a/keyboards/monstargear/xo87/solderable/config.h +++ b/keyboards/monstargear/xo87/solderable/config.h @@ -24,7 +24,6 @@ #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 } #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 } -#define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 21 #define DRIVER_COUNT 2 #define RGBLED_NUM 21 diff --git a/keyboards/monstargear/xo87/solderable/info.json b/keyboards/monstargear/xo87/solderable/info.json index 669c8c1592..9decf28f70 100644 --- a/keyboards/monstargear/xo87/solderable/info.json +++ b/keyboards/monstargear/xo87/solderable/info.json @@ -17,6 +17,9 @@ "driver": "custom", "pin": "F0" }, + "ws2812": { + "pin": "D7" + }, "processor": "at90usb646", "bootloader": "lufa-dfu", "layouts": { diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h index 3caa3c9aca..b0b9bb6c17 100644 --- a/keyboards/montsinger/rebound/rev4/config.h +++ b/keyboards/montsinger/rebound/rev4/config.h @@ -20,5 +20,4 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 17 diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index 4fa5b0b83b..fbee96edc7 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -18,6 +18,9 @@ {"pin_a": "D2", "pin_b": "D3"} ] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h index 6545f91070..c828bd36ff 100644 --- a/keyboards/mschwingen/modelm/config.h +++ b/keyboards/mschwingen/modelm/config.h @@ -70,7 +70,6 @@ #endif // 3* WS2812 LEDs instead of singlecolor GPIO LEDs -#define RGB_DI_PIN B6 #define RGBLED_NUM 3 // disabled, needs PCB patch. diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json index a1e22f1614..4df6816eb1 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/mschwingen/modelm/info.json @@ -8,6 +8,9 @@ "pid": "0x558E", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "lufa-dfu", "layouts": { diff --git a/keyboards/mss_studio/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h index 60a9555a78..5250c1c84f 100644 --- a/keyboards/mss_studio/m63_rgb/config.h +++ b/keyboards/mss_studio/m63_rgb/config.h @@ -27,9 +27,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - /* RGB Matrix config */ - #define RGB_DI_PIN B15 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/mss_studio/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json index 388400c0e5..2585dabccd 100644 --- a/keyboards/mss_studio/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], "rows": ["B3", "B4", "A0", "A2", "A3"] diff --git a/keyboards/mss_studio/m64_rgb/config.h b/keyboards/mss_studio/m64_rgb/config.h index 4711bb62a6..7270ccb4b3 100644 --- a/keyboards/mss_studio/m64_rgb/config.h +++ b/keyboards/mss_studio/m64_rgb/config.h @@ -27,9 +27,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - /* RGB Matrix config */ - #define RGB_DI_PIN B15 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/mss_studio/m64_rgb/info.json b/keyboards/mss_studio/m64_rgb/info.json index 7637456e0a..c597e9d845 100644 --- a/keyboards/mss_studio/m64_rgb/info.json +++ b/keyboards/mss_studio/m64_rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B10", "A7", "A6", "A5", "A4", "B5", "B6", "A1", "B7", "B8", "B9"], "rows": ["B3", "B4", "A0", "A2", "A3"] diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h index 355454f9d4..b61be3ea8f 100644 --- a/keyboards/mt/blocked65/config.h +++ b/keyboards/mt/blocked65/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Backlight configuration */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index a187e30f8f..fa169a1d35 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h index 32a2dfb2d3..bb90137436 100644 --- a/keyboards/mt/mt40/config.h +++ b/keyboards/mt/mt40/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once - -#define RGB_DI_PIN C0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index 357553c951..ec07876c33 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -80,7 +80,6 @@ #endif -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json index 1eb2212598..46588f96c6 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h index 012c209f77..1a2d49d734 100644 --- a/keyboards/mt/mt84/config.h +++ b/keyboards/mt/mt84/config.h @@ -83,7 +83,6 @@ #endif -#define RGB_DI_PIN B0 # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RAINBOW_SWIRL # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json index 036aa9d0d4..c171ba99c4 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"], "rows": ["D7", "D6", "D5", "D3", "D2", "D4"] diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h index ff91085de3..b1268b2b59 100644 --- a/keyboards/mt/mt980/config.h +++ b/keyboards/mt/mt980/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index 3a99cc6cb7..2e291fc69b 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -22,6 +22,9 @@ "scroll_lock": "B5", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "bootmagic": { "matrix": [5, 0] }, diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h index fd1cc98c7f..1bc6c9f937 100644 --- a/keyboards/mt/ncr80/hotswap/config.h +++ b/keyboards/mt/ncr80/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json index 8eaa0519cf..a6201ad430 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/info.json @@ -19,6 +19,9 @@ "scroll_lock": "C7", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h index 21b234cc19..e062eaef89 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ b/keyboards/mtbkeys/mtb60/hotswap/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* Pin WS2812 RGB LEDs are connected to */ -#define RGB_DI_PIN D4 - # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json index d2ece9ff7f..f9f86f9b02 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/info.json +++ b/keyboards/mtbkeys/mtb60/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"], "rows": ["D6", "D7", "B4", "B5", "D5"] diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h index 18a568fc48..e062eaef89 100644 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ b/keyboards/mtbkeys/mtb60/solder/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* Pin WS2812 RGB LEDs are connected to */ -#define RGB_DI_PIN B0 - # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json index 552985d562..2769bc084e 100644 --- a/keyboards/mtbkeys/mtb60/solder/info.json +++ b/keyboards/mtbkeys/mtb60/solder/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "F4", "F1", "D2"] diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index b4d733a212..53ac3aa161 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -18,9 +18,6 @@ #define FORCE_NKRO - -#define RGB_DI_PIN B1 - #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGBLED_NUM 87 diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index f33b5d2ccc..b88dd97b3a 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -16,6 +16,9 @@ {"pin_a": "B11", "pin_b": "B10"} ] }, + "ws2812": { + "pin": "B1" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h index c54f6bf281..f987360d4a 100644 --- a/keyboards/mwstudio/mw65_black/config.h +++ b/keyboards/mwstudio/mw65_black/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 21 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json index 1a53a22195..3e433aff92 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/info.json @@ -8,6 +8,9 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"], "rows": ["D4", "D7", "B4", "B3", "B6"] diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h index 94388ff316..ebde358b49 100644 --- a/keyboards/mwstudio/mw65_rgb/config.h +++ b/keyboards/mwstudio/mw65_rgb/config.h @@ -16,9 +16,6 @@ #pragma once -/* RGB Matrix config */ -#define RGB_DI_PIN B3 - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 83 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index 8cace68cce..79dc8c0c7e 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["D0", "D1", "D2", "D3", "B7"] diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index f9040f64ad..9603e1db2b 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -18,8 +18,6 @@ #define FORCE_NKRO - -#define RGB_DI_PIN B8 #define DRIVER_LED_TOTAL 34 #define RGBLED_NUM 34 diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json index 7e7b9609ff..8bf0f3f2fc 100644 --- a/keyboards/mwstudio/mw660/info.json +++ b/keyboards/mwstudio/mw660/info.json @@ -12,6 +12,9 @@ "nkro": true, "rgblight": true }, + "ws2812": { + "pin": "B8" + }, "matrix_pins": { "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ], "rows": ["A3", "A4", "A5", "A6", "A2" ] diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h index cbfaa2221d..0a9b073ce1 100644 --- a/keyboards/mwstudio/mw75/config.h +++ b/keyboards/mwstudio/mw75/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index f7497ec325..e15905a629 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -21,6 +21,9 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h index 387015e937..ded31181aa 100644 --- a/keyboards/mwstudio/mw75r2/config.h +++ b/keyboards/mwstudio/mw75r2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index e479c68c96..b92412ae02 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -8,6 +8,9 @@ "pid": "0x7502", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/info.json index 718493f576..0b0a9717d3 100644 --- a/keyboards/mwstudio/mw80/info.json +++ b/keyboards/mwstudio/mw80/info.json @@ -23,11 +23,11 @@ "caps_lock": "A0" }, "ws2812": { + "pin": "B8", "driver": "pwm" }, "rgblight": { "led_count": 16, - "pin": "B8", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h index 1a372c72f5..d33ee88ce8 100644 --- a/keyboards/mxss/config.h +++ b/keyboards/mxss/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Basic RGB configuration */ -#define RGB_DI_PIN C7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mxss/info.json b/keyboards/mxss/info.json index 70bb5c5f76..a69292473e 100644 --- a/keyboards/mxss/info.json +++ b/keyboards/mxss/info.json @@ -8,6 +8,9 @@ "pid": "0x5353", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "D0", "C6", "B6", "D1", "B5", "D2", "B4", "D3", "D5", "B0", "B2", "B3"], "rows": ["F4", "F1", "F7", "B1", "B7"] diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h index 0dc341052e..7240672afe 100644 --- a/keyboards/nack/config.h +++ b/keyboards/nack/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 - #define RGB_DI_PIN B5 #define RGBLED_NUM 52 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json index bd1e027995..00c319f9bc 100644 --- a/keyboards/nack/info.json +++ b/keyboards/nack/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B5", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h index 64f60becf3..9c6773547e 100644 --- a/keyboards/nacly/splitreus62/config.h +++ b/keyboards/nacly/splitreus62/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN B1 - #define RGBLED_NUM 12 // Number of LEDs #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index 07ccd770c1..e8361decda 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h index 938da5cbb7..1a5eb90e61 100644 --- a/keyboards/neito/config.h +++ b/keyboards/neito/config.h @@ -19,7 +19,6 @@ /* RGB Light Configuration */ -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index d02329aad7..10cce03e82 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -26,6 +26,9 @@ "indicators": { "caps_lock": "B6" }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h index 8f9caa06b2..6073564e1f 100644 --- a/keyboards/neokeys/g67/element_hs/config.h +++ b/keyboards/neokeys/g67/element_hs/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGB_DI_PIN F0 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json index 54f7222589..18155520de 100644 --- a/keyboards/neokeys/g67/element_hs/info.json +++ b/keyboards/neokeys/g67/element_hs/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "B2", "B3", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h index bb0046c0c2..2021d3a95e 100644 --- a/keyboards/neokeys/g67/hotswap/config.h +++ b/keyboards/neokeys/g67/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGB_DI_PIN F0 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json index 6cb402bf62..3a57fefc09 100644 --- a/keyboards/neokeys/g67/hotswap/info.json +++ b/keyboards/neokeys/g67/hotswap/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "B2", "B3", "F7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h index 397c6d90db..5fa404fa5a 100644 --- a/keyboards/neokeys/g67/soldered/config.h +++ b/keyboards/neokeys/g67/soldered/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGB_DI_PIN F0 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json index ed547b8603..5fde8fe740 100644 --- a/keyboards/neokeys/g67/soldered/info.json +++ b/keyboards/neokeys/g67/soldered/info.json @@ -18,6 +18,9 @@ "levels": 10, "breathing": true }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_tsangan", "65_iso", "65_iso_blocker"], diff --git a/keyboards/neson_design/700e/config.h b/keyboards/neson_design/700e/config.h index 047d836eb6..74872d0c7d 100644 --- a/keyboards/neson_design/700e/config.h +++ b/keyboards/neson_design/700e/config.h @@ -39,7 +39,6 @@ //rgb light setting #define RGBLED_NUM 68 -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/neson_design/700e/info.json b/keyboards/neson_design/700e/info.json index feb9c5d506..195907488f 100644 --- a/keyboards/neson_design/700e/info.json +++ b/keyboards/neson_design/700e/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "F5" }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h index 1a3cd3c897..35a2671ede 100644 --- a/keyboards/neson_design/n6/config.h +++ b/keyboards/neson_design/n6/config.h @@ -39,7 +39,6 @@ //rgb light setting #define RGBLED_NUM 65 -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/neson_design/n6/info.json b/keyboards/neson_design/n6/info.json index c92fd9fae2..5e0faf393a 100644 --- a/keyboards/neson_design/n6/info.json +++ b/keyboards/neson_design/n6/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "F5" }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/newgame40/config.h b/keyboards/newgame40/config.h index bccf17c98e..18c605eb62 100644 --- a/keyboards/newgame40/config.h +++ b/keyboards/newgame40/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/newgame40/info.json b/keyboards/newgame40/info.json index 4cb38d7d94..2cbb4c117d 100644 --- a/keyboards/newgame40/info.json +++ b/keyboards/newgame40/info.json @@ -13,6 +13,9 @@ "rows": ["F7", "B1", "B3", "B2"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x10"], diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index cefed954f8..d1703c1c80 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D5 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json index 97cf05912f..d45356262d 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/info.json @@ -18,6 +18,9 @@ {"pin_a": "C7", "pin_b": "C6"} ] }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index 095aea8e07..d56e19898b 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 2491b10711..0c33b1c769 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -18,6 +18,9 @@ "num_lock": "D7", "scroll_lock": "B4" }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], diff --git a/keyboards/nightly_boards/conde60/config.h b/keyboards/nightly_boards/conde60/config.h index 6f005a97a0..541d2e289e 100644 --- a/keyboards/nightly_boards/conde60/config.h +++ b/keyboards/nightly_boards/conde60/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 0883b994e3..3fda17eb2c 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -13,6 +13,9 @@ "rows": ["B1", "B2", "F0", "F1", "F4"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h index 37e99fe794..a43016970c 100644 --- a/keyboards/nightly_boards/n2/config.h +++ b/keyboards/nightly_boards/n2/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D4 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/nightly_boards/n2/info.json b/keyboards/nightly_boards/n2/info.json index 5b5b3abfac..f925eba577 100644 --- a/keyboards/nightly_boards/n2/info.json +++ b/keyboards/nightly_boards/n2/info.json @@ -13,6 +13,9 @@ "rows": ["F1", "C7"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/n40_o/config.h b/keyboards/nightly_boards/n40_o/config.h index 1183cd7d49..474742b6af 100644 --- a/keyboards/nightly_boards/n40_o/config.h +++ b/keyboards/nightly_boards/n40_o/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B4 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json index 4130601105..f1401f5061 100644 --- a/keyboards/nightly_boards/n40_o/info.json +++ b/keyboards/nightly_boards/n40_o/info.json @@ -20,6 +20,9 @@ {"pin_a": "B6", "pin_b": "C6"} ] }, + "ws2812": { + "pin": "B4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h index c87c581a88..9daf4c7579 100644 --- a/keyboards/nightly_boards/n60_s/config.h +++ b/keyboards/nightly_boards/n60_s/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . /* Underglow */ -#define RGB_DI_PIN D1 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json index 1ab1fbedf4..50e94f22d2 100644 --- a/keyboards/nightly_boards/n60_s/info.json +++ b/keyboards/nightly_boards/n60_s/info.json @@ -18,6 +18,9 @@ {"pin_a": "D3", "pin_b": "D5"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h index 90a38e8d6a..492b8fb618 100644 --- a/keyboards/nightly_boards/n87/config.h +++ b/keyboards/nightly_boards/n87/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D0 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/nightly_boards/n87/info.json b/keyboards/nightly_boards/n87/info.json index c9eb8ac3bf..1be9d83f1c 100644 --- a/keyboards/nightly_boards/n87/info.json +++ b/keyboards/nightly_boards/n87/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "B2", "B3", "F1", "F0", "D7", "B4", "D1", "D2", "D3", "D5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h index f76c2bd366..e0358f57d1 100644 --- a/keyboards/nightly_boards/n9/config.h +++ b/keyboards/nightly_boards/n9/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F5 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json index 8c83af0485..6929804d0c 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/info.json @@ -13,6 +13,9 @@ "rows": ["F4", "B1", "B3"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "F5" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index 25b30b0a41..27c3d4bd02 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json index d166f96e35..4fd95b4a8c 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/info.json @@ -19,6 +19,9 @@ {"pin_a": "F4", "pin_b": "F5"} ] }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index 2cbf1c89f8..71556373dc 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -38,10 +38,12 @@ "hue_steps": 8, "led_count": 8, "max_brightness": 255, - "pin": "F7", "saturation_steps": 8, "sleep": true }, + "ws2812": { + "pin": "F7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ning/tiny_board/tb16_rgb/config.h b/keyboards/ning/tiny_board/tb16_rgb/config.h index d6e6c6a154..a44da94f82 100644 --- a/keyboards/ning/tiny_board/tb16_rgb/config.h +++ b/keyboards/ning/tiny_board/tb16_rgb/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/info.json index 5c19f2fe6b..c47cdc9533 100644 --- a/keyboards/ning/tiny_board/tb16_rgb/info.json +++ b/keyboards/ning/tiny_board/tb16_rgb/info.json @@ -16,6 +16,9 @@ "cols": ["B6", "B1", "B3", "B2"], "rows": ["F7", "F6", "F5", "F4"] }, + "ws2812": { + "pin": "B5" + }, "development_board": "promicro", "url": "", "usb": { diff --git a/keyboards/nix_studio/oxalys80/config.h b/keyboards/nix_studio/oxalys80/config.h index 058287b281..dad8a5e9f1 100644 --- a/keyboards/nix_studio/oxalys80/config.h +++ b/keyboards/nix_studio/oxalys80/config.h @@ -21,7 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json index 5261b52e6c..768eccb7c2 100644 --- a/keyboards/nix_studio/oxalys80/info.json +++ b/keyboards/nix_studio/oxalys80/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "B3" + }, "indicators": { "caps_lock": "E6", "scroll_lock": "B2", diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h index c44f3c17a8..4abb4bd5da 100644 --- a/keyboards/novelkeys/nk1/config.h +++ b/keyboards/novelkeys/nk1/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json index 28f270038c..64f74e92f6 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/info.json @@ -8,6 +8,9 @@ "pid": "0x4E4D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h index 0524f9766c..23b8d2915a 100644 --- a/keyboards/novelkeys/nk20/config.h +++ b/keyboards/novelkeys/nk20/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB options */ -#define RGB_DI_PIN A7 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json index 5de23f5618..1a2ce39f89 100644 --- a/keyboards/novelkeys/nk20/info.json +++ b/keyboards/novelkeys/nk20/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h index 758c556ce3..a22f9b1685 100755 --- a/keyboards/novelkeys/nk65b/config.h +++ b/keyboards/novelkeys/nk65b/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB options */ -#define RGB_DI_PIN B4 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json index 8326a10b73..1385cb4eeb 100755 --- a/keyboards/novelkeys/nk65b/info.json +++ b/keyboards/novelkeys/nk65b/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h index b2927c353f..49d3104c45 100644 --- a/keyboards/novelkeys/nk87b/config.h +++ b/keyboards/novelkeys/nk87b/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB options */ -#define RGB_DI_PIN B0 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json index 6ac86add9f..c00053e27a 100755 --- a/keyboards/novelkeys/nk87b/info.json +++ b/keyboards/novelkeys/nk87b/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B0", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h index e1d9ada105..8c82daf631 100755 --- a/keyboards/novelkeys/novelpad/config.h +++ b/keyboards/novelkeys/novelpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json index b663f16c38..e98746ab29 100644 --- a/keyboards/novelkeys/novelpad/info.json +++ b/keyboards/novelkeys/novelpad/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 10 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4"], diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h index 8fcd63e7b2..9abdc5c69b 100644 --- a/keyboards/noxary/268_2_rgb/config.h +++ b/keyboards/noxary/268_2_rgb/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once /* ws2812b options */ -#define RGB_DI_PIN B5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json index b751e27f90..d1f57bc5fc 100644 --- a/keyboards/noxary/268_2_rgb/info.json +++ b/keyboards/noxary/268_2_rgb/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "B5" + }, "indicators": { "caps_lock": "B0" }, diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h index 8c659d5a21..1a8211bc3a 100644 --- a/keyboards/noxary/x268/config.h +++ b/keyboards/noxary/x268/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* ws2812b options */ -#define RGB_DI_PIN B5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json index 2f190a3e68..3b47943e97 100644 --- a/keyboards/noxary/x268/info.json +++ b/keyboards/noxary/x268/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nullbitsco/nibble/config.h b/keyboards/nullbitsco/nibble/config.h index af85027e64..5ef3783b87 100644 --- a/keyboards/nullbitsco/nibble/config.h +++ b/keyboards/nullbitsco/nibble/config.h @@ -39,7 +39,6 @@ #define MATRIX_COL_PINS { } /* Optional SMT LED pins */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nullbitsco/nibble/info.json b/keyboards/nullbitsco/nibble/info.json index 5c69cb0e7e..3fc0c3304f 100644 --- a/keyboards/nullbitsco/nibble/info.json +++ b/keyboards/nullbitsco/nibble/info.json @@ -12,6 +12,9 @@ {"pin_a": "B5", "pin_b": "B4"} ] }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 10, diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h index bf0c7568ec..346a8fb8a8 100644 --- a/keyboards/nullbitsco/tidbit/config.h +++ b/keyboards/nullbitsco/tidbit/config.h @@ -23,7 +23,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 200 /* Optional SMT LED pins */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json index aa95009339..e2e060aef0 100644 --- a/keyboards/nullbitsco/tidbit/info.json +++ b/keyboards/nullbitsco/tidbit/info.json @@ -7,6 +7,9 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": [null, null, "F4", "F5", "F6", "F7"], "rows": ["B1", "E6", "D7", "C6", "D4"] diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h index d11ad6d8e5..96963e6721 100644 --- a/keyboards/numatreus/config.h +++ b/keyboards/numatreus/config.h @@ -19,9 +19,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - // keyboard RGB LED support // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes #define RGBLED_NUM 6 diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json index 6139c594d6..c7e31c6c61 100644 --- a/keyboards/numatreus/info.json +++ b/keyboards/numatreus/info.json @@ -13,6 +13,9 @@ "rows": ["C6", "D7", "E6", "B4"] }, "diode_direction": "ROW2COL", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/obosob/arch_36/config.h b/keyboards/obosob/arch_36/config.h index c861404357..068a231f43 100644 --- a/keyboards/obosob/arch_36/config.h +++ b/keyboards/obosob/arch_36/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLED_SPLIT { 6, 6 } #define RGBLED_NUM 12 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \ diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json index 9eef360e86..d978080a2f 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h index 46b598cf02..c6739d7f66 100644 --- a/keyboards/ogre/ergo_single/config.h +++ b/keyboards/ogre/ergo_single/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7} #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index c6e8eea75c..b2f4493362 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -13,6 +13,9 @@ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h index 724905efd7..92535947de 100644 --- a/keyboards/ogre/ergo_split/config.h +++ b/keyboards/ogre/ergo_split/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D1 -#define RGB_DI_PIN B6 #define RGBLED_SPLIT { 7, 7 } #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 7} diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index e01e6873d1..84452270de 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h index 0309f3820c..f11b35919e 100644 --- a/keyboards/ok60/config.h +++ b/keyboards/ok60/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ok60/info.json b/keyboards/ok60/info.json index 53bbbd73bd..e012d3b43c 100644 --- a/keyboards/ok60/info.json +++ b/keyboards/ok60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb"], diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h index 9af406eec5..16957f9a0a 100644 --- a/keyboards/om60/config.h +++ b/keyboards/om60/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 69 #define RGBLIGHT_LED_MAP { \ diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json index c33231efe8..8eefadbb3c 100644 --- a/keyboards/om60/info.json +++ b/keyboards/om60/info.json @@ -13,6 +13,9 @@ {"pin_a": "B4", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h index c5772b4124..c66f9ef044 100644 --- a/keyboards/omkbd/ergodash/mini/config.h +++ b/keyboards/omkbd/ergodash/mini/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json index 5d53117b14..8020aec580 100644 --- a/keyboards/omkbd/ergodash/mini/info.json +++ b/keyboards/omkbd/ergodash/mini/info.json @@ -20,6 +20,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h index 2f3532bbb4..03eea39fd6 100644 --- a/keyboards/omkbd/ergodash/rev1/config.h +++ b/keyboards/omkbd/ergodash/rev1/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json index a5f7e38b5b..8e357b326b 100644 --- a/keyboards/omkbd/ergodash/rev1/info.json +++ b/keyboards/omkbd/ergodash/rev1/info.json @@ -20,6 +20,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT_4key": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h index fefd4840a8..b54416a389 100644 --- a/keyboards/omkbd/runner3680/3x6/config.h +++ b/keyboards/omkbd/runner3680/3x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index ebd7e4d2c2..4cd318a2ef 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h index 9fa7ef6ecb..c70baa156f 100644 --- a/keyboards/omkbd/runner3680/3x7/config.h +++ b/keyboards/omkbd/runner3680/3x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index c55fb295a7..aec7fbcbef 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h index 1640c1ae10..41740c62e4 100644 --- a/keyboards/omkbd/runner3680/3x8/config.h +++ b/keyboards/omkbd/runner3680/3x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index c04f891b76..ccf59c180b 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h index 1640c1ae10..41740c62e4 100644 --- a/keyboards/omkbd/runner3680/4x6/config.h +++ b/keyboards/omkbd/runner3680/4x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index f4edd551ba..f2433c99b6 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h index 85cc2719f7..03b4919378 100644 --- a/keyboards/omkbd/runner3680/4x7/config.h +++ b/keyboards/omkbd/runner3680/4x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index df40623eb3..17af0b601e 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h index aa4a29d56d..d3f8800e34 100644 --- a/keyboards/omkbd/runner3680/4x8/config.h +++ b/keyboards/omkbd/runner3680/4x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index bb1478a47d..f8fb9fa02c 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h index 1d77295725..8dbc8175aa 100644 --- a/keyboards/omkbd/runner3680/5x6/config.h +++ b/keyboards/omkbd/runner3680/5x6/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index 8881bef9ab..dc9aa6f7f9 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h index 658f0bf059..6c1d08fe32 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/config.h +++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index 16641e8a53..605bef904a 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h index 688e0f7520..f7457e18b4 100644 --- a/keyboards/omkbd/runner3680/5x7/config.h +++ b/keyboards/omkbd/runner3680/5x7/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index a74e20eea6..c7cc414c5d 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h index 421ceefab9..193767245e 100644 --- a/keyboards/omkbd/runner3680/5x8/config.h +++ b/keyboards/omkbd/runner3680/5x8/config.h @@ -25,7 +25,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index f852ca2b52..5b4f3ad5cd 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 6382a3b398..e2b275251d 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -18,9 +18,7 @@ along with this program. If not, see . #pragma once /* RGB Underglow - * F6 PIN for Org60 that has pre-soldered WS2812 LEDs */ -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/org60/info.json b/keyboards/org60/info.json index ccb05c66ce..e71474ae2d 100644 --- a/keyboards/org60/info.json +++ b/keyboards/org60/info.json @@ -17,6 +17,9 @@ "pin": "F5", "levels": 6 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h index 62b80bcd5d..3964ccec15 100644 --- a/keyboards/orthocode/config.h +++ b/keyboards/orthocode/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN D5 #define RGBLED_NUM 10 /*Change for the number of leds on the strip you attach*/ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json index 2919876772..f01c75da91 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/info.json @@ -18,6 +18,9 @@ {"pin_a": "D1", "pin_b": "D0", "resolution": 1} ] }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32a", "bootloader": "usbasploader", "debounce": 0, diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index f17deefb4e..502f364719 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h @@ -34,7 +34,7 @@ along with this program. If not, see . #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT))) #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN D3 +# define WS2812_DI_PIN D3 # define RGBLED_NUM 16 // Number of LEDs # define RGBLED_SPLIT \ { 8, 8 } diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 2fa05fda7c..7852878ee7 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -32,8 +32,8 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_KNIGHT // #define RGBLED_SPLIT { 5, 5 } -#undef RGB_DI_PIN -#define RGB_DI_PIN D3 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN D3 #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define RGBLIGHT_SLEEP diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h index 6544962d74..b1176fc6b8 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/config.h +++ b/keyboards/owlab/jelly_epoch/hotswap/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define FORCE_NKRO /* RGB Strip*/ -#define RGB_DI_PIN B15 # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index 1db0cc9b9d..63a884fc2c 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "B2", "B3", "A15", "B10"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B15" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h index 6544962d74..b1176fc6b8 100644 --- a/keyboards/owlab/jelly_epoch/soldered/config.h +++ b/keyboards/owlab/jelly_epoch/soldered/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define FORCE_NKRO /* RGB Strip*/ -#define RGB_DI_PIN B15 # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json index e2353d69f9..4e001d03c0 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B1", "B2", "B3", "A15", "B10"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B15" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h index b0168c4763..c1dab1c71f 100644 --- a/keyboards/owlab/spring/config.h +++ b/keyboards/owlab/spring/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define FORCE_NKRO /* RGB Strip*/ -#define RGB_DI_PIN D3 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index ece663928e..c6d40526cf 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -13,6 +13,9 @@ "rows": ["B0", "B7", "D0", "D1", "D2"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h index 4bbbb43a33..76fc80e242 100644 --- a/keyboards/owlab/voice65/hotswap/config.h +++ b/keyboards/owlab/voice65/hotswap/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define FORCE_NKRO /* RGB stripe */ -#define RGB_DI_PIN B15 # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json index 3fd9933b41..0c2d43c001 100644 --- a/keyboards/owlab/voice65/hotswap/info.json +++ b/keyboards/owlab/voice65/hotswap/info.json @@ -18,6 +18,9 @@ {"pin_a": "B4", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h index c873464c72..fa2291fb4f 100644 --- a/keyboards/owlab/voice65/soldered/config.h +++ b/keyboards/owlab/voice65/soldered/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define FORCE_NKRO /* RGB stripe */ -#define RGB_DI_PIN B15 # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json index 1300916cc5..8b63b265e7 100644 --- a/keyboards/owlab/voice65/soldered/info.json +++ b/keyboards/owlab/voice65/soldered/info.json @@ -18,6 +18,9 @@ {"pin_a": "B4", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"], diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h index a8026b4d17..2db0b8566c 100644 --- a/keyboards/p3d/glitch/config.h +++ b/keyboards/p3d/glitch/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B1 #define RGBLED_NUM 25 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index ebe7ac6e30..6f6b51ef0d 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -18,6 +18,9 @@ {"pin_a": "F6", "pin_b": "F7", "resolution": 2} ] }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/panc40/config.h b/keyboards/panc40/config.h index 96117cf81c..edc623d08f 100644 --- a/keyboards/panc40/config.h +++ b/keyboards/panc40/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json index 60618f6794..31b9bc8093 100644 --- a/keyboards/panc40/info.json +++ b/keyboards/panc40/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D0", "D1"], "rows": ["F0", "F1", "F4", "F5"] diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h index cfd4fba907..ede3d42de5 100644 --- a/keyboards/paprikman/albacore/config.h +++ b/keyboards/paprikman/albacore/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 8 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json index 23a45a6c0b..211591fc38 100644 --- a/keyboards/paprikman/albacore/info.json +++ b/keyboards/paprikman/albacore/info.json @@ -16,6 +16,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index 62a104a337..b5832b9a79 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -32,7 +32,6 @@ ] }, "rgblight": { - "pin": "D2", "led_count": 8, "hue_steps": 8, "brightness_steps": 8, @@ -50,6 +49,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT_ortho_2x2u": { "layout": [ diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h index 455b46c8eb..009f810b0c 100644 --- a/keyboards/pearlboards/atlas/config.h +++ b/keyboards/pearlboards/atlas/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGB_DI_PIN B6 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json index f5e1be9ac3..11967be065 100644 --- a/keyboards/pearlboards/atlas/info.json +++ b/keyboards/pearlboards/atlas/info.json @@ -24,6 +24,9 @@ "scroll_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "B6" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h index dea50e6a4d..02fc30db97 100644 --- a/keyboards/pearlboards/pandora/config.h +++ b/keyboards/pearlboards/pandora/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json index d482167bc0..b3d80109fe 100644 --- a/keyboards/pearlboards/pandora/info.json +++ b/keyboards/pearlboards/pandora/info.json @@ -22,6 +22,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h index 47cb682e7a..361c315929 100644 --- a/keyboards/pearlboards/pearl/config.h +++ b/keyboards/pearlboards/pearl/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json index a1e90c6431..1a4b7f301c 100644 --- a/keyboards/pearlboards/pearl/info.json +++ b/keyboards/pearlboards/pearl/info.json @@ -19,6 +19,9 @@ "scroll_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 4, diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h index 0b72f187a4..102c43e168 100644 --- a/keyboards/pearlboards/zeus/config.h +++ b/keyboards/pearlboards/zeus/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json index 7de8efb8d7..6fbe41611e 100644 --- a/keyboards/pearlboards/zeus/info.json +++ b/keyboards/pearlboards/zeus/info.json @@ -24,6 +24,9 @@ "scroll_lock": "C3", "on_state": 0 }, + "ws2812": { + "pin": "D5" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h index c6c843dddd..205cad6e32 100644 --- a/keyboards/pearlboards/zeuspad/config.h +++ b/keyboards/pearlboards/zeuspad/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . /*== all animations enabled ==*/ /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json index 6b5cb66ad4..c062ce5442 100644 --- a/keyboards/pearlboards/zeuspad/info.json +++ b/keyboards/pearlboards/zeuspad/info.json @@ -18,6 +18,9 @@ {"pin_a": "D6", "pin_b": "D4", "resolution": 1} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 0, diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h index 2978c96efd..2cfff5c7bf 100644 --- a/keyboards/percent/booster/config.h +++ b/keyboards/percent/booster/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json index 79b9cb8026..ba8be4a603 100644 --- a/keyboards/percent/booster/info.json +++ b/keyboards/percent/booster/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_5x4"], diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h index f5bfd30028..fe374cd794 100644 --- a/keyboards/percent/canoe_gen2/config.h +++ b/keyboards/percent/canoe_gen2/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . /* Backlight configuration */ -#define RGB_DI_PIN B7 #define RGB_MATRIX_LED_COUNT 77 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json index 96d646c4a0..0f64915a2a 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/info.json @@ -8,6 +8,9 @@ "pid": "0x89F0", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"], "rows": ["B1", "B3", "B2", "F5", "F4"] diff --git a/keyboards/phage_studio/pila87/config.h b/keyboards/phage_studio/pila87/config.h index 5e5150abe1..2f4f0fac76 100644 --- a/keyboards/phage_studio/pila87/config.h +++ b/keyboards/phage_studio/pila87/config.h @@ -24,9 +24,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - /* RGB Matrix config */ - #define RGB_DI_PIN A4 - /* RGB Matrix effect */ #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json index 2eda57d0e7..95a16a39d3 100644 --- a/keyboards/phage_studio/pila87/info.json +++ b/keyboards/phage_studio/pila87/info.json @@ -19,6 +19,9 @@ "caps_lock": "C14", "scroll_lock": "A0" }, + "ws2812": { + "pin": "A4" + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h index 1e64cede55..9f5804745a 100644 --- a/keyboards/phantom/config.h +++ b/keyboards/phantom/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/phantom/info.json b/keyboards/phantom/info.json index f13f481170..bf858eaf06 100644 --- a/keyboards/phantom/info.json +++ b/keyboards/phantom/info.json @@ -17,6 +17,9 @@ "caps_lock": "B6", "scroll_lock": "B7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "halfkay", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/phase_studio/titan65/hotswap/config.h b/keyboards/phase_studio/titan65/hotswap/config.h index 11fc714e6e..8724fc556d 100644 --- a/keyboards/phase_studio/titan65/hotswap/config.h +++ b/keyboards/phase_studio/titan65/hotswap/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 67 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json index ce4d3cf4b5..d55716fa79 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0xBB91", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"], "rows": ["B4", "B5", "B6", "C6", "F7"] diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/info.json index 8e4e64618d..e491dd798a 100644 --- a/keyboards/pica40/rev1/info.json +++ b/keyboards/pica40/rev1/info.json @@ -19,12 +19,14 @@ }, "rgblight": { "led_count": 1, - "pin": "D3", "layers": { "enabled": true, "max": 3 } }, + "ws2812": { + "pin": "D3" + }, "encoder": { "rotary": [{ "pin_a": "C6", "pin_b": "D4" }] }, diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/info.json index 9dd5aa2995..7d92343c09 100644 --- a/keyboards/pica40/rev2/info.json +++ b/keyboards/pica40/rev2/info.json @@ -24,7 +24,6 @@ }, "rgblight": { "led_count": 1, - "pin": "GP12", "split": true, "layers": { "enabled": true, @@ -32,6 +31,7 @@ } }, "ws2812": { + "pin": "GP12", "driver": "vendor" }, "split": { diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h index 789626b6da..7506090b1e 100644 --- a/keyboards/pico/65keys/config.h +++ b/keyboards/pico/65keys/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json index f96b487d78..c591f0fe47 100644 --- a/keyboards/pico/65keys/info.json +++ b/keyboards/pico/65keys/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h index 789626b6da..7506090b1e 100644 --- a/keyboards/pico/70keys/config.h +++ b/keyboards/pico/70keys/config.h @@ -21,9 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #undef RGBLED_NUM #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json index 593e8eeb87..0cd5afb0ca 100644 --- a/keyboards/pico/70keys/info.json +++ b/keyboards/pico/70keys/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/picolab/frusta_fundamental/config.h b/keyboards/picolab/frusta_fundamental/config.h index d8f00513d8..1bd318c9ad 100644 --- a/keyboards/picolab/frusta_fundamental/config.h +++ b/keyboards/picolab/frusta_fundamental/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B0 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json index 8e37509ca6..2296712e1e 100644 --- a/keyboards/picolab/frusta_fundamental/info.json +++ b/keyboards/picolab/frusta_fundamental/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5"] diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h index 14ef447bed..6ded752fcc 100644 --- a/keyboards/pimentoso/touhoupad/config.h +++ b/keyboards/pimentoso/touhoupad/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json index a45bdb9b3d..4e35191761 100644 --- a/keyboards/pimentoso/touhoupad/info.json +++ b/keyboards/pimentoso/touhoupad/info.json @@ -8,6 +8,9 @@ "pid": "0x0031", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D4"] diff --git a/keyboards/pixelspace/capsule65i/config.h b/keyboards/pixelspace/capsule65i/config.h index 2b5ec82860..c6dd26a46a 100644 --- a/keyboards/pixelspace/capsule65i/config.h +++ b/keyboards/pixelspace/capsule65i/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/pixelspace/capsule65i/info.json b/keyboards/pixelspace/capsule65i/info.json index 24ce379e89..b2ac8f8528 100644 --- a/keyboards/pixelspace/capsule65i/info.json +++ b/keyboards/pixelspace/capsule65i/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "F6" }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h index 450addbd99..9ee7d9fac4 100644 --- a/keyboards/planck/keymaps/experimental/config.h +++ b/keyboards/planck/keymaps/experimental/config.h @@ -7,7 +7,7 @@ #define BACKLIGHT_BREATHING /* ws2812 RGB LED */ -#define RGB_DI_PIN B1 +#define WS2812_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/planck/keymaps/myoung34/config.h b/keyboards/planck/keymaps/myoung34/config.h index 92ad42f0fa..f69cb62280 100644 --- a/keyboards/planck/keymaps/myoung34/config.h +++ b/keyboards/planck/keymaps/myoung34/config.h @@ -39,7 +39,7 @@ /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ //#define MIDI_TONE_KEYCODE_OCTAVES 2 -#define RGB_DI_PIN B2 // The pin the LED strip is connected to (PB2 by default) +#define WS2812_DI_PIN B2 // The pin the LED strip is connected to (PB2 by default) #define RGBLED_NUM 3 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 5bde659509..1d029dae69 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -45,7 +45,6 @@ /* * WS2812 Underglow Matrix options */ -#define RGB_DI_PIN A1 #define RGBLED_NUM 9 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index 505990904e..40af6bd442 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.6" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 296e1ac6d9..ff15e9628d 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -46,7 +46,6 @@ /* * WS2812 Underglow Matrix options */ -#define RGB_DI_PIN A1 #define RGBLED_NUM 9 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index 9581cb6b09..a759ada42b 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.6" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h index f5dcc375fa..9bcb20ae88 100644 --- a/keyboards/playkbtw/ca66/config.h +++ b/keyboards/playkbtw/ca66/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 8cd12628a4..4363e0c618 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "F0" }, + "ws2812": { + "pin": "B1" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/playkbtw/helen80/config.h b/keyboards/playkbtw/helen80/config.h index 2a8c2d30c3..89199f511e 100644 --- a/keyboards/playkbtw/helen80/config.h +++ b/keyboards/playkbtw/helen80/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 87 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/playkbtw/helen80/info.json b/keyboards/playkbtw/helen80/info.json index 5d512ceeeb..6b68149977 100644 --- a/keyboards/playkbtw/helen80/info.json +++ b/keyboards/playkbtw/helen80/info.json @@ -18,6 +18,9 @@ "scroll_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h index 398e870462..8471167fcd 100644 --- a/keyboards/playkbtw/pk60/config.h +++ b/keyboards/playkbtw/pk60/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/playkbtw/pk60/info.json b/keyboards/playkbtw/pk60/info.json index 86adea4b61..a3cb5549e1 100644 --- a/keyboards/playkbtw/pk60/info.json +++ b/keyboards/playkbtw/pk60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "F4", "on_state": 0 diff --git a/keyboards/playkbtw/pk64rgb/config.h b/keyboards/playkbtw/pk64rgb/config.h index 13b3cb90a2..3b2087c5b8 100644 --- a/keyboards/playkbtw/pk64rgb/config.h +++ b/keyboards/playkbtw/pk64rgb/config.h @@ -40,7 +40,6 @@ #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL #endif -#define RGB_DI_PIN B0 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/playkbtw/pk64rgb/info.json b/keyboards/playkbtw/pk64rgb/info.json index 738e96b781..2751e9c685 100644 --- a/keyboards/playkbtw/pk64rgb/info.json +++ b/keyboards/playkbtw/pk64rgb/info.json @@ -13,6 +13,9 @@ "rows": ["D7", "D6", "D5", "D3", "D2"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h index c7fcc504e3..bc7e587ee7 100644 --- a/keyboards/ploopyco/mouse/config.h +++ b/keyboards/ploopyco/mouse/config.h @@ -30,7 +30,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN B5 #define RGBLED_NUM 4 #define RGBLIGHT_LIMIT_VAL 40 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index c8889f59f9..96b91d89a6 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -11,6 +11,9 @@ "bootmagic": { "matrix": [0, 3] }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h index fcf51c4c1b..66a453dcb8 100644 --- a/keyboards/ploopyco/trackball/rev1_005/config.h +++ b/keyboards/ploopyco/trackball/rev1_005/config.h @@ -23,8 +23,6 @@ #define UNUSABLE_PINS \ { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 } -// If board has a debug LED, you can enable it by defining this -#define RGB_DI_PIN B5 #define RGBLED_NUM 3 #define RGBLIGHT_LIMIT_VAL 40 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json index b963f8842a..91574c5c4b 100644 --- a/keyboards/ploopyco/trackball/rev1_005/info.json +++ b/keyboards/ploopyco/trackball/rev1_005/info.json @@ -5,5 +5,8 @@ "direct": [ ["D4", "D2", "E6", "B6", "D7"] ] + }, + "ws2812": { + "pin": "B5" } } diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json index 80951b5b2d..602692866c 100644 --- a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json +++ b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json @@ -8,13 +8,14 @@ }, "rgblight": { "led_count": 3, - "pin": "B5", "max_brightness": 40, "animations": { "breathing": true, "rainbow_mood": true, "rainbow_swirl": true } + }, + "ws2812": { + "pin": "B5" } - } diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h index 389b5ff394..3169b059f8 100644 --- a/keyboards/plume/plume65/config.h +++ b/keyboards/plume/plume65/config.h @@ -16,7 +16,6 @@ #pragma once - #define RGB_DI_PIN B0 #define RGBLED_NUM 10 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json index 7a3570a0d5..aaf3ae1225 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/info.json @@ -8,6 +8,9 @@ "pid": "0x22CF", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B7", "F7", "C7", "C6", "B6", "F0", "B5", "F1", "B4", "F4", "D7", "F5", "D6", "F6", "D4"], "rows": ["D2", "D5", "E6", "D0", "D1"] diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h index d300277060..09d996e930 100644 --- a/keyboards/plut0nium/0x3e/config.h +++ b/keyboards/plut0nium/0x3e/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* * RGB Underglow */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json index 5e96db2c28..65c4567c4e 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/info.json @@ -18,6 +18,9 @@ "levels": 6, "breathing": true }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json index fa22b77959..d9d5c73d82 100644 --- a/keyboards/plywrks/allaro/info.json +++ b/keyboards/plywrks/allaro/info.json @@ -26,7 +26,6 @@ }, "rgblight": { "led_count": 16, - "pin": "E2", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -43,6 +42,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "E2" + }, "layouts": { "LAYOUT_arisu": { "layout": [ diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h index e96a51c2a4..9dca983f22 100644 --- a/keyboards/plywrks/lune/config.h +++ b/keyboards/plywrks/lune/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 8 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json index 6f3f8b8421..694044ba4f 100644 --- a/keyboards/plywrks/lune/info.json +++ b/keyboards/plywrks/lune/info.json @@ -8,6 +8,9 @@ "pid": "0x7901", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"], "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"] diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h index 80408e3cf6..aadf46e198 100644 --- a/keyboards/pohjolaworks/louhi/config.h +++ b/keyboards/pohjolaworks/louhi/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B5 # define RGBLED_NUM 14 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json index 1e16cf9cfb..d6c6fc31f0 100644 --- a/keyboards/pohjolaworks/louhi/info.json +++ b/keyboards/pohjolaworks/louhi/info.json @@ -18,6 +18,9 @@ {"pin_a": "B2", "pin_b": "B3"} ] }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/poker87c/config.h b/keyboards/poker87c/config.h index db6b79a45a..cd3cd3a3c9 100644 --- a/keyboards/poker87c/config.h +++ b/keyboards/poker87c/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 95 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/poker87c/info.json b/keyboards/poker87c/info.json index fb4aaa9696..a250fd25f4 100644 --- a/keyboards/poker87c/info.json +++ b/keyboards/poker87c/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h index 8d13c9fad8..03b43fcee2 100644 --- a/keyboards/poker87d/config.h +++ b/keyboards/poker87d/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 125 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json index 31556bc638..b955d147d4 100644 --- a/keyboards/poker87d/info.json +++ b/keyboards/poker87d/info.json @@ -21,6 +21,9 @@ "num_lock": "B1", "scroll_lock": "B2" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/polycarbdiet/s20/config.h b/keyboards/polycarbdiet/s20/config.h index 18844c7f95..e61b67307f 100644 --- a/keyboards/polycarbdiet/s20/config.h +++ b/keyboards/polycarbdiet/s20/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json index 6511d1305a..19b1a71864 100644 --- a/keyboards/polycarbdiet/s20/info.json +++ b/keyboards/polycarbdiet/s20/info.json @@ -17,6 +17,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h index c09fcf6fbf..4c85d73c7a 100644 --- a/keyboards/pom_keyboards/tnln95/config.h +++ b/keyboards/pom_keyboards/tnln95/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* RGB Configs */ -#define RGB_DI_PIN C7 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json index 06dc68f853..22b115fb8f 100644 --- a/keyboards/pom_keyboards/tnln95/info.json +++ b/keyboards/pom_keyboards/tnln95/info.json @@ -18,6 +18,9 @@ "levels": 10, "breathing": true }, + "ws2812": { + "pin": "C7" + }, "bootmagic": { "matrix": [0, 4] }, diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h index 0267852335..18812886f7 100644 --- a/keyboards/preonic/keymaps/seph/config.h +++ b/keyboards/preonic/keymaps/seph/config.h @@ -7,8 +7,8 @@ #define BACKLIGHT_LEVELS 8 /* ws2812 RGB LED */ -#undef RGB_DI_PIN -#define RGB_DI_PIN B3 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN B3 #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index a2de64a324..2f55894ae6 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -45,7 +45,6 @@ /* * WS2812 Underglow Matrix options */ -#define RGB_DI_PIN A1 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index 253017bf9a..de242674bb 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -7,6 +7,7 @@ "device_version": "0.0.3" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index f05911872b..ac584dfbfe 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -45,7 +45,6 @@ /* * WS2812 Underglow Matrix options */ -#define RGB_DI_PIN A1 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index a327c2cf40..ff105f700f 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -7,6 +7,7 @@ "device_version": "0.0.3" }, "ws2812": { + "pin": "A1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h index 92ac0a089f..0633f8948e 100644 --- a/keyboards/primekb/meridian/config.h +++ b/keyboards/primekb/meridian/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 3 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h index e2e4e55992..e28306587d 100644 --- a/keyboards/primekb/meridian/ktr1010/config.h +++ b/keyboards/primekb/meridian/ktr1010/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 3 // Special timing definitions for KTR101 #define WS2812_TIMING 1325 diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/info.json new file mode 100644 index 0000000000..3a330b7306 --- /dev/null +++ b/keyboards/primekb/meridian/ktr1010/info.json @@ -0,0 +1,5 @@ +{ + "ws2812": { + "pin": "B15" + } +} diff --git a/keyboards/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h index 92ac0a089f..0633f8948e 100644 --- a/keyboards/primekb/meridian/ws2812/config.h +++ b/keyboards/primekb/meridian/ws2812/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B15 #define RGBLED_NUM 3 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/info.json index 3aa1a1bc55..9870232117 100644 --- a/keyboards/primekb/meridian/ws2812/info.json +++ b/keyboards/primekb/meridian/ws2812/info.json @@ -1,5 +1,6 @@ { "ws2812": { + "pin": "B15", "driver": "spi" } } diff --git a/keyboards/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h index 2777e43a44..ce5c51f120 100644 --- a/keyboards/primekb/meridian_rgb/config.h +++ b/keyboards/primekb/meridian_rgb/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 64 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json index cb5d6478f3..d3422ffec9 100644 --- a/keyboards/primekb/meridian_rgb/info.json +++ b/keyboards/primekb/meridian_rgb/info.json @@ -18,6 +18,9 @@ "num_lock": "B0", "scroll_lock": "B2" }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/primekb/prime_e/rgb/config.h b/keyboards/primekb/prime_e/rgb/config.h index 57fbc6182d..6610d03f04 100644 --- a/keyboards/primekb/prime_e/rgb/config.h +++ b/keyboards/primekb/prime_e/rgb/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once - -#define RGB_DI_PIN B7 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/primekb/prime_e/rgb/info.json b/keyboards/primekb/prime_e/rgb/info.json index 1d40389e87..189e448ed9 100644 --- a/keyboards/primekb/prime_e/rgb/info.json +++ b/keyboards/primekb/prime_e/rgb/info.json @@ -3,5 +3,8 @@ "usb": { "pid": "0x0052", "device_version": "0.0.1" + }, + "ws2812": { + "pin": "B7" } } diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h index 7e1c6cc785..9120905d7a 100644 --- a/keyboards/program_yoink/config.h +++ b/keyboards/program_yoink/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /*RGB*/ -#define RGB_DI_PIN D4 #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json index cd43c3f92a..ef5492bd52 100644 --- a/keyboards/program_yoink/ortho/info.json +++ b/keyboards/program_yoink/ortho/info.json @@ -8,6 +8,9 @@ "pid": "0xF10C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"], "rows": ["D2", "D3", "B1", "B0"] diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/info.json index e23f4ff970..b17fd072a8 100644 --- a/keyboards/program_yoink/staggered/info.json +++ b/keyboards/program_yoink/staggered/info.json @@ -8,6 +8,9 @@ "pid": "0xF10B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "D6", "C2", "D5"], "rows": ["D2", "D3", "B1", "B0"] diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index e6990c6c48..bcb9ffbb09 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json index cbeebbb670..4ed9926907 100644 --- a/keyboards/projectkb/alice/rev1/info.json +++ b/keyboards/projectkb/alice/rev1/info.json @@ -1,5 +1,6 @@ { "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index cd1726d7eb..95f845c931 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json index 0ddf3403f5..57113b1e3c 100644 --- a/keyboards/projectkb/alice/rev2/info.json +++ b/keyboards/projectkb/alice/rev2/info.json @@ -1,5 +1,6 @@ { "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h index 8436b743be..19bddd08a4 100644 --- a/keyboards/protozoa/p01/config.h +++ b/keyboards/protozoa/p01/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define WS2812_DMA_STREAM STM32_DMA1_STREAM5 #define WS2812_DMA_CHANNEL 5 -#define RGB_DI_PIN A9 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json index b0764b5074..6293b4342c 100644 --- a/keyboards/protozoa/p01/info.json +++ b/keyboards/protozoa/p01/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h index c0243f8ee8..d661f794cc 100644 --- a/keyboards/pteron36/config.h +++ b/keyboards/pteron36/config.h @@ -42,5 +42,4 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 7 //RGB Underglow -#define RGB_DI_PIN B6 #define RGBLED_NUM 10 diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 54bcb2e7fa..bb5a8ee1eb 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -28,6 +28,9 @@ } } }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index 53e42221c9..6603c0e153 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -18,7 +18,6 @@ #define LOCKING_SUPPORT_ENABLE -#define RGB_DI_PIN F0 #define RGBLED_NUM 4 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index aa99956be9..6c70d42f42 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -19,6 +19,9 @@ {"pin_a": "C7", "pin_b": "F7", "resolution": 3} ] }, + "ws2812": { + "pin": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h index 143efc9e0d..e7d231ffba 100644 --- a/keyboards/quad_h/lb75/config.h +++ b/keyboards/quad_h/lb75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 6f6f5a598a..2a69607316 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h index feb0b65458..2f70b1e53b 100644 --- a/keyboards/quarkeys/z40/config.h +++ b/keyboards/quarkeys/z40/config.h @@ -14,7 +14,6 @@ #pragma once -#define RGB_DI_PIN F1 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 47 #define RGB_MATRIX_KEYPRESSES // Reacts to Keypresses diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index fd152e4070..10531ddf57 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -12,6 +12,9 @@ "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"], "rows": ["E6", "B3", "C7", "C6"] }, + "ws2812": { + "pin": "F1" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h index d6945273ef..d1456a07f8 100644 --- a/keyboards/quarkeys/z60/hotswap/config.h +++ b/keyboards/quarkeys/z60/hotswap/config.h @@ -14,7 +14,6 @@ #pragma once -#define RGB_DI_PIN D6 #define RGBLED_NUM 80 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json index 82a280e524..3924726711 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/info.json @@ -12,6 +12,9 @@ "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] }, + "ws2812": { + "pin": "D6" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h index 4f45b2ba12..bf95108da3 100644 --- a/keyboards/quarkeys/z60/solder/config.h +++ b/keyboards/quarkeys/z60/solder/config.h @@ -14,7 +14,6 @@ #pragma once -#define RGB_DI_PIN D6 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json index bf1cc9230f..daffbb0220 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/info.json @@ -12,6 +12,9 @@ "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"], "rows": ["B0", "B1", "B2", "B3", "B4"] }, + "ws2812": { + "pin": "D6" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h index 74d8d069c7..2b4eb0f8e4 100644 --- a/keyboards/quarkeys/z67/hotswap/config.h +++ b/keyboards/quarkeys/z67/hotswap/config.h @@ -14,7 +14,6 @@ #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 77 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json index 0431f3bca6..5daf2e0d16 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/info.json @@ -12,6 +12,9 @@ "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] }, + "ws2812": { + "pin": "F0" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h index 778fa5e07f..a4c6bd7153 100644 --- a/keyboards/quarkeys/z67/solder/config.h +++ b/keyboards/quarkeys/z67/solder/config.h @@ -14,7 +14,6 @@ #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json index d6dbb553ea..4e0e697fd9 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/info.json @@ -12,6 +12,9 @@ "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] }, + "ws2812": { + "pin": "F0" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/qvex/lynepad/config.h b/keyboards/qvex/lynepad/config.h index 8779e34349..e9b5f0d0e0 100644 --- a/keyboards/qvex/lynepad/config.h +++ b/keyboards/qvex/lynepad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* LEDs */ -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/qvex/lynepad/info.json b/keyboards/qvex/lynepad/info.json index 997158c29f..984fa3f96c 100644 --- a/keyboards/qvex/lynepad/info.json +++ b/keyboards/qvex/lynepad/info.json @@ -19,6 +19,9 @@ {"pin_a": "B5", "pin_b": "D6"}, ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h index a816a920e2..d47dcae187 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D6 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json index ee61129722..0a0a9a551e 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/info.json @@ -13,6 +13,9 @@ "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], "rows": ["B6", "B2", "B3", "B1"] }, + "ws2812": { + "pin": "D6" + }, "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h index e26458be8e..3f9d574f77 100644 --- a/keyboards/rainkeebs/delilah/config.h +++ b/keyboards/rainkeebs/delilah/config.h @@ -21,8 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json index 0ee9115b9e..fe8d6f9286 100644 --- a/keyboards/rainkeebs/delilah/info.json +++ b/keyboards/rainkeebs/delilah/info.json @@ -8,6 +8,9 @@ "pid": "0x645C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F0", "E6", "D5", "D3", "D4", "D6", "D7", "B4"], "rows": ["B5", "B6", "C6", "C7"] diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h index 7d9d92abe3..5033c1ceac 100644 --- a/keyboards/rainkeebs/yasui/config.h +++ b/keyboards/rainkeebs/yasui/config.h @@ -21,8 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D1 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json index 7ce96382de..4ef45e2c46 100644 --- a/keyboards/rainkeebs/yasui/info.json +++ b/keyboards/rainkeebs/yasui/info.json @@ -8,6 +8,9 @@ "pid": "0x7973", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "B5", "E6"] diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h index c5334b4230..031e003c04 100644 --- a/keyboards/rart/rart4x4/config.h +++ b/keyboards/rart/rart4x4/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json index 090120c22d..b53e79e484 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/info.json @@ -8,6 +8,9 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F7", "B2", "B5", "B4"], "rows": ["F4", "B6", "B3", "B1"] diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h index 983dca5505..f2b7e045da 100644 --- a/keyboards/rart/rart67/config.h +++ b/keyboards/rart/rart67/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json index e33877e783..0ec558c67b 100644 --- a/keyboards/rart/rart67/info.json +++ b/keyboards/rart/rart67/info.json @@ -8,6 +8,9 @@ "pid": "0x0067", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F7", "F6", "F5", "F4", "F1", "E6"], "rows": ["D0", "D1", "D2", "D3", "B0"] diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h index bf5963648d..803f0c79ec 100644 --- a/keyboards/rart/rart75hs/config.h +++ b/keyboards/rart/rart75hs/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN C0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json index 4c10d4b067..7003bb36a6 100644 --- a/keyboards/rart/rart75hs/info.json +++ b/keyboards/rart/rart75hs/info.json @@ -22,6 +22,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "C0" + }, "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h index e98417be6d..42f78d3efe 100644 --- a/keyboards/rart/rart80/config.h +++ b/keyboards/rart/rart80/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json index b52626377e..22ff437b2c 100644 --- a/keyboards/rart/rart80/info.json +++ b/keyboards/rart/rart80/info.json @@ -17,6 +17,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "D5" + }, "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h index 55b365001d..b242e63013 100644 --- a/keyboards/rart/rartlice/config.h +++ b/keyboards/rart/rartlice/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 11 #define WS2812_SPI SPID2 diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json index d6cef540ea..c8b2497285 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/info.json @@ -20,6 +20,7 @@ "on_state": 0 }, "ws2812": { + "pin": "B15", "driver": "spi" }, "processor": "STM32F103", diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h index 5da34f7ad3..25467cdd3a 100644 --- a/keyboards/rart/rartpad/config.h +++ b/keyboards/rart/rartpad/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 78f034a063..77d99deeb6 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -22,6 +22,9 @@ "indicators": { "caps_lock": "D7" }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h index e1f218f682..b2d36827bb 100644 --- a/keyboards/rate/pistachio/rev1/config.h +++ b/keyboards/rate/pistachio/rev1/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define USE_I2C /* ws2812 RGB LED */ -#define RGB_DI_PIN D2 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 1, 1 } #define RGBLED_NUM 2 diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json index 0ecbe691df..c57493f8fe 100644 --- a/keyboards/rate/pistachio/rev1/info.json +++ b/keyboards/rate/pistachio/rev1/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h index 20e6f23c67..95898ac2c1 100644 --- a/keyboards/rate/pistachio/rev2/config.h +++ b/keyboards/rate/pistachio/rev2/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define SPLIT_HAND_MATRIX_GRID D4,D3 /* ws2812 RGB LED */ -#define RGB_DI_PIN D2 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 38, 46 } #define RGBLED_NUM 84 diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json index 992a866125..a98938f559 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h index 934872a0c6..b788bd2bc1 100644 --- a/keyboards/rate/pistachio_mp/config.h +++ b/keyboards/rate/pistachio_mp/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 3 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index e35c7432bc..0aca3a3f8e 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -8,6 +8,9 @@ "pid": "0xE212", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6"], "rows": ["B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h index 403ba8859c..17ec1a2bab 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/config.h +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json index 8a389c05c0..381e690fa8 100644 --- a/keyboards/rationalist/ratio65_hotswap/rev_a/info.json +++ b/keyboards/rationalist/ratio65_hotswap/rev_a/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"], "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"] diff --git a/keyboards/rationalist/ratio65_solder/rev_a/config.h b/keyboards/rationalist/ratio65_solder/rev_a/config.h index cb55082c6a..c3f781ab7c 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/config.h +++ b/keyboards/rationalist/ratio65_solder/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/rationalist/ratio65_solder/rev_a/info.json b/keyboards/rationalist/ratio65_solder/rev_a/info.json index 2f8fd025ee..0d0dcd57b8 100644 --- a/keyboards/rationalist/ratio65_solder/rev_a/info.json +++ b/keyboards/rationalist/ratio65_solder/rev_a/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["C2", "D2", "B6", "B5", "B4", "B3", "B2", "D6"], "rows": ["D1", "D0", "D5", "D4", "C7", "B7", "C6", "C5", "B0", "B1"] diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h index cabcaa1388..d91130ed89 100644 --- a/keyboards/recompile_keys/mio/config.h +++ b/keyboards/recompile_keys/mio/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index c2647c081a..8843ad5739 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -8,6 +8,9 @@ "pid": "0x4D41", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "F4", "F7", "F6", "F5"] diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h index 739186fdeb..e7ca3c1760 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h @@ -58,7 +58,7 @@ along with this program. If not, see . // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN B5 + #define WS2812_DI_PIN B5 #define RGBLIGHT_TIMER #define RGBLED_NUM 6 diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h index 739186fdeb..e7ca3c1760 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h +++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h @@ -58,7 +58,7 @@ along with this program. If not, see . // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN B5 + #define WS2812_DI_PIN B5 #define RGBLIGHT_TIMER #define RGBLED_NUM 6 diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h index f8ece5e250..6fb0d430fb 100644 --- a/keyboards/rect44/config.h +++ b/keyboards/rect44/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B6 #define RGBLED_NUM 12 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json index c136ec6809..da406586fd 100644 --- a/keyboards/rect44/info.json +++ b/keyboards/rect44/info.json @@ -8,6 +8,9 @@ "pid": "0x4DD7", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["D3", "D2", "F5", "F4"] diff --git a/keyboards/redox/keymaps/thattolleyguy/config.h b/keyboards/redox/keymaps/thattolleyguy/config.h index cf32745193..f3b73d8974 100644 --- a/keyboards/redox/keymaps/thattolleyguy/config.h +++ b/keyboards/redox/keymaps/thattolleyguy/config.h @@ -22,8 +22,8 @@ along with this program. If not, see . #define EE_HANDS #undef RGBLED_NUM -#undef RGB_DI_PIN -#define RGB_DI_PIN C6 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN C6 #define RGBLED_NUM 14 // Number of LEDs #define RGBLED_SPLIT { 7, 7 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index 1c251361f0..e0d1433115 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -10,6 +10,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 8b05acd7ed..5b44f7541f 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 14 // Number of LEDs #define RGBLIGHT_SPLIT // sync LEDs between RIGHT and LEFT hand diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index c32700fda9..08a74aef2c 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -25,10 +25,6 @@ #define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 #define SERIAL_USART_TIMEOUT 20 // USART driver timeout. default 20 -/* ws2812 RGB LED */ -#undef RGB_DI_PIN -#define RGB_DI_PIN A9 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 5d5358adb0..7fec1e7950 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "1.0.1" }, + "ws2812": { + "pin": "A9" + }, "matrix_pins": { "cols": ["A1", "A0", "B8", "B13", "B14", "B15", "B9"], "rows": ["B5", "B3", "B2", "B1", "B0"] diff --git a/keyboards/reedskeebs/alish40/info.json b/keyboards/reedskeebs/alish40/info.json index a4f862bec9..d916d4173b 100644 --- a/keyboards/reedskeebs/alish40/info.json +++ b/keyboards/reedskeebs/alish40/info.json @@ -40,9 +40,11 @@ "brightness_steps": 17, "hue_steps": 10, "led_count": 10, - "pin": "F5", "saturation_steps": 17 }, + "ws2812": { + "pin": "F5" + }, "url": "https://mechwild.com/product/alish/", "usb": { "device_version": "1.3.0", diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h index 8f31e689c3..38d0e5dd61 100644 --- a/keyboards/retro_75/config.h +++ b/keyboards/retro_75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A9 #define RGBLED_NUM 18 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json index d4087ab72d..a9645528cb 100644 --- a/keyboards/retro_75/info.json +++ b/keyboards/retro_75/info.json @@ -8,6 +8,9 @@ "pid": "0x5275", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A9" + }, "matrix_pins": { "cols": ["A5", "A4", "A3", "F0", "C15", "C14", "C13", "A6", "B11", "B10", "B2", "B1", "B0", "A7", "A14", "A15"], "rows": ["A8", "B15", "B14", "B13", "B12", "B8"] diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h index 7c718c6bd2..a730f35d8c 100644 --- a/keyboards/reversestudio/decadepad/config.h +++ b/keyboards/reversestudio/decadepad/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/reversestudio/decadepad/info.json b/keyboards/reversestudio/decadepad/info.json index bae2ecb1dc..3b56eb8c53 100644 --- a/keyboards/reversestudio/decadepad/info.json +++ b/keyboards/reversestudio/decadepad/info.json @@ -8,6 +8,9 @@ "pid": "0x4450", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h index 26b116c747..64334bb2d9 100644 --- a/keyboards/reviung/reviung33/config.h +++ b/keyboards/reviung/reviung33/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 5 # define RGBLIGHT_HUE_STEP 16 # define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json index f1f82cf55c..addfdf057c 100644 --- a/keyboards/reviung/reviung33/info.json +++ b/keyboards/reviung/reviung33/info.json @@ -8,6 +8,9 @@ "pid": "0x516D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B1", "B3", "B2", "B6", "B5"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h index f19b1a1f26..e4d91482c9 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h @@ -18,7 +18,7 @@ // place overrides here -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h index f19b1a1f26..e4d91482c9 100644 --- a/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h +++ b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h @@ -18,7 +18,7 @@ // place overrides here -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h index fecd9083e6..d868c539e4 100644 --- a/keyboards/reviung/reviung39/keymaps/default/config.h +++ b/keyboards/reviung/reviung39/keymaps/default/config.h @@ -18,7 +18,7 @@ // place overrides here -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h index b8a8e3c6e1..c44a5f9d7c 100644 --- a/keyboards/reviung/reviung39/keymaps/default_s/config.h +++ b/keyboards/reviung/reviung39/keymaps/default_s/config.h @@ -18,7 +18,7 @@ // place overrides here -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h index 3c1583a1c4..a947a6c67f 100644 --- a/keyboards/reviung/reviung39/keymaps/toshi0383/config.h +++ b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h @@ -18,7 +18,7 @@ // place overrides here -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h index f44fafc2b0..9eb9f83f9c 100644 --- a/keyboards/reviung/reviung41/config.h +++ b/keyboards/reviung/reviung41/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 11 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json index 81275da923..a138636dc0 100644 --- a/keyboards/reviung/reviung41/info.json +++ b/keyboards/reviung/reviung41/info.json @@ -8,6 +8,9 @@ "pid": "0xDCCB", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h index da04717af0..1ec887464e 100644 --- a/keyboards/reviung/reviung5/config.h +++ b/keyboards/reviung/reviung5/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 4 # define RGBLIGHT_HUE_STEP 16 # define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json index f899e6b841..59ca122b11 100644 --- a/keyboards/reviung/reviung5/info.json +++ b/keyboards/reviung/reviung5/info.json @@ -8,6 +8,9 @@ "pid": "0x4F0D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4"], "rows": ["F4"] diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h index a234905969..174384a675 100644 --- a/keyboards/reviung/reviung53/config.h +++ b/keyboards/reviung/reviung53/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json index c45b2ac449..4d3b7c1354 100644 --- a/keyboards/reviung/reviung53/info.json +++ b/keyboards/reviung/reviung53/info.json @@ -8,6 +8,9 @@ "pid": "0x4E09", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h index bf11c1c5b7..854af5142d 100644 --- a/keyboards/reviung/reviung61/keymaps/default_rgb/config.h +++ b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h @@ -19,7 +19,7 @@ // place overrides here // --- RGB underglow --- -#define RGB_DI_PIN B7 +#define WS2812_DI_PIN B7 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index 5b1b86b68f..5b411a8c52 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -49,7 +49,6 @@ #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC /* RGB LED Configuration */ -#define RGB_DI_PIN B5 #define RGBLED_NUM 98 #define RGBLED_SPLIT { 49, 49 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index fbaf90756f..9d5bf972c1 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B5", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c index fab3cac785..023c766de6 100644 --- a/keyboards/rgbkb/pan/pan.c +++ b/keyboards/rgbkb/pan/pan.c @@ -27,7 +27,6 @@ LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT]; static void init(void) {} static void flush(void) { - // Assumes use of RGB_DI_PIN ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT); } diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h deleted file mode 100644 index 432288736d..0000000000 --- a/keyboards/rgbkb/pan/rev1/32a/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/*Copyright 2020 RGBKB - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License 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 RGB_DI_PIN B3 diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json index e6ebce6270..e4ac3eeecb 100644 --- a/keyboards/rgbkb/pan/rev1/32a/info.json +++ b/keyboards/rgbkb/pan/rev1/32a/info.json @@ -11,5 +11,8 @@ {"pin_a": "B0", "pin_b": "B1"}, {"pin_a": "D0", "pin_b": "B2"} ] + }, + "ws2812": { + "pin": "B3" } } diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h deleted file mode 100644 index 0013f20e12..0000000000 --- a/keyboards/rgbkb/pan/rev1/proton_c/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/*Copyright 2020 RGBKB - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License 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 RGB_DI_PIN A3 diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json index 0e04b61593..ff81cd1092 100644 --- a/keyboards/rgbkb/pan/rev1/proton_c/info.json +++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json @@ -12,5 +12,8 @@ {"pin_a": "B14", "pin_b": "B15"}, {"pin_a": "B11", "pin_b": "B12"} ] + }, + "ws2812": { + "pin": "A3" } } diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index fcef317e1f..a41959a88b 100644 --- a/keyboards/rgbkb/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B3 - #ifdef LED_MIRRORED #define RGBLED_NUM 35 #else diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index dfaedb6cff..ae88231a49 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index 874ec536b1..19680c84b3 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B7 - // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define // Full Hand case adds 24 LEDs, Star Fighter case adds 38 LEDs // For mirrored LED control (each MCU controls half the LEDs), total LED counts are divided in half diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index e60042b2c2..97b7921464 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 88d4a84c73..9cc0134249 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -53,7 +53,6 @@ #define DIP_SWITCH_PINS_RIGHT { A14, B0 } /* RGB LED Configuration */ -#define RGB_DI_PIN B5 #define RGBLED_NUM 156 #define RGBLED_SPLIT { 78, 78 } #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index f8d9d4fa4e..77116bb733 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B5", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index 77108690fb..88951a1b44 100644 --- a/keyboards/rgbkb/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D1 - #define RGBLED_NUM 16 // Number of LEDs /* diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index fbefbf744a..013b56764f 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index 252ed730fb..394fd1630b 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index 1303324cbc..ef91fd30d1 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index 79e7f75b6d..022e361de1 100644 --- a/keyboards/rgbkb/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . /* Select hand configuration */ #define EE_HANDS -/* ws2812 RGB LED */ -#define RGB_DI_PIN B7 #ifndef RGBLIGHT_SPLIT_ENABLE #define RGBLED_NUM 30 #else diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index cda09d1d81..c85e9e0a9c 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "ortho_5x12"], diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h index 463de85aa1..b4efbc241c 100644 --- a/keyboards/rmi_kb/squishy65/config.h +++ b/keyboards/rmi_kb/squishy65/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -// RGB B4 -#define RGB_DI_PIN B15 #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json index 9b00b9387a..5b87e81e98 100644 --- a/keyboards/rmi_kb/squishy65/info.json +++ b/keyboards/rmi_kb/squishy65/info.json @@ -8,6 +8,9 @@ "pid": "0x10B5", "device_version": "0.6.5" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["A9", "B9", "B7", "B6", "B5", "B4", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A10", "A3", "A2"], "rows": ["A15", "B3", "A0", "B10", "B11"] diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index 970cf0532c..69522b8362 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C15 # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json index 541ec06731..7f68631da7 100644 --- a/keyboards/rmi_kb/squishyfrl/info.json +++ b/keyboards/rmi_kb/squishyfrl/info.json @@ -8,6 +8,9 @@ "pid": "0x4BE5", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C15" + }, "matrix_pins": { "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"] diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h index 970cf0532c..69522b8362 100644 --- a/keyboards/rmi_kb/squishytkl/config.h +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C15 # define RGBLED_NUM 16 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json index f8a33eea8e..aa49ed4af3 100644 --- a/keyboards/rmi_kb/squishytkl/info.json +++ b/keyboards/rmi_kb/squishytkl/info.json @@ -8,6 +8,9 @@ "pid": "0x00B1", "device_version": "1.0.0" }, + "ws2812": { + "pin": "C15" + }, "matrix_pins": { "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"] diff --git a/keyboards/rmi_kb/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h index cdcae9d159..d3e7eed02c 100644 --- a/keyboards/rmi_kb/tkl_ff/v2/config.h +++ b/keyboards/rmi_kb/tkl_ff/v2/config.h @@ -19,7 +19,6 @@ #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#define RGB_DI_PIN E2 # define RGBLED_NUM 26 # define RGBLIGHT_HUE_STEP 32 # define RGBLIGHT_SAT_STEP 32 diff --git a/keyboards/rmi_kb/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json index ed70ec408c..a7617b5f30 100644 --- a/keyboards/rmi_kb/tkl_ff/v2/info.json +++ b/keyboards/rmi_kb/tkl_ff/v2/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0x10FF" + }, + "ws2812": { + "pin": "E2" } } diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h index 758a6fabfe..c4d0637afe 100644 --- a/keyboards/rmi_kb/wete/v1/config.h +++ b/keyboards/rmi_kb/wete/v1/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -// RGB B4 -#define RGB_DI_PIN B4 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json index c2d2f03271..1ae2b9c993 100644 --- a/keyboards/rmi_kb/wete/v1/info.json +++ b/keyboards/rmi_kb/wete/v1/info.json @@ -18,6 +18,9 @@ "levels": 24, "breathing": true }, + "ws2812": { + "pin": "B4" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h index 8605706bbd..bbf7d911ad 100644 --- a/keyboards/rmi_kb/wete/v2/config.h +++ b/keyboards/rmi_kb/wete/v2/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#define RGB_DI_PIN D0 # define RGBLED_NUM 18 # define RGBLIGHT_HUE_STEP 32 # define RGBLIGHT_SAT_STEP 32 diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json index e110a7ff9e..53d64f2696 100644 --- a/keyboards/rmi_kb/wete/v2/info.json +++ b/keyboards/rmi_kb/wete/v2/info.json @@ -18,6 +18,9 @@ {"pin_a": "D2", "pin_b": "D1"} ] }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h index ad3b4c359a..64c493ace8 100644 --- a/keyboards/rocketboard_16/config.h +++ b/keyboards/rocketboard_16/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN A4 #define RGBLED_NUM 16 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json index 81af3361ad..00006749d8 100644 --- a/keyboards/rocketboard_16/info.json +++ b/keyboards/rocketboard_16/info.json @@ -24,6 +24,9 @@ "bootmagic": { "matrix": [4, 1] }, + "ws2812": { + "pin": "A4" + }, "layout_aliases": { "LAYOUT_default": "LAYOUT" }, diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h index 592d5f5615..e503d296c0 100644 --- a/keyboards/runes/vaengr/config.h +++ b/keyboards/runes/vaengr/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json index 2765e7072c..fb23385a49 100644 --- a/keyboards/runes/vaengr/info.json +++ b/keyboards/runes/vaengr/info.json @@ -8,6 +8,9 @@ "pid": "0x7661", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "D0", "D1", "D6", "D4", "D2", "D3", "D5"], "rows": ["B3", "B7", "B0", "F7", "C6"] diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h index df333efe48..3ca7920978 100644 --- a/keyboards/rura66/rev1/config.h +++ b/keyboards/rura66/rev1/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define MASTER_LEFT #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D3 #define RGBLED_NUM 66 // Number of LEDs #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 33, 33 } diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json index d4f9a92f68..6c405ab95d 100644 --- a/keyboards/rura66/rev1/info.json +++ b/keyboards/rura66/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h index e7618bfdb6..835872aed5 100644 --- a/keyboards/ryanbaekr/rb18/config.h +++ b/keyboards/ryanbaekr/rb18/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Underglow options */ -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json index 287bceec89..2ee0967486 100644 --- a/keyboards/ryanbaekr/rb18/info.json +++ b/keyboards/ryanbaekr/rb18/info.json @@ -8,6 +8,9 @@ "pid": "0x0018", "device_version": "0.0.3" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B2", "B6", "B5", "B4"], "rows": ["B1", "F7", "F6", "F5", "F4"] diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h index a9724ad47a..5614dfa100 100644 --- a/keyboards/ryanbaekr/rb69/config.h +++ b/keyboards/ryanbaekr/rb69/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Underglow options */ -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json index c3e8101dbb..a0340ed599 100644 --- a/keyboards/ryanbaekr/rb69/info.json +++ b/keyboards/ryanbaekr/rb69/info.json @@ -8,6 +8,9 @@ "pid": "0x0069", "device_version": "0.0.3" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "B4", "B5", "B7", "D5", "C7", "E6"], "rows": ["D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h index beeaf9e25c..ca1f8284c5 100644 --- a/keyboards/ryanbaekr/rb87/config.h +++ b/keyboards/ryanbaekr/rb87/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Underglow options */ -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json index 559c121aeb..777cd1e7a0 100644 --- a/keyboards/ryanbaekr/rb87/info.json +++ b/keyboards/ryanbaekr/rb87/info.json @@ -10,6 +10,9 @@ "pid": "0x0087", "device_version": "0.0.3" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "F0", "F1", "C7", "E6", "B4", "B5", "B7", "D5", "D3"], "rows": ["D2", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h index 08a3180510..5e38b1f36a 100644 --- a/keyboards/ryanskidmore/rskeys100/config.h +++ b/keyboards/ryanskidmore/rskeys100/config.h @@ -27,8 +27,6 @@ * the diode direction is COL(umn) to ROW */ #define DIODE_DIRECTION COL2ROW -/* RGB Data Pin */ -#define RGB_DI_PIN C7 /* The number of RGB LEDs connected */ #define RGB_MATRIX_LED_COUNT 105 /* Set the maximum brightness to 110 to avoid going over 500 mA. diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json index 2570549742..949c6021bc 100644 --- a/keyboards/ryanskidmore/rskeys100/info.json +++ b/keyboards/ryanskidmore/rskeys100/info.json @@ -6,6 +6,9 @@ "pid": "0x0064", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "url": "", diff --git a/keyboards/ryloo_studio/m0110/config.h b/keyboards/ryloo_studio/m0110/config.h index 4527345d8d..fb4c0774ef 100755 --- a/keyboards/ryloo_studio/m0110/config.h +++ b/keyboards/ryloo_studio/m0110/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ryloo_studio/m0110/info.json b/keyboards/ryloo_studio/m0110/info.json index 17e88bac32..ef523dcc18 100644 --- a/keyboards/ryloo_studio/m0110/info.json +++ b/keyboards/ryloo_studio/m0110/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h index d99a5188bf..865ab45d31 100644 --- a/keyboards/s_ol/0xc_pad/config.h +++ b/keyboards/s_ol/0xc_pad/config.h @@ -17,7 +17,6 @@ /* ws2812 RGB LED */ -#define RGB_DI_PIN C7 #define RGB_MATRIX_LED_COUNT 12 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_MATRIX_CENTER \ diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json index f1c47c4623..6f49522ba6 100644 --- a/keyboards/s_ol/0xc_pad/info.json +++ b/keyboards/s_ol/0xc_pad/info.json @@ -6,6 +6,9 @@ "rows": ["B7", "B6", "B5", "B4"], "cols": ["D4", "D3", "D2", "D1"] }, + "ws2812": { + "pin": "C7" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/saevus/cor_tkl/config.h b/keyboards/saevus/cor_tkl/config.h index b10c977af4..b42ece99a6 100644 --- a/keyboards/saevus/cor_tkl/config.h +++ b/keyboards/saevus/cor_tkl/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB Matrix setup */ -#define RGB_DI_PIN GP19 #define RGB_MATRIX_LED_COUNT 2 #define RGBLED_NUM 2 #define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json index 2e7699f0ca..54451c1077 100644 --- a/keyboards/saevus/cor_tkl/info.json +++ b/keyboards/saevus/cor_tkl/info.json @@ -38,6 +38,7 @@ "driver": "WS2812" }, "ws2812": { + "pin": "GP19", "driver": "vendor" }, "layouts": { diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index 4156fd3aae..573efb81c7 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 12 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index f0bf9b1d98..3aab930399 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h index b4ac29b52d..82eec4a306 100644 --- a/keyboards/salicylic_acid3/7splus/config.h +++ b/keyboards/salicylic_acid3/7splus/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 31 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 72dcc86573..47f3bcc5c2 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h index 150c2f4dcc..dcbdb0f537 100644 --- a/keyboards/salicylic_acid3/ergoarrows/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 86 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 6d0282fdd6..415a7e1945 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index d004f287df..cdc803a98c 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 9 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index 33f5822449..c63baa8942 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6", "B2"] diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/info.json index 3bd04677b7..8cf8504aba 100644 --- a/keyboards/salicylic_acid3/guide68/info.json +++ b/keyboards/salicylic_acid3/guide68/info.json @@ -26,7 +26,6 @@ }, "rgblight": { "led_count": 12, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -44,6 +43,9 @@ "split": true, "split_count": [ 6, 6 ] }, + "ws2812": { + "pin": "D3" + }, "split": { "enabled": true, "transport": { diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index 70e81ae774..51b6d454e5 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 32 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index 33488610b8..c362ba54e1 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h index 4d7fc6297b..94d44bfce8 100644 --- a/keyboards/salicylic_acid3/nafuda/config.h +++ b/keyboards/salicylic_acid3/nafuda/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index 3553928e8b..cbcc9f54fa 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.1.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6"], "rows": ["D1", "D0", "D4"] diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index 3f1c2f9ca5..c7246fad76 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 48 #endif diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index 96d81a7e71..a7345e5d48 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -22,6 +22,9 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index 4d991f2ea3..33ee2b5030 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN B6 - #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 } diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index 2416e063d9..7eed51635b 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -22,6 +22,9 @@ } } }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h index 24acc89bcf..9f39d06f61 100644 --- a/keyboards/salicylic_acid3/nknl7en/config.h +++ b/keyboards/salicylic_acid3/nknl7en/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 21 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index c36278aa47..0777289c5c 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h index 3c8fca5ab0..65091cadc0 100644 --- a/keyboards/salicylic_acid3/nknl7jp/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 20 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index b2f07e233a..83505e513c 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 26f1bf2661..eb9e0b5b1d 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 21 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index b3e2754e89..c8fb67d574 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h index e2248fee36..3792f94db7 100644 --- a/keyboards/sam/s80/config.h +++ b/keyboards/sam/s80/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 20 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index dd03cf3098..ff069c000e 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h index ad4a16b65a..0d5714a68f 100644 --- a/keyboards/sam/sg81m/config.h +++ b/keyboards/sam/sg81m/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E6 //reserved pin for potential underglow rgb #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json index 9f741abeff..f4d6c5749b 100644 --- a/keyboards/sam/sg81m/info.json +++ b/keyboards/sam/sg81m/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "B0" }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index 9a9418e9b2..1cca19e506 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB */ -#define RGB_DI_PIN D2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index 3cd4c7c96d..f7892d0286 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -18,6 +18,9 @@ "scroll_lock": "B0", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json index 4793b44a41..b2a8de9593 100644 --- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json +++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json @@ -28,7 +28,6 @@ "key_lock": false }, "rgblight": { - "pin": "B0", "led_count": 18, "hue_steps": 8, "saturation_steps": 8, @@ -48,6 +47,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json index 40ad2b7f80..7e7fe5a43e 100644 --- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json +++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json @@ -28,7 +28,6 @@ "key_lock": false }, "rgblight": { - "pin": "B0", "led_count": 18, "hue_steps": 8, "saturation_steps": 8, @@ -48,6 +47,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 0e918d90f6..936a988139 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index 380fa706b0..4c6e26dc54 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -17,6 +17,9 @@ "caps_lock": "F0", "on_state": 0 }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index 0a80e4d7f3..602670158b 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -22,7 +22,6 @@ #define ENCODERS_CCW_KEY { { 12, 4 } } /* RGB */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 94a091b0f8..481b503520 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -22,6 +22,9 @@ "caps_lock": "B0", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index fe32525c06..146d07f1fe 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F1 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index 264887f7ad..0d9dc6d58c 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -22,6 +22,9 @@ "caps_lock": "F0", "on_state": 0 }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/info.json index d45f9a3896..d4afc35bfc 100644 --- a/keyboards/sawnsprojects/plaque80/info.json +++ b/keyboards/sawnsprojects/plaque80/info.json @@ -25,7 +25,6 @@ "rgblight": true }, "rgblight": { - "pin": "F0", "led_count": 30, "sleep": true, "animations": { @@ -41,6 +40,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "F0" + }, "indicators": { "caps_lock": "E6", "scroll_lock": "D2" diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index 50f9d0cefd..d180a0b733 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F0 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 3911634dc0..642f813a67 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -8,6 +8,9 @@ "pid": "0x0727", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F1", "F4", "F5"], "rows": ["F7", "F6"] diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index 2dd2cc25c9..c18b8e95f1 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index 617851ba00..d91101d107 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -17,6 +17,9 @@ "caps_lock": "F1", "on_state": 0 }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sck/gtm/config.h b/keyboards/sck/gtm/config.h index a99fc7a3e8..c95d84b30d 100644 --- a/keyboards/sck/gtm/config.h +++ b/keyboards/sck/gtm/config.h @@ -8,7 +8,6 @@ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sck/gtm/info.json b/keyboards/sck/gtm/info.json index c756b02c87..422fb0c0f1 100644 --- a/keyboards/sck/gtm/info.json +++ b/keyboards/sck/gtm/info.json @@ -8,6 +8,9 @@ "pid": "0x6090", "device_version": "0.0.2" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B7", "C7", "D0"], "rows": ["C4", "C5", "D1"] diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h index 1d94c2ae02..f5bb154b9a 100644 --- a/keyboards/sck/osa/config.h +++ b/keyboards/sck/osa/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGB_DI_PIN D4 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index e884c6d57d..ae63add062 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -18,6 +18,9 @@ "num_lock": "C7", "scroll_lock": "B6" }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h index 2f89717aa5..2030d914d6 100644 --- a/keyboards/sendyyeah/pix/config.h +++ b/keyboards/sendyyeah/pix/config.h @@ -27,7 +27,6 @@ #define USB_MAX_POWER_CONSUMPTION 500 -#define RGB_DI_PIN B5 #define RGBLED_NUM 15 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json index 178d763b0d..fda8bc8309 100644 --- a/keyboards/sendyyeah/pix/info.json +++ b/keyboards/sendyyeah/pix/info.json @@ -8,6 +8,9 @@ "pid": "0x4E34", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B3"} diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h index 5c4153e3d0..44f0121915 100644 --- a/keyboards/senselessclay/ck60/config.h +++ b/keyboards/senselessclay/ck60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB matrix lighting */ -#define RGB_DI_PIN B1 #define RGB_MATRIX_LED_COUNT 62 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json index 45e84f254b..208fef9ae6 100644 --- a/keyboards/senselessclay/ck60/info.json +++ b/keyboards/senselessclay/ck60/info.json @@ -8,6 +8,9 @@ "pid": "0x0601", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B2", "F1", "F4", "F5"] diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h index 2d2326fb40..b3f2707dde 100644 --- a/keyboards/senselessclay/ck65/config.h +++ b/keyboards/senselessclay/ck65/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT /* RGB Backlighting */ -#define RGB_DI_PIN B1 #define RGBLED_NUM 69 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json index 80332946de..8ed8af77e5 100644 --- a/keyboards/senselessclay/ck65/info.json +++ b/keyboards/senselessclay/ck65/info.json @@ -8,6 +8,9 @@ "pid": "0x0651", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "B2", "F1", "F4", "F5"] diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h index 02d27c11e6..d395b76ecc 100644 --- a/keyboards/senselessclay/gos65/config.h +++ b/keyboards/senselessclay/gos65/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT /* RGB Backlighting */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index bdd73caed4..d35d088a8b 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -8,6 +8,9 @@ "pid": "0x0650", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F4", "D5", "D3", "D2", "D1", "D0", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B2", "F1", "F6", "F5"] diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 0d1abf3c24..e6ad038b12 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 13 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index 3a7b43fb83..61b085d86f 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -7,6 +7,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["C7", "D5", "D1", "D0"], "rows": ["F5", "F0", "B5", "D6", "D4"] diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 443b6d7649..da4d3257a6 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index 0c6aba4ac6..9d224d2c85 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -9,6 +9,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index ea97d48f84..900ea0aa40 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index b19bffd207..7873b364ce 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "D3" + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index c4678115db..7b388614f4 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index dcfcbed531..d87a6873ca 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -18,6 +18,9 @@ "levels": 5, "as_caps_lock": true }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_iso"], diff --git a/keyboards/sets3n/kk980/config.h b/keyboards/sets3n/kk980/config.h index 734cdcc7ae..46245213c9 100644 --- a/keyboards/sets3n/kk980/config.h +++ b/keyboards/sets3n/kk980/config.h @@ -33,7 +33,6 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B7 #define RGBLED_NUM 102 #define RGBLIGHT_LED_MAP { 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, \ diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json index 4705096576..b71dff3ec8 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B1", "B0", "D0", "D1"], "rows": ["B2", "B3", "D3", "D4", "D5", "D6"] diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index f412f715e4..2b6e5807a6 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define MASTER_RIGHT -#define RGB_DI_PIN D3 //#define RGBLIGHT_SPLIT #define RGBLED_SPLIT {26, 26} #define RGBLED_NUM 52 diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index 3458bfe1f5..3973885e4f 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -8,6 +8,9 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/skeletn87/hotswap/config.h b/keyboards/skeletn87/hotswap/config.h index 6c80c4d3ee..21dc04a727 100644 --- a/keyboards/skeletn87/hotswap/config.h +++ b/keyboards/skeletn87/hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index ead6bc60c0..18c918d331 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -22,6 +22,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/skeletn87/soldered/config.h b/keyboards/skeletn87/soldered/config.h index de02ac11f8..21dc04a727 100644 --- a/keyboards/skeletn87/soldered/config.h +++ b/keyboards/skeletn87/soldered/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index 1f3061227c..f428a78225 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -22,6 +22,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/skeletonkbd/skeletonnumpad/config.h b/keyboards/skeletonkbd/skeletonnumpad/config.h index b7b3399970..d30c5891ba 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/config.h +++ b/keyboards/skeletonkbd/skeletonnumpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D4 # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/skeletonkbd/skeletonnumpad/info.json b/keyboards/skeletonkbd/skeletonnumpad/info.json index 91bc05fd1c..8ea3a9dd66 100644 --- a/keyboards/skeletonkbd/skeletonnumpad/info.json +++ b/keyboards/skeletonkbd/skeletonnumpad/info.json @@ -8,6 +8,9 @@ "pid": "0x6E70", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5"], "rows": ["B6", "C6", "C7", "F7", "F6"] diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h index f8b5ae2db6..9e6239f67f 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ b/keyboards/skippys_custom_pcs/rooboard65/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN F7 #define RGBLED_NUM 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json index 6ef9194b6b..cf666c3c40 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/info.json @@ -8,6 +8,9 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B3", "B2", "B1", "D1"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h index e912cc50ea..f787da4012 100644 --- a/keyboards/skippys_custom_pcs/roopad/config.h +++ b/keyboards/skippys_custom_pcs/roopad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 #define RGBLED_NUM 21 #define RGBLIGHT_SLEEP diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index 9e6fb3964d..2a5d8f8e7a 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["F0", "B4", "D7", "D6", "D4"], "rows": ["B5", "F6", "F5", "F4", "F1"] diff --git a/keyboards/skmt/15k/config.h b/keyboards/skmt/15k/config.h index e1f021159e..63b3758737 100644 --- a/keyboards/skmt/15k/config.h +++ b/keyboards/skmt/15k/config.h @@ -21,7 +21,6 @@ #define FORCE_NKRO -#define RGB_DI_PIN GP1 // RGB LED pin #define RGBLED_NUM 15 // Number of LEDs #define RGB_MATRIX_LED_COUNT 15 // Number of LEDs #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/info.json index d0269f428e..5b7fdfc481 100644 --- a/keyboards/skmt/15k/info.json +++ b/keyboards/skmt/15k/info.json @@ -66,6 +66,7 @@ ] }, "ws2812": { + "pin": "GP1", "driver": "vendor" } } diff --git a/keyboards/smithrune/iron165r2/f072/config.h b/keyboards/smithrune/iron165r2/f072/config.h index 21702a94a6..9f86b9e55c 100644 --- a/keyboards/smithrune/iron165r2/f072/config.h +++ b/keyboards/smithrune/iron165r2/f072/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define RGB_DI_PIN B15 #define RGBLED_NUM 22 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json index a4171d423e..8ced3df775 100644 --- a/keyboards/smithrune/iron165r2/f072/info.json +++ b/keyboards/smithrune/iron165r2/f072/info.json @@ -4,6 +4,9 @@ "levels": 20, "breathing": true }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu" } diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h index 88ff1d167a..fa904fdabb 100644 --- a/keyboards/smithrune/iron165r2/f411/config.h +++ b/keyboards/smithrune/iron165r2/f411/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define RGB_DI_PIN B15 #define RGBLED_NUM 22 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json index 904dd6209d..7fd45874f2 100644 --- a/keyboards/smithrune/iron165r2/f411/info.json +++ b/keyboards/smithrune/iron165r2/f411/info.json @@ -5,6 +5,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "pwm" }, "processor": "STM32F411", diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h index 622495f6d0..9cc3f8601e 100644 --- a/keyboards/smk60/config.h +++ b/keyboards/smk60/config.h @@ -22,7 +22,6 @@ //rgb light setting #define RGBLED_NUM 4 -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/smk60/info.json b/keyboards/smk60/info.json index bc32109a17..5773958ea9 100644 --- a/keyboards/smk60/info.json +++ b/keyboards/smk60/info.json @@ -8,6 +8,9 @@ "pid": "0x6585", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C6", "C7", "F6", "F7", "F4", "B1", "B3", "D0", "D1", "D2", "D3", "D5"], "rows": ["B0", "F0", "F1", "F5", "B2"] diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h index 6a7dcff5ed..ceccc0915b 100644 --- a/keyboards/sneakbox/aliceclonergb/config.h +++ b/keyboards/sneakbox/aliceclonergb/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json index c5426ce30d..e16645e735 100644 --- a/keyboards/sneakbox/aliceclonergb/info.json +++ b/keyboards/sneakbox/aliceclonergb/info.json @@ -26,6 +26,9 @@ "bootmagic": { "matrix": [2, 0] }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h index a936b135f9..a97d34f7f2 100644 --- a/keyboards/sneakbox/ava/config.h +++ b/keyboards/sneakbox/ava/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json index c8ed5d2537..693794e031 100644 --- a/keyboards/sneakbox/ava/info.json +++ b/keyboards/sneakbox/ava/info.json @@ -22,6 +22,9 @@ "caps_lock": "D6", "num_lock": "D4" }, + "ws2812": { + "pin": "F7" + }, "bootmagic": { "matrix": [2, 0] }, diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h index 1f14d0f534..9d07bd0dce 100644 --- a/keyboards/soda/cherish/config.h +++ b/keyboards/soda/cherish/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN A13 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 446fda090b..447dcffa42 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -8,6 +8,9 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A13" + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h index 89571c505f..053083f230 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE // enable NKRO_ENABLE #define FORCE_NKRO -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN C15 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 34 diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index 16374bc9d8..815eb0da13 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -8,6 +8,9 @@ "pid": "0x4F51", "device_version": "1.0.2" }, + "ws2812": { + "pin": "C15" + }, "matrix_pins": { "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h index 0f02ae7cfb..80ad4912cb 100755 --- a/keyboards/sofle/keyhive/config.h +++ b/keyboards/sofle/keyhive/config.h @@ -31,7 +31,6 @@ // Add RGB underglow // by defining in the keyboard, incompatible keymaps will fail to compile. #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN D3 # define RGBLED_NUM 74 # define RGBLED_SPLIT {37,37} # define RGBLIGHT_LIMIT_VAL 100 // LED Brightness, high power draw may exceed the USB limitations of 0.6A and cause a crash. diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json index 5bfc312cf2..dfbe30f133 100644 --- a/keyboards/sofle/keyhive/info.json +++ b/keyboards/sofle/keyhive/info.json @@ -6,6 +6,9 @@ "pid": "0x1287", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h index f15cd7b8fb..dd3b6d8f5a 100644 --- a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h +++ b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h @@ -40,7 +40,7 @@ #if defined(KEYBOARD_sofle_rev1) #define RGBLED_NUM 70 // D3 for ws2812 RGB LED - #define RGB_DI_PIN D3 + #define WS2812_DI_PIN D3 #endif #endif diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h index 6564238bba..7d14c6e337 100644 --- a/keyboards/sofle/keymaps/devdev/config.h +++ b/keyboards/sofle/keymaps/devdev/config.h @@ -45,7 +45,7 @@ #define RGBLIGHT_LAYERS /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h index e4649cc5be..10c9ea450e 100644 --- a/keyboards/sofle/keymaps/killmaster/config.h +++ b/keyboards/sofle/keymaps/killmaster/config.h @@ -20,7 +20,7 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness for more options. */ -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h index 6564238bba..7d14c6e337 100644 --- a/keyboards/sofle/keymaps/rgb_default/config.h +++ b/keyboards/sofle/keymaps/rgb_default/config.h @@ -45,7 +45,7 @@ #define RGBLIGHT_LAYERS /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 +#define WS2812_DI_PIN D3 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h index 2806b70b0f..d4bf95b710 100644 --- a/keyboards/sofle/keymaps/via/config.h +++ b/keyboards/sofle/keymaps/via/config.h @@ -24,7 +24,7 @@ for more options. #if defined(KEYBOARD_sofle_rev1) // Add RGB underglow and top facing lighting -# define RGB_DI_PIN D3 +# define WS2812_DI_PIN D3 # define RGBLED_NUM 70 # define RGBLED_SPLIT \ { 36, 36 } diff --git a/keyboards/sowbug/68keys/config.h b/keyboards/sowbug/68keys/config.h index 5f01daec82..04b1fced2b 100644 --- a/keyboards/sowbug/68keys/config.h +++ b/keyboards/sowbug/68keys/config.h @@ -18,8 +18,6 @@ #pragma once -#define RGB_DI_PIN B9 - #define RGB_MATRIX_KEYPRESSES #define RGBLED_NUM 68 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json index 8da6bdc825..a5d2e8e35b 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/info.json @@ -8,6 +8,9 @@ "pid": "0x8888", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B9" + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10"], "rows": ["C14", "C15", "A0", "A1", "A2"] diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h index 7c520910bc..08c01e662d 100644 --- a/keyboards/sowbug/ansi_tkl/config.h +++ b/keyboards/sowbug/ansi_tkl/config.h @@ -18,7 +18,6 @@ #pragma once -#define RGB_DI_PIN B9 #define RGB_MATRIX_KEYPRESSES #define RGBLED_NUM 87 #define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json index a1c19c60aa..995d05362f 100644 --- a/keyboards/sowbug/ansi_tkl/info.json +++ b/keyboards/sowbug/ansi_tkl/info.json @@ -8,6 +8,9 @@ "pid": "0x8889", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B9" + }, "matrix_pins": { "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"], "rows": ["C14", "C15", "A0", "A1", "A2", "A3"] diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h index 36ed0fa73a..bfebbd8f5e 100755 --- a/keyboards/spaceholdings/nebula12/config.h +++ b/keyboards/spaceholdings/nebula12/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 -#define RGB_DI_PIN B15 #define RGBLED_NUM 10 /* If number is smaller, buffer updates too fast causing glitches */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index 6af24d1dd9..aa5dbc1873 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h index 0928d190df..aba496d469 100755 --- a/keyboards/spaceholdings/nebula12b/config.h +++ b/keyboards/spaceholdings/nebula12b/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB options */ -#define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json index 8d5af9da50..5cf82edf92 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/info.json @@ -8,6 +8,9 @@ "pid": "0x5332", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["F4", "F5", "D7"], "rows": ["B7", "B4", "F7", "F6"] diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index eaefff82df..fa9000b282 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define RGB_DI_PIN A7 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json index ccd2c4b4e2..21675a37c9 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h index 08ce4cb92d..4da2b5894a 100755 --- a/keyboards/spaceholdings/nebula68b/config.h +++ b/keyboards/spaceholdings/nebula68b/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB options */ -#define RGB_DI_PIN B7 #define RGB_MATRIX_LED_COUNT 79 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json index ca74035946..d3918f5f3b 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -8,6 +8,9 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D4", "D6", "D7", "B4", "E6"] diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h index 59ffda45c0..6a3ec9c5c1 100644 --- a/keyboards/spaceman/2_milk/config.h +++ b/keyboards/spaceman/2_milk/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B6 #define RGBLED_NUM 1 #endif diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index daba0b9851..5e8d0207af 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -8,6 +8,9 @@ "pid": "0x3225", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json index 64da285877..2051020895 100644 --- a/keyboards/splitkb/aurora/corne/rev1/info.json +++ b/keyboards/splitkb/aurora/corne/rev1/info.json @@ -105,12 +105,14 @@ } }, "rgblight": { - "pin": "D3", "led_count": 54, "split": true, "split_count": [27, 27], "max_brightness": 128 }, + "ws2812": { + "pin": "D3" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json index 4c00eedbeb..0341189830 100644 --- a/keyboards/splitkb/aurora/lily58/rev1/info.json +++ b/keyboards/splitkb/aurora/lily58/rev1/info.json @@ -116,12 +116,14 @@ } }, "rgblight": { - "pin": "D3", "led_count": 68, "split": true, "split_count": [34, 34], "max_brightness": 128 }, + "ws2812": { + "pin": "D3" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json index dc1cfeea82..d044b243b2 100644 --- a/keyboards/splitkb/aurora/sweep/rev1/info.json +++ b/keyboards/splitkb/aurora/sweep/rev1/info.json @@ -108,12 +108,14 @@ } }, "rgblight": { - "pin": "D3", "led_count": 46, "split": true, "split_count": [23, 23], "max_brightness": 128 }, + "ws2812": { + "pin": "D3" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index dc83cf6b86..3f7655d431 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -29,7 +29,7 @@ along with this program. If not, see . # define SERIAL_USART_TX_PIN D3 # define SERIAL_USART_RX_PIN D2 -# define RGB_DI_PIN PAL_LINE(GPIOA, 3) +# define WS2812_DI_PIN PAL_LINE(GPIOA, 3) # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 @@ -37,7 +37,7 @@ along with this program. If not, see . # define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. # define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else -# define RGB_DI_PIN D3 +# define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 #endif diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 8b878739fe..1e8dd02727 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -35,7 +35,7 @@ along with this program. If not, see . # define SERIAL_USART_TX_PIN D3 # define SERIAL_USART_RX_PIN D2 -# define RGB_DI_PIN PAL_LINE(GPIOA, 3) +# define WS2812_DI_PIN PAL_LINE(GPIOA, 3) # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 @@ -43,7 +43,7 @@ along with this program. If not, see . # define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. # define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else -# define RGB_DI_PIN D3 +# define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 #endif diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json index 96bf65847f..57d8d19130 100644 --- a/keyboards/splitkb/kyria/rev3/info.json +++ b/keyboards/splitkb/kyria/rev3/info.json @@ -174,12 +174,14 @@ } }, "rgblight": { - "pin": "D3", "led_count": 62, "split": true, "split_count": [31, 31], "max_brightness": 128 }, + "ws2812": { + "pin": "D3" + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index c06c192e0d..840cc8e679 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define AUDIO_CLICKY #define NO_MUSIC_MODE -#define RGB_DI_PIN B5 #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index e73ba2775c..7fd39cf607 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,9 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "D7", "resolution": 2} diff --git a/keyboards/star75/config.h b/keyboards/star75/config.h index 5af3c1452a..559dd046b7 100644 --- a/keyboards/star75/config.h +++ b/keyboards/star75/config.h @@ -9,8 +9,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B3 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json index 1f28a20819..0105fac71d 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/stello65/hs_rev1/config.h b/keyboards/stello65/hs_rev1/config.h index cf9c8a3b6b..d1563065b0 100644 --- a/keyboards/stello65/hs_rev1/config.h +++ b/keyboards/stello65/hs_rev1/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D0 # define RGBLED_NUM 4 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json index 17f48c644f..6c19cfb7fe 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["F1", "F0", "D1", "D2", "B6", "C6", "C7", "F7", "F6", "F5"] diff --git a/keyboards/stello65/sl_rev1/config.h b/keyboards/stello65/sl_rev1/config.h index b806ad5cd6..d1563065b0 100644 --- a/keyboards/stello65/sl_rev1/config.h +++ b/keyboards/stello65/sl_rev1/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B7 # define RGBLED_NUM 4 //# define RGBLIGHT_HUE_STEP 8 //# define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json index 6d36772839..523a5c0dbb 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["C7", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "E6", "D0", "D1", "C6", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/stratos/config.h b/keyboards/stratos/config.h index 0f48233bf1..e9168d07fd 100644 --- a/keyboards/stratos/config.h +++ b/keyboards/stratos/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* RGB LEDs */ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/stratos/info.json b/keyboards/stratos/info.json index c7a490036c..bef0a7cd14 100644 --- a/keyboards/stratos/info.json +++ b/keyboards/stratos/info.json @@ -8,6 +8,9 @@ "pid": "0x992D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h index 2e9ef28615..21b9804761 100644 --- a/keyboards/studiokestra/bourgeau/config.h +++ b/keyboards/studiokestra/bourgeau/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json index 8092bddc4a..835b0e60a8 100644 --- a/keyboards/studiokestra/bourgeau/info.json +++ b/keyboards/studiokestra/bourgeau/info.json @@ -8,6 +8,9 @@ "pid": "0x7501", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["E6", "B0", "D2", "D1", "D0", "D3", "B6", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B5", "B4"], "rows": ["D4", "D6", "D7", "D5", "B1", "F0"] diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h index 08d63c8001..2c3ce711d3 100644 --- a/keyboards/studiokestra/cascade/config.h +++ b/keyboards/studiokestra/cascade/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/studiokestra/cascade/info.json b/keyboards/studiokestra/cascade/info.json index 1cda31cab7..0e14c96158 100644 --- a/keyboards/studiokestra/cascade/info.json +++ b/keyboards/studiokestra/cascade/info.json @@ -8,6 +8,9 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["E6", "D5", "D1", "D0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D6", "D7"], "rows": ["F0", "B1", "D4", "F4", "F1"] diff --git a/keyboards/studiokestra/frl84/config.h b/keyboards/studiokestra/frl84/config.h index 3413465027..670578869f 100644 --- a/keyboards/studiokestra/frl84/config.h +++ b/keyboards/studiokestra/frl84/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B0 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json index 9520e2bd1b..3cff311132 100644 --- a/keyboards/studiokestra/frl84/info.json +++ b/keyboards/studiokestra/frl84/info.json @@ -17,6 +17,9 @@ "cols": ["D3", "D5", "D0", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6", "D2", "D1"] }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "url": "", "usb": { diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h index 4dbaafd5e4..c37d8a5ad2 100644 --- a/keyboards/studiokestra/galatea/config.h +++ b/keyboards/studiokestra/galatea/config.h @@ -6,4 +6,4 @@ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE \ No newline at end of file +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h index 40c94daf62..5502b3787d 100644 --- a/keyboards/studiokestra/galatea/rev2/config.h +++ b/keyboards/studiokestra/galatea/rev2/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D4 #define RGBLED_NUM 24 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index 927d1396b9..9cc8f3a266 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -29,6 +29,9 @@ "scroll_lock": "D2", "on_state": 0 }, + "ws2812": { + "pin": "D4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h index 49157532f2..b737022959 100644 --- a/keyboards/swiftrax/retropad/config.h +++ b/keyboards/swiftrax/retropad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 23f3a372e5..2c18990f02 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -21,6 +21,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h index 12b18b0cba..790d70d9c8 100644 --- a/keyboards/switchplate/southpaw_65/config.h +++ b/keyboards/switchplate/southpaw_65/config.h @@ -21,7 +21,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -#define RGB_DI_PIN C7 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/info.json index 97cff66a16..c44ef51cff 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/info.json @@ -12,6 +12,9 @@ "pin": "B5", "levels": 10 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h index 60dfb6ad51..16c2aae950 100644 --- a/keyboards/synthlabs/060/config.h +++ b/keyboards/synthlabs/060/config.h @@ -8,8 +8,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define RGB_DI_PIN E6 - // RGB Matrix Animation modes // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json index aee8d16713..75d503b883 100644 --- a/keyboards/synthlabs/060/info.json +++ b/keyboards/synthlabs/060/info.json @@ -16,6 +16,9 @@ "rgblight": false, "rgb_matrix": true }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": [ "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7" ], "rows": [ "F0", "F1", "F4", "F5", "F6" ] diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h index 10b1036c72..27e3025fe3 100644 --- a/keyboards/system76/launch_1/config.h +++ b/keyboards/system76/launch_1/config.h @@ -18,7 +18,6 @@ #pragma once #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN E2 # define RGB_MATRIX_LED_COUNT 84 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index e6c8743541..e9d991ac6a 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -7,6 +7,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h index 2653ab0a49..f902184d82 100755 --- a/keyboards/tada68/keymaps/rgb/config.h +++ b/keyboards/tada68/keymaps/rgb/config.h @@ -1,7 +1,7 @@ #include "../../config.h" /* WS2812B RGB Underglow LED */ -#define RGB_DI_PIN F5 // See readme.md for wiring your led's +#define WS2812_DI_PIN F5 // See readme.md for wiring your led's #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index 49c2326a25..6610fca8bf 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index d0e819f097..e7930bdb01 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -8,6 +8,9 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index a095aa04c0..90d19444ad 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index f8c84acb46..f67abdbd3f 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -8,6 +8,9 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index 6cc2fc87e5..f71ff71726 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 4 * 2 # define RGBLED_SPLIT { 4, 4 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 7da4dd5257..2a91bd48f0 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -8,6 +8,9 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["B2", "B6", "B3"] diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 4a26be606e..59c63c91fd 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index 492e854664..e9c9437902 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"], "rows": ["B3", "B2", "B6", "B5"] diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index b87b08161e..04a29143bf 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -48,7 +48,6 @@ }, "rgblight": { "led_count": 11, - "pin": "D3", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -65,6 +64,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index bacecb13db..a4685b9d06 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 * 2 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 8280a9e6b1..95ecb65e1b 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -8,6 +8,9 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index f4d136f808..6f631456ea 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 76df78895d..c591487e7b 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -8,6 +8,9 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 49c2326a25..6610fca8bf 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index f8df8f16c4..d7e9e2271e 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -8,6 +8,9 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index f6ab4c4b3a..39e1d8df5b 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index 043325531d..d9b0e1aaa0 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -8,6 +8,9 @@ "pid": "0x0019", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json index 16450db96e..161ed5ed60 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/info.json @@ -47,7 +47,6 @@ }, "rgblight": { "led_count": 53, - "pin": "D3", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -64,6 +63,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json index 7918682c20..891968963c 100644 --- a/keyboards/takashicompany/tightwriter/info.json +++ b/keyboards/takashicompany/tightwriter/info.json @@ -39,7 +39,6 @@ }, "rgblight": { "led_count": 10, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -53,6 +52,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h index 3f57dc2380..ac6c077f6b 100644 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ b/keyboards/takashiski/hecomi/alpha/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . //#define USE_I2C - #define RGB_DI_PIN D4 #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index 4ef1c2c554..eecf812a68 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h index 3505ff3cc1..c4a349580c 100644 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ b/keyboards/takashiski/namecard2x4/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json index e5c68e101d..28781bcd0a 100644 --- a/keyboards/takashiski/namecard2x4/rev1/info.json +++ b/keyboards/takashiski/namecard2x4/rev1/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["E6", "D7", "C6", "D4"], "rows": ["B4", "B5"] diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h index 99560988d8..f90b4e073c 100644 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ b/keyboards/takashiski/namecard2x4/rev2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D4 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json index 24ae3ff5f0..51fe26c555 100644 --- a/keyboards/takashiski/namecard2x4/rev2/info.json +++ b/keyboards/takashiski/namecard2x4/rev2/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["B2", "B6"] diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h index 8ca22c4c3a..b62209abaa 100644 --- a/keyboards/taleguers/taleguers75/config.h +++ b/keyboards/taleguers/taleguers75/config.h @@ -22,8 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json index d736d0f18f..1152f381e4 100644 --- a/keyboards/taleguers/taleguers75/info.json +++ b/keyboards/taleguers/taleguers75/info.json @@ -18,6 +18,9 @@ {"pin_a": "B6", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h index 4e8095c0bc..305eacfd35 100644 --- a/keyboards/tanuki/config.h +++ b/keyboards/tanuki/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json index aa8a24bbd1..fa6101de64 100644 --- a/keyboards/tanuki/info.json +++ b/keyboards/tanuki/info.json @@ -8,6 +8,9 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "F4", "F5", "F6"], "rows": ["F7", "B1", "D4", "D0"] diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json index dca1387203..979cc9e10c 100644 --- a/keyboards/tau4/info.json +++ b/keyboards/tau4/info.json @@ -56,10 +56,12 @@ }, "led_count": 10, "max_brightness": 128, - "pin": "B2", "saturation_steps": 16, "sleep": true }, + "ws2812": { + "pin": "B2" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/teahouse/ayleen/config.h b/keyboards/teahouse/ayleen/config.h index 0c39df4272..cb3b80349d 100644 --- a/keyboards/teahouse/ayleen/config.h +++ b/keyboards/teahouse/ayleen/config.h @@ -3,9 +3,6 @@ #pragma once - - -#define RGB_DI_PIN C7 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index 03ce63beaf..db4d36088c 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Ayleen", - "manufacturer": "Teahouse" + "manufacturer": "Teahouse", "url": "https://keyspensory.store/products/fcfs-ayleen-tkl-by-teahouse-extra-parts?_pos=1&_sid=e33d5f339&_ss=r", "maintainer": "Freather", "processor": "atmega32u4", @@ -29,6 +29,9 @@ "B6" ] }, + "ws2812": { + "pin": "C7" + }, "usb":{ "vid": "0x5448", "pid": "0x4141", diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h index 8f66213bc2..6c72720ab2 100644 --- a/keyboards/team0110/p1800fl/config.h +++ b/keyboards/team0110/p1800fl/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB Lighting */ -#define RGB_DI_PIN C6 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index ae17356c81..2dba562fd3 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "C6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h index ca094965d0..58a533406e 100644 --- a/keyboards/technika/config.h +++ b/keyboards/technika/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 16 #define RGBLIGHT_LIMIT_VAL 200 #define RGBLIGHT_SLEEP diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json index 0eb1e83fea..cfe8492c45 100644 --- a/keyboards/technika/info.json +++ b/keyboards/technika/info.json @@ -18,6 +18,9 @@ "num_lock": "A15", "scroll_lock": "B4" }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h index 0a7878337c..2b7b6435ec 100644 --- a/keyboards/tenki/config.h +++ b/keyboards/tenki/config.h @@ -8,7 +8,6 @@ /* ws2812 RGB LED */ -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json index 7f3b3254cd..2979362a61 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/info.json @@ -8,6 +8,9 @@ "pid": "0x5445", "device_version": "10.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["F4", "F5", "D4", "D0"], "rows": ["B1", "B4", "F6", "B6", "B2"] diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h index f54408c1be..3f0378e73c 100755 --- a/keyboards/tetris/config.h +++ b/keyboards/tetris/config.h @@ -12,7 +12,6 @@ #define NO_MUSIC_MODE #endif -#define RGB_DI_PIN F5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tetris/info.json b/keyboards/tetris/info.json index cf506e51c5..058226ba3f 100644 --- a/keyboards/tetris/info.json +++ b/keyboards/tetris/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F5" + }, "matrix_pins": { "cols": ["D7", "B4", "B6", "C6", "C7", "F6", "F7", "D4", "D2", "D3", "D5", "D6"], "rows": ["B3", "B2", "B1", "B0", "E6"] diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h index 354e163b39..4cc46acbbb 100644 --- a/keyboards/tg4x/config.h +++ b/keyboards/tg4x/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json index 33c45b68b8..4250d9b8dc 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/info.json @@ -8,6 +8,9 @@ "pid": "0x0458", "device_version": "0.2.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"] diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h index f752e60fcd..02c222b2b8 100644 --- a/keyboards/the_royal/liminal/config.h +++ b/keyboards/the_royal/liminal/config.h @@ -6,7 +6,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_HUE_STEP 6 diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index 45d26bf4e7..eadbb7a027 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"], "rows": ["C6", "B6", "B7", "C7"] diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h index 600797d1ee..8cfda8f8e5 100644 --- a/keyboards/the_royal/schwann/config.h +++ b/keyboards/the_royal/schwann/config.h @@ -6,7 +6,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B3 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index db132721eb..85b6afb369 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -8,6 +8,9 @@ "pid": "0x3521", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"], "rows": ["F0", "F1", "F6", "C7"] diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h index 3b3edb01bd..3c3b68d782 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/config.h +++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB BackLight */ -#define RGB_DI_PIN B7 #define RGBLED_NUM 4 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json index 9672ea832c..e769b23f12 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/info.json +++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json @@ -18,6 +18,9 @@ {"pin_a": "D0", "pin_b": "D1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h index 3b3edb01bd..3c3b68d782 100644 --- a/keyboards/themadnoodle/noodlepad/config.h +++ b/keyboards/themadnoodle/noodlepad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB BackLight */ -#define RGB_DI_PIN B7 #define RGBLED_NUM 4 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json index 688e4b8f13..e605034697 100644 --- a/keyboards/themadnoodle/noodlepad/info.json +++ b/keyboards/themadnoodle/noodlepad/info.json @@ -18,6 +18,9 @@ {"pin_a": "D0", "pin_b": "D1"} ] }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h index 48658a617e..e8aca5e862 100644 --- a/keyboards/thevankeyboards/jetvan/config.h +++ b/keyboards/thevankeyboards/jetvan/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Define RGB Underglow */ -#define RGB_DI_PIN D0 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json index 34f4dfa027..cd40690d7a 100644 --- a/keyboards/thevankeyboards/jetvan/info.json +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -8,6 +8,9 @@ "pid": "0x8858", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h index b05e792407..44b61b7458 100644 --- a/keyboards/thevankeyboards/minivan/config.h +++ b/keyboards/thevankeyboards/minivan/config.h @@ -23,6 +23,5 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* RGB Setup */ -#define RGB_DI_PIN D0 #define RGBLED_NUM 3 #define RGBLIGHT_SLEEP diff --git a/keyboards/thevankeyboards/minivan/info.json b/keyboards/thevankeyboards/minivan/info.json index d21c1e6e3f..be95cdaf5a 100644 --- a/keyboards/thevankeyboards/minivan/info.json +++ b/keyboards/thevankeyboards/minivan/info.json @@ -8,6 +8,9 @@ "pid": "0x8844", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"], "rows": ["D7", "B5", "F7", "D4"] diff --git a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h index c6404f8ce5..958b0cdaf5 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/halvves/config.h @@ -14,7 +14,7 @@ #endif #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D0 + #define WS2812_DI_PIN D0 #define RGBLED_NUM 3 #define RGBLIGHT_EFFECT_BREATHING #endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h index 910696f86c..49d7d463aa 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h @@ -36,7 +36,7 @@ // LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes #ifdef RGBLIGHT_ENABLE - #define RGB_DI_PIN D0 + #define WS2812_DI_PIN D0 #define RGBLIGHT_TIMER #define RGBLED_NUM 3 #endif diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h index ef3a9d3cbb..e995bb1c7c 100644 --- a/keyboards/tkc/godspeed75/config.h +++ b/keyboards/tkc/godspeed75/config.h @@ -32,7 +32,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN A13 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json index 3a223f55dc..6aac8e45e0 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A13" + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"], "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"] diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h index 1ffe54ec23..6ac2777073 100644 --- a/keyboards/tkc/m0lly/config.h +++ b/keyboards/tkc/m0lly/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D7 # define RGBLED_NUM 30 # define RGBLIGHT_HUE_STEP 5 # define RGBLIGHT_SAT_STEP 10 diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json index a59a574da1..a7dca24d36 100644 --- a/keyboards/tkc/m0lly/info.json +++ b/keyboards/tkc/m0lly/info.json @@ -27,6 +27,9 @@ "num_lock": "D2", "scroll_lock": "D4" }, + "ws2812": { + "pin": "D7" + }, "processor": "at90usb1286", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h index 77c08941d7..799a43cbbb 100644 --- a/keyboards/tkc/osav2/config.h +++ b/keyboards/tkc/osav2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGB_DI_PIN D4 #define RGBLED_NUM 9 // #define RGBLIGHT_HUE_STEP 10 // #define RGBLIGHT_SAT_STEP 17 diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index 38f30819fe..78cad2daf2 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json @@ -8,6 +8,9 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["B4", "D7", "D5", "D3", "D2", "D0", "D1", "B5"], "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h index 11fcf61626..dd6631f545 100644 --- a/keyboards/tkc/tkc1800/config.h +++ b/keyboards/tkc/tkc1800/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underlight configuration */ -#define RGB_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index a8db70fa75..f9c20e4b4d 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -27,6 +27,9 @@ "num_lock": "D2", "scroll_lock": "D4" }, + "ws2812": { + "pin": "D7" + }, "processor": "at90usb1286", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h index af2168c781..e01e92ccf2 100644 --- a/keyboards/tkc/tkl_ab87/config.h +++ b/keyboards/tkc/tkl_ab87/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations -#define RGB_DI_PIN E2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json index 6b1263429a..9a65d8e1e1 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/info.json @@ -21,6 +21,9 @@ "caps_lock": "F1", "scroll_lock": "F0" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index 9db69dcf3a..b6fc3a66a2 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -20,7 +20,6 @@ #define MATRIX_IO_DELAY 5 #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN B1 #define RGBLED_NUM 16 #define RGBLED_SPLIT { 8,8 } #define RGBLIGHT_LIMIT_VAL 120 diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index eb913b40e7..c6d658e00a 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -7,6 +7,7 @@ "pid": "0x7812" }, "ws2812": { + "pin": "B1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index a102a34946..b6a0586598 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -18,7 +18,6 @@ #define MATRIX_IO_DELAY 5 #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN B1 #define RGBLED_NUM 13 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index b0d6cc321c..5cc58677d5 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "ws2812": { + "pin": "B1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h index d14e063f7d..4870446be4 100644 --- a/keyboards/tmo50/config.h +++ b/keyboards/tmo50/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/tmo50/info.json b/keyboards/tmo50/info.json index 680f770469..2eafe3ecfb 100644 --- a/keyboards/tmo50/info.json +++ b/keyboards/tmo50/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/toffee_studio/blueberry/config.h b/keyboards/toffee_studio/blueberry/config.h index 72887d0490..b18dd40ccd 100644 --- a/keyboards/toffee_studio/blueberry/config.h +++ b/keyboards/toffee_studio/blueberry/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D0 # define RGBLED_NUM 22 /* RGB LED logical order map */ diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json index 4c5adb3b6a..fb1fb56aad 100644 --- a/keyboards/toffee_studio/blueberry/info.json +++ b/keyboards/toffee_studio/blueberry/info.json @@ -8,6 +8,9 @@ "pid": "0x626C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "matrix_pins": { "cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"], "rows": ["E6", "B0", "B1", "F6", "F5", "F1", "F7", "F0", "F4"] diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index bf30035c5c..fad2d49c93 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index b839c147dc..d314896095 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -18,6 +18,9 @@ "levels": 31, "breathing": true }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h index c762abeac5..800cb31a2f 100644 --- a/keyboards/tokyokeyboard/tokyo60/config.h +++ b/keyboards/tokyokeyboard/tokyo60/config.h @@ -9,7 +9,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json index f7bba46b46..49a7c08f63 100644 --- a/keyboards/tokyokeyboard/tokyo60/info.json +++ b/keyboards/tokyokeyboard/tokyo60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 6 }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_hhkb"], diff --git a/keyboards/tominabox1/bigboy/config.h b/keyboards/tominabox1/bigboy/config.h index 968161c7ea..77d49adbec 100755 --- a/keyboards/tominabox1/bigboy/config.h +++ b/keyboards/tominabox1/bigboy/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN B5 - #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json index 9797c96f46..5d954777ba 100644 --- a/keyboards/tominabox1/bigboy/info.json +++ b/keyboards/tominabox1/bigboy/info.json @@ -8,6 +8,9 @@ "pid": "0x6262", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B6", "resolution": 2} diff --git a/keyboards/tominabox1/le_chiffre/he/config.h b/keyboards/tominabox1/le_chiffre/he/config.h deleted file mode 100644 index 846ed4216d..0000000000 --- a/keyboards/tominabox1/le_chiffre/he/config.h +++ /dev/null @@ -1,21 +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 - -/* - * WS2812 Underglow Matrix options - */ -#define RGB_DI_PIN F0 diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json index c43a7d9062..2d4f369413 100644 --- a/keyboards/tominabox1/le_chiffre/he/info.json +++ b/keyboards/tominabox1/le_chiffre/he/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.3" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"], "rows": ["B3", "D4", "F1", "C6"] diff --git a/keyboards/tominabox1/le_chiffre/rev1/config.h b/keyboards/tominabox1/le_chiffre/rev1/config.h deleted file mode 100644 index 1b69991220..0000000000 --- a/keyboards/tominabox1/le_chiffre/rev1/config.h +++ /dev/null @@ -1,21 +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 - -/* - * WS2812 Underglow Matrix options - */ -#define RGB_DI_PIN F0 diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json index 962811500a..5726f5a488 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/info.json +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"], "rows": ["B3", "D4", "F1", "C6"] diff --git a/keyboards/tominabox1/le_chiffre/rev2/config.h b/keyboards/tominabox1/le_chiffre/rev2/config.h deleted file mode 100644 index 7d5f3db99e..0000000000 --- a/keyboards/tominabox1/le_chiffre/rev2/config.h +++ /dev/null @@ -1,21 +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 - -/* - * WS2812 Underglow Matrix options - */ -#define RGB_DI_PIN B1 diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json index e91472ff3f..b079e2ebad 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/info.json +++ b/keyboards/tominabox1/le_chiffre/rev2/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["B2", "F0", "F1", "F4", "F5", "B5", "B4", "D7", "D6", "D4"], "rows": ["B3", "F6", "F7", "C7"] diff --git a/keyboards/tominabox1/qaz/config.h b/keyboards/tominabox1/qaz/config.h index 05c3c91539..a9b9df6815 100644 --- a/keyboards/tominabox1/qaz/config.h +++ b/keyboards/tominabox1/qaz/config.h @@ -5,8 +5,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F7 - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tominabox1/qaz/info.json b/keyboards/tominabox1/qaz/info.json index d2cd29a850..5dd7f7138c 100644 --- a/keyboards/tominabox1/qaz/info.json +++ b/keyboards/tominabox1/qaz/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["B4", "D3", "D2", "F5", "B5", "F6", "D7"], "rows": ["F4", "D4", "C6", "E6", "D1", "D0"] diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h index e1dbb54940..333d0a100e 100644 --- a/keyboards/tominabox1/underscore33/rev1/config.h +++ b/keyboards/tominabox1/underscore33/rev1/config.h @@ -19,6 +19,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* #define RGB_DI_PIN B6 - #define RGBLED_NUM 1 */ diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h index 332120053c..eac1807676 100644 --- a/keyboards/tominabox1/underscore33/rev2/config.h +++ b/keyboards/tominabox1/underscore33/rev2/config.h @@ -21,7 +21,6 @@ #define LOCKING_RESYNC_ENABLE #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D6 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json index 8841b633b3..f8c1587bb7 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x3302", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D6" + }, "matrix_pins": { "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"], "rows": ["C4", "B0", "B1", "B2"] diff --git a/keyboards/tr60w/config.h b/keyboards/tr60w/config.h index dadd48d994..a6dfefb6b9 100644 --- a/keyboards/tr60w/config.h +++ b/keyboards/tr60w/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json index 16d4be92aa..01ec8b32c7 100644 --- a/keyboards/tr60w/info.json +++ b/keyboards/tr60w/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index f1e3c21e7c..64c34a8008 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -23,7 +23,6 @@ SOFTWARE. #pragma once #define USB_MAX_POWER_CONSUMPTION 100 -#define RGB_DI_PIN F4 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index e624507210..6b4ea75bb0 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -8,6 +8,9 @@ "pid": "0x8947", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["F5", "F1", "F0", "F7", "B6", "F6"] diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h index 07495a6099..4ef7a66314 100644 --- a/keyboards/tszaboo/ortho4exent/config.h +++ b/keyboards/tszaboo/ortho4exent/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGB_DI_PIN B6 #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json index d20477b615..5bd5baef9d 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/info.json @@ -8,6 +8,9 @@ "pid": "0x7934", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B6" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D6", "D5", "D3", "D2", "D1", "B7", "B3", "B2"], "rows": ["B0", "B1", "D4", "D7", "B4"] diff --git a/keyboards/tunks/ergo33/config.h b/keyboards/tunks/ergo33/config.h index a1ffa98f25..5ab6f8a347 100644 --- a/keyboards/tunks/ergo33/config.h +++ b/keyboards/tunks/ergo33/config.h @@ -17,7 +17,6 @@ #pragma once /* Underglow + top RGB configuration */ -#define RGB_DI_PIN D4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json index cdf10962dc..afb589db13 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/info.json @@ -7,6 +7,9 @@ "pid": "0xA0A1", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["F0", "F1", "B5", "B4", "D7"] diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h index 6ddb568f89..7c93823314 100644 --- a/keyboards/tw40/config.h +++ b/keyboards/tw40/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tw40/info.json b/keyboards/tw40/info.json index 699f5ca2ac..5c24e3e1b1 100644 --- a/keyboards/tw40/info.json +++ b/keyboards/tw40/info.json @@ -8,6 +8,9 @@ "pid": "0x5457", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "D5", "D3", "D2"] diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json index 85eaa67060..cdf016838c 100644 --- a/keyboards/tweetydabird/lbs4/info.json +++ b/keyboards/tweetydabird/lbs4/info.json @@ -47,7 +47,6 @@ "rgblight": { "led_count": 6, - "pin": "D2", "hue_steps": 8, "saturation_steps": 17, "brightness_steps": 17, @@ -59,6 +58,9 @@ "static_gradient": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json index 18edcce9b9..49588adf60 100644 --- a/keyboards/tweetydabird/lbs6/info.json +++ b/keyboards/tweetydabird/lbs6/info.json @@ -46,7 +46,6 @@ "rgblight": { "led_count": 8, - "pin": "D2", "hue_steps": 8, "saturation_steps": 17, "brightness_steps": 17, @@ -58,6 +57,9 @@ "static_gradient": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h index c1c2f6832a..af98f887db 100644 --- a/keyboards/tzarc/djinn/config.h +++ b/keyboards/tzarc/djinn/config.h @@ -41,7 +41,6 @@ #define BACKLIGHT_PAL_MODE 1 // RGB configuration -#define RGB_DI_PIN B2 #define WS2812_EXTERNAL_PULLUP #define WS2812_PWM_DRIVER PWMD20 #define WS2812_PWM_CHANNEL 1 diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index 9165255746..0c396a3d53 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -34,6 +34,7 @@ "levels": 4 }, "ws2812": { + "pin": "B2", "driver": "pwm" }, "split": { diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h index 39b587bab0..616d4ab84a 100644 --- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h +++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h @@ -22,7 +22,6 @@ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN GP2 // RGB configuration -#define RGB_DI_PIN GP13 #define RGB_ENABLE_PIN GP6 // ADC Configuration diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/info.json index 21f05ee6b9..86856ac721 100644 --- a/keyboards/tzarc/ghoul/rev1/rp2040/info.json +++ b/keyboards/tzarc/ghoul/rev1/rp2040/info.json @@ -13,6 +13,7 @@ ] }, "ws2812": { + "pin": "GP13", "driver": "vendor" } } diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h index 12c9f77d5e..1dbc164039 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/config.h +++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h @@ -25,7 +25,6 @@ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN A4 // RGB configuration -#define RGB_DI_PIN C6 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/info.json index b1ece191f5..c77fc17dfa 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/info.json +++ b/keyboards/tzarc/ghoul/rev1/stm32/info.json @@ -4,6 +4,7 @@ "bootloader": "stm32-dfu", "bootloader_instructions": "Press the 5 keys on the bottom row of the left side, or hold the boot switch and tap the reset switch, or hold the top-left key when plugging in the board.", "ws2812": { + "pin": "C6", "driver": "pwm" }, "encoder": { diff --git a/keyboards/ubest/vn/config.h b/keyboards/ubest/vn/config.h index 5b5632009c..3e6c6dc0e5 100644 --- a/keyboards/ubest/vn/config.h +++ b/keyboards/ubest/vn/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index aef7138b64..fc28aa5bea 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "B3", "num_lock": "B1", diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index 7142253136..ab971a55ad 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* ws2812b options */ -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index a33a558b25..5f3ccdb678 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "F6" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h index d72a8fd06d..9c6459abbd 100644 --- a/keyboards/ungodly/launch_pad/config.h +++ b/keyboards/ungodly/launch_pad/config.h @@ -20,7 +20,6 @@ #define MIDI_ADVANCED /* RGB Matrix configuration */ -#define RGB_DI_PIN F7 #ifdef RGB_MATRIX_ENABLE # define RGBLED_NUM 22 # define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index be205c17e9..abb568146e 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -12,6 +12,9 @@ "cols": ["B0", "B1", "B2", "B3"], "rows": ["D4", "D6", "D7", "B4", "B5"] }, + "ws2812": { + "pin": "F7" + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h index 27309c9b72..1c1eaef7fd 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #endif /* RGB Lighting */ -#define RGB_DI_PIN B7 #define RGBLED_NUM 7 // Layer Indicator(2) + Rotary Encoder(5) #define RGBLIGHT_LED_MAP {1, 2, 0, 3, 4, 5, 6} // align LEDs from Left to Right #define RGBLIGHT_HUE_STEP 4 diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json index a402c44e35..4b911f6096 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/info.json @@ -12,6 +12,9 @@ "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] }, + "ws2812": { + "pin": "B7" + }, "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index 73f9e9e2c2..5d33e9e99c 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -21,7 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index f1da7c9726..5a7bde1da1 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -21,6 +21,9 @@ "caps_lock": "B6", "scroll_lock": "B5" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 85be8c0232..fdfbaa443e 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 54 // Number of LEDs #define RGBLED_SPLIT { 27, 27 } diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index 1bcb6ad5f8..9d08cbdaeb 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/vertex/angler2/config.h b/keyboards/vertex/angler2/config.h index 768474ba26..79cb6d6aae 100644 --- a/keyboards/vertex/angler2/config.h +++ b/keyboards/vertex/angler2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 3d06550bca..588695c8f4 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -18,6 +18,9 @@ "scroll_lock": "B7", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": [ diff --git a/keyboards/vertex/arc60/config.h b/keyboards/vertex/arc60/config.h index 5cbee6426f..ff75c3a227 100644 --- a/keyboards/vertex/arc60/config.h +++ b/keyboards/vertex/arc60/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 9 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/vertex/arc60/info.json b/keyboards/vertex/arc60/info.json index 60758ac3b8..6a421f4060 100644 --- a/keyboards/vertex/arc60/info.json +++ b/keyboards/vertex/arc60/info.json @@ -17,6 +17,9 @@ "caps_lock": "C13", "on_state": 0 }, + "ws2812": { + "pin": "B15" + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": [ diff --git a/keyboards/vertex/arc60h/config.h b/keyboards/vertex/arc60h/config.h index 650d910089..9f9ed0cdb3 100644 --- a/keyboards/vertex/arc60h/config.h +++ b/keyboards/vertex/arc60h/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 9 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/vertex/arc60h/info.json b/keyboards/vertex/arc60h/info.json index a319f3c376..28efdcd357 100644 --- a/keyboards/vertex/arc60h/info.json +++ b/keyboards/vertex/arc60h/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "spi" }, "matrix_pins": { diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 97bd940cdc..825ceabbd3 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define RGB_DI_PIN B15 #define RGBLED_NUM 4 #define RGBLIGHT_DEFAULT_VAL 0 diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json index 19eec6200e..5b599959ce 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B15", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json index 396aca8bcd..7b6245d72e 100644 --- a/keyboards/viktus/minne/info.json +++ b/keyboards/viktus/minne/info.json @@ -32,7 +32,6 @@ }, "rgblight": { "led_count": 14, - "pin": "F6", "max_brightness": 191, "animations": { "breathing": true, @@ -40,6 +39,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "F6" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json index b2274880bc..c977d8ebec 100644 --- a/keyboards/viktus/osav2/info.json +++ b/keyboards/viktus/osav2/info.json @@ -33,7 +33,6 @@ }, "rgblight": { "led_count": 23, - "pin": "D4", "max_brightness": 191, "animations": { "breathing": true, @@ -41,6 +40,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D4" + }, "backlight": { "levels": 6, "max_brightness": 191, diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index c9a1d1cca3..bc80a8ebca 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define USE_I2C /* ws2812 RGB LED */ -#define RGB_DI_PIN E6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index 6b287e9833..4ac4e95913 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -26,6 +26,9 @@ } } }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index 9d63b82b19..81dd72ca9e 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN F0 - #define RGBLED_NUM 16 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index 7561cb5851..f9fd3d018e 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -10,5 +10,8 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "F0" + }, "bootloader": "caterina" } diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 0fa20e9c86..ce07676fee 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -22,9 +22,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B4 -/* ws2812 RGB LED */ -#define RGB_DI_PIN F0 - #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index 0098b22d14..9170f80a7d 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -16,5 +16,8 @@ "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "F0" + }, "bootloader": "qmk-dfu" } diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h index bdb41e4e57..a0d7763711 100644 --- a/keyboards/waldo/config.h +++ b/keyboards/waldo/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // RGB LED -#define RGB_DI_PIN B0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json index 6ee9b4befd..c371f051b1 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/info.json @@ -16,6 +16,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h index 0bc18e3730..6d33342cf8 100644 --- a/keyboards/walletburner/cajal/config.h +++ b/keyboards/walletburner/cajal/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/walletburner/cajal/info.json b/keyboards/walletburner/cajal/info.json index bba30bebcd..f73195f06f 100644 --- a/keyboards/walletburner/cajal/info.json +++ b/keyboards/walletburner/cajal/info.json @@ -18,6 +18,9 @@ {"pin_a": "D6", "pin_b": "D7"} ] }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h index 92f42ed901..2dae864ddb 100644 --- a/keyboards/walletburner/neuron/config.h +++ b/keyboards/walletburner/neuron/config.h @@ -6,8 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json index 0b7ee467f6..d66824fa24 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/info.json @@ -8,6 +8,9 @@ "pid": "0x6E75", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"], "rows": ["D0", "D1", "D3", "F5"] diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h index 67683c158c..a88ed9ba34 100644 --- a/keyboards/wavtype/foundation/config.h +++ b/keyboards/wavtype/foundation/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN B0 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json index 3b770ae352..c03550e885 100644 --- a/keyboards/wavtype/foundation/info.json +++ b/keyboards/wavtype/foundation/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["B3", "B2", "B1", "F0", "F1"] diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h index 1db4974e40..c2c0a6e034 100644 --- a/keyboards/wavtype/p01_ultra/config.h +++ b/keyboards/wavtype/p01_ultra/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 # define RGBLED_NUM 18 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json index dc95d31390..fa04ce7850 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/info.json @@ -8,6 +8,9 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], "rows": ["B4", "D7", "D6", "B5", "B6", "D4"] diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h index fd3f070d35..948bd0c7f1 100644 --- a/keyboards/weirdo/geminate60/config.h +++ b/keyboards/weirdo/geminate60/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN A6 #define RGBLED_NUM 1 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json index 76de73c51e..e197061d65 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/info.json @@ -8,6 +8,9 @@ "pid": "0x676D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A6" + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h index e3e65a074b..0a446abeba 100644 --- a/keyboards/weirdo/kelowna/rgb64/config.h +++ b/keyboards/weirdo/kelowna/rgb64/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN A6 #define RGBLED_NUM 64 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json index ff6b6b0f85..c22e666f28 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/info.json @@ -8,6 +8,9 @@ "pid": "0x4C64", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A6" + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"], "rows": ["B12", "B13", "B14", "C11", "A1"] diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h index 93b7d5c69e..d2b9299c8f 100644 --- a/keyboards/weirdo/ls_60/config.h +++ b/keyboards/weirdo/ls_60/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN A6 #define RGBLED_NUM 1 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index a9247037fc..94cf75c25c 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -8,6 +8,9 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A6" + }, "matrix_pins": { "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["A9", "A10", "B10", "B11", "B15"] diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h index 2b4073cbd6..2c31247277 100644 --- a/keyboards/weirdo/naiping/np64/config.h +++ b/keyboards/weirdo/naiping/np64/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN B1 #define RGBLED_NUM 80 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json index 0c1bf74f3c..6e4e822b78 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/info.json @@ -8,6 +8,9 @@ "pid": "0x7064", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h index 683ba29edc..0a3df009ab 100644 --- a/keyboards/weirdo/naiping/nphhkb/config.h +++ b/keyboards/weirdo/naiping/nphhkb/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN A7 #define RGBLED_NUM 78 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json index c0df6fb453..fc0439a527 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/info.json @@ -8,6 +8,9 @@ "pid": "0x7068", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A7" + }, "matrix_pins": { "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"], "rows": ["B7", "B8", "B9", "C13", "B4"] diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h index fd2dcbdde1..782833a3af 100644 --- a/keyboards/weirdo/naiping/npminila/config.h +++ b/keyboards/weirdo/naiping/npminila/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN D1 #define RGBLED_NUM 82 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index 7c489e378c..df826600da 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -8,6 +8,9 @@ "pid": "0x706D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["E6", "B7", "F7", "F4", "F5"] diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h index 86f2ffb3ee..a2d6575d8e 100644 --- a/keyboards/wekey/we27/config.h +++ b/keyboards/wekey/we27/config.h @@ -18,8 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGB_MATRIX_ENABLE -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN C6 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 27 diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json index 77b94ae378..0ded933932 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/info.json @@ -18,6 +18,9 @@ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} ] }, + "ws2812": { + "pin": "C6" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x5"], diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index bca35e1b85..a2c9c54040 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 diff --git a/keyboards/westfoxtrot/aanzee/info.json b/keyboards/westfoxtrot/aanzee/info.json index a2b5f6b49c..0038e1f7e5 100644 --- a/keyboards/westfoxtrot/aanzee/info.json +++ b/keyboards/westfoxtrot/aanzee/info.json @@ -22,6 +22,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h index 080681e53f..ddfe166509 100644 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h +++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/config.h @@ -16,7 +16,7 @@ #pragma once -#define RGB_DI_PIN F7 +#define WS2812_DI_PIN F7 #define RGBLED_NUM 15 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md index 065b8f5233..14cde79827 100644 --- a/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md +++ b/keyboards/westfoxtrot/cypher/rev1/keymaps/kwer/readme.md @@ -31,7 +31,7 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow **config.h** ``` [...] -#define RGB_DI_PIN F7 +#define WS2812_DI_PIN F7 #define RGBLED_NUM 15 // Change this number to the amount of LEDs on the strip you soldered [...] ``` diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h index b4cdf23d93..85da50eba8 100644 --- a/keyboards/westfoxtrot/cypher/rev5/config.h +++ b/keyboards/westfoxtrot/cypher/rev5/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . */ #define GRAVE_ESC_CTRL_OVERRIDE -#define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 25 diff --git a/keyboards/westfoxtrot/cypher/rev5/info.json b/keyboards/westfoxtrot/cypher/rev5/info.json index 3725b4e3c9..6bf10eedee 100644 --- a/keyboards/westfoxtrot/cypher/rev5/info.json +++ b/keyboards/westfoxtrot/cypher/rev5/info.json @@ -16,6 +16,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h index 054b47cca2..db711fcfd9 100644 --- a/keyboards/westm/westm68/rev1/config.h +++ b/keyboards/westm/westm68/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN A8 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json index a4736b30a4..70c31e162b 100644 --- a/keyboards/westm/westm68/rev1/info.json +++ b/keyboards/westm/westm68/rev1/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0x0101" + }, + "ws2812": { + "pin": "A8" } } diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h index 054b47cca2..db711fcfd9 100644 --- a/keyboards/westm/westm68/rev2/config.h +++ b/keyboards/westm/westm68/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN A8 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json index 0b36e6dd58..50711496d3 100644 --- a/keyboards/westm/westm68/rev2/info.json +++ b/keyboards/westm/westm68/rev2/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0x0102" + }, + "ws2812": { + "pin": "A8" } } diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h index fcc9ddb99d..17de75167c 100644 --- a/keyboards/westm/westm9/rev1/config.h +++ b/keyboards/westm/westm9/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN F1 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json index 9934337227..5986e5c1c8 100644 --- a/keyboards/westm/westm9/rev1/info.json +++ b/keyboards/westm/westm9/rev1/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0x0301" + }, + "ws2812": { + "pin": "F1" } } diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h index fcc9ddb99d..17de75167c 100644 --- a/keyboards/westm/westm9/rev2/config.h +++ b/keyboards/westm/westm9/rev2/config.h @@ -16,8 +16,6 @@ #pragma once -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN F1 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json index 3b2f219948..faebf5d443 100644 --- a/keyboards/westm/westm9/rev2/info.json +++ b/keyboards/westm/westm9/rev2/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0x0302" + }, + "ws2812": { + "pin": "F1" } } diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h index 7b6f2e2120..2b64827856 100644 --- a/keyboards/westm/westmergo/config.h +++ b/keyboards/westm/westmergo/config.h @@ -26,8 +26,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN A8 #define RGBLED_NUM 16 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json index 388ae9b860..e2decedf4f 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/info.json @@ -8,6 +8,9 @@ "pid": "0x0201", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A8" + }, "matrix_pins": { "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h index 50759df781..914d9b2763 100644 --- a/keyboards/wilba_tech/wt70_jb/config.h +++ b/keyboards/wilba_tech/wt70_jb/config.h @@ -21,7 +21,6 @@ #define LOCKING_RESYNC_ENABLE // RGBLIGHT configuation -#define RGB_DI_PIN B2 #define RGBLED_NUM 2 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json index a913e0b225..b4f9f05fb0 100644 --- a/keyboards/wilba_tech/wt70_jb/info.json +++ b/keyboards/wilba_tech/wt70_jb/info.json @@ -8,6 +8,9 @@ "pid": "0x001F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "cols": ["F5", "D5", "D3", "D2", "D1", "D0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B3"], "rows": ["E6", "F0", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md index 8688892e59..1fbd745742 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md +++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md @@ -36,7 +36,7 @@ You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7 ```c // Set up RGB underglow. - #define RGB_DI_PIN B0 // The pin your RGB strip is wired to + #define WS2812_DI_PIN B0 // The pin your RGB strip is wired to #define RGBLED_NUM 35 // Number of LEDs #define RGBLIGHT_HUE_STEP 5 // How much each press of rgb_hue changes hue #define RGBLIGHT_SAT_STEP 10 // How much each press of rgb_sat changes sat diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h index b106ebc181..e797f81941 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h +++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h @@ -20,7 +20,7 @@ #define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0 // Set up RGB underglow. -#define RGB_DI_PIN B0 // The pin your RGB strip is wired to +#define WS2812_DI_PIN B0 // The pin your RGB strip is wired to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h index 36fc5c6200..73844a7bc7 100644 --- a/keyboards/winkeys/mini_winni/config.h +++ b/keyboards/winkeys/mini_winni/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E6 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json index 56a13deaf9..614d534fd2 100644 --- a/keyboards/winkeys/mini_winni/info.json +++ b/keyboards/winkeys/mini_winni/info.json @@ -15,6 +15,9 @@ ["F6", "F7", "B6", "B5"] ] }, + "ws2812": { + "pin": "E6" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h index 90e70999b6..0e0377603b 100644 --- a/keyboards/winry/winry25tc/config.h +++ b/keyboards/winry/winry25tc/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D5 #define RGBLED_NUM 40 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json index afdc9f62e4..79f4100f68 100644 --- a/keyboards/winry/winry25tc/info.json +++ b/keyboards/winry/winry25tc/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D5" + }, "matrix_pins": { "cols": ["F5", "C7", "B7", "B2", "B4"], "rows": ["E6", "F0", "D6", "D2", "B6"] diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h index 620a7f6e6b..18d47f7ec4 100644 --- a/keyboards/winry/winry315/config.h +++ b/keyboards/winry/winry315/config.h @@ -12,7 +12,6 @@ // RGB LED parameters. // This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for // per-key backlight and underglow. -#define RGB_DI_PIN F7 #define RGBLED_NUM 27 #define RGBLIGHT_LIMIT_VAL 150 diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json index 4039d5aaf5..10088f2c42 100644 --- a/keyboards/winry/winry315/info.json +++ b/keyboards/winry/winry315/info.json @@ -22,6 +22,9 @@ ["F4", "C7", "D4", "D5", "D1", "F5", "C6", "D6", "D3", "D2", "F6", "B6", "D7", "B4", "B5", "B2", "D0", "E6", null, null, null, null, null, null] ] }, + "ws2812": { + "pin": "F7" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_top" }, diff --git a/keyboards/wolf/m60_b/config.h b/keyboards/wolf/m60_b/config.h index a38b9748ce..a0d44d48e3 100644 --- a/keyboards/wolf/m60_b/config.h +++ b/keyboards/wolf/m60_b/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 62 -#define RGB_DI_PIN D1 #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json index be2237354a..75e6b64b2e 100644 --- a/keyboards/wolf/m60_b/info.json +++ b/keyboards/wolf/m60_b/info.json @@ -14,6 +14,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["D5", "D3", "D2", "B0", "B2"] diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h index cfc1ef79bc..5064157a52 100644 --- a/keyboards/wolf/ts60/config.h +++ b/keyboards/wolf/ts60/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Define RGB Underglow */ -#define RGB_DI_PIN D0 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index a8b8e91268..010ed85755 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 6 }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi"], diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h index 9a3613f6c5..743d5df7e2 100644 --- a/keyboards/wolfmarkclub/wm1/config.h +++ b/keyboards/wolfmarkclub/wm1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN A3 #define RGBLED_NUM 18 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json index ac1827daf6..8d61f9ed09 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/info.json @@ -8,6 +8,9 @@ "pid": "0x2B29", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A3" + }, "matrix_pins": { "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"], "rows": ["C4", "A7", "A6", "A5", "A4"] diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h index 643a094f44..eff8d0f47a 100755 --- a/keyboards/woodkeys/bigseries/1key/config.h +++ b/keyboards/woodkeys/bigseries/1key/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json index e6243a2844..72ac6af4d6 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/info.json @@ -8,6 +8,9 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B4"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h index 62734fc947..a4a762b232 100755 --- a/keyboards/woodkeys/bigseries/2key/config.h +++ b/keyboards/woodkeys/bigseries/2key/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json index 1a5d5bd34d..1e4d0fe04a 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/info.json @@ -8,6 +8,9 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B4", "B3"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h index 592aae3c88..bc00538fdb 100755 --- a/keyboards/woodkeys/bigseries/3key/config.h +++ b/keyboards/woodkeys/bigseries/3key/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json index fd7172fbcb..c8ee901dea 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/info.json @@ -8,6 +8,9 @@ "pid": "0x6073", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B4", "B3", "B5"], "rows": ["B0"] diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h index 53e1242c88..0bc82865f9 100755 --- a/keyboards/woodkeys/bigseries/4key/config.h +++ b/keyboards/woodkeys/bigseries/4key/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json index d151eeea6b..22ebdc7f6b 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/info.json @@ -8,6 +8,9 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B4", "B3"], "rows": ["B0", "B5"] diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h index f1434fdbd4..d5bdf9540c 100644 --- a/keyboards/woodkeys/meira/config.h +++ b/keyboards/woodkeys/meira/config.h @@ -28,7 +28,5 @@ along with this program. If not, see . #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 - #define RGBLED_NUM 15 // Number of LEDs #endif diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 0f366baaba..e39df58323 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -12,6 +12,9 @@ "driver": "custom", "levels": 10 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h index c640c6254f..3854dc8659 100644 --- a/keyboards/woodkeys/scarletbandana/config.h +++ b/keyboards/woodkeys/scarletbandana/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json index 7550db40c8..c2371fb5c3 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/info.json @@ -8,6 +8,9 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"], "rows": ["D4", "D6", "D7", "B4", "B5"] diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 020b95da17..4d5bcf9dba 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT #define RGBLIGHT_DEFAULT_HUE 36 -#define RGB_DI_PIN F1 #define RGB_MATRIX_LED_COUNT 9 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 4c84fb0008..194b3274d4 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -22,6 +22,9 @@ "bootmagic": { "matrix": [0, 11] }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index bfe04592ac..f23c5a4ef1 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -10,7 +10,6 @@ */ #define USB_MAX_POWER_CONSUMPTION 100 -#define RGB_DI_PIN D1 #define RGB_MATRIX_LED_COUNT 12 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index 3627122102..22a4e5b261 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -39,6 +39,9 @@ "max_brightness": 150, "saturation_steps": 8 }, + "ws2812": { + "pin": "D1" + }, "url": "https://worklouder.cc/", "usb": { "device_version": "1.0.0", diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index add9608eb4..265da302e5 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT #define RGBLIGHT_DEFAULT_HUE 170 -#define RGB_DI_PIN F6 #define RGB_MATRIX_LED_COUNT 2 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index f24f612ca5..1be97c86a7 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -18,6 +18,9 @@ {"pin_a": "D7", "pin_b": "B4"} ] }, + "ws2812": { + "pin": "F6" + }, "bootmagic": { "matrix": [0, 2] }, diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json index dbae02e573..8400e21a83 100644 --- a/keyboards/work_louder/numpad/info.json +++ b/keyboards/work_louder/numpad/info.json @@ -63,10 +63,12 @@ "hue_steps": 8, "led_count": 8, "max_brightness": 120, - "pin": "D1", "saturation_steps": 8, "sleep": true }, + "ws2812": { + "pin": "D1" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c index a425eb763a..138779465e 100644 --- a/keyboards/work_louder/rgb_functions.c +++ b/keyboards/work_louder/rgb_functions.c @@ -17,8 +17,8 @@ #include "rgb_functions.h" #ifdef RGBLIGHT_ENABLE -#undef RGB_DI_PIN -#define RGB_DI_PIN RGBLIGHT_DI_PIN +#undef WS2812_DI_PIN +#define WS2812_DI_PIN RGBLIGHT_DI_PIN #define ws2812_setleds ws2812_rgb_setleds diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index de4cf74bad..8f392bd050 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -38,7 +38,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9 #define RGBLIGHT_DEFAULT_HUE 213 -#define RGB_DI_PIN D1 #define RGB_MATRIX_LED_COUNT 49 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index 6826f123a9..a25070dacd 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -17,6 +17,9 @@ {"pin_a": "B0", "pin_b": "B1"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wsk/alpha9/config.h b/keyboards/wsk/alpha9/config.h index 9a9dd8e470..defc0a92dc 100644 --- a/keyboards/wsk/alpha9/config.h +++ b/keyboards/wsk/alpha9/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F4 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json index bb5415b022..8ca6640542 100644 --- a/keyboards/wsk/alpha9/info.json +++ b/keyboards/wsk/alpha9/info.json @@ -17,6 +17,9 @@ "caps_lock": "D3", "on_state": 0 }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/wsk/g4m3ralpha/config.h b/keyboards/wsk/g4m3ralpha/config.h index 657fe0e273..a14f9dbde2 100644 --- a/keyboards/wsk/g4m3ralpha/config.h +++ b/keyboards/wsk/g4m3ralpha/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json index 37672ede0a..9f70410b23 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/info.json @@ -8,6 +8,9 @@ "pid": "0x56D9", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5", "D1"] diff --git a/keyboards/wsk/gothic50/config.h b/keyboards/wsk/gothic50/config.h index 1ad6c6652b..541e19bece 100644 --- a/keyboards/wsk/gothic50/config.h +++ b/keyboards/wsk/gothic50/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json index f773ebf193..a3fb3dd0e6 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/info.json @@ -8,6 +8,9 @@ "pid": "0x04EF", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "C7", "C6", "B6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B0"], "rows": ["B5", "B4", "D7", "D6"] diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h index ad03105a86..b6ee3e9cc8 100644 --- a/keyboards/wsk/gothic70/config.h +++ b/keyboards/wsk/gothic70/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json index 0fd4a6018d..34483ca2bf 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/info.json @@ -8,6 +8,9 @@ "pid": "0x63CC", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/wsk/houndstooth/config.h b/keyboards/wsk/houndstooth/config.h index 08f6b873c5..5f36081323 100644 --- a/keyboards/wsk/houndstooth/config.h +++ b/keyboards/wsk/houndstooth/config.h @@ -5,5 +5,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN F1 diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json index e383e46b3c..bdcfebbdb4 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/info.json @@ -8,6 +8,9 @@ "pid": "0xFA9C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["D1", "F4", "D0", "F5", "D4", "F6"], "rows": ["C6", "F7", "D7", "B1", "B4", "B2", "B5", "B6"] diff --git a/keyboards/wsk/kodachi50/config.h b/keyboards/wsk/kodachi50/config.h index 3227e9a087..da4d3257a6 100644 --- a/keyboards/wsk/kodachi50/config.h +++ b/keyboards/wsk/kodachi50/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json index 29f17cc225..af2112d63b 100644 --- a/keyboards/wsk/kodachi50/info.json +++ b/keyboards/wsk/kodachi50/info.json @@ -8,6 +8,9 @@ "pid": "0x72D4", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"], "rows": ["D2", "B5", "B6", "B2", "B3", "B1", "F7", "F6"] diff --git a/keyboards/wsk/pain27/config.h b/keyboards/wsk/pain27/config.h index 56fee4fd44..edc623d08f 100644 --- a/keyboards/wsk/pain27/config.h +++ b/keyboards/wsk/pain27/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json index ce8a292a64..c82080bad6 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/info.json @@ -8,6 +8,9 @@ "pid": "0x9E8C", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, "matrix_pins": { "cols": ["D2", "B3", "F6", "B1", "B2", "B6", "D4", "C6", "D7", "E6"], "rows": ["F4", "F5", "D0"] diff --git a/keyboards/wsk/sl40/config.h b/keyboards/wsk/sl40/config.h index 80d7ef3f3d..d33de62b5f 100644 --- a/keyboards/wsk/sl40/config.h +++ b/keyboards/wsk/sl40/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN F1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/sl40/info.json b/keyboards/wsk/sl40/info.json index 713987382f..73cb2445d2 100644 --- a/keyboards/wsk/sl40/info.json +++ b/keyboards/wsk/sl40/info.json @@ -8,6 +8,9 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["D3", "D1", "F6", "F7", "B6", "B2", "B3", "B1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "D2", "D0"] diff --git a/keyboards/wsk/tkl30/config.h b/keyboards/wsk/tkl30/config.h index 4decec3392..2dae864ddb 100644 --- a/keyboards/wsk/tkl30/config.h +++ b/keyboards/wsk/tkl30/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json index 0b1dac4028..b9dfc3d58a 100644 --- a/keyboards/wsk/tkl30/info.json +++ b/keyboards/wsk/tkl30/info.json @@ -8,6 +8,9 @@ "pid": "0x0B7F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D3", "D1", "D0", "D4", "F7", "C6", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "F6", "E5"], "rows": ["D2", "B5", "F4"] diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h index 89b02120ac..61a472d2fb 100644 --- a/keyboards/wuque/creek70/config.h +++ b/keyboards/wuque/creek70/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D0 # define RGBLED_NUM 7 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json index e03b4df35f..4760e16d6b 100644 --- a/keyboards/wuque/creek70/info.json +++ b/keyboards/wuque/creek70/info.json @@ -45,6 +45,9 @@ "caps_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "D0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h index a73d36b72a..9ca2e18c52 100644 --- a/keyboards/wuque/ikki68/config.h +++ b/keyboards/wuque/ikki68/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json index 4dd86d2a6b..5de436ac17 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h index 26d5f82b09..19720b3bb4 100644 --- a/keyboards/wuque/ikki68_aurora/config.h +++ b/keyboards/wuque/ikki68_aurora/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json index 811684c14d..a1d965a569 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/info.json @@ -17,6 +17,9 @@ "caps_lock": "F7", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h index fde25201aa..c9e7fa42fb 100644 --- a/keyboards/wuque/promise87/ansi/config.h +++ b/keyboards/wuque/promise87/ansi/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json index c2370e80b5..6bb1b38a42 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/info.json @@ -17,6 +17,9 @@ "caps_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h index fde25201aa..c9e7fa42fb 100644 --- a/keyboards/wuque/promise87/wkl/config.h +++ b/keyboards/wuque/promise87/wkl/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json index f855cafe6e..5cb4d7a5d0 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/info.json @@ -17,6 +17,9 @@ "caps_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h index 8dcff82f55..ae0e692191 100644 --- a/keyboards/xelus/akis/config.h +++ b/keyboards/xelus/akis/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Lighting */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 23 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/xelus/akis/info.json b/keyboards/xelus/akis/info.json index 074b9ca341..cc3116a685 100644 --- a/keyboards/xelus/akis/info.json +++ b/keyboards/xelus/akis/info.json @@ -8,6 +8,9 @@ "pid": "0xA04B", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "F6", "F7", "C7", "C6", "B6", "B5"], "rows": ["F5", "F4", "F1", "F0", "E6"] diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h index 8bec078edc..d3b505447a 100644 --- a/keyboards/xelus/dawn60/rev1/config.h +++ b/keyboards/xelus/dawn60/rev1/config.h @@ -46,7 +46,6 @@ #define RGB_BACKLIGHT_DAWN60 //RGB Underglow defines -#define RGB_DI_PIN F0 #define WS2812_LED_TOTAL 20 #define RGB_UNDERGLOW_ALPHA_TOP_START 0 diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json index 525e9d9ab0..b575f3a88e 100644 --- a/keyboards/xelus/dawn60/rev1/info.json +++ b/keyboards/xelus/dawn60/rev1/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B3", "F1", "F6", "F7"] diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h index 410093b6cf..d84773e5fb 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/config.h +++ b/keyboards/xelus/dawn60/rev1_qmk/config.h @@ -21,7 +21,6 @@ #define LOCKING_RESYNC_ENABLE //RGB Underglow defines -#define RGB_DI_PIN F0 #define WS2812_LED_TOTAL 20 //RGB Matrix defines diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json index 525e9d9ab0..b575f3a88e 100644 --- a/keyboards/xelus/dawn60/rev1_qmk/info.json +++ b/keyboards/xelus/dawn60/rev1_qmk/info.json @@ -1,4 +1,7 @@ { + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B1", "B3", "F1", "F6", "F7"] diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h index dd44daae35..82ada2e6da 100755 --- a/keyboards/xelus/la_plus/config.h +++ b/keyboards/xelus/la_plus/config.h @@ -23,8 +23,6 @@ #define LOCKING_RESYNC_ENABLE // RGB Matrix -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN F1 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 32 diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json index 48cdf901e4..3736b691a0 100644 --- a/keyboards/xelus/la_plus/info.json +++ b/keyboards/xelus/la_plus/info.json @@ -8,6 +8,9 @@ "pid": "0x4C50", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B1", "F0", "F4", "F5"] diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h index 19da636e13..42be4c4415 100644 --- a/keyboards/xelus/ninjin/config.h +++ b/keyboards/xelus/ninjin/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Underglow */ -#define RGB_DI_PIN A10 #define RGBLED_NUM 26 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json index 9bd47b7076..3fc48c08f9 100644 --- a/keyboards/xelus/ninjin/info.json +++ b/keyboards/xelus/ninjin/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A10", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h index 36608599e2..187710670e 100644 --- a/keyboards/xelus/valor/rev1/config.h +++ b/keyboards/xelus/valor/rev1/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Underglow */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 28 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json index b945eb9e74..344c9cdbdf 100644 --- a/keyboards/xelus/valor/rev1/info.json +++ b/keyboards/xelus/valor/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x5652", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["B1", "B2", "C7", "C6", "B6"] diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h index f7bbd338fa..cc63e70bb4 100644 --- a/keyboards/xelus/valor/rev2/config.h +++ b/keyboards/xelus/valor/rev2/config.h @@ -40,7 +40,6 @@ #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191 /* RGB Matrix */ -#define RGB_DI_PIN A9 #define RGBLED_NUM 28 #define RGB_MATRIX_LED_COUNT 28 #define NOP_FUDGE 0.4 diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json index 0085ad2226..381e8eb649 100644 --- a/keyboards/xelus/valor/rev2/info.json +++ b/keyboards/xelus/valor/rev2/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "A9", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h index 807c397aba..242560c067 100644 --- a/keyboards/xelus/xs60/hotswap/config.h +++ b/keyboards/xelus/xs60/hotswap/config.h @@ -38,7 +38,6 @@ #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191 // RGBLIGHT -#define RGB_DI_PIN A10 #define RGBLED_NUM 8 // actually only has 1 #define RGBLIGHT_LAYERS #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json index 35c4c7bc63..24ceb992ad 100644 --- a/keyboards/xelus/xs60/hotswap/info.json +++ b/keyboards/xelus/xs60/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0x5861", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32L422", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h index da1468be66..cbbdc49b12 100644 --- a/keyboards/xelus/xs60/soldered/config.h +++ b/keyboards/xelus/xs60/soldered/config.h @@ -37,7 +37,6 @@ // More EEPROM for layers // RGBLIGHT -#define RGB_DI_PIN A10 #define RGBLED_NUM 8 // actually only has 1 #define RGBLIGHT_LAYERS #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/info.json index 471bedba8c..ab73494213 100644 --- a/keyboards/xelus/xs60/soldered/info.json +++ b/keyboards/xelus/xs60/soldered/info.json @@ -8,6 +8,9 @@ "pid": "0x5860", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A10" + }, "processor": "STM32L422", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/xiudi/xd002/config.h b/keyboards/xiudi/xd002/config.h index 19f01664b2..d442ee5762 100644 --- a/keyboards/xiudi/xd002/config.h +++ b/keyboards/xiudi/xd002/config.h @@ -16,7 +16,6 @@ #pragma once #define RGBLED_NUM 2 -#define RGB_DI_PIN B2 // Save as much space as we can... #define LAYER_STATE_8BIT diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json index c160af5f85..c36199e06e 100644 --- a/keyboards/xiudi/xd002/info.json +++ b/keyboards/xiudi/xd002/info.json @@ -8,6 +8,9 @@ "pid": "0x0202", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, "matrix_pins": { "direct": [ ["B0", "B1"] diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index a404780eea..8be0117d40 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -11,6 +11,9 @@ "pin": "D5", "levels": 6 }, + "ws2812": { + "pin": "C6" + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 1e747adeaf..823ba86358 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -28,7 +28,6 @@ This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk We do not have enough space in the flash for this at the moment, maybe further optimizations can be done on that side. */ -#define RGB_DI_PIN C6 #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLED_NUM 2 diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index adf33530e8..21efad0d81 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/config.h @@ -18,9 +18,7 @@ along with this program. If not, see . #pragma once /* RGB Underglow - * F6 PIN for XD60v2 that has pre-soldered WS2812 LEDs */ -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json index eaf7f9f7e4..c45ef7af64 100644 --- a/keyboards/xiudi/xd60/rev2/info.json +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -13,6 +13,9 @@ "levels": 6, "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index cb3c91b202..f8845d411f 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/config.h @@ -18,9 +18,7 @@ along with this program. If not, see . #pragma once /* RGB Underglow - * F6 PIN for XD60v3 that has pre-soldered LEDs */ -#define RGB_DI_PIN F6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json index 66bcb7be81..68c97c0a9e 100644 --- a/keyboards/xiudi/xd60/rev3/info.json +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -13,6 +13,9 @@ "levels": 6, "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h index 8759e7ff2e..e62b98a12d 100644 --- a/keyboards/xiudi/xd68/config.h +++ b/keyboards/xiudi/xd68/config.h @@ -39,7 +39,6 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT // ws2812 options -#define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json index 77b5b04058..9a2fb81c5e 100644 --- a/keyboards/xiudi/xd68/info.json +++ b/keyboards/xiudi/xd68/info.json @@ -19,6 +19,9 @@ "breathing": true, "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h index 0824eae60e..f8938d2d9e 100644 --- a/keyboards/xiudi/xd75/config.h +++ b/keyboards/xiudi/xd75/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F6 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 12 # define RGBLIGHT_SAT_STEP 25 diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json index f78ff3c7a3..bc2e724214 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/info.json @@ -18,6 +18,9 @@ "levels": 6, "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h index 344c5c6c2b..42cce6f1c0 100644 --- a/keyboards/xiudi/xd84/config.h +++ b/keyboards/xiudi/xd84/config.h @@ -21,7 +21,6 @@ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 -#define RGB_DI_PIN C7 #define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json index 1280b621a9..f7bfaeaebd 100644 --- a/keyboards/xiudi/xd84/info.json +++ b/keyboards/xiudi/xd84/info.json @@ -17,6 +17,9 @@ "caps_lock": "B6", "on_state": 0 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi", "75_iso"], diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h index ec27530f45..3c5bbfbdce 100644 --- a/keyboards/xiudi/xd84pro/config.h +++ b/keyboards/xiudi/xd84pro/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN F6 #define RGBLED_NUM 12 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json index 46f70c42c5..e905ff3e7e 100644 --- a/keyboards/xiudi/xd84pro/info.json +++ b/keyboards/xiudi/xd84pro/info.json @@ -22,6 +22,9 @@ "caps_lock": "B2", "on_state": 0 }, + "ws2812": { + "pin": "F6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi", "75_iso"], diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h index a5020cc807..d89929e9c8 100644 --- a/keyboards/xiudi/xd87/config.h +++ b/keyboards/xiudi/xd87/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json index 9bb0611182..5aa56a60e9 100644 --- a/keyboards/xiudi/xd87/info.json +++ b/keyboards/xiudi/xd87/info.json @@ -21,6 +21,9 @@ "caps_lock": "E2", "on_state": 0 }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h index 8e2a50511f..5fc09b0483 100644 --- a/keyboards/xiudi/xd96/config.h +++ b/keyboards/xiudi/xd96/config.h @@ -21,7 +21,6 @@ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 -#define RGB_DI_PIN C7 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json index c5b667bb12..03b38f39ee 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/info.json @@ -17,6 +17,9 @@ "num_lock": "C6", "on_state": 0 }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h index 8aedbcf715..6327578ebf 100644 --- a/keyboards/yampad/config.h +++ b/keyboards/yampad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* Underlight configuration */ -#define RGB_DI_PIN F4 #define RGBLED_NUM 9 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/yampad/info.json b/keyboards/yampad/info.json index 98afd2252b..54c363b28b 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/info.json @@ -8,6 +8,9 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index 22610f4518..677e41a00d 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN B4 # define RGBLED_NUM 1 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json index e426da7dcf..34702641a8 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index 878ac47bbc..110f0d096c 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN A8 # define RGBLED_NUM 12 # define RGBLIGHT_SLEEP # define RGBLIGHT_VAL_STEP 5 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index 4865cecb0b..bdf9be5f1e 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -11,6 +11,9 @@ "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "A8" + }, "debounce": 8, "layouts": { "LAYOUT": { diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 0c091e17af..573fa12151 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN A7 # define RGBLED_NUM 4 # define RGBLIGHT_LIMIT_VAL 180 diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index c050822531..899e4a7576 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index b3bb28e7ae..5e4cdaaea0 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -20,7 +20,6 @@ /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN A7 # define RGBLED_NUM 82 # define RGB_MATRIX_LED_COUNT RGBLED_NUM @@ -88,7 +87,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN A7 # define RGBLED_NUM 82 # define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index ff5ad4d5a0..9ae46559d5 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -5,6 +5,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 9a23a64ae2..860ee45381 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -21,7 +21,6 @@ /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN B5 # define RGBLED_NUM 86 # define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json index 02e40aefe6..b9355552d6 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "B5", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 84c1c2ae8f..373b5bcbf9 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -18,7 +18,6 @@ /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN A7 # define RGBLED_NUM 69 # define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json index b18af48c53..677746d82e 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 46c0d6005d..74c8f4adce 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -17,7 +17,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN B5 # define RGBLED_NUM 1 # define RGBLIGHT_LAYERS diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index ebf3bf70e6..023f71fc14 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "B5", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h index b5f122fdc8..0e8602dee9 100644 --- a/keyboards/yandrstudio/yr80/config.h +++ b/keyboards/yandrstudio/yr80/config.h @@ -18,7 +18,6 @@ #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN A7 # define RGBLED_NUM 1 # define DRIVER_LED_TOTAL RGBLED_NUM diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json index 50b381885e..6d15acd3be 100644 --- a/keyboards/yandrstudio/yr80/info.json +++ b/keyboards/yandrstudio/yr80/info.json @@ -7,6 +7,7 @@ "device_version": "1.0.0" }, "ws2812": { + "pin": "A7", "driver": "pwm" }, "diode_direction": "COL2ROW", diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 5e34888c14..8a4ce9ec49 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -29,7 +29,6 @@ #define AUDIO_PWM_CHANNEL 1 /* RGB LED */ -#define RGB_DI_PIN B1 #define RGBLED_NUM 8 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 78aaa10e72..be55f047b8 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "ws2812": { + "pin": "B1", "driver": "pwm" }, "matrix_pins": { diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h index 305f37ad19..dd6631f545 100644 --- a/keyboards/ydkb/chili/config.h +++ b/keyboards/ydkb/chili/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . /* Underlight configuration */ -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index 2516744ef0..263eb70e8c 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "B3" + }, "indicators": { "caps_lock": "B2", "num_lock": "B1", diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h index 0b71d91e84..0d488de5d4 100644 --- a/keyboards/ydkb/grape/config.h +++ b/keyboards/ydkb/grape/config.h @@ -25,7 +25,6 @@ #define SN74X138_ADDRESS_PINS { D2, D1, D0 } #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN E6 #define RGBLED_NUM 4 #endif diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json index 1609ba2721..911b5cf831 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/info.json @@ -12,6 +12,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E6" + }, "indicators": { "caps_lock": "F0", "num_lock": "F1", diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h index d47f6e3992..9914803853 100644 --- a/keyboards/ydkb/yd68/config.h +++ b/keyboards/ydkb/yd68/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ydkb/yd68/info.json b/keyboards/ydkb/yd68/info.json index 7b15598735..ee5d43fb8e 100644 --- a/keyboards/ydkb/yd68/info.json +++ b/keyboards/ydkb/yd68/info.json @@ -17,6 +17,9 @@ "caps_lock": "D4", "on_state": 0 }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yeehaw/config.h b/keyboards/yeehaw/config.h index 63780b4581..1445271c8e 100644 --- a/keyboards/yeehaw/config.h +++ b/keyboards/yeehaw/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN B2 #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json index 6c0a2b165e..67080ad327 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/info.json @@ -13,6 +13,9 @@ {"pin_a": "D1", "pin_b": "D0"} ] }, + "ws2812": { + "pin": "B2" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 56495cac2c..a62c64fb37 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index fa2b459fae..83c45eaa6b 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 3ab1f3b604..0f6e31d199 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN E2 # define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 927496efa6..709f382c0a 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -16,6 +16,9 @@ "pin": "B7", "levels": 31 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "num_lock": "C6", "on_state": 0 diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index d1812a65ed..1998e88011 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,7 +15,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 25a04a5158..090c8bc4d7 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h index 84b368eb33..1679d16b44 100644 --- a/keyboards/ymdk/wingshs/config.h +++ b/keyboards/ymdk/wingshs/config.h @@ -13,7 +13,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 80 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ymdk/wingshs/info.json b/keyboards/ymdk/wingshs/info.json index 5e3099d1a3..ec532eff87 100644 --- a/keyboards/ymdk/wingshs/info.json +++ b/keyboards/ymdk/wingshs/info.json @@ -21,6 +21,9 @@ "caps_lock": "C7", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h index 4b44082d9f..135548b4ff 100644 --- a/keyboards/ymdk/yd60mq/config.h +++ b/keyboards/ymdk/yd60mq/config.h @@ -5,7 +5,6 @@ /* prevent stuck modifiers */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json index 60ff8f7fe2..cb10a82245 100644 --- a/keyboards/ymdk/yd60mq/info.json +++ b/keyboards/ymdk/yd60mq/info.json @@ -16,6 +16,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], diff --git a/keyboards/ymdk/ym68/config.h b/keyboards/ymdk/ym68/config.h index c55883abd3..8d19a6eb7e 100644 --- a/keyboards/ymdk/ym68/config.h +++ b/keyboards/ymdk/ym68/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/ymdk/ym68/info.json b/keyboards/ymdk/ym68/info.json index e3ec6538f8..e7490d59dd 100644 --- a/keyboards/ymdk/ym68/info.json +++ b/keyboards/ymdk/ym68/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h index 768d93d624..b66c41ad69 100644 --- a/keyboards/ymdk/ymd09/config.h +++ b/keyboards/ymdk/ymd09/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once #define RGB_MATRIX_LED_COUNT 9 -#define RGB_DI_PIN E2 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json index bbd7ea9eea..9868188d06 100644 --- a/keyboards/ymdk/ymd09/info.json +++ b/keyboards/ymdk/ymd09/info.json @@ -24,6 +24,9 @@ "nkro": true, "rgb_matrix": true, }, + "ws2812": { + "pin": "E2" + }, "build": { "lto": true }, diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h index 5f0ff7b52d..a88fef93fa 100644 --- a/keyboards/ymdk/ymd21/v2/config.h +++ b/keyboards/ymdk/ymd21/v2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #if defined(RGBLIGHT_ENABLE) #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json index af1906a5fc..d059c82a06 100644 --- a/keyboards/ymdk/ymd21/v2/info.json +++ b/keyboards/ymdk/ymd21/v2/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], diff --git a/keyboards/ymdk/ymd40/air40/config.h b/keyboards/ymdk/ymd40/air40/config.h index 4fcbc8421c..2f64f97d93 100644 --- a/keyboards/ymdk/ymd40/air40/config.h +++ b/keyboards/ymdk/ymd40/air40/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 51 #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index 273c5e4a7a..349c117611 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -13,6 +13,9 @@ "rows": ["D0", "B3", "B2", "B1"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd40/v2/config.h b/keyboards/ymdk/ymd40/v2/config.h index a0b2e37f8f..eb16363416 100644 --- a/keyboards/ymdk/ymd40/v2/config.h +++ b/keyboards/ymdk/ymd40/v2/config.h @@ -17,7 +17,6 @@ #pragma once #if defined(RGBLIGHT_ENABLE) - #define RGB_DI_PIN E2 #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 7d28fcacaf..395a9b8bfd 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/ymdk/ymd67/config.h b/keyboards/ymdk/ymd67/config.h index c78fae6957..8a3612b8a5 100644 --- a/keyboards/ymdk/ymd67/config.h +++ b/keyboards/ymdk/ymd67/config.h @@ -5,7 +5,6 @@ /* prevent stuck modifiers */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index 89cdd6b258..cc83eb82ac 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h index 5807ae4d8d..32bdab2478 100644 --- a/keyboards/ymdk/ymd75/config.h +++ b/keyboards/ymdk/ymd75/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json index 1b1a4dbf15..3dc0cf87b9 100644 --- a/keyboards/ymdk/ymd75/info.json +++ b/keyboards/ymdk/ymd75/info.json @@ -6,5 +6,275 @@ "usb": { "vid": "0x20A0", "pid": "0x422D" + }, + "ws2812": { + "pin": "E2" + }, + "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":"Del", "x":14, "y":0}, + {"label":"Fn", "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":"End", "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 Up", "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":"Page Down", "x":15, "y":4}, + {"label":"Ctrl", "x":0, "y":5, "w":1.25}, + {"label":"GUI", "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":"Fn", "x":11, "y":5}, + {"label":"Ctrl", "x":12, "y":5}, + {"label":"\u2190", "x":13, "y":5}, + {"label":"\u2193", "x":14, "y":5}, + {"label":"\u2192", "x":15, "y":5} + ] + }, + "LAYOUT_75_iso": { + "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":"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":"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":"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":"~", "x":12.75, "y":3}, + {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, + {"label":"Page Down", "x":15, "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, "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}, + {"label":"Space", "x":3.75, "y":5, "w":6.25}, + {"label":"AltGr", "x":10, "y":5}, + {"label":"Menu", "x":11, "y":5}, + {"label":"Ctrl", "x":12, "y":5}, + {"label":"Left", "x":13, "y":5}, + {"label":"Down", "x":14, "y":5}, + {"label":"Right", "x":15, "y":5} + ] + }, + "LAYOUT_75_iso_rwkl": { + "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":"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":"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":"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":"~", "x":12.75, "y":3}, + {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, + {"label":"Page Down", "x":15, "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, "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}, + {"label":"Space", "x":3.75, "y":5, "w":6.25}, + {"label":"AltGr", "x":10, "y":5, "w":1.5}, + {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, + {"label":"Left", "x":13, "y":5}, + {"label":"Down", "x":14, "y":5}, + {"label":"Right", "x":15, "y":5} + ] + } } } diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h index cc4cd0d147..3b6ffded66 100644 --- a/keyboards/ymdk/ymd96/config.h +++ b/keyboards/ymdk/ymd96/config.h @@ -24,10 +24,7 @@ along with this program. If not, see . #define USB_MAX_POWER_CONSUMPTION 100 /* RGB underglow */ -// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards. -// The same pin is used on the JJ40, at least. #define RGBLED_NUM 18 -#define RGB_DI_PIN E2 // NOTE: for PS2AVRGB boards, underglow commands are sent via I2C to 0xB0. #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h index b8bcd08e27..d44817cae9 100644 --- a/keyboards/yncognito/batpad/config.h +++ b/keyboards/yncognito/batpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B5 #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYRELEASES diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json index 362da55e6f..7eb388c4d0 100644 --- a/keyboards/yncognito/batpad/info.json +++ b/keyboards/yncognito/batpad/info.json @@ -8,6 +8,9 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["F1", "F0", "D5", "D3"], "rows": ["F4", "C7"] diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h index 4e835b92f3..a0445973a5 100644 --- a/keyboards/yoichiro/lunakey_macro/config.h +++ b/keyboards/yoichiro/lunakey_macro/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . /* Layer Count */ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 -#define RGB_DI_PIN D3 #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/yoichiro/lunakey_macro/info.json b/keyboards/yoichiro/lunakey_macro/info.json index 0da556eb1f..f892a9db7f 100644 --- a/keyboards/yoichiro/lunakey_macro/info.json +++ b/keyboards/yoichiro/lunakey_macro/info.json @@ -13,6 +13,9 @@ "rows": ["E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index 4d680d5306..1e2b0af370 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 6, 6 } diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index ebd425050b..1347f73cb0 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json index e98e38a335..2b477e726c 100644 --- a/keyboards/yoichiro/lunakey_pico/info.json +++ b/keyboards/yoichiro/lunakey_pico/info.json @@ -26,7 +26,6 @@ }, "rgblight": { "led_count": 12, - "pin": "GP6", "sleep": true, "split": true, "split_count": [6, 6], @@ -51,6 +50,7 @@ "enabled": true }, "ws2812": { + "pin": "GP6", "driver": "vendor" }, "layout_aliases": { diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h index c17ec90d8e..4930c35c60 100644 --- a/keyboards/yosino58/rev1/config.h +++ b/keyboards/yosino58/rev1/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index 597c4a442e..0e8431cc88 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 3b3c9b14dc..fdd7a80cc5 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 9 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index a6b946367f..fc314aa10d 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -12,6 +12,9 @@ {"pin_a": "B5", "pin_b": "B6"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 5b59cf5d5e..00a59e57cb 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . 33, 32, 31, 30, 29, 28, 27, \ 34, 35, 36, 37, 38, 39, 40 } -#define RGB_DI_PIN D3 # define RGBLED_NUM 9+32 # define RGBLED_SPLIT { 9, 32 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 5bc055b381..bb2a7669e0 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -34,6 +34,9 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 1e45541119..f5e39f3b00 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 18 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 0a6c30f9ea..8c59e1a549 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -18,6 +18,9 @@ {"pin_a": "B4", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h index 96656f70c8..b224f4303f 100644 --- a/keyboards/yushakobo/quick7/config.h +++ b/keyboards/yushakobo/quick7/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -# define RGB_DI_PIN D3 # define RGBLED_NUM 13 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json index 4413c06def..97885f55ed 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/info.json @@ -14,6 +14,9 @@ {"pin_a": "F5", "pin_b": "F6"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h index 2eafd24586..e94b19675f 100644 --- a/keyboards/yynmt/dozen0/config.h +++ b/keyboards/yynmt/dozen0/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/yynmt/dozen0/info.json b/keyboards/yynmt/dozen0/info.json index d787dd53c6..9a2417f039 100644 --- a/keyboards/yynmt/dozen0/info.json +++ b/keyboards/yynmt/dozen0/info.json @@ -8,6 +8,9 @@ "pid": "0xEA4F", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "B5", "B4", "E6", "D7", "C6", "D4"], "rows": ["F4"] diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h index e2bf97645b..f50a2c72c3 100644 --- a/keyboards/yynmt/kagamidget/config.h +++ b/keyboards/yynmt/kagamidget/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json index 983b09aa79..368be6834b 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["D1", "D0", "F4", "F5"] diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h index 0167811c6a..eecce57fe6 100644 --- a/keyboards/zfrontier/big_switch/config.h +++ b/keyboards/zfrontier/big_switch/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once /* RGB light config */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 4 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index 72cf7de0c2..02c40f6125 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -12,6 +12,9 @@ "cols": ["F1"], "rows": ["F0"] }, + "ws2812": { + "pin": "B6" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index b60f50713b..eff7fc2d49 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 4fc7a2f449..6d0df4a0c5 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -16,6 +16,9 @@ "pin": "B6", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi"], diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index b66aed55c7..8471167fcd 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -6,7 +6,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index e327919dcb..9f01b09518 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -12,6 +12,9 @@ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], "rows": ["B0", "B1", "D4", "D5"] }, + "ws2812": { + "pin": "D6" + }, "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 8437e42144..310b4f5756 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 20 // SPI RGB Driver #define WS2812_SPI SPID2 diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index fe8cf08586..e762ab1d48 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -18,6 +18,7 @@ "breathing": true }, "ws2812": { + "pin": "B15", "driver": "spi" }, "indicators": { diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index cda1688944..3cb23cdcc5 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -20,7 +20,6 @@ #define SPLIT_HAND_PIN B3 #define SELECT_SOFT_SERIAL_SPEED 0 -#define RGB_DI_PIN B4 #define RGBLED_NUM 24 #define RGBLED_SPLIT { 12, 12 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index ba23913c88..f657556db9 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -26,6 +26,7 @@ } }, "ws2812": { + "pin": "B4", "driver": "pwm" }, "processor": "STM32F103", diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index c643ca5d31..9274f5101b 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -21,7 +21,6 @@ //#define SELECT_SOFT_SERIAL_SPEED 0 #define SERIAL_USART_SPEED 921600 -#define RGB_DI_PIN B1 #define RGBLED_NUM 48 #define RGBLED_SPLIT {24, 24} #define RGBLIGHT_LIMIT_VAL 120 diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index e0052a33d4..df18f9f0ed 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -19,6 +19,7 @@ ] }, "ws2812": { + "pin": "B1", "driver": "pwm" }, "split": { diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h index 901b62ad89..92fdcaa586 100644 --- a/keyboards/zykrah/fuyu/config.h +++ b/keyboards/zykrah/fuyu/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE /* The pin connected to the data pin of the LEDs */ -#define RGB_DI_PIN GP2 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 3/4 diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json index 00056c1bd8..c37f3b44ae 100644 --- a/keyboards/zykrah/fuyu/info.json +++ b/keyboards/zykrah/fuyu/info.json @@ -27,6 +27,7 @@ "driver": "WS2812" }, "ws2812": { + "pin": "GP2", "driver": "vendor" }, "url": "https://github.com/zykrah/fuyu", diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h index 63d02fc807..4606bc8a6d 100644 --- a/layouts/community/60_iso/unxmaal/config.h +++ b/layouts/community/60_iso/unxmaal/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h index 5458a236ce..0181b66605 100644 --- a/layouts/community/ergodox/jackhumbert/config.h +++ b/layouts/community/ergodox/jackhumbert/config.h @@ -1,7 +1,7 @@ #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D7 +#define WS2812_DI_PIN D7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h index 566365d7b6..a02b1d6df8 100644 --- a/layouts/community/numpad_5x6/bjohnson/config.h +++ b/layouts/community/numpad_5x6/bjohnson/config.h @@ -1,7 +1,7 @@ #pragma once #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) -#define RGB_DI_PIN B7 +#define WS2812_DI_PIN B7 #define RGBLED_NUM 13 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h index 83e8766b27..51fd021c75 100644 --- a/layouts/community/numpad_5x6/drashna/config.h +++ b/layouts/community/numpad_5x6/drashna/config.h @@ -18,7 +18,7 @@ #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) -# define RGB_DI_PIN B1 +# define WS2812_DI_PIN B1 # define RGBLED_NUM 16 // Number of LEDs # define RGBLIGHT_HUE_STEP 12 diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h index 85112d8ce4..8443ff054f 100644 --- a/layouts/community/ortho_4x12/drashna/config.h +++ b/layouts/community/ortho_4x12/drashna/config.h @@ -18,7 +18,7 @@ #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) # if defined(KEYBOARD_planck_light) -# define RGB_DI_PIN A0 +# define WS2812_DI_PIN A0 # define RGBLED_NUM 13 // Number of LEDs # endif # define RGBLIGHT_HUE_STEP 12 diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h index 44bac5bf18..1ccf427557 100644 --- a/layouts/community/ortho_4x12/xyverz/config.h +++ b/layouts/community/ortho_4x12/xyverz/config.h @@ -8,7 +8,7 @@ #undef RGBLED_NUM #if defined(KEYBOARD_planck_rev5) #define RGBLED_NUM 10 - #define RGB_DI_PIN D1 + #define WS2812_DI_PIN D1 #elif defined(KEYBOARD_keebio_levinson_rev2) #define RGBLED_NUM 12 #elif defined(KEYBOARD_lets_split_rev2) diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h index 61c95fed8f..0e7d1dd0db 100644 --- a/layouts/community/ortho_5x12/drashna/config.h +++ b/layouts/community/ortho_5x12/drashna/config.h @@ -18,7 +18,7 @@ /* ws2812 RGB LED */ #if defined(KEYBOARD_fractal) -# define RGB_DI_PIN D2 +# define WS2812_DI_PIN D2 # undef RGBLED_NUM # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h index bb444a51a5..5ee4d372ef 100644 --- a/layouts/community/ortho_5x12/xyverz/config.h +++ b/layouts/community/ortho_5x12/xyverz/config.h @@ -6,10 +6,10 @@ /* ws2812 RGB LED */ #ifndef RGBLIGHT_ENABLE -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #endif #if defined(KEYBOARD_preonic_rev2) - #define RGB_DI_PIN B3 + #define WS2812_DI_PIN B3 #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h index 66959a6d42..933f2f3ad7 100644 --- a/layouts/community/ortho_5x14/yet-another-developer/config.h +++ b/layouts/community/ortho_5x14/yet-another-developer/config.h @@ -2,7 +2,7 @@ /* ws2812 RGB LED */ #if defined(KEYBOARD_fractal) -# define RGB_DI_PIN D2 +# define WS2812_DI_PIN D2 # undef RGBLED_NUM # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index e43ad5e3ac..92065e8f31 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h @@ -41,8 +41,8 @@ #ifdef RGB_MATRIX_ENABLE # ifdef CONVERT_TO_PROTON_C -# undef RGB_DI_PIN -# define RGB_DI_PIN A3 +# undef WS2812_DI_PIN +# define WS2812_DI_PIN A3 # endif # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/platforms/avr/drivers/ws2812_bitbang.c b/platforms/avr/drivers/ws2812_bitbang.c index 5c0cb3b718..aad10d86b0 100644 --- a/platforms/avr/drivers/ws2812_bitbang.c +++ b/platforms/avr/drivers/ws2812_bitbang.c @@ -38,10 +38,10 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi); void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) { - DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN); + DDRx_ADDRESS(WS2812_DI_PIN) |= pinmask(WS2812_DI_PIN); - uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN); - uint8_t maskhi = pinmask(RGB_DI_PIN) | PORTx_ADDRESS(RGB_DI_PIN); + uint8_t masklo = ~(pinmask(WS2812_DI_PIN)) & PORTx_ADDRESS(WS2812_DI_PIN); + uint8_t maskhi = pinmask(WS2812_DI_PIN) | PORTx_ADDRESS(WS2812_DI_PIN); ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi); @@ -165,7 +165,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t " dec %0 \n\t" // '1' [+2] '0' [+2] " brne loop%=\n\t" // '1' [+3] '0' [+4] : "=&d"(ctr) - : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo)); + : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(WS2812_DI_PIN))), "r"(maskhi), "r"(masklo)); } SREG = sreg_prev; diff --git a/platforms/chibios/boards/BONSAI_C4/configs/config.h b/platforms/chibios/boards/BONSAI_C4/configs/config.h index e412f73d3d..c5dbb25c45 100644 --- a/platforms/chibios/boards/BONSAI_C4/configs/config.h +++ b/platforms/chibios/boards/BONSAI_C4/configs/config.h @@ -67,8 +67,8 @@ // WS2812-style LED control on pin A10 #ifdef WS2812_DRIVER_PWM -# ifndef RGB_DI_PIN -# define RGB_DI_PIN PAL_LINE(GPIOA, 10) +# ifndef WS2812_DI_PIN +# define WS2812_DI_PIN PAL_LINE(GPIOA, 10) # endif # ifndef WS2812_PWM_DRIVER # define WS2812_PWM_DRIVER PWMD1 diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c index a46b099195..99a6cfaba9 100644 --- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c +++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c @@ -185,7 +185,7 @@ bool ws2812_init(void) { (pio_idx == 0 ? PAL_MODE_ALTERNATE_PIO0 : PAL_MODE_ALTERNATE_PIO1); // clang-format on - palSetLineMode(RGB_DI_PIN, rgb_pin_mode); + palSetLineMode(WS2812_DI_PIN, rgb_pin_mode); STATE_MACHINE = pio_claim_unused_sm(pio, true); if (STATE_MACHINE < 0) { @@ -195,11 +195,11 @@ bool ws2812_init(void) { uint offset = pio_add_program(pio, &ws2812_program); - pio_sm_set_consecutive_pindirs(pio, STATE_MACHINE, RGB_DI_PIN, 1, true); + pio_sm_set_consecutive_pindirs(pio, STATE_MACHINE, WS2812_DI_PIN, 1, true); pio_sm_config config = pio_get_default_sm_config(); sm_config_set_wrap(&config, offset + WS2812_WRAP_TARGET, offset + WS2812_WRAP); - sm_config_set_sideset_pins(&config, RGB_DI_PIN); + sm_config_set_sideset_pins(&config, WS2812_DI_PIN); sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_TX); #if defined(WS2812_EXTERNAL_PULLUP) diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c index 55ac333b1e..d05deb1a50 100644 --- a/platforms/chibios/drivers/ws2812_bitbang.c +++ b/platforms/chibios/drivers/ws2812_bitbang.c @@ -53,22 +53,22 @@ void sendByte(uint8_t byte) { // using something like wait_ns(is_one ? T1L : T0L) here throws off timings if (is_one) { // 1 - writePinHigh(RGB_DI_PIN); + writePinHigh(WS2812_DI_PIN); wait_ns(WS2812_T1H); - writePinLow(RGB_DI_PIN); + writePinLow(WS2812_DI_PIN); wait_ns(WS2812_T1L); } else { // 0 - writePinHigh(RGB_DI_PIN); + writePinHigh(WS2812_DI_PIN); wait_ns(WS2812_T0H); - writePinLow(RGB_DI_PIN); + writePinLow(WS2812_DI_PIN); wait_ns(WS2812_T0L); } } } void ws2812_init(void) { - palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); + palSetLineMode(WS2812_DI_PIN, WS2812_OUTPUT_MODE); } // Setleds for standard RGB diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c index c4a591c10b..04c8279a97 100644 --- a/platforms/chibios/drivers/ws2812_pwm.c +++ b/platforms/chibios/drivers/ws2812_pwm.c @@ -308,7 +308,7 @@ void ws2812_init(void) { for (i = 0; i < WS2812_RESET_BIT_N; i++) ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0; // All reset bits are zero - palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); + palSetLineMode(WS2812_DI_PIN, WS2812_OUTPUT_MODE); // PWM Configuration //#pragma GCC diagnostic ignored "-Woverride-init" // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c index 03ffbd7f82..c28f5007f1 100644 --- a/platforms/chibios/drivers/ws2812_spi.c +++ b/platforms/chibios/drivers/ws2812_spi.c @@ -136,7 +136,7 @@ static void set_led_color_rgb(LED_TYPE color, int pos) { } void ws2812_init(void) { - palSetLineMode(RGB_DI_PIN, WS2812_MOSI_OUTPUT_MODE); + palSetLineMode(WS2812_DI_PIN, WS2812_MOSI_OUTPUT_MODE); #ifdef WS2812_SPI_SCK_PIN palSetLineMode(WS2812_SPI_SCK_PIN, WS2812_SCK_OUTPUT_MODE); @@ -150,8 +150,8 @@ void ws2812_init(void) { WS2812_SPI_BUFFER_MODE, # endif NULL, // end_cb - PAL_PORT(RGB_DI_PIN), - PAL_PAD(RGB_DI_PIN), + PAL_PORT(WS2812_DI_PIN), + PAL_PAD(WS2812_DI_PIN), # if defined(WB32F3G71xx) || defined(WB32FQ95xx) 0, 0, @@ -170,8 +170,8 @@ void ws2812_init(void) { # endif NULL, // data_cb NULL, // error_cb - PAL_PORT(RGB_DI_PIN), - PAL_PAD(RGB_DI_PIN), + PAL_PORT(WS2812_DI_PIN), + PAL_PAD(WS2812_DI_PIN), WS2812_SPI_DIVISOR_CR1_BR_X, 0 #endif diff --git a/users/ishtob/config.h b/users/ishtob/config.h index 98a3a5537e..993521acc4 100755 --- a/users/ishtob/config.h +++ b/users/ishtob/config.h @@ -22,7 +22,7 @@ //#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f /* ws2812 RGB LED -#define RGB_DI_PIN B5 +#define WS2812_DI_PIN B5 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 -- cgit v1.3.1 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/0_sixty/info.json | 8 +- keyboards/1upkeyboards/1up60rgb/info.json | 6 - keyboards/1upkeyboards/pi40/grid_v1_1/info.json | 4 +- keyboards/1upkeyboards/pi40/mit_v1_0/info.json | 4 +- keyboards/1upkeyboards/pi40/mit_v1_1/info.json | 4 +- keyboards/1upkeyboards/pi60/info.json | 146 +-- keyboards/1upkeyboards/pi60_hse/info.json | 124 +-- keyboards/1upkeyboards/pi60_rgb/info.json | 120 +-- keyboards/1upkeyboards/sweet16/info.json | 1 - keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 4 +- .../1upkeyboards/sweet16v2/pro_micro/info.json | 2 +- keyboards/25keys/aleth42/info.json | 6 +- keyboards/4pplet/aekiso60/info.json | 1 - keyboards/4pplet/bootleg/rev_a/info.json | 1 - keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 3 - keyboards/4pplet/steezy60/rev_a/info.json | 16 +- keyboards/4pplet/steezy60/rev_b/info.json | 16 +- keyboards/4pplet/unextended_std/rev_a/info.json | 12 +- keyboards/4pplet/yakiimo/rev_a/info.json | 4 - keyboards/acheron/arctic/info.json | 6 +- keyboards/acheron/austin/info.json | 8 - keyboards/acheron/keebspcb/info.json | 6 +- keyboards/adkb96/info.json | 248 ++--- keyboards/adpenrose/obi/info.json | 1 - keyboards/aeboards/constellation/rev1/info.json | 1 - keyboards/aeboards/constellation/rev2/info.json | 1 - keyboards/aeboards/constellation/rev3/info.json | 1 - keyboards/ai03/equinox/info.json | 14 +- keyboards/ai03/jp60/info.json | 2 +- keyboards/ai03/lunar/info.json | 6 +- keyboards/ai03/lunar_ii/info.json | 4 +- keyboards/ai03/orbit/info.json | 6 +- keyboards/ai03/orbit_x/info.json | 6 +- keyboards/ai03/quasar/info.json | 6 +- keyboards/ai03/soyuz/info.json | 6 +- keyboards/ai03/vega/info.json | 8 - keyboards/ai03/voyager60_alps/info.json | 6 +- keyboards/aidansmithdotdev/fine40/info.json | 4 +- keyboards/akb/ogr/info.json | 8 - keyboards/akb/ogrn/info.json | 2 +- keyboards/akb/vero/info.json | 4 - keyboards/al1/info.json | 1 - keyboards/aleblazer/zodiark/info.json | 6 +- keyboards/alf/dc60/info.json | 10 +- keyboards/alf/x2/info.json | 2 - keyboards/alfredslab/swift65/hotswap/info.json | 1 - keyboards/alhenkb/macropad5x4/info.json | 2 +- keyboards/aliceh66/pianoforte/info.json | 2 +- keyboards/aliceh66/pianoforte_hs/info.json | 2 +- keyboards/alpha/info.json | 4 +- keyboards/an_achronism/tetromino/info.json | 204 ++-- keyboards/anavi/knob1/info.json | 34 +- keyboards/anavi/macropad10/info.json | 32 +- keyboards/ano/info.json | 1 - keyboards/argo_works/ishi/80/mk0_avr/info.json | 6 +- .../argo_works/ishi/80/mk0_avr_extra/info.json | 6 +- keyboards/ashpil/modelm_usbc/info.json | 6 +- keyboards/ask55/info.json | 12 +- keyboards/atlantis/ak81_ve/info.json | 2 +- keyboards/atset/at1/info.json | 2 +- keyboards/atset/at12/info.json | 2 +- keyboards/atset/at3/info.json | 2 +- keyboards/axolstudio/foundation_gamma/info.json | 6 +- keyboards/axolstudio/helpo/info.json | 6 +- keyboards/bahm/aster_ergo/info.json | 2 +- keyboards/basekeys/slice/rev1/info.json | 6 +- keyboards/basekeys/trifecta/info.json | 6 +- keyboards/bemeier/bmek/info.json | 6 +- keyboards/binepad/bn009/r1/info.json | 1 - keyboards/bioi/g60/info.json | 6 - keyboards/bioi/morgan65/info.json | 8 - keyboards/bioi/s65/info.json | 8 - keyboards/black_hellebore/info.json | 227 ++-- keyboards/blaster75/info.json | 8 +- keyboards/blockboy/ac980mini/info.json | 2 +- keyboards/blu/vimclutch/info.json | 48 +- keyboards/boardsource/beiwagon/info.json | 8 +- keyboards/boardsource/lulu/info.json | 116 +- keyboards/boardsource/microdox/v2/info.json | 72 +- keyboards/boardsource/technik_s/info.json | 78 +- keyboards/bop/info.json | 2 +- keyboards/boston/info.json | 2 - keyboards/boston_meetup/info.json | 6 +- keyboards/bubble75/hotswap/info.json | 6 +- keyboards/buildakb/potato65s/info.json | 3 - keyboards/butterkeebs/pocketpad/info.json | 67 +- keyboards/buzzard/rev1/info.json | 2 +- keyboards/cablecardesigns/cypher/rev6/info.json | 2 - keyboards/caffeinated/serpent65/info.json | 4 - keyboards/cannonkeys/adelie/info.json | 2 - keyboards/cannonkeys/aella/info.json | 2 - keyboards/cannonkeys/atlas_alps/info.json | 6 +- keyboards/cannonkeys/bakeneko60_iso_hs/info.json | 2 +- keyboards/cannonkeys/balance/info.json | 4 - keyboards/cannonkeys/brutalv2_1800/info.json | 8 - keyboards/cannonkeys/brutalv2_65/info.json | 8 - keyboards/cannonkeys/caerdroia/info.json | 2 +- keyboards/cannonkeys/cloudline/info.json | 4 - keyboards/cannonkeys/crin/info.json | 8 - keyboards/cannonkeys/devastatingtkl/info.json | 8 - keyboards/cannonkeys/ellipse/info.json | 8 - keyboards/cannonkeys/ellipse_hs/info.json | 1 - keyboards/cannonkeys/gentoo/info.json | 12 - keyboards/cannonkeys/hoodrowg/info.json | 2 - keyboards/cannonkeys/moment/info.json | 4 - keyboards/cannonkeys/nearfield/info.json | 1 - keyboards/cannonkeys/obliterated75/info.json | 4 - keyboards/cannonkeys/onyx/info.json | 8 - keyboards/cannonkeys/ortho48v2/info.json | 96 +- keyboards/cannonkeys/rekt1800/info.json | 4 - keyboards/cannonkeys/ripple_hs/info.json | 2 +- keyboards/cannonkeys/serenity/info.json | 4 - keyboards/cannonkeys/typeb/info.json | 2 +- keyboards/cannonkeys/vector/info.json | 4 - keyboards/capsunlocked/cu24/info.json | 6 +- keyboards/capsunlocked/cu80/v1/info.json | 6 +- keyboards/cest73/tkm/info.json | 2 - keyboards/charue/charon/info.json | 4 - keyboards/charue/sunsetter_r2/info.json | 4 - keyboards/chavdai40/info.json | 4 +- keyboards/checkerboards/axon40/info.json | 6 +- keyboards/checkerboards/g_idb60/info.json | 1 - keyboards/checkerboards/phoenix45_ortho/info.json | 2 +- keyboards/checkerboards/plexus75/info.json | 6 +- keyboards/checkerboards/pursuit40/info.json | 6 +- keyboards/cherrybstudio/cb1800/info.json | 8 - keyboards/cherrybstudio/cb65/info.json | 8 - keyboards/cherrybstudio/cb87rgb/info.json | 8 - keyboards/cherrybstudio/cb87v2/info.json | 8 - keyboards/chromatonemini/info.json | 4 +- keyboards/cipulot/kawayo/info.json | 2 +- keyboards/citrus/erdnuss65/info.json | 11 +- keyboards/clueboard/california/info.json | 8 +- keyboards/contra/info.json | 1 - keyboards/controllerworks/mini36/info.json | 88 +- keyboards/controllerworks/mini42/info.json | 92 +- keyboards/converter/a1200/info.json | 2 +- keyboards/converter/modelm101/info.json | 6 +- keyboards/converter/modelm101_teensy2/info.json | 6 +- keyboards/converter/numeric_keypad_iie/info.json | 6 +- keyboards/copenhagen_click/click_pad_v1/info.json | 6 +- keyboards/coseyfannitutti/discipad/info.json | 6 +- keyboards/coseyfannitutti/discipline/info.json | 6 +- keyboards/coseyfannitutti/mullet/info.json | 6 +- keyboards/coseyfannitutti/mulletpad/info.json | 6 +- keyboards/coseyfannitutti/mysterium/info.json | 6 +- keyboards/coseyfannitutti/romeo/info.json | 6 +- keyboards/crbn/info.json | 2 +- keyboards/crimsonkeyboards/resume1800/info.json | 6 +- keyboards/custommk/evo70/info.json | 1 - keyboards/custommk/genesis/rev1/info.json | 7 +- keyboards/custommk/genesis/rev2/info.json | 6 +- keyboards/cx60/info.json | 6 +- keyboards/delikeeb/vaneelaex/info.json | 1 - keyboards/demiurge/info.json | 1 - keyboards/deng/djam/info.json | 1 - keyboards/dmqdesign/spin/info.json | 6 +- keyboards/do60/info.json | 6 +- keyboards/doio/kb38/info.json | 6 +- keyboards/donutcables/budget96/info.json | 6 +- keyboards/donutcables/scrabblepad/info.json | 28 +- keyboards/doppelganger/info.json | 6 +- keyboards/dotmod/dymium65/info.json | 108 +- keyboards/drhigsby/ogurec/info.json | 6 +- keyboards/drop/sense75/info.json | 122 +-- keyboards/dtisaac/cg108/info.json | 8 +- keyboards/dtisaac/dosa40rgb/info.json | 2 +- keyboards/dtisaac/dtisaac01/info.json | 6 +- keyboards/duck/octagon/v1/info.json | 6 +- keyboards/duck/octagon/v2/info.json | 1 - keyboards/duck/orion/v3/info.json | 6 +- keyboards/duck/tcv3/info.json | 6 +- keyboards/ducky/one2sf/1967st/info.json | 2 - keyboards/dumbpad/v3x/info.json | 2 +- keyboards/durgod/dgk6x/hades_iso/info.json | 140 +-- keyboards/dyz/dyz60_hs/info.json | 2 +- keyboards/dztech/bocc/info.json | 6 +- keyboards/dztech/duo_s/info.json | 6 +- keyboards/dztech/tofu/jr/v1/info.json | 1 - keyboards/ealdin/quadrant/info.json | 4 +- keyboards/eason/greatsword80/info.json | 2 +- keyboards/ebastler/e80_1800/info.json | 1042 +++++++++--------- keyboards/eek/silk_down/info.json | 2 +- keyboards/eek/silk_up/info.json | 2 +- keyboards/emi20/info.json | 6 +- keyboards/era/era65/info.json | 9 +- keyboards/ericrlau/numdiscipline/rev1/info.json | 6 +- keyboards/esca/getawayvan/info.json | 6 +- keyboards/esca/getawayvan_f042/info.json | 6 +- keyboards/evancookaudio/sleepingdinosaur/info.json | 2 +- keyboards/eve/meteor/info.json | 6 +- keyboards/evolv/info.json | 6 +- keyboards/evyd13/atom47/rev2/info.json | 6 +- keyboards/evyd13/atom47/rev3/info.json | 6 +- keyboards/evyd13/atom47/rev4/info.json | 6 +- keyboards/evyd13/atom47/rev5/info.json | 6 +- keyboards/evyd13/eon40/info.json | 6 +- keyboards/evyd13/eon65/info.json | 6 +- keyboards/evyd13/eon75/info.json | 6 +- keyboards/evyd13/eon95/info.json | 6 +- keyboards/evyd13/fin_pad/info.json | 2 +- keyboards/evyd13/gh80_1800/info.json | 6 +- keyboards/evyd13/gh80_3700/info.json | 6 +- keyboards/evyd13/gud70/info.json | 6 +- keyboards/evyd13/minitomic/info.json | 6 +- keyboards/evyd13/mx5160/info.json | 6 +- keyboards/evyd13/nt210/info.json | 2 +- keyboards/evyd13/nt650/info.json | 2 +- keyboards/evyd13/nt660/info.json | 6 +- keyboards/evyd13/nt750/info.json | 6 +- keyboards/evyd13/nt980/info.json | 6 +- keyboards/evyd13/pockettype/info.json | 6 +- keyboards/evyd13/solheim68/info.json | 6 +- keyboards/exclusive/e6v2/le/info.json | 6 +- keyboards/exclusive/e6v2/le_bmc/info.json | 2 +- keyboards/exclusive/e6v2/oe_bmc/info.json | 2 +- keyboards/eyeohdesigns/babyv/info.json | 6 +- keyboards/eyeohdesigns/theboulevard/info.json | 8 +- keyboards/ez_maker/directpins/teensy_32/info.json | 26 +- keyboards/ez_maker/directpins/teensy_lc/info.json | 26 +- keyboards/fallacy/info.json | 4 +- keyboards/fc660c/info.json | 6 +- keyboards/flehrad/snagpad/info.json | 1 - keyboards/fleuron/info.json | 4 +- keyboards/foxlab/leaf60/hotswap/info.json | 6 +- keyboards/foxlab/leaf60/universal/info.json | 6 +- keyboards/fr4/southpaw75/info.json | 6 +- keyboards/fr4/unix60/info.json | 6 +- keyboards/friedrich/info.json | 4 +- keyboards/frobiac/blackbowl/info.json | 80 +- keyboards/frobiac/blackflat/info.json | 76 +- keyboards/frobiac/hypernano/info.json | 88 +- keyboards/frobiac/redtilt/info.json | 1 - keyboards/ft/mars80/info.json | 6 +- keyboards/fungo/rev1/info.json | 2 +- keyboards/funky40/info.json | 6 +- keyboards/geistmaschine/geist/info.json | 448 ++++---- keyboards/geistmaschine/macropod/info.json | 24 +- keyboards/geonworks/frogmini/fmh/info.json | 6 +- keyboards/ghs/jem/info.json | 412 ++++---- .../keymaps/default_giabarinaix2/info.json | 158 +-- .../giabalanai/keymaps/giabarinaix2led/info.json | 158 +-- .../giabalanai/keymaps/via_giabarinaix2/info.json | 158 +-- keyboards/gl516/a52gl/info.json | 6 +- keyboards/gl516/j73gl/info.json | 6 +- keyboards/gl516/n51gl/info.json | 6 +- keyboards/gmmk/numpad/info.json | 2 +- keyboards/gopolar/gg86/info.json | 6 +- keyboards/gray_studio/aero75/info.json | 6 +- keyboards/gray_studio/hb85/info.json | 6 +- keyboards/grid600/press/info.json | 6 +- keyboards/h0oni/deskpad/info.json | 6 +- keyboards/h0oni/hotduck/info.json | 6 +- keyboards/hadron/info.json | 6 +- keyboards/halfcliff/info.json | 6 +- keyboards/han60/info.json | 1 - keyboards/handwired/3dfoxc/info.json | 2 +- keyboards/handwired/alcor_dactyl/info.json | 148 +-- keyboards/handwired/bigmac/info.json | 1 - keyboards/handwired/dactyl_left/info.json | 6 +- keyboards/handwired/dactyl_manuform/4x6/info.json | 1 - .../handwired/dactyl_manuform/5x6_68/info.json | 138 +-- keyboards/handwired/ddg_56/info.json | 6 +- keyboards/handwired/eagleii/info.json | 6 +- keyboards/handwired/fc200rt_qmk/info.json | 7 +- keyboards/handwired/gamenum/info.json | 6 +- keyboards/handwired/hnah40/info.json | 6 +- keyboards/handwired/hnah40rgb/info.json | 4 +- keyboards/handwired/jscotto/scotto36/info.json | 1 - keyboards/handwired/jscotto/scotto9/info.json | 1 - keyboards/handwired/jscotto/scottocmd/info.json | 1 - .../handwired/jscotto/scottostarter/info.json | 1 - keyboards/handwired/juliet/info.json | 6 +- keyboards/handwired/m40/5x5_macropad/info.json | 14 +- keyboards/handwired/magicforce68/info.json | 1 - .../handwired/maverick0197/keydeck8/info.json | 70 +- keyboards/handwired/mechboards_micropad/info.json | 6 +- keyboards/handwired/owlet60/info.json | 6 +- keyboards/handwired/polly40/info.json | 2 +- keyboards/handwired/prkl30/promicro/info.json | 2 +- keyboards/handwired/sejin_eat1010r2/info.json | 6 +- keyboards/handwired/selene/info.json | 8 +- keyboards/handwired/sono1/info.json | 6 +- keyboards/handwired/split89/info.json | 178 ++-- keyboards/handwired/swiftrax/astro65/info.json | 6 +- keyboards/handwired/swiftrax/bebol/info.json | 6 +- keyboards/handwired/swiftrax/beegboy/info.json | 6 +- keyboards/handwired/swiftrax/bumblebee/info.json | 8 +- keyboards/handwired/swiftrax/cowfish/info.json | 6 +- keyboards/handwired/swiftrax/glacier/info.json | 6 +- keyboards/handwired/swiftrax/joypad/info.json | 6 +- .../handwired/swiftrax/koalafications/info.json | 6 +- keyboards/handwired/swiftrax/nodu/info.json | 6 +- keyboards/handwired/swiftrax/the_galleon/info.json | 6 +- keyboards/handwired/swiftrax/unsplit/info.json | 6 +- keyboards/handwired/symmetric70_proto/info.json | 6 +- keyboards/handwired/t111/info.json | 6 +- keyboards/handwired/tennie/info.json | 2 +- keyboards/handwired/tkk/info.json | 4 +- keyboards/handwired/tritium_numpad/info.json | 2 +- keyboards/handwired/wabi/info.json | 6 +- keyboards/handwired/z150/info.json | 6 +- keyboards/handwired/zergo/info.json | 6 +- keyboards/hardwareabstraction/handwire/info.json | 3 - keyboards/hazel/bad_wings/info.json | 12 +- keyboards/heliotrope/info.json | 225 ++-- keyboards/hfdkb/keyboard_sw/k83/info.json | 2 +- keyboards/hillside/46/0_1/info.json | 4 - keyboards/hillside/46/info.json | 4 +- keyboards/hillside/48/0_1/info.json | 6 +- keyboards/hillside/48/info.json | 4 +- keyboards/hillside/52/0_1/info.json | 6 +- keyboards/hillside/52/info.json | 4 +- keyboards/hineybush/hineyg80/info.json | 6 +- keyboards/hotdox76v2/info.json | 4 +- keyboards/hubble/info.json | 7 +- keyboards/ianklug/grooveboard/info.json | 2 +- .../ibm/model_m_4th_gen/overnumpad_1xb/info.json | 4 +- keyboards/idobao/id80/v2/ansi/info.json | 18 +- keyboards/idobao/id87/v1/info.json | 6 +- keyboards/idyllic/tinny50_rgb/info.json | 2 +- keyboards/igloo/info.json | 25 +- keyboards/illuminati/is0/info.json | 6 +- keyboards/illusion/rosa/info.json | 6 +- keyboards/ilumkb/primus75/info.json | 7 +- keyboards/ilumkb/simpler61/info.json | 1 - keyboards/ilumkb/simpler64/info.json | 2 +- keyboards/ilumkb/volcano660/info.json | 6 +- keyboards/jae/j01/info.json | 6 +- keyboards/jels/boaty/info.json | 4 +- keyboards/jiran/info.json | 6 +- keyboards/jkeys_design/gentleman65/info.json | 8 +- keyboards/jkeys_design/gentleman65_se_s/info.json | 6 +- keyboards/jorne/rev1/info.json | 2 +- keyboards/k34/info.json | 8 +- keyboards/kabedon/kabedon78s/info.json | 14 +- keyboards/kabedon/kabedon980/info.json | 14 +- keyboards/kagizaraya/halberd/info.json | 6 +- keyboards/kagizaraya/scythe/info.json | 6 +- keyboards/kalakos/bahrnob/info.json | 2 +- keyboards/kamigakushi/info.json | 4 +- keyboards/kapcave/arya/info.json | 6 +- keyboards/kapcave/paladinpad/info.json | 6 +- keyboards/kb_elmo/67mk_e/info.json | 6 +- keyboards/kb_elmo/aek2_usb/info.json | 6 +- keyboards/kb_elmo/m0110a_usb/info.json | 6 +- keyboards/kb_elmo/m0116_usb/info.json | 6 +- keyboards/kb_elmo/twelvekey/info.json | 6 +- keyboards/kbdclack/kaishi65/info.json | 6 +- keyboards/kbdcraft/adam64/info.json | 3 +- keyboards/kbdfans/bella/rgb/info.json | 6 +- keyboards/kbdfans/bella/rgb_iso/info.json | 6 +- keyboards/kbdfans/boop65/rgb/info.json | 8 +- keyboards/kbdfans/bounce/75/hotswap/info.json | 6 +- keyboards/kbdfans/bounce/pad/info.json | 4 +- keyboards/kbdfans/d45/v2/info.json | 2 +- keyboards/kbdfans/kbd67/hotswap/info.json | 6 +- keyboards/kbdfans/kbd67/mkii_soldered/info.json | 6 +- keyboards/kbdfans/kbd67/mkiirgb/info.json | 4 +- keyboards/kbdfans/kbd6x/info.json | 6 +- keyboards/kbdfans/kbd75hs/info.json | 6 +- keyboards/kbdfans/kbd8x_mk2/info.json | 6 +- keyboards/kbdfans/kbdmini/info.json | 2 +- keyboards/kbdfans/kbdpad/mk2/info.json | 22 +- keyboards/kbdfans/kbdpad/mk3/info.json | 1 - keyboards/kbdfans/niu_mini/info.json | 1 - keyboards/kbdfans/odinmini/info.json | 2 - keyboards/kbdfans/tiger80/info.json | 329 +++--- keyboards/keaboard/info.json | 4 - keyboards/keebio/choconum/info.json | 2 +- keyboards/keebio/convolution/rev1/info.json | 30 +- keyboards/keebio/fourier/info.json | 6 +- keyboards/keebio/laplace/info.json | 7 +- keyboards/keebio/sinc/rev3/info.json | 98 +- keyboards/keebsforall/freebird75/info.json | 169 ++- keyboards/kepler_33/proto/info.json | 101 +- keyboards/keybee/keybee65/info.json | 2 +- keyboards/keychron/q0/rev_0130/info.json | 85 +- keyboards/keychron/q0/rev_0131/info.json | 108 +- keyboards/keychron/q1/ansi/info.json | 68 +- keyboards/keychron/q1/ansi_encoder/info.json | 62 +- keyboards/keychron/q1/iso/info.json | 60 +- keyboards/keychron/q1/iso_encoder/info.json | 60 +- keyboards/keychron/q10/ansi_encoder/info.json | 66 +- keyboards/keychron/q10/iso_encoder/info.json | 66 +- keyboards/keychron/q11/ansi_encoder/info.json | 182 ++-- keyboards/keychron/q12/ansi_encoder/info.json | 206 ++-- keyboards/keychron/q12/iso_encoder/info.json | 208 ++-- keyboards/keychron/q2/ansi/info.json | 48 +- keyboards/keychron/q2/ansi_encoder/info.json | 48 +- keyboards/keychron/q2/iso/info.json | 48 +- keyboards/keychron/q2/iso_encoder/info.json | 48 +- keyboards/keychron/q2/jis/info.json | 50 +- keyboards/keychron/q2/jis_encoder/info.json | 50 +- keyboards/keychron/q3/ansi/info.json | 68 +- keyboards/keychron/q3/ansi_encoder/info.json | 70 +- keyboards/keychron/q3/iso/info.json | 68 +- keyboards/keychron/q3/iso_encoder/info.json | 70 +- keyboards/keychron/q3/jis/info.json | 72 +- keyboards/keychron/q3/jis_encoder/info.json | 72 +- keyboards/keychron/q4/iso/info.json | 4 +- keyboards/keychron/q5/ansi/info.json | 94 +- keyboards/keychron/q5/ansi_encoder/info.json | 90 +- keyboards/keychron/q5/iso/info.json | 94 +- keyboards/keychron/q5/iso_encoder/info.json | 90 +- keyboards/keychron/q6/ansi/info.json | 110 +- keyboards/keychron/q6/ansi_encoder/info.json | 112 +- keyboards/keychron/q6/iso/info.json | 110 +- keyboards/keychron/q6/iso_encoder/info.json | 112 +- keyboards/keychron/q60/ansi/info.json | 36 +- keyboards/keychron/q65/ansi_encoder/info.json | 58 +- keyboards/keychron/q7/ansi/info.json | 56 +- keyboards/keychron/q7/iso/info.json | 56 +- keyboards/keychron/q8/ansi/info.json | 46 +- keyboards/keychron/q8/ansi_encoder/info.json | 46 +- keyboards/keychron/q8/iso/info.json | 46 +- keyboards/keychron/q8/iso_encoder/info.json | 46 +- keyboards/keychron/q9/ansi/info.json | 38 +- keyboards/keychron/q9/ansi_encoder/info.json | 38 +- keyboards/keychron/q9/iso/info.json | 38 +- keyboards/keychron/q9/iso_encoder/info.json | 38 +- keyboards/keychron/s1/ansi/rgb/info.json | 60 +- keyboards/keychron/s1/ansi/white/info.json | 60 +- keyboards/keychron/v1/ansi/info.json | 58 +- keyboards/keychron/v1/ansi_encoder/info.json | 58 +- keyboards/keychron/v1/iso/info.json | 58 +- keyboards/keychron/v1/iso_encoder/info.json | 58 +- keyboards/keychron/v1/jis/info.json | 62 +- keyboards/keychron/v1/jis_encoder/info.json | 62 +- keyboards/keychron/v10/ansi_encoder/info.json | 66 +- keyboards/keychron/v10/iso_encoder/info.json | 66 +- keyboards/keychron/v2/ansi/info.json | 48 +- keyboards/keychron/v2/ansi_encoder/info.json | 48 +- keyboards/keychron/v2/iso/info.json | 48 +- keyboards/keychron/v2/iso_encoder/info.json | 48 +- keyboards/keychron/v2/jis/info.json | 50 +- keyboards/keychron/v2/jis_encoder/info.json | 50 +- keyboards/keychron/v3/ansi/info.json | 68 +- keyboards/keychron/v3/ansi_encoder/info.json | 70 +- keyboards/keychron/v3/iso/info.json | 68 +- keyboards/keychron/v3/iso_encoder/info.json | 70 +- keyboards/keychron/v3/jis/info.json | 72 +- keyboards/keychron/v3/jis_encoder/info.json | 72 +- keyboards/keychron/v4/ansi/info.json | 36 +- keyboards/keychron/v4/iso/info.json | 36 +- keyboards/keychron/v5/ansi/info.json | 92 +- keyboards/keychron/v5/ansi_encoder/info.json | 92 +- keyboards/keychron/v5/iso/info.json | 92 +- keyboards/keychron/v5/iso_encoder/info.json | 92 +- keyboards/keychron/v6/ansi/info.json | 110 +- keyboards/keychron/v6/ansi_encoder/info.json | 112 +- keyboards/keychron/v6/iso/info.json | 110 +- keyboards/keychron/v6/iso_encoder/info.json | 112 +- keyboards/keychron/v7/ansi/info.json | 56 +- keyboards/keychron/v7/iso/info.json | 56 +- keyboards/keychron/v8/ansi/info.json | 46 +- keyboards/keychron/v8/ansi_encoder/info.json | 46 +- keyboards/keychron/v8/iso/info.json | 44 +- keyboards/keychron/v8/iso_encoder/info.json | 44 +- keyboards/keyhive/maypad/info.json | 1 - keyboards/keyhive/navi10/info.json | 6 +- keyboards/keyhive/smallice/info.json | 6 +- keyboards/keyprez/rhino/info.json | 2 - keyboards/keystonecaps/gameroyadvance/info.json | 2 +- keyboards/keyten/kt3700/info.json | 14 +- keyboards/kikoslab/ellora65/info.json | 6 +- keyboards/kikoslab/kl90/info.json | 6 +- keyboards/kineticlabs/emu/hotswap/info.json | 6 +- keyboards/kineticlabs/emu/soldered/info.json | 6 +- keyboards/kingly_keys/romac/info.json | 4 +- keyboards/kingly_keys/romac_plus/info.json | 4 +- keyboards/kira75/info.json | 6 +- keyboards/kira80/info.json | 6 +- keyboards/kiwikeebs/macro/info.json | 1 - keyboards/kj_modify/rs40/info.json | 78 +- keyboards/kkatano/bakeneko80/info.json | 6 +- keyboards/knobgoblin/info.json | 1 - keyboards/knops/mini/info.json | 56 +- keyboards/kopibeng/mnk65/info.json | 2 +- keyboards/kopibeng/mnk65_stm32/info.json | 12 +- keyboards/kopibeng/typ65/info.json | 2 +- keyboards/kopibeng/xt60/info.json | 2 +- keyboards/kopibeng/xt60_singa/info.json | 2 +- keyboards/kopibeng/xt8x/info.json | 2 +- keyboards/kprepublic/jj40/info.json | 2 - keyboards/ktec/ergodone/info.json | 4 +- keyboards/ktec/staryu/info.json | 6 +- keyboards/kuro/kuro65/info.json | 280 ++--- keyboards/labbe/labbeminiv1/info.json | 8 +- keyboards/labyrinth75/info.json | 6 +- keyboards/latincompass/latin47ble/info.json | 1 - keyboards/latincompass/latinpad/info.json | 1 - keyboards/lazydesigners/dimple/ortho/info.json | 6 +- keyboards/lazydesigners/dimple/staggered/info.json | 6 +- .../lazydesigners/dimple/staggered/rev3/info.json | 2 +- keyboards/lazydesigners/the40/info.json | 1 - keyboards/lazydesigners/the50/info.json | 6 +- keyboards/lily58/r2g/info.json | 82 +- keyboards/lily58/rev1/info.json | 6 +- keyboards/linworks/dolice/info.json | 2 +- keyboards/linworks/em8/info.json | 285 +++-- keyboards/ll3macorn/bongopad/info.json | 86 +- keyboards/lpad/info.json | 10 +- keyboards/lucid/velvet_hotswap/info.json | 10 +- keyboards/lucid/velvet_solder/info.json | 10 +- keyboards/lw67/info.json | 6 +- keyboards/lw75/info.json | 6 +- keyboards/lxxt/info.json | 182 ++-- keyboards/lyso1/lck75/info.json | 8 +- keyboards/lyso1/lefishe/info.json | 6 +- keyboards/machkeyboards/mach3/info.json | 2 +- keyboards/macro1/info.json | 8 +- keyboards/majistic/info.json | 8 +- keyboards/makenova/omega/omega4/info.json | 2 +- keyboards/maple_computing/c39/info.json | 6 +- keyboards/matthewdias/txuu/info.json | 4 +- keyboards/mc_76k/info.json | 2 +- keyboards/mechbrewery/mb65h/info.json | 1 - keyboards/mechlovin/foundation/info.json | 6 +- keyboards/mechlovin/hannah910/rev1/info.json | 6 +- keyboards/mechlovin/zed65/mono_led/info.json | 8 +- .../mechlovin/zed65/no_backlight/cor65/info.json | 8 +- .../mechlovin/zed65/no_backlight/retro66/info.json | 8 +- .../zed65/no_backlight/wearhaus66/info.json | 4 +- keyboards/mechstudio/dawn/info.json | 6 +- keyboards/mechstudio/ud_40_ortho/info.json | 6 +- keyboards/mechwild/bbs/info.json | 2 +- keyboards/mechwild/bde/rev2/info.json | 4 +- keyboards/mechwild/bde/righty/info.json | 4 +- keyboards/mechwild/clunker/info.json | 90 +- keyboards/meletrix/zoom75/info.json | 6 +- keyboards/melgeek/mj64/info.json | 1 - keyboards/melgeek/mojo68/info.json | 8 +- keyboards/meow48/info.json | 2 +- keyboards/millipad/info.json | 6 +- keyboards/mincedshon/ecila/info.json | 4 +- keyboards/mini_elixivy/info.json | 4 +- keyboards/mino_plus/soldered/info.json | 2 +- keyboards/mk65/info.json | 142 +-- keyboards/mkh_studio/bully/info.json | 2 +- keyboards/mode/m80v1/m80h/info.json | 20 +- keyboards/mode/m80v1/m80s/info.json | 12 +- keyboards/mode/m80v2/m80v2h/info.json | 24 +- keyboards/mode/m80v2/m80v2s/info.json | 16 +- keyboards/mokey/mokey63/info.json | 2 +- keyboards/monstargear/xo87/rgb/info.json | 6 +- keyboards/mountainblocks/mb17/info.json | 6 +- keyboards/ms_sculpt/info.json | 2 +- keyboards/mschwingen/modelm/info.json | 1 - keyboards/mt/blocked65/info.json | 6 +- keyboards/mt/mt64rgb/info.json | 6 +- keyboards/mt/mt84/info.json | 6 +- keyboards/mt/split75/info.json | 6 +- keyboards/mwstudio/mw660/info.json | 6 +- keyboards/mwstudio/mw80/info.json | 4 +- keyboards/mysticworks/wyvern/info.json | 6 +- keyboards/nacly/sodium50/info.json | 2 +- keyboards/nacly/sodium62/info.json | 2 +- keyboards/navi60/info.json | 26 +- keyboards/nightingale_studios/hailey/info.json | 4 +- keyboards/nightly_boards/adellein/info.json | 14 +- keyboards/nightly_boards/alter/rev1/info.json | 14 +- keyboards/nightly_boards/conde60/info.json | 16 +- keyboards/nightly_boards/daily60/info.json | 10 +- keyboards/nightly_boards/jisoo/info.json | 11 +- keyboards/nightly_boards/n40_o/info.json | 16 +- keyboards/nightly_boards/n60_s/info.json | 20 +- keyboards/nightly_boards/n9/info.json | 12 +- keyboards/nightly_boards/octopad/info.json | 16 +- keyboards/nightly_boards/octopadplus/info.json | 14 +- keyboards/nightly_boards/paraluman/info.json | 8 +- keyboards/novelkeys/nk1/info.json | 4 +- keyboards/novelkeys/nk65/info.json | 6 +- keyboards/noxary/220/info.json | 6 +- keyboards/noxary/260/info.json | 6 +- keyboards/noxary/280/info.json | 6 +- keyboards/noxary/vulcan/info.json | 6 +- keyboards/nyhxis/nfr_70/info.json | 6 +- keyboards/ocean/addon/info.json | 2 +- keyboards/ocean/slamz/info.json | 6 +- keyboards/ocean/stealth/info.json | 6 +- keyboards/ocean/sus/info.json | 6 +- keyboards/ocean/wang_v2/info.json | 6 +- keyboards/ocean/yuri/info.json | 6 +- keyboards/odelia/info.json | 6 +- keyboards/om60/info.json | 8 +- keyboards/omnikeyish/info.json | 6 +- keyboards/ortho5by12/info.json | 4 +- keyboards/owlab/spring/info.json | 2 +- keyboards/owlab/suit80/ansi/info.json | 2 +- keyboards/owlab/suit80/iso/info.json | 2 +- keyboards/pabile/p18/info.json | 6 +- keyboards/pabile/p40/info.json | 12 +- keyboards/pabile/p40_ortho/info.json | 3 +- keyboards/pabile/p42/info.json | 6 +- keyboards/panc40/info.json | 1 - keyboards/pauperboards/brick/info.json | 352 +++---- keyboards/pdxkbc/info.json | 6 +- keyboards/peranekofactory/tone/rev1/info.json | 6 +- keyboards/peranekofactory/tone/rev2/info.json | 6 +- keyboards/percent/canoe_gen2/info.json | 6 +- keyboards/pkb65/info.json | 6 +- keyboards/playkbtw/ca66/info.json | 6 +- keyboards/ploopyco/trackball_thumb/info.json | 12 +- .../ploopyco/trackball_thumb/rev1_001/info.json | 4 +- keyboards/plume/plume65/info.json | 6 +- keyboards/plywrks/allaro/info.json | 1 - keyboards/projectcain/relic/info.json | 6 +- keyboards/projectcain/vault35/info.json | 6 +- keyboards/projectkb/signature65/info.json | 6 +- keyboards/projectkb/signature87/info.json | 6 +- keyboards/prototypist/oceanographer/info.json | 10 +- keyboards/prototypist/pt60/info.json | 396 ++++--- keyboards/prototypist/pt80/info.json | 18 +- keyboards/pteropus/info.json | 2 +- keyboards/puck/info.json | 6 +- keyboards/qpockets/eggman/info.json | 20 +- keyboards/qpockets/space_space/rev1/info.json | 14 +- keyboards/qpockets/space_space/rev2/info.json | 16 +- keyboards/qpockets/wanten/info.json | 22 +- keyboards/quad_h/lb75/info.json | 14 +- keyboards/quarkeys/z40/info.json | 8 +- keyboards/quarkeys/z60/hotswap/info.json | 8 +- keyboards/quarkeys/z60/solder/info.json | 6 +- keyboards/quarkeys/z67/hotswap/info.json | 8 +- keyboards/quarkeys/z67/solder/info.json | 8 +- keyboards/qwertlekeys/calice/info.json | 6 +- keyboards/rad/info.json | 2 +- keyboards/ramlord/witf/info.json | 4 +- keyboards/rart/rart60/info.json | 6 +- keyboards/rart/rartland/info.json | 6 +- keyboards/rate/pistachio_mp/info.json | 6 +- keyboards/redscarf_iiplus/verb/info.json | 6 +- keyboards/redscarf_iiplus/verc/info.json | 6 +- keyboards/retro_75/info.json | 6 +- keyboards/reviung/reviung53/info.json | 1 - keyboards/rkg68/info.json | 212 ++-- keyboards/rmkeebs/rm_numpad/info.json | 1 - keyboards/rotor/info.json | 8 +- keyboards/rotr/info.json | 6 +- keyboards/saevus/cor/info.json | 146 +-- keyboards/salicylic_acid3/7skb/rev1/info.json | 6 +- keyboards/salicylic_acid3/7splus/info.json | 6 +- keyboards/salicylic_acid3/ajisai74/info.json | 6 +- keyboards/salicylic_acid3/ergoarrows/info.json | 7 +- keyboards/salicylic_acid3/getta25/rev1/info.json | 6 +- keyboards/salicylic_acid3/guide68/info.json | 140 +-- keyboards/salicylic_acid3/jisplit89/rev1/info.json | 6 +- keyboards/salicylic_acid3/nafuda/info.json | 6 +- keyboards/salicylic_acid3/naked48/rev1/info.json | 6 +- keyboards/salicylic_acid3/naked60/rev1/info.json | 6 +- keyboards/salicylic_acid3/naked64/rev1/info.json | 1 - keyboards/salicylic_acid3/nknl7en/info.json | 6 +- keyboards/salicylic_acid3/nknl7jp/info.json | 6 +- .../sawnsprojects/eclipse/eclipse60/info.json | 4 +- keyboards/sawnsprojects/eclipse/tinyneko/info.json | 4 +- keyboards/sawnsprojects/plaque80/info.json | 2 +- keyboards/senselessclay/gos65/info.json | 2 +- keyboards/sentraq/s60_x/rgb/info.json | 2 +- keyboards/shoc/info.json | 2 +- keyboards/skeletn87/hotswap/info.json | 6 +- keyboards/skeletn87/soldered/info.json | 6 +- keyboards/skippys_custom_pcs/roopad/info.json | 8 +- keyboards/smithrune/iron160/iron160_h/info.json | 122 +-- keyboards/smithrune/iron160/iron160_s/info.json | 126 +-- keyboards/spaceman/2_milk/info.json | 4 +- keyboards/spaceman/pancake/rev1/info.json | 6 +- keyboards/spaceman/pancake/rev2/info.json | 4 +- keyboards/splitkb/aurora/corne/rev1/info.json | 120 +-- keyboards/splitkb/aurora/lily58/rev1/info.json | 148 +-- keyboards/splitkb/aurora/sweep/rev1/info.json | 104 +- keyboards/splitkb/kyria/rev3/info.json | 202 ++-- keyboards/sporewoh/banime40/info.json | 12 +- keyboards/stello65/beta/info.json | 1 - keyboards/studiokestra/frl84/info.json | 170 +-- keyboards/studiokestra/galatea/rev1/info.json | 2 +- keyboards/studiokestra/galatea/rev2/info.json | 2 +- keyboards/subatomic/info.json | 2 - keyboards/subrezon/info.json | 2 +- keyboards/subrezon/la_nc/info.json | 84 +- keyboards/supersplit/info.json | 2 - keyboards/swiftrax/retropad/info.json | 6 +- keyboards/switchplate/southpaw_fullsize/info.json | 6 +- keyboards/sx60/info.json | 3 - keyboards/synapse/info.json | 14 +- keyboards/synthandkeys/the_debit_card/info.json | 2 +- keyboards/synthlabs/060/info.json | 1114 ++++++++++---------- keyboards/synthlabs/solo/info.json | 74 +- keyboards/takashicompany/compacx/info.json | 2 +- keyboards/takashicompany/dogtag/info.json | 2 +- keyboards/takashicompany/goat51/info.json | 2 +- keyboards/takashicompany/heavy_left/info.json | 2 +- keyboards/takashicompany/radialex/info.json | 2 +- keyboards/takashicompany/tightwriter/info.json | 2 +- keyboards/takashiski/namecard2x4/info.json | 6 +- keyboards/takashiski/otaku_split/rev0/info.json | 4 +- keyboards/takashiski/otaku_split/rev1/info.json | 6 +- keyboards/tau4/info.json | 6 +- keyboards/teahouse/ayleen/info.json | 182 ++-- keyboards/team0110/p1800fl/info.json | 6 +- keyboards/teleport/native/ansi/info.json | 168 +-- keyboards/teleport/native/info.json | 5 +- keyboards/teleport/native/iso/info.json | 171 ++- keyboards/tempo_turtle/bradpad/info.json | 6 +- keyboards/tender/macrowo_pad/info.json | 6 +- keyboards/tenki/info.json | 10 +- keyboards/terrazzo/info.json | 6 +- keyboards/tg4x/info.json | 6 +- keyboards/tgr/910ce/info.json | 8 +- keyboards/tgr/jane/v2/info.json | 6 +- keyboards/tgr/tris/info.json | 1 - keyboards/thepanduuh/degenpad/info.json | 6 +- keyboards/thevankeyboards/bananasplit/info.json | 6 +- keyboards/tkc/california/info.json | 8 +- keyboards/tkc/godspeed75/info.json | 6 +- keyboards/tkc/portico75/info.json | 4 +- keyboards/tkc/tkl_ab87/info.json | 22 +- keyboards/toad/info.json | 4 - keyboards/tokyokeyboard/alix40/info.json | 2 +- keyboards/touchpad/info.json | 6 +- keyboards/tszaboo/ortho4exent/info.json | 10 +- keyboards/tweetydabird/lbs4/info.json | 20 +- keyboards/tweetydabird/lbs6/info.json | 20 +- keyboards/tweetydabird/lotus58/elite_c/info.json | 2 +- keyboards/tweetydabird/lotus58/info.json | 10 +- keyboards/tzarc/ghoul/info.json | 4 +- keyboards/unikorn/info.json | 6 +- keyboards/uranuma/info.json | 6 +- keyboards/vagrant_10/info.json | 6 +- keyboards/vertex/angle65/info.json | 2 +- keyboards/vertex/angler2/info.json | 10 +- keyboards/viktus/minne/info.json | 2 +- keyboards/viktus/minne_topre/info.json | 2 +- keyboards/viktus/osav2/info.json | 2 +- keyboards/viktus/sp111/info.json | 6 +- keyboards/waldo/info.json | 2 +- keyboards/walletburner/neuron/info.json | 6 +- keyboards/wekey/we27/info.json | 6 +- keyboards/westm/westm9/info.json | 2 +- keyboards/westm/westmergo/info.json | 8 +- keyboards/wilba_tech/rama_works_kara/info.json | 6 +- keyboards/wilba_tech/rama_works_koyu/info.json | 6 +- keyboards/wilba_tech/rama_works_m50_a/info.json | 6 +- keyboards/wilba_tech/rama_works_m50_ax/info.json | 6 +- keyboards/wilba_tech/rama_works_m60_a/info.json | 6 +- keyboards/wilba_tech/rama_works_m65_b/info.json | 6 +- keyboards/wilba_tech/rama_works_m65_bx/info.json | 6 +- keyboards/wilba_tech/rama_works_u80_a/info.json | 6 +- keyboards/wilba_tech/wt60_a/info.json | 6 +- keyboards/wilba_tech/wt60_c/info.json | 1 - keyboards/wilba_tech/wt60_g/info.json | 6 +- keyboards/wilba_tech/wt60_g2/info.json | 6 +- keyboards/wilba_tech/wt60_h2/info.json | 6 +- keyboards/wilba_tech/wt60_xt/info.json | 6 +- keyboards/wilba_tech/wt65_a/info.json | 6 +- keyboards/wilba_tech/wt65_b/info.json | 6 +- keyboards/wilba_tech/wt65_f/info.json | 6 +- keyboards/wilba_tech/wt65_fx/info.json | 6 +- keyboards/wilba_tech/wt65_g/info.json | 6 +- keyboards/wilba_tech/wt65_g2/info.json | 6 +- keyboards/wilba_tech/wt65_h1/info.json | 6 +- keyboards/wilba_tech/wt65_xt/info.json | 6 +- keyboards/wilba_tech/wt65_xtx/info.json | 6 +- keyboards/wilba_tech/wt69_a/info.json | 6 +- keyboards/wilba_tech/wt70_jb/info.json | 6 +- keyboards/wilba_tech/wt75_a/info.json | 6 +- keyboards/wilba_tech/wt75_b/info.json | 6 +- keyboards/wilba_tech/wt75_c/info.json | 6 +- keyboards/wilba_tech/wt80_a/info.json | 6 +- keyboards/wilba_tech/wt80_g/info.json | 6 +- keyboards/wilba_tech/wt8_a/info.json | 6 +- keyboards/wilba_tech/zeal60/info.json | 6 +- keyboards/wilba_tech/zeal65/info.json | 6 +- keyboards/wolf/frogpad/info.json | 4 +- keyboards/wolf/m60_b/info.json | 2 +- keyboards/wolf/ryujin/info.json | 8 +- keyboards/wolf/sabre/info.json | 6 +- keyboards/wolf/ts60/info.json | 2 +- keyboards/wolf/twilight/info.json | 2 +- keyboards/wolfmarkclub/wm1/info.json | 6 +- keyboards/woodkeys/scarletbandana/info.json | 6 +- keyboards/wsk/gothic50/info.json | 6 +- keyboards/wsk/gothic70/info.json | 6 +- keyboards/wsk/houndstooth/info.json | 6 +- keyboards/wsk/pain27/info.json | 6 +- keyboards/xbows/woody/info.json | 6 +- keyboards/xelus/xs60/hotswap/info.json | 3 +- keyboards/xiudi/xd004/info.json | 4 +- keyboards/xiudi/xd96/info.json | 2 +- keyboards/yandrstudio/transition80/info.json | 1 - keyboards/ydkb/chili/info.json | 6 +- keyboards/ydkb/ydpm40/info.json | 182 ++-- keyboards/yeehaw/info.json | 6 +- keyboards/yiancardesigns/gingham/info.json | 6 +- keyboards/ymdk/id75/info.json | 2 +- keyboards/ymdk/np24/u4rgb6/info.json | 2 - keyboards/ymdk/ymd09/info.json | 8 +- keyboards/ymdk/ymd40/air40/info.json | 1 - keyboards/ymdk/ymd40/v2/info.json | 1 - keyboards/ymdk/ymd96/info.json | 6 +- keyboards/yosino58/rev1/info.json | 6 +- keyboards/zicodia/tklfrlnrlmlao/info.json | 4 +- keyboards/zoo/wampus/info.json | 2 +- keyboards/ztboards/after/info.json | 2 +- keyboards/ztboards/noon/info.json | 6 +- 805 files changed, 10407 insertions(+), 10788 deletions(-) (limited to 'keyboards/maple_computing') diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index 98f93ff746..f86b9722e8 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -23,7 +23,7 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT_1x2uC": { + "LAYOUT_1x2uC": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -89,8 +89,8 @@ {"matrix": [4, 10], "x": 10, "y": 4}, {"matrix": [4, 11], "x": 11, "y": 4} ] - }, - "LAYOUT_2x2uC": { + }, + "LAYOUT_2x2uC": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -224,7 +224,7 @@ {"matrix": [4, 11], "x": 11, "y": 4} ] }, - "LAYOUT_1x2uR": { + "LAYOUT_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 7eedd1cde1..ee6914a4e5 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -97,7 +97,6 @@ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -167,7 +166,6 @@ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -238,7 +236,6 @@ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -310,7 +307,6 @@ {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_split_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -381,7 +377,6 @@ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_tsangan_split_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -451,7 +446,6 @@ {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json index f2c3d4267a..8199aa2448 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json @@ -30,8 +30,8 @@ "rgblight": false }, "matrix_pins": { - "rows": [ "GP21", "GP20", "GP19", "GP18" ], - "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ] + "rows": ["GP21", "GP20", "GP19", "GP18"], + "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"] }, "encoder": { "enabled": true, diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json index 0df4b7e86d..a8122e6957 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json @@ -30,8 +30,8 @@ "rgblight": false }, "matrix_pins": { - "rows": [ "GP21", "GP20", "GP19", "GP18" ], - "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ] + "rows": ["GP21", "GP20", "GP19", "GP18"], + "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"] }, "encoder": { "enabled": true, diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json index 2892cb465e..a25635f9d4 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json @@ -30,8 +30,8 @@ "rgblight": false }, "matrix_pins": { - "rows": [ "GP21", "GP20", "GP19", "GP18" ], - "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ] + "rows": ["GP21", "GP20", "GP19", "GP18"], + "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"] }, "encoder": { "enabled": true, diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index 3ec2f62aea..e114ac4e6a 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -43,11 +43,11 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 2, "x": 17, "y": 50 }, - { "flags": 2, "x": 37, "y": 50 }, - { "flags": 2, "x": 56, "y": 50 }, - { "flags": 2, "x": 77, "y": 50 }, - { "flags": 2, "x": 94, "y": 50 }, + { "flags": 2, "x": 17, "y": 50 }, + { "flags": 2, "x": 37, "y": 50 }, + { "flags": 2, "x": 56, "y": 50 }, + { "flags": 2, "x": 77, "y": 50 }, + { "flags": 2, "x": 94, "y": 50 }, { "flags": 2, "x": 114, "y": 50 }, { "flags": 2, "x": 131, "y": 50 }, { "flags": 2, "x": 148, "y": 50 }, @@ -60,84 +60,84 @@ { "flags": 2, "x": 145, "y": 13 }, { "flags": 2, "x": 126, "y": 13 }, { "flags": 2, "x": 109, "y": 13 }, - { "flags": 2, "x": 90, "y": 13 }, - { "flags": 2, "x": 71, "y": 13 }, - { "flags": 2, "x": 54, "y": 13 }, - { "flags": 2, "x": 20, "y": 13 } + { "flags": 2, "x": 90, "y": 13 }, + { "flags": 2, "x": 71, "y": 13 }, + { "flags": 2, "x": 54, "y": 13 }, + { "flags": 2, "x": 20, "y": 13 } ] }, "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, - { "label": "~", "matrix": [0, 14], "x": 14, "y": 0 }, - { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "ISO'", "matrix": [2, 12], "x": 12.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, + { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "~", "matrix": [0, 14], "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "ISO'", "matrix": [2, 12], "x": 12.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 }, + { "label": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 }, { "label": "RShift", "matrix": [3, 12], "x": 13, "y": 3 }, - { "label": "FN", "matrix": [3, 14], "x": 14, "y": 3 }, - { "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "FN", "matrix": [3, 14], "x": 14, "y": 3 }, + { "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 }, { "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 }, { "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 }, - { "label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4 }, - { "label": "FN", "matrix": [4, 11], "x": 11, "y": 4 }, - { "label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4 }, - { "label": "Menu", "matrix": [4, 13], "x": 13, "y": 4 }, - { "label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4 } + { "label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4 }, + { "label": "FN", "matrix": [4, 11], "x": 11, "y": 4 }, + { "label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4 }, + { "label": "Menu", "matrix": [4, 13], "x": 13, "y": 4 }, + { "label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index c490e89f4b..6c77f39bc7 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -58,70 +58,70 @@ "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ - { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, - { "label": "~", "matrix": [1, 13], "x": 14, "y": 0 }, - { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "~", "matrix": [1, 13], "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "FN", "matrix": [3, 13], "x": 14, "y": 3 }, - { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "Menu", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } + { "label": "FN", "matrix": [3, 13], "x": 14, "y": 3 }, + { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "Menu", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json index 29d31b5696..566cafe4d1 100644 --- a/keyboards/1upkeyboards/pi60_rgb/info.json +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -106,68 +106,68 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "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": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "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": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 }, { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, - { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, - { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "FN", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } + { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "FN", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index 178082212d..ac9d944969 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -30,7 +30,6 @@ {"matrix": [3, 3], "x": 3, "y": 3} ] }, - "LAYOUT_numpad_4x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index e41026815b..35ce80efa8 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -29,7 +29,7 @@ "driver": "vendor" }, "matrix_pins": { - "cols": ["GP2", "GP9", "GP8", "GP7"], + "cols": ["GP2", "GP9", "GP8", "GP7"], "rows": ["GP26", "GP1", "GP18", "GP5"] }, "diode_direction": "COL2ROW", @@ -90,4 +90,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index bc4649d409..03f5689e40 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -88,4 +88,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json index 2773a9fd60..2000c037f5 100644 --- a/keyboards/25keys/aleth42/info.json +++ b/keyboards/25keys/aleth42/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ALETH42", + "keyboard_name": "ALETH42", "manufacturer": "25KEYS", - "url": "http://www.sho-k.co.uk/tech/aleth42", - "maintainer": "monksoffunk", + "url": "http://www.sho-k.co.uk/tech/aleth42", + "maintainer": "monksoffunk", "usb": { "vid": "0x04D8", "pid": "0xEAC8" diff --git a/keyboards/4pplet/aekiso60/info.json b/keyboards/4pplet/aekiso60/info.json index c402031c99..80d5ab233d 100644 --- a/keyboards/4pplet/aekiso60/info.json +++ b/keyboards/4pplet/aekiso60/info.json @@ -81,7 +81,6 @@ {"label": "Ctrl", "matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_iso_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index f149126a17..0e0929fcfc 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -94,7 +94,6 @@ {"label": "Ctrl", "matrix": [4, 9], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index f0023534ad..02d4f38632 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -98,7 +98,6 @@ {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -170,7 +169,6 @@ {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -241,7 +239,6 @@ {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index 40223b44e2..3ac472301b 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -26,8 +26,8 @@ ], "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["C4","C6","B7","B6","B5","B4","B3","B2","B1","D6","D5","D4","D2","D1"], - "rows": ["C2","D0","B0","C7","C5"] + "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"], + "rows": ["C2", "D0", "B0", "C7", "C5"] }, "features": { "audio": false, @@ -133,7 +133,7 @@ { "label": "Fn", "matrix": [4, 11], "x": 14, "y": 4 } ] }, - "LAYOUT_60_ansi": { + "LAYOUT_60_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -198,7 +198,7 @@ { "label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_ansi_split_bs_rshift": { + "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -265,7 +265,7 @@ { "label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_ansi_tsangan": { + "LAYOUT_60_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -329,7 +329,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_60_hhkb": { + "LAYOUT_60_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -592,7 +592,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_60_tsangan_hhkb": { + "LAYOUT_60_tsangan_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -658,7 +658,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_canon": { + "LAYOUT_canon": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json index 6896b37844..c11aeba78f 100644 --- a/keyboards/4pplet/steezy60/rev_b/info.json +++ b/keyboards/4pplet/steezy60/rev_b/info.json @@ -22,8 +22,8 @@ ], "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["A7","A5","A4","A3","A1","F1","F0","C15","C14","B9","B6","B5","B4","B3"], - "rows": ["B8","A15","C13","A2","A6"] + "cols": ["A7", "A5", "A4", "A3", "A1", "F1", "F0", "C15", "C14", "B9", "B6", "B5", "B4", "B3"], + "rows": ["B8", "A15", "C13", "A2", "A6"] }, "features": { "audio": false, @@ -129,7 +129,7 @@ { "label": "Fn", "matrix": [4, 11], "x": 14, "y": 4 } ] }, - "LAYOUT_60_ansi": { + "LAYOUT_60_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -194,7 +194,7 @@ { "label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_ansi_split_bs_rshift": { + "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -261,7 +261,7 @@ { "label": "Fn", "matrix": [4, 11], "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_ansi_tsangan": { + "LAYOUT_60_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -325,7 +325,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_60_hhkb": { + "LAYOUT_60_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -588,7 +588,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_60_tsangan_hhkb": { + "LAYOUT_60_tsangan_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, @@ -654,7 +654,7 @@ { "label": "Ctrl", "matrix": [4, 11], "w": 1.5, "x": 13.5, "y": 4 } ] }, - "LAYOUT_canon": { + "LAYOUT_canon": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json index 1e88400947..3a9ab63b73 100644 --- a/keyboards/4pplet/unextended_std/rev_a/info.json +++ b/keyboards/4pplet/unextended_std/rev_a/info.json @@ -10,16 +10,13 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", - "matrix_pins": { "rows": - ["B14","B15","B6","B5","B4"], + ["B14", "B15", "B6", "B5", "B4"], "cols": - ["B2","A4","A1","A2","F1","F0","C15","C14","C13","B9","B8","B7","B12","B3"] + ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"] }, - "diode_direction": "COL2ROW", - "features": { "bootmagic": true, "mousekey": true, @@ -31,7 +28,6 @@ "rgblight": true, "audio": false }, - "ws2812": { "pin": "A8" }, @@ -50,12 +46,10 @@ "twinkle": true } }, - "indicators": { "caps_lock": "A10", "on_state": 0 }, - "layouts": { "LAYOUT_all": { "layout": [ @@ -185,7 +179,7 @@ {"label":"opt", "matrix": [4, 1], "x":1, "y":4}, {"label":"Cmd", "matrix": [4, 2], "x":2, "y":4, "w":1.75}, {"label":"`", "matrix": [4, 3], "x":3.75, "y":4}, - {"label":"Space", "matrix": [4, 6],"x":4.75, "y":4, "w":4.75}, + {"label":"Space", "matrix": [4, 6], "x":4.75, "y":4, "w":4.75}, {"label":"\\", "matrix": [4, 8], "x":9.5, "y":4}, {"label":"\u2190", "matrix": [4, 9], "x":10.5, "y":4}, {"label":"\u2192", "matrix": [4, 10], "x":11.5, "y":4}, diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index d71b9d787a..ae4654007d 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -135,7 +135,6 @@ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_ansi_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -239,7 +238,6 @@ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -345,7 +343,6 @@ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_iso_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -450,7 +447,6 @@ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index 07227d8003..22eb5763bb 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ArcticPCB", + "keyboard_name": "ArcticPCB", "manufacturer": "AcheronProject", - "url": "http://gondolindrim.github.io/AcheronDocs/arctic/intro.html", - "maintainer": "Gondolindrim", + "url": "http://gondolindrim.github.io/AcheronDocs/arctic/intro.html", + "maintainer": "Gondolindrim", "usb": { "vid": "0x4150", "pid": "0x4152", diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index 5b7e406b6f..d36258fb92 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -151,7 +151,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -264,7 +263,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -378,7 +376,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_wkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -490,7 +487,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_wkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -603,7 +599,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -717,7 +712,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -832,7 +826,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_wkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -945,7 +938,6 @@ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_wkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index e56cb16bdd..9609611059 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KeebsPCB", + "keyboard_name": "KeebsPCB", "manufacturer": "AcheronProject", - "url": "http://gondolindrim.github.io/AcheronDocs/keebs/intro.html", - "maintainer": "Gondolindrim", + "url": "http://gondolindrim.github.io/AcheronDocs/keebs/intro.html", + "maintainer": "Gondolindrim", "usb": { "vid": "0x4150", "pid": "0x4B45", diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json index b293e03f73..47e08a7ed7 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/info.json @@ -1,131 +1,131 @@ { - "keyboard_name": "ADKB96", - "manufacturer": "Bit Trade One", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x00A5", - "pid": "0xAD96", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], - "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] - }, - "diode_direction": "COL2ROW", - "split": { - "soft_serial_pin": "D0" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layout_aliases": { - "LAYOUT": "LAYOUT_ortho_6x16" - }, - "layouts": { - "LAYOUT_ortho_6x16": { - "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": [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}, - {"matrix": [6, 7], "x": 15, "y": 0}, + "keyboard_name": "ADKB96", + "manufacturer": "Bit Trade One", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x00A5", + "pid": "0xAD96", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_6x16" + }, + "layouts": { + "LAYOUT_ortho_6x16": { + "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": [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}, + {"matrix": [6, 7], "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": [7, 0], "x": 8, "y": 1}, - {"matrix": [7, 1], "x": 9, "y": 1}, - {"matrix": [7, 2], "x": 10, "y": 1}, - {"matrix": [7, 3], "x": 11, "y": 1}, - {"matrix": [7, 4], "x": 12, "y": 1}, - {"matrix": [7, 5], "x": 13, "y": 1}, - {"matrix": [7, 6], "x": 14, "y": 1}, - {"matrix": [7, 7], "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": [7, 0], "x": 8, "y": 1}, + {"matrix": [7, 1], "x": 9, "y": 1}, + {"matrix": [7, 2], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 4], "x": 12, "y": 1}, + {"matrix": [7, 5], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 7], "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": [2, 7], "x": 7, "y": 2}, - {"matrix": [8, 0], "x": 8, "y": 2}, - {"matrix": [8, 1], "x": 9, "y": 2}, - {"matrix": [8, 2], "x": 10, "y": 2}, - {"matrix": [8, 3], "x": 11, "y": 2}, - {"matrix": [8, 4], "x": 12, "y": 2}, - {"matrix": [8, 5], "x": 13, "y": 2}, - {"matrix": [8, 6], "x": 14, "y": 2}, - {"matrix": [8, 7], "x": 15, "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": [8, 0], "x": 8, "y": 2}, + {"matrix": [8, 1], "x": 9, "y": 2}, + {"matrix": [8, 2], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 4], "x": 12, "y": 2}, + {"matrix": [8, 5], "x": 13, "y": 2}, + {"matrix": [8, 6], "x": 14, "y": 2}, + {"matrix": [8, 7], "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": [3, 7], "x": 7, "y": 3}, - {"matrix": [9, 0], "x": 8, "y": 3}, - {"matrix": [9, 1], "x": 9, "y": 3}, - {"matrix": [9, 2], "x": 10, "y": 3}, - {"matrix": [9, 3], "x": 11, "y": 3}, - {"matrix": [9, 4], "x": 12, "y": 3}, - {"matrix": [9, 5], "x": 13, "y": 3}, - {"matrix": [9, 6], "x": 14, "y": 3}, - {"matrix": [9, 7], "x": 15, "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": [9, 0], "x": 8, "y": 3}, + {"matrix": [9, 1], "x": 9, "y": 3}, + {"matrix": [9, 2], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 4], "x": 12, "y": 3}, + {"matrix": [9, 5], "x": 13, "y": 3}, + {"matrix": [9, 6], "x": 14, "y": 3}, + {"matrix": [9, 7], "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, 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": [10, 0], "x": 8, "y": 4}, - {"matrix": [10, 1], "x": 9, "y": 4}, - {"matrix": [10, 2], "x": 10, "y": 4}, - {"matrix": [10, 3], "x": 11, "y": 4}, - {"matrix": [10, 4], "x": 12, "y": 4}, - {"matrix": [10, 5], "x": 13, "y": 4}, - {"matrix": [10, 6], "x": 14, "y": 4}, - {"matrix": [10, 7], "x": 15, "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": [10, 0], "x": 8, "y": 4}, + {"matrix": [10, 1], "x": 9, "y": 4}, + {"matrix": [10, 2], "x": 10, "y": 4}, + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 4], "x": 12, "y": 4}, + {"matrix": [10, 5], "x": 13, "y": 4}, + {"matrix": [10, 6], "x": 14, "y": 4}, + {"matrix": [10, 7], "x": 15, "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": [11, 0], "x": 8, "y": 5}, - {"matrix": [11, 1], "x": 9, "y": 5}, - {"matrix": [11, 2], "x": 10, "y": 5}, - {"matrix": [11, 3], "x": 11, "y": 5}, - {"matrix": [11, 4], "x": 12, "y": 5}, - {"matrix": [11, 5], "x": 13, "y": 5}, - {"matrix": [11, 6], "x": 14, "y": 5}, - {"matrix": [11, 7], "x": 15, "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": [11, 0], "x": 8, "y": 5}, + {"matrix": [11, 1], "x": 9, "y": 5}, + {"matrix": [11, 2], "x": 10, "y": 5}, + {"matrix": [11, 3], "x": 11, "y": 5}, + {"matrix": [11, 4], "x": 12, "y": 5}, + {"matrix": [11, 5], "x": 13, "y": 5}, + {"matrix": [11, 6], "x": 14, "y": 5}, + {"matrix": [11, 7], "x": 15, "y": 5} + ] + } + } } diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index 7db370c935..00a2572e7a 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -81,7 +81,6 @@ {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3} ] }, - "LAYOUT_625u_space": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/info.json index 3a2d3feea9..9001eec1c5 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/info.json @@ -94,7 +94,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_rwkl_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/info.json index c9bea8aafd..87cb103d4a 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/info.json @@ -94,7 +94,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_rwkl_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/info.json index ca6f8b2588..6e38e99fe9 100644 --- a/keyboards/aeboards/constellation/rev3/info.json +++ b/keyboards/aeboards/constellation/rev3/info.json @@ -94,7 +94,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_rwkl_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index 275f2ac7ea..2912f0c1d8 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "Equinox", + "keyboard_name": "Equinox", "manufacturer": "ai03 Design Studio", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { - "vid": "0xA103", - "pid": "0x0004", - "device_version": "0.0.1" + "vid": "0xA103", + "pid": "0x0004", + "device_version": "0.0.1" }, "layouts": { "LAYOUT_all": { @@ -61,7 +61,6 @@ {"label": "Delete", "matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} ] }, - "LAYOUT_ansi_split_space": { "layout": [ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, @@ -112,7 +111,6 @@ {"label": "Ctrl", "matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} ] }, - "LAYOUT_iso_split_space": { "layout": [ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index 922dacafa9..8e879d6f4b 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -89,4 +89,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index e2d0e78c64..6e7845b136 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Lunar", + "keyboard_name": "Lunar", "manufacturer": "Switchplate Peripherals", - "url": "https://geekhack.org/index.php?topic=96112.0", - "maintainer": "ai03", + "url": "https://geekhack.org/index.php?topic=96112.0", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0001", diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json index a810ad4cc7..15c1da9867 100644 --- a/keyboards/ai03/lunar_ii/info.json +++ b/keyboards/ai03/lunar_ii/info.json @@ -12,8 +12,8 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "matrix_pins": { - "rows": [ "D0", "D1", "D2", "F0", "F1" ], - "cols": [ "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"] + "rows": ["D0", "D1", "D2", "F0", "F1"], + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"] }, "indicators": { "caps_lock": "B3", diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 6a4ee1abf3..4c5cd1ee51 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Orbit", + "keyboard_name": "Orbit", "manufacturer": "ai03 Keyboard Designs", - "url": "https://github.com/ai03-2725/Orbit", - "maintainer": "ai03", + "url": "https://github.com/ai03-2725/Orbit", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0003", diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index dca371faf2..ebb11624fe 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "OrbitX", + "keyboard_name": "OrbitX", "manufacturer": "ai03 Design Studio", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0014", diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index 85551af773..fc2d39cc3b 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Quasar", + "keyboard_name": "Quasar", "manufacturer": "Ryota Goto", - "url": "https://github.com/ai03-2725/Quasar/", - "maintainer": "ai03", + "url": "https://github.com/ai03-2725/Quasar/", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0010", diff --git a/keyboards/ai03/soyuz/info.json b/keyboards/ai03/soyuz/info.json index 873b974f39..0c1cd54810 100644 --- a/keyboards/ai03/soyuz/info.json +++ b/keyboards/ai03/soyuz/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Soyuz", + "keyboard_name": "Soyuz", "manufacturer": "ai03 Design Studio", - "url": "https://github.com/ai03-2725/soyuz", - "maintainer": "ai03", + "url": "https://github.com/ai03-2725/soyuz", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0018", diff --git a/keyboards/ai03/vega/info.json b/keyboards/ai03/vega/info.json index 95a69b1cc6..35127edbc2 100644 --- a/keyboards/ai03/vega/info.json +++ b/keyboards/ai03/vega/info.json @@ -105,7 +105,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -181,7 +180,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -258,7 +256,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -333,7 +330,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -409,7 +405,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -486,7 +481,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -564,7 +558,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -640,7 +633,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index 0c6ff04667..00a2a9f4d8 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Voyager60-Alps", + "keyboard_name": "Voyager60-Alps", "manufacturer": "ai03", - "url": "https://github.com/ai03-2725/Voyager60/tree/alps", - "maintainer": "ai03", + "url": "https://github.com/ai03-2725/Voyager60/tree/alps", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x060A", diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index eb0ec8f143..b7f34b0c12 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -15,8 +15,8 @@ "nkro": true }, "matrix_pins": { - "cols": [ "B3", "E6", "B1", "D7", "F7", "C6" ], - "rows": [ "F5", "F6", "B2", "B5", "F4", "D4", "B4", "B6" ] + "cols": ["B3", "E6", "B1", "D7", "F7", "C6"], + "rows": ["F5", "F6", "B2", "B5", "F4", "D4", "B4", "B6"] }, "processor": "atmega32u4", "url": "https://aidansmith.dev", diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json index 5394ef0cd1..d1b062820a 100644 --- a/keyboards/akb/ogr/info.json +++ b/keyboards/akb/ogr/info.json @@ -114,7 +114,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} ] }, - "LAYOUT_65_xt_ansi_blocker": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -200,7 +199,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_ansi_blocker_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -287,7 +285,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_ansi_blocker_wkl": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -371,7 +368,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_ansi_blocker_wkl_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -456,7 +452,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_iso_blocker": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -543,7 +538,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_iso_blocker_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -631,7 +625,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_iso_blocker_wkl": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, @@ -716,7 +709,6 @@ {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4.0} ] }, - "LAYOUT_65_xt_iso_blocker_wkl_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0.0, "y": 0.0}, diff --git a/keyboards/akb/ogrn/info.json b/keyboards/akb/ogrn/info.json index 23d4d77273..d76dca0930 100644 --- a/keyboards/akb/ogrn/info.json +++ b/keyboards/akb/ogrn/info.json @@ -56,4 +56,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/info.json index d297e56d2f..2ba6515bc9 100644 --- a/keyboards/akb/vero/info.json +++ b/keyboards/akb/vero/info.json @@ -99,7 +99,6 @@ {"label": "Alt", "matrix": [4, 11], "x": 11.5, "y": 4} ] }, - "LAYOUT_60_true_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -168,7 +167,6 @@ {"label": "Alt", "matrix": [4, 11], "x": 11.5, "y": 4} ] }, - "LAYOUT_60_true_hhkb_split_space": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -238,7 +236,6 @@ {"label": "Alt", "matrix": [4, 11], "x": 11.5, "y": 4} ] }, - "LAYOUT_60_true_hhkb_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -308,7 +305,6 @@ {"label": "Alt", "matrix": [4, 11], "x": 11.5, "y": 4} ] }, - "LAYOUT_60_true_hhkb_iso_split_space": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index c241b7c14d..6051163dc7 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -225,5 +225,4 @@ ] } } - } diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index 73ce2b1c18..8d466e12b6 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Zodiark", + "keyboard_name": "Zodiark", "manufacturer": "Aleblazer", - "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark", - "maintainer": "Aleblazer", + "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark", + "maintainer": "Aleblazer", "usb": { "vid": "0xF901", "pid": "0xF902", diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json index e7d977bcaf..9d304c8de9 100644 --- a/keyboards/alf/dc60/info.json +++ b/keyboards/alf/dc60/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "dc60", + "keyboard_name": "dc60", "manufacturer": "Alf", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", @@ -110,7 +110,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 14, "y": 4} ] }, - "LAYOUT_60_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -180,7 +179,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_arrow": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -252,7 +250,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 14, "y": 4} ] }, - "LAYOUT_64_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -325,7 +322,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 14, "y": 4} ] }, - "LAYOUT_60_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -396,7 +392,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_iso_arrow": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -469,7 +464,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 14, "y": 4} ] }, - "LAYOUT_64_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json index e15b07c2fb..ea54b093ce 100644 --- a/keyboards/alf/x2/info.json +++ b/keyboards/alf/x2/info.json @@ -103,7 +103,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 14, "y": 5} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Volume Up", "matrix": [4, 4], "x": 1.5, "y": 0}, @@ -176,7 +175,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 5, "w": 1.25} ] }, - "LAYOUT_ansi_split_bs_rshift": { "layout": [ {"label": "Volume Up", "matrix": [4, 4], "x": 1.5, "y": 0}, diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index e246fcc85f..d60bd0c85d 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -102,4 +102,3 @@ } } } - diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json index 68f6cb0301..65c4132ad5 100644 --- a/keyboards/alhenkb/macropad5x4/info.json +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -45,7 +45,7 @@ {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "K41 (B5,F6)", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4}, - {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 4} + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_5x4": { diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json index 8a7ec075bc..d645ddf5f6 100644 --- a/keyboards/aliceh66/pianoforte/info.json +++ b/keyboards/aliceh66/pianoforte/info.json @@ -553,4 +553,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index bfc9f7a839..eea0bc06b5 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -123,4 +123,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index ede9ad92f9..86e4dbefb3 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Alpha", + "keyboard_name": "Alpha", "manufacturer": "PyroL", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json index cb2a02989a..6dd0af2bbf 100644 --- a/keyboards/an_achronism/tetromino/info.json +++ b/keyboards/an_achronism/tetromino/info.json @@ -26,79 +26,79 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", - "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"], + "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", + "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"], "rows": ["GP16", "GP17", "GP18", "GP19", "GP20"] }, "layouts": { "LAYOUT_ortho_5x14": { "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, 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, 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, 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, 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 }, - { "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, 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 }, @@ -112,72 +112,72 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 52, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 69, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 103, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 121, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 138, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 155, "y": 0 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 52, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 69, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 103, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 121, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 138, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 155, "y": 0 }, { "flags": 4, "matrix": [0, 10], "x": 172, "y": 0 }, { "flags": 4, "matrix": [0, 11], "x": 190, "y": 0 }, { "flags": 4, "matrix": [0, 12], "x": 207, "y": 0 }, { "flags": 4, "matrix": [0, 13], "x": 224, "y": 0 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 }, - { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, - { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, - { "flags": 4, "matrix": [1, 3], "x": 52, "y": 16 }, - { "flags": 4, "matrix": [1, 4], "x": 69, "y": 16 }, - { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, - { "flags": 4, "matrix": [1, 6], "x": 103, "y": 16 }, - { "flags": 4, "matrix": [1, 7], "x": 121, "y": 16 }, - { "flags": 4, "matrix": [1, 8], "x": 138, "y": 16 }, - { "flags": 4, "matrix": [1, 9], "x": 155, "y": 16 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 52, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 69, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, + { "flags": 4, "matrix": [1, 6], "x": 103, "y": 16 }, + { "flags": 4, "matrix": [1, 7], "x": 121, "y": 16 }, + { "flags": 4, "matrix": [1, 8], "x": 138, "y": 16 }, + { "flags": 4, "matrix": [1, 9], "x": 155, "y": 16 }, { "flags": 4, "matrix": [1, 10], "x": 172, "y": 16 }, { "flags": 4, "matrix": [1, 11], "x": 190, "y": 16 }, { "flags": 4, "matrix": [1, 12], "x": 207, "y": 16 }, { "flags": 4, "matrix": [1, 13], "x": 224, "y": 16 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 }, - { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, - { "flags": 4, "matrix": [2, 3], "x": 52, "y": 32 }, - { "flags": 4, "matrix": [2, 4], "x": 69, "y": 32 }, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, - { "flags": 4, "matrix": [2, 6], "x": 103, "y": 32 }, - { "flags": 4, "matrix": [2, 7], "x": 121, "y": 32 }, - { "flags": 4, "matrix": [2, 8], "x": 138, "y": 32 }, - { "flags": 4, "matrix": [2, 9], "x": 155, "y": 32 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 52, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 69, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 103, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 121, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 138, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 155, "y": 32 }, { "flags": 4, "matrix": [2, 10], "x": 172, "y": 32 }, { "flags": 4, "matrix": [2, 11], "x": 190, "y": 32 }, { "flags": 4, "matrix": [2, 12], "x": 207, "y": 32 }, { "flags": 4, "matrix": [2, 13], "x": 224, "y": 32 }, - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 }, - { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, - { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, - { "flags": 4, "matrix": [3, 3], "x": 52, "y": 48 }, - { "flags": 4, "matrix": [3, 4], "x": 69, "y": 48 }, - { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, - { "flags": 4, "matrix": [3, 6], "x": 103, "y": 48 }, - { "flags": 4, "matrix": [3, 7], "x": 121, "y": 48 }, - { "flags": 4, "matrix": [3, 8], "x": 138, "y": 48 }, - { "flags": 4, "matrix": [3, 9], "x": 155, "y": 48 }, + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 52, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 69, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, + { "flags": 4, "matrix": [3, 6], "x": 103, "y": 48 }, + { "flags": 4, "matrix": [3, 7], "x": 121, "y": 48 }, + { "flags": 4, "matrix": [3, 8], "x": 138, "y": 48 }, + { "flags": 4, "matrix": [3, 9], "x": 155, "y": 48 }, { "flags": 4, "matrix": [3, 10], "x": 172, "y": 48 }, { "flags": 4, "matrix": [3, 11], "x": 190, "y": 48 }, { "flags": 4, "matrix": [3, 12], "x": 207, "y": 48 }, { "flags": 4, "matrix": [3, 13], "x": 224, "y": 48 }, - { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, - { "flags": 4, "matrix": [4, 1], "x": 17, "y": 64 }, - { "flags": 4, "matrix": [4, 2], "x": 34, "y": 64 }, - { "flags": 4, "matrix": [4, 3], "x": 52, "y": 64 }, - { "flags": 4, "matrix": [4, 4], "x": 69, "y": 64 }, - { "flags": 4, "matrix": [4, 5], "x": 86, "y": 64 }, - { "flags": 4, "matrix": [4, 6], "x": 103, "y": 64 }, - { "flags": 4, "matrix": [4, 7], "x": 121, "y": 64 }, - { "flags": 4, "matrix": [4, 8], "x": 138, "y": 64 }, - { "flags": 4, "matrix": [4, 9], "x": 155, "y": 64 }, + { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [4, 1], "x": 17, "y": 64 }, + { "flags": 4, "matrix": [4, 2], "x": 34, "y": 64 }, + { "flags": 4, "matrix": [4, 3], "x": 52, "y": 64 }, + { "flags": 4, "matrix": [4, 4], "x": 69, "y": 64 }, + { "flags": 4, "matrix": [4, 5], "x": 86, "y": 64 }, + { "flags": 4, "matrix": [4, 6], "x": 103, "y": 64 }, + { "flags": 4, "matrix": [4, 7], "x": 121, "y": 64 }, + { "flags": 4, "matrix": [4, 8], "x": 138, "y": 64 }, + { "flags": 4, "matrix": [4, 9], "x": 155, "y": 64 }, { "flags": 4, "matrix": [4, 10], "x": 172, "y": 64 }, { "flags": 4, "matrix": [4, 11], "x": 190, "y": 64 }, { "flags": 4, "matrix": [4, 12], "x": 207, "y": 64 }, diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index fd22b96603..06acec583f 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/info.json @@ -12,25 +12,25 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { "led_count": 1, - "hue_steps": 10, - "saturation_steps": 17, + "hue_steps": 10, + "saturation_steps": 17, "brightness_steps": 17, - "max_brightness": 255, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true + "max_brightness": 255, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "ws2812": { @@ -38,7 +38,7 @@ "driver": "vendor" }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ {"pin_a": "GP27", "pin_b": "GP28", "resolution": 2} ] @@ -51,7 +51,7 @@ "layouts": { "LAYOUT_k1": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] } + {"x": 0, "y": 0, "matrix": [0, 0]} ] } }, diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json index 214a72ec33..41f25ee633 100644 --- a/keyboards/anavi/macropad10/info.json +++ b/keyboards/anavi/macropad10/info.json @@ -17,25 +17,25 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true }, "rgblight": { "led_count": 4, - "hue_steps": 10, - "saturation_steps": 17, + "hue_steps": 10, + "saturation_steps": 17, "brightness_steps": 17, - "max_brightness": 255, - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": true, - "snake": true, - "static_gradient": true, - "twinkle": true + "max_brightness": 255, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true } }, "ws2812": { @@ -43,7 +43,7 @@ "driver": "vendor" }, "encoder": { - "enabled": true, + "enabled": true, "rotary": [ {"pin_a": "GP1", "pin_b": "GP2", "resolution": 2} ] diff --git a/keyboards/ano/info.json b/keyboards/ano/info.json index 1251700d73..146e0cad7f 100644 --- a/keyboards/ano/info.json +++ b/keyboards/ano/info.json @@ -132,5 +132,4 @@ ] } } - } diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json index 4bc73f02ce..d3f10f3811 100644 --- a/keyboards/argo_works/ishi/80/mk0_avr/info.json +++ b/keyboards/argo_works/ishi/80/mk0_avr/info.json @@ -25,7 +25,7 @@ "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"], "rows": ["B3", "B1", "B6", "B2", "D1", "D0", "B5", "B4", "E6"] - }, + }, "layouts": { "LAYOUT": { "layout": [ @@ -110,5 +110,5 @@ { "matrix": [8, 8], "x": 21.5, "y": 4 } ] } - } -} \ No newline at end of file + } +} diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json index 67ffea958f..c19bf621a5 100644 --- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json +++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json @@ -26,7 +26,7 @@ "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"], "rows": ["B3", "B1", "B6", "B2", "F0", "F1", "B5", "B4", "E6"] - }, + }, "layouts": { "LAYOUT": { "layout": [ @@ -116,5 +116,5 @@ "rotary": [ {"pin_a": "B7", "pin_b": "D5"} ] - } -} \ No newline at end of file + } +} diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json index 71760995eb..4d8eec3167 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/ashpil/modelm_usbc/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "IBM Model M 101/102", "manufacturer": "ashpil", - "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc", - "maintainer": "ashpil", + "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc", + "maintainer": "ashpil", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json index 738203f248..9d3e916829 100644 --- a/keyboards/ask55/info.json +++ b/keyboards/ask55/info.json @@ -112,12 +112,12 @@ { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25 }, { "label": "Fn", "matrix": [3, 13], "x": 13.5, "y": 3 }, - { "label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 4 }, - { "label": "Alt", "matrix": [4, 1], "x": 1, "y": 4 }, - { "label": "GUI", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75 }, - { "label": "`~", "matrix": [4, 3], "x": 3.75, "y": 4 }, - { "label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75 }, - { "label": "\\|", "matrix": [4, 9], "x": 9.5, "y": 4 }, + { "label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 4 }, + { "label": "Alt", "matrix": [4, 1], "x": 1, "y": 4 }, + { "label": "GUI", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75 }, + { "label": "`~", "matrix": [4, 3], "x": 3.75, "y": 4 }, + { "label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75 }, + { "label": "\\|", "matrix": [4, 9], "x": 9.5, "y": 4 }, { "label": "\u2190", "matrix": [4, 10], "x": 10.5, "y": 4 }, { "label": "\u2192", "matrix": [4, 11], "x": 11.5, "y": 4 }, { "label": "\u2193", "matrix": [4, 12], "x": 12.5, "y": 4 }, diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index 0dc2db9072..434e10c81f 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -132,4 +132,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json index 85b848e8d6..23ddc76c8d 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -21,4 +21,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json index 7708afac20..94bb71626f 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -32,4 +32,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json index 9f804fad1a..b34057c8fc 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -23,4 +23,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json index 09ae1a222d..230f0cef43 100644 --- a/keyboards/axolstudio/foundation_gamma/info.json +++ b/keyboards/axolstudio/foundation_gamma/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Foundation Gamma", + "keyboard_name": "Foundation Gamma", "manufacturer": "Axolstudio", - "url": "https://axolstudio.ca/foundation-gamma", - "maintainer": "kb-elmo", + "url": "https://axolstudio.ca/foundation-gamma", + "maintainer": "kb-elmo", "usb": { "vid": "0x525C", "pid": "0xE3EB", diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index cf74098bf5..14a3c8213e 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Helpo", + "keyboard_name": "Helpo", "manufacturer": "Axolstudio", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0x525C", "pid": "0xC89F", diff --git a/keyboards/bahm/aster_ergo/info.json b/keyboards/bahm/aster_ergo/info.json index 13897bcbc6..5545e02409 100644 --- a/keyboards/bahm/aster_ergo/info.json +++ b/keyboards/bahm/aster_ergo/info.json @@ -333,4 +333,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json index 1e7594df44..6b97d0c9ec 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Slice", + "keyboard_name": "Slice", "manufacturer": "2Moons", - "url": "https://www.basekeys.com", - "maintainer": "2Moons", + "url": "https://www.basekeys.com", + "maintainer": "2Moons", "usb": { "vid": "0x04D8", "pid": "0xEC17", diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index eae4ac1d63..03e5886ee6 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Trifecta", + "keyboard_name": "Trifecta", "manufacturer": "Swiftrax", - "url": "https://www.basekeys.com", - "maintainer": "Swiftrax", + "url": "https://www.basekeys.com", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAF3", diff --git a/keyboards/bemeier/bmek/info.json b/keyboards/bemeier/bmek/info.json index de78d59dde..0959f9f3a6 100755 --- a/keyboards/bemeier/bmek/info.json +++ b/keyboards/bemeier/bmek/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "BMEK", + "keyboard_name": "BMEK", "manufacturer": "Bemeier", - "url": "https://github.com/Bemeier/bmek", - "maintainer": "Bemeier", + "url": "https://github.com/Bemeier/bmek", + "maintainer": "Bemeier", "usb": { "vid": "0x626D", "pid": "0x656B" diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json index b83ebd3ebc..4b6a49bb9d 100644 --- a/keyboards/binepad/bn009/r1/info.json +++ b/keyboards/binepad/bn009/r1/info.json @@ -11,4 +11,3 @@ "device_version": "0.0.1" } } - \ No newline at end of file diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index b2c522a97a..10a92de946 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -98,7 +98,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 14, "y": 4} ] }, - "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -170,7 +169,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi_arrow": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -242,7 +240,6 @@ {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4} ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -313,7 +310,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -386,7 +382,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_iso_arrow": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -459,7 +454,6 @@ {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4} ] }, - "LAYOUT_60_tsangan_hhkb_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 5f0fd8c11f..3a2968a0b9 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -111,7 +111,6 @@ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -187,7 +186,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -264,7 +262,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -339,7 +336,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -415,7 +411,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -492,7 +487,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -570,7 +564,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -646,7 +639,6 @@ { "label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_tsangan_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index 5e6e16c860..a3a783b61f 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -111,7 +111,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -195,7 +194,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_ansi_split_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -280,7 +278,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_ansi_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -363,7 +360,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_ansi_tsangan_split_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -447,7 +443,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_isoenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -531,7 +526,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_isoenter_split_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -616,7 +610,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_isoenter_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -699,7 +692,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_isoenter_tsangan_split_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json index f7d35c58fd..f8da2e4a4f 100644 --- a/keyboards/black_hellebore/info.json +++ b/keyboards/black_hellebore/info.json @@ -28,67 +28,67 @@ "pid": "0x4467", "vid": "0x3141" }, - "rgb_matrix": { + "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 0] , "x": 7 , "y": 5 } , - { "flags": 4, "matrix": [0, 1] , "x": 22 , "y": 5 } , - { "flags": 4, "matrix": [0, 2] , "x": 37 , "y": 5 } , - { "flags": 4, "matrix": [0, 3] , "x": 52 , "y": 5 } , - { "flags": 4, "matrix": [0, 4] , "x": 67 , "y": 5 } , - { "flags": 4, "matrix": [0, 5] , "x": 82 , "y": 5 } , - { "flags": 4, "matrix": [0, 6] , "x": 97 , "y": 5 } , - { "flags": 4, "matrix": [0, 7] , "x": 112, "y": 5 } , - { "flags": 4, "matrix": [0, 8] , "x": 127, "y": 5 } , - { "flags": 4, "matrix": [0, 9] , "x": 142, "y": 5 } , - { "flags": 4, "matrix": [0, 10], "x": 157, "y": 5 } , - { "flags": 4, "matrix": [0, 11], "x": 172, "y": 5 } , - { "flags": 4, "matrix": [0, 12], "x": 187, "y": 5 } , - { "flags": 4, "matrix": [0, 13], "x": 209, "y": 5 } , + { "flags": 4, "matrix": [0, 0], "x": 7, "y": 5 }, + { "flags": 4, "matrix": [0, 1], "x": 22, "y": 5 }, + { "flags": 4, "matrix": [0, 2], "x": 37, "y": 5 }, + { "flags": 4, "matrix": [0, 3], "x": 52, "y": 5 }, + { "flags": 4, "matrix": [0, 4], "x": 67, "y": 5 }, + { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, + { "flags": 4, "matrix": [0, 6], "x": 97, "y": 5 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 5 }, + { "flags": 4, "matrix": [0, 8], "x": 127, "y": 5 }, + { "flags": 4, "matrix": [0, 9], "x": 142, "y": 5 }, + { "flags": 4, "matrix": [0, 10], "x": 157, "y": 5 }, + { "flags": 4, "matrix": [0, 11], "x": 172, "y": 5 }, + { "flags": 4, "matrix": [0, 12], "x": 187, "y": 5 }, + { "flags": 4, "matrix": [0, 13], "x": 209, "y": 5 }, { "flags": 4, "matrix": [1, 13], "x": 213, "y": 17 }, { "flags": 4, "matrix": [1, 12], "x": 194, "y": 17 }, { "flags": 4, "matrix": [1, 11], "x": 179, "y": 17 }, { "flags": 4, "matrix": [1, 10], "x": 164, "y": 17 }, - { "flags": 4, "matrix": [1, 9] , "x": 149, "y": 17 }, - { "flags": 4, "matrix": [1, 8] , "x": 134, "y": 17 }, - { "flags": 4, "matrix": [1, 7] , "x": 119, "y": 17 }, - { "flags": 4, "matrix": [1, 6] , "x": 104, "y": 17 }, - { "flags": 4, "matrix": [1, 5] , "x": 90 , "y": 17 }, - { "flags": 4, "matrix": [1, 4] , "x": 75 , "y": 17 }, - { "flags": 4, "matrix": [1, 3] , "x": 60 , "y": 17 }, - { "flags": 4, "matrix": [1, 2] , "x": 45 , "y": 17 }, - { "flags": 4, "matrix": [1, 1] , "x": 30 , "y": 17 }, - { "flags": 4, "matrix": [1, 0] , "x": 11 , "y": 17 }, - { "flags": 4, "matrix": [2, 0] , "x": 13 , "y": 29 }, - { "flags": 4, "matrix": [2, 1] , "x": 34 , "y": 29 }, - { "flags": 4, "matrix": [2, 2] , "x": 49 , "y": 29 }, - { "flags": 4, "matrix": [2, 3] , "x": 63 , "y": 29 }, - { "flags": 4, "matrix": [2, 4] , "x": 78 , "y": 29 }, - { "flags": 4, "matrix": [2, 5] , "x": 93 , "y": 29 }, - { "flags": 4, "matrix": [2, 6] , "x": 108, "y": 29 }, - { "flags": 4, "matrix": [2, 7] , "x": 123, "y": 29 }, - { "flags": 4, "matrix": [2, 8] , "x": 138, "y": 29 }, - { "flags": 4, "matrix": [2, 9] , "x": 153, "y": 29 }, + { "flags": 4, "matrix": [1, 9], "x": 149, "y": 17 }, + { "flags": 4, "matrix": [1, 8], "x": 134, "y": 17 }, + { "flags": 4, "matrix": [1, 7], "x": 119, "y": 17 }, + { "flags": 4, "matrix": [1, 6], "x": 104, "y": 17 }, + { "flags": 4, "matrix": [1, 5], "x": 90, "y": 17 }, + { "flags": 4, "matrix": [1, 4], "x": 75, "y": 17 }, + { "flags": 4, "matrix": [1, 3], "x": 60, "y": 17 }, + { "flags": 4, "matrix": [1, 2], "x": 45, "y": 17 }, + { "flags": 4, "matrix": [1, 1], "x": 30, "y": 17 }, + { "flags": 4, "matrix": [1, 0], "x": 11, "y": 17 }, + { "flags": 4, "matrix": [2, 0], "x": 13, "y": 29 }, + { "flags": 4, "matrix": [2, 1], "x": 34, "y": 29 }, + { "flags": 4, "matrix": [2, 2], "x": 49, "y": 29 }, + { "flags": 4, "matrix": [2, 3], "x": 63, "y": 29 }, + { "flags": 4, "matrix": [2, 4], "x": 78, "y": 29 }, + { "flags": 4, "matrix": [2, 5], "x": 93, "y": 29 }, + { "flags": 4, "matrix": [2, 6], "x": 108, "y": 29 }, + { "flags": 4, "matrix": [2, 7], "x": 123, "y": 29 }, + { "flags": 4, "matrix": [2, 8], "x": 138, "y": 29 }, + { "flags": 4, "matrix": [2, 9], "x": 153, "y": 29 }, { "flags": 4, "matrix": [2, 10], "x": 168, "y": 29 }, { "flags": 4, "matrix": [2, 11], "x": 183, "y": 29 }, - { "flags": 4, "matrix": [2, 13], "x": 207, "y": 29 }, + { "flags": 4, "matrix": [2, 13], "x": 207, "y": 29 }, { "flags": 4, "matrix": [3, 13], "x": 203, "y": 41 }, - { "flags": 4, "matrix": [3, 10], "x": 175, "y": 41 }, - { "flags": 4, "matrix": [3, 9] , "x": 161, "y": 41 }, - { "flags": 4, "matrix": [3, 8] , "x": 146, "y": 41 }, - { "flags": 4, "matrix": [3, 7] , "x": 131, "y": 41 }, - { "flags": 4, "matrix": [3, 6] , "x": 116, "y": 41 }, - { "flags": 4, "matrix": [3, 5] , "x": 101, "y": 41 }, - { "flags": 4, "matrix": [3, 4] , "x": 86 , "y": 41 }, - { "flags": 4, "matrix": [3, 3] , "x": 71 , "y": 41 }, - { "flags": 4, "matrix": [3, 2] , "x": 56 , "y": 41 }, - { "flags": 4, "matrix": [3, 1] , "x": 41 , "y": 41 }, - { "flags": 4, "matrix": [3, 0] , "x": 17 , "y": 41 }, - { "flags": 4, "matrix": [4, 0] , "x": 9 , "y": 54 }, - { "flags": 4, "matrix": [4, 1] , "x": 28 , "y": 54 }, - { "flags": 4, "matrix": [4, 2] , "x": 47 , "y": 54 }, - { "flags": 4, "matrix": [4, 5] , "x": 103, "y": 54 }, - { "flags": 4, "matrix": [4, 9] , "x": 159, "y": 54 }, + { "flags": 4, "matrix": [3, 10], "x": 175, "y": 41 }, + { "flags": 4, "matrix": [3, 9], "x": 161, "y": 41 }, + { "flags": 4, "matrix": [3, 8], "x": 146, "y": 41 }, + { "flags": 4, "matrix": [3, 7], "x": 131, "y": 41 }, + { "flags": 4, "matrix": [3, 6], "x": 116, "y": 41 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 41 }, + { "flags": 4, "matrix": [3, 4], "x": 86, "y": 41 }, + { "flags": 4, "matrix": [3, 3], "x": 71, "y": 41 }, + { "flags": 4, "matrix": [3, 2], "x": 56, "y": 41 }, + { "flags": 4, "matrix": [3, 1], "x": 41, "y": 41 }, + { "flags": 4, "matrix": [3, 0], "x": 17, "y": 41 }, + { "flags": 4, "matrix": [4, 0], "x": 9, "y": 54 }, + { "flags": 4, "matrix": [4, 1], "x": 28, "y": 54 }, + { "flags": 4, "matrix": [4, 2], "x": 47, "y": 54 }, + { "flags": 4, "matrix": [4, 5], "x": 103, "y": 54 }, + { "flags": 4, "matrix": [4, 9], "x": 159, "y": 54 }, { "flags": 4, "matrix": [4, 10], "x": 177, "y": 54 }, { "flags": 4, "matrix": [4, 11], "x": 196, "y": 54 }, { "flags": 4, "matrix": [4, 13], "x": 215, "y": 54 } @@ -97,69 +97,68 @@ "layouts": { "LAYOUT_60_ansi": { "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, 13], "w": 2.25 , "x": 12.75, "y": 2 }, - { "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, 13], "w": 2.75 , "x": 12.25, "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] , "w": 1.25 , "x": 10 , "y": 4 }, - { "matrix": [4, 10], "w": 1.25 , "x": 11.25, "y": 4 }, - { "matrix": [4, 11], "w": 1.25 , "x": 12.5 , "y": 4 }, - { "matrix": [4, 13], "w": 1.25 , "x": 13.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": [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, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "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, 13], "w": 2.75, "x": 12.25, "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], "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 } ] } } } - diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 71d2fee97c..406de75028 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Blaster 75", + "keyboard_name": "Blaster 75", "manufacturer": "Altain", - "url": "", - "maintainer": "Altain", + "url": "", + "maintainer": "Altain", "usb": { "vid": "0xA122", "pid": "0xB075", @@ -206,4 +206,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json index 512e73e4d2..c754176824 100644 --- a/keyboards/blockboy/ac980mini/info.json +++ b/keyboards/blockboy/ac980mini/info.json @@ -117,4 +117,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/blu/vimclutch/info.json b/keyboards/blu/vimclutch/info.json index 33b126dc4e..bb9586b61f 100644 --- a/keyboards/blu/vimclutch/info.json +++ b/keyboards/blu/vimclutch/info.json @@ -1,26 +1,26 @@ { - "keyboard_name": "vimclutch", - "manufacturer": "blu", - "url": "https://github.com/blu006/vimclutch_hw", - "maintainer": "blu006", - "usb": { - "vid": "0xFEED", - "pid": "0x6060", - "device_version": "0.0.1" - }, - "development_board": "promicro", - "diode_direction": "ROW2COL", - "matrix_pins": { - "cols": ["B3", "B2", "B6"], - "rows": ["B5"] - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "k00", "x": 0, "y": 0, "matrix": [0, 0]}, - {"label": "k01", "x": 1, "y": 0, "matrix": [0, 1]}, - {"label": "k02", "x": 2, "y": 0, "matrix": [0, 2]} - ] - } - } + "keyboard_name": "vimclutch", + "manufacturer": "blu", + "url": "https://github.com/blu006/vimclutch_hw", + "maintainer": "blu006", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, + "development_board": "promicro", + "diode_direction": "ROW2COL", + "matrix_pins": { + "cols": ["B3", "B2", "B6"], + "rows": ["B5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0, "matrix": [0, 0]}, + {"label": "k01", "x": 1, "y": 0, "matrix": [0, 1]}, + {"label": "k02", "x": 2, "y": 0, "matrix": [0, 2]} + ] + } + } } diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json index ac0e023c44..851c18bae7 100644 --- a/keyboards/boardsource/beiwagon/info.json +++ b/keyboards/boardsource/beiwagon/info.json @@ -33,16 +33,16 @@ { "flags": 2, "x": 48, "y": 38 }, { "flags": 2, "x": 48, "y": 113 }, { "flags": 2, "x": 48, "y": 188 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, { "flags": 4, "matrix": [0, 1], "x": 32, "y": 0 }, { "flags": 4, "matrix": [0, 2], "x": 64, "y": 0 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 75 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 75 }, { "flags": 4, "matrix": [1, 1], "x": 32, "y": 75 }, { "flags": 4, "matrix": [1, 2], "x": 64, "y": 75 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 150 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 150 }, { "flags": 4, "matrix": [2, 1], "x": 32, "y": 150 }, { "flags": 4, "matrix": [2, 2], "x": 64, "y": 150 }, - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 224 }, + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 224 }, { "flags": 4, "matrix": [3, 1], "x": 32, "y": 224 }, { "flags": 4, "matrix": [3, 2], "x": 64, "y": 224 } ] diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json index 8c3f07f14e..52fba27db3 100644 --- a/keyboards/boardsource/lulu/info.json +++ b/keyboards/boardsource/lulu/info.json @@ -40,70 +40,70 @@ { "flags": 2, "x": 17, "y": 10 }, { "flags": 2, "x": 51, "y": 10 }, { "flags": 2, "x": 86, "y": 10 }, - { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 68, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 51, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16 }, - { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, - { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, - { "flags": 4, "matrix": [1, 3], "x": 51, "y": 16 }, - { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, - { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, - { "flags": 4, "matrix": [2, 4], "x": 68, "y": 32 }, - { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, - { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32 }, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48 }, - { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, - { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, - { "flags": 4, "matrix": [3, 3], "x": 51, "y": 48 }, - { "flags": 4, "matrix": [3, 4], "x": 68, "y": 48 }, - { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, - { "flags": 4, "matrix": [4, 5], "x": 103, "y": 40 }, - { "flags": 1, "matrix": [4, 4], "x": 96, "y": 64 }, - { "flags": 1, "matrix": [4, 3], "x": 77, "y": 64 }, - { "flags": 1, "matrix": [4, 2], "x": 60, "y": 64 }, - { "flags": 1, "matrix": [4, 1], "x": 43, "y": 64 }, + { "flags": 4, "matrix": [0, 5], "x": 86, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 68, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 51, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 34, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 17, "y": 0 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 17, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 34, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 51, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 86, "y": 16 }, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 68, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 51, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 34, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 17, "y": 32 }, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 17, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 51, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 68, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 86, "y": 48 }, + { "flags": 4, "matrix": [4, 5], "x": 103, "y": 40 }, + { "flags": 1, "matrix": [4, 4], "x": 96, "y": 64 }, + { "flags": 1, "matrix": [4, 3], "x": 77, "y": 64 }, + { "flags": 1, "matrix": [4, 2], "x": 60, "y": 64 }, + { "flags": 1, "matrix": [4, 1], "x": 43, "y": 64 }, { "flags": 2, "x": 137, "y": 55 }, { "flags": 2, "x": 172, "y": 55 }, { "flags": 2, "x": 206, "y": 40 }, { "flags": 2, "x": 206, "y": 10 }, { "flags": 2, "x": 172, "y": 10 }, { "flags": 2, "x": 137, "y": 10 }, - { "flags": 4, "matrix": [5, 5], "x": 137, "y": 0 }, - { "flags": 4, "matrix": [5, 4], "x": 155, "y": 0 }, - { "flags": 4, "matrix": [5, 3], "x": 172, "y": 0 }, - { "flags": 4, "matrix": [5, 2], "x": 189, "y": 0 }, - { "flags": 4, "matrix": [5, 1], "x": 206, "y": 0 }, - { "flags": 1, "matrix": [5, 0], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [6, 0], "x": 224, "y": 16 }, - { "flags": 4, "matrix": [6, 1], "x": 206, "y": 16 }, - { "flags": 4, "matrix": [6, 2], "x": 189, "y": 16 }, - { "flags": 4, "matrix": [6, 3], "x": 172, "y": 16 }, - { "flags": 4, "matrix": [6, 4], "x": 155, "y": 16 }, - { "flags": 4, "matrix": [6, 5], "x": 137, "y": 16 }, - { "flags": 4, "matrix": [7, 5], "x": 137, "y": 32 }, - { "flags": 4, "matrix": [7, 4], "x": 155, "y": 32 }, - { "flags": 4, "matrix": [7, 3], "x": 172, "y": 32 }, - { "flags": 4, "matrix": [7, 2], "x": 189, "y": 32 }, - { "flags": 4, "matrix": [7, 1], "x": 206, "y": 32 }, - { "flags": 1, "matrix": [7, 0], "x": 224, "y": 32 }, - { "flags": 1, "matrix": [8, 0], "x": 224, "y": 48 }, - { "flags": 4, "matrix": [8, 1], "x": 206, "y": 48 }, - { "flags": 4, "matrix": [8, 2], "x": 189, "y": 48 }, - { "flags": 4, "matrix": [8, 3], "x": 172, "y": 48 }, - { "flags": 4, "matrix": [8, 4], "x": 155, "y": 48 }, - { "flags": 4, "matrix": [8, 5], "x": 137, "y": 48 }, - { "flags": 4, "matrix": [9, 5], "x": 120, "y": 40 }, - { "flags": 1, "matrix": [9, 4], "x": 127, "y": 64 }, - { "flags": 1, "matrix": [9, 3], "x": 146, "y": 64 }, - { "flags": 1, "matrix": [9, 2], "x": 163, "y": 64 }, - { "flags": 1, "matrix": [9, 1], "x": 180, "y": 64 } + { "flags": 4, "matrix": [5, 5], "x": 137, "y": 0 }, + { "flags": 4, "matrix": [5, 4], "x": 155, "y": 0 }, + { "flags": 4, "matrix": [5, 3], "x": 172, "y": 0 }, + { "flags": 4, "matrix": [5, 2], "x": 189, "y": 0 }, + { "flags": 4, "matrix": [5, 1], "x": 206, "y": 0 }, + { "flags": 1, "matrix": [5, 0], "x": 224, "y": 0 }, + { "flags": 1, "matrix": [6, 0], "x": 224, "y": 16 }, + { "flags": 4, "matrix": [6, 1], "x": 206, "y": 16 }, + { "flags": 4, "matrix": [6, 2], "x": 189, "y": 16 }, + { "flags": 4, "matrix": [6, 3], "x": 172, "y": 16 }, + { "flags": 4, "matrix": [6, 4], "x": 155, "y": 16 }, + { "flags": 4, "matrix": [6, 5], "x": 137, "y": 16 }, + { "flags": 4, "matrix": [7, 5], "x": 137, "y": 32 }, + { "flags": 4, "matrix": [7, 4], "x": 155, "y": 32 }, + { "flags": 4, "matrix": [7, 3], "x": 172, "y": 32 }, + { "flags": 4, "matrix": [7, 2], "x": 189, "y": 32 }, + { "flags": 4, "matrix": [7, 1], "x": 206, "y": 32 }, + { "flags": 1, "matrix": [7, 0], "x": 224, "y": 32 }, + { "flags": 1, "matrix": [8, 0], "x": 224, "y": 48 }, + { "flags": 4, "matrix": [8, 1], "x": 206, "y": 48 }, + { "flags": 4, "matrix": [8, 2], "x": 189, "y": 48 }, + { "flags": 4, "matrix": [8, 3], "x": 172, "y": 48 }, + { "flags": 4, "matrix": [8, 4], "x": 155, "y": 48 }, + { "flags": 4, "matrix": [8, 5], "x": 137, "y": 48 }, + { "flags": 4, "matrix": [9, 5], "x": 120, "y": 40 }, + { "flags": 1, "matrix": [9, 4], "x": 127, "y": 64 }, + { "flags": 1, "matrix": [9, 3], "x": 146, "y": 64 }, + { "flags": 1, "matrix": [9, 2], "x": 163, "y": 64 }, + { "flags": 1, "matrix": [9, 1], "x": 180, "y": 64 } ] }, "layouts": { diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json index 9e5fc60377..d77b961425 100644 --- a/keyboards/boardsource/microdox/v2/info.json +++ b/keyboards/boardsource/microdox/v2/info.json @@ -45,42 +45,42 @@ { "flags": 2, "x": 136, "y": 11 }, { "flags": 2, "x": 136, "y": 53 }, { "flags": 2, "x": 224, "y": 64 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 24, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 49, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 74, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 99, "y": 0 }, - { "flags": 4, "matrix": [4, 4], "x": 124, "y": 0 }, - { "flags": 4, "matrix": [4, 3], "x": 149, "y": 0 }, - { "flags": 4, "matrix": [4, 2], "x": 174, "y": 0 }, - { "flags": 4, "matrix": [4, 1], "x": 199, "y": 0 }, - { "flags": 4, "matrix": [4, 0], "x": 224, "y": 0 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 21 }, - { "flags": 4, "matrix": [1, 1], "x": 24, "y": 21 }, - { "flags": 4, "matrix": [1, 2], "x": 49, "y": 21 }, - { "flags": 4, "matrix": [1, 3], "x": 74, "y": 21 }, - { "flags": 4, "matrix": [1, 4], "x": 99, "y": 21 }, - { "flags": 4, "matrix": [5, 4], "x": 124, "y": 21 }, - { "flags": 4, "matrix": [5, 3], "x": 149, "y": 21 }, - { "flags": 4, "matrix": [5, 2], "x": 174, "y": 21 }, - { "flags": 4, "matrix": [5, 1], "x": 199, "y": 21 }, - { "flags": 4, "matrix": [5, 0], "x": 224, "y": 21 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 42 }, - { "flags": 4, "matrix": [2, 1], "x": 24, "y": 42 }, - { "flags": 4, "matrix": [2, 2], "x": 49, "y": 42 }, - { "flags": 4, "matrix": [2, 3], "x": 74, "y": 42 }, - { "flags": 4, "matrix": [2, 4], "x": 99, "y": 42 }, - { "flags": 4, "matrix": [6, 4], "x": 124, "y": 42 }, - { "flags": 4, "matrix": [6, 3], "x": 149, "y": 42 }, - { "flags": 4, "matrix": [6, 2], "x": 174, "y": 42 }, - { "flags": 4, "matrix": [6, 1], "x": 199, "y": 42 }, - { "flags": 4, "matrix": [6, 0], "x": 224, "y": 42 }, - { "flags": 1, "matrix": [3, 2], "x": 49, "y": 64 }, - { "flags": 1, "matrix": [3, 3], "x": 74, "y": 64 }, - { "flags": 1, "matrix": [3, 4], "x": 99, "y": 64 }, - { "flags": 1, "matrix": [7, 4], "x": 124, "y": 64 }, - { "flags": 1, "matrix": [7, 3], "x": 149, "y": 64 }, - { "flags": 1, "matrix": [7, 2], "x": 174, "y": 64 } + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 24, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 49, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 74, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 99, "y": 0 }, + { "flags": 4, "matrix": [4, 4], "x": 124, "y": 0 }, + { "flags": 4, "matrix": [4, 3], "x": 149, "y": 0 }, + { "flags": 4, "matrix": [4, 2], "x": 174, "y": 0 }, + { "flags": 4, "matrix": [4, 1], "x": 199, "y": 0 }, + { "flags": 4, "matrix": [4, 0], "x": 224, "y": 0 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 21 }, + { "flags": 4, "matrix": [1, 1], "x": 24, "y": 21 }, + { "flags": 4, "matrix": [1, 2], "x": 49, "y": 21 }, + { "flags": 4, "matrix": [1, 3], "x": 74, "y": 21 }, + { "flags": 4, "matrix": [1, 4], "x": 99, "y": 21 }, + { "flags": 4, "matrix": [5, 4], "x": 124, "y": 21 }, + { "flags": 4, "matrix": [5, 3], "x": 149, "y": 21 }, + { "flags": 4, "matrix": [5, 2], "x": 174, "y": 21 }, + { "flags": 4, "matrix": [5, 1], "x": 199, "y": 21 }, + { "flags": 4, "matrix": [5, 0], "x": 224, "y": 21 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 42 }, + { "flags": 4, "matrix": [2, 1], "x": 24, "y": 42 }, + { "flags": 4, "matrix": [2, 2], "x": 49, "y": 42 }, + { "flags": 4, "matrix": [2, 3], "x": 74, "y": 42 }, + { "flags": 4, "matrix": [2, 4], "x": 99, "y": 42 }, + { "flags": 4, "matrix": [6, 4], "x": 124, "y": 42 }, + { "flags": 4, "matrix": [6, 3], "x": 149, "y": 42 }, + { "flags": 4, "matrix": [6, 2], "x": 174, "y": 42 }, + { "flags": 4, "matrix": [6, 1], "x": 199, "y": 42 }, + { "flags": 4, "matrix": [6, 0], "x": 224, "y": 42 }, + { "flags": 1, "matrix": [3, 2], "x": 49, "y": 64 }, + { "flags": 1, "matrix": [3, 3], "x": 74, "y": 64 }, + { "flags": 1, "matrix": [3, 4], "x": 99, "y": 64 }, + { "flags": 1, "matrix": [7, 4], "x": 124, "y": 64 }, + { "flags": 1, "matrix": [7, 3], "x": 149, "y": 64 }, + { "flags": 1, "matrix": [7, 2], "x": 174, "y": 64 } ] } } diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json index 089acc9397..0635bb805f 100644 --- a/keyboards/boardsource/technik_s/info.json +++ b/keyboards/boardsource/technik_s/info.json @@ -88,51 +88,51 @@ "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, 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], "w": 1.5, "x": 0, "y": 1 }, - { "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, 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], "w": 1.5, "x": 10.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": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "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 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, { "matrix": [3, 3], "w": 1.5, "x": 3, "y": 3 }, { "matrix": [3, 5], "w": 1.5, "x": 4.5, "y": 3 }, { "matrix": [3, 6], "w": 1.5, "x": 6, "y": 3 }, { "matrix": [3, 8], "w": 1.5, "x": 7.5, "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, 9], "x": 9, "y": 3 }, + { "matrix": [3, 10], "x": 10, "y": 3 }, + { "matrix": [3, 11], "x": 11, "y": 3 } ] } } diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json index 48c3e31de8..f7ae94b3be 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "bop", + "keyboard_name": "bop", "manufacturer": "fruitykeeb", "url": "https://github.com/blewis308/BOP-Keyboard", "maintainer": "Fruit", diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json index fcc6680987..76d6cb41ab 100644 --- a/keyboards/boston/info.json +++ b/keyboards/boston/info.json @@ -173,7 +173,6 @@ {"label": ".", "matrix": [6, 17], "x": 18.5, "y": 6.5} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, @@ -308,7 +307,6 @@ {"label": ".", "matrix": [6, 17], "x": 18.5, "y": 6.5} ] }, - "LAYOUT_iso": { "layout": [ {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json index 6be55c249c..3156c643c9 100644 --- a/keyboards/boston_meetup/info.json +++ b/keyboards/boston_meetup/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Boston Meetup Board", + "keyboard_name": "Boston Meetup Board", "manufacturer": "ishtob", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFB30", "pid": "0x26BE" diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json index dcf98006a1..a12e4ca794 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "bubble75", - "url": "", + "keyboard_name": "bubble75", + "url": "", "manufacturer": "phl", - "maintainer": "velocifire", + "maintainer": "velocifire", "usb": { "vid": "0x4242", "pid": "0x5A4C", diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json index 183e857c84..c9239bede4 100644 --- a/keyboards/buildakb/potato65s/info.json +++ b/keyboards/buildakb/potato65s/info.json @@ -125,7 +125,6 @@ { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -202,7 +201,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -277,7 +275,6 @@ { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 96adda2cee..db52582830 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -1,15 +1,13 @@ { - "manufacturer": "ButterKeebs", + "manufacturer": "ButterKeebs", "keyboard_name": "PocketPad", "maintainer": "qmk", "diode_direction": "ROW2COL", - - "usb": { - "device_version": "1.0.0", + "usb": { + "device_version": "1.0.0", "pid": "0x1475", "vid": "0xFEED" }, - "features": { "bootmagic": true, "command": false, @@ -22,35 +20,34 @@ "cols": ["F1", "C7", "D5", "B7"], "rows": ["F7", "F6", "F5", "F4", "B1"] }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "bootloader": "atmel-dfu", "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": 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": 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": 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": 0, "y": 4, "matrix": [4,0]}, - {"x": 1, "y": 4, "matrix": [4,1]} - ] - } - } -} \ No newline at end of file + "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": 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": 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": 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": 0, "y": 4, "matrix": [4, 0]}, + {"x": 1, "y": 4, "matrix": [4, 1]} + ] + } + } +} diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json index 78479a8dd2..c39421c597 100644 --- a/keyboards/buzzard/rev1/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -115,4 +115,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json index 2096eed000..5974c492a1 100644 --- a/keyboards/cablecardesigns/cypher/rev6/info.json +++ b/keyboards/cablecardesigns/cypher/rev6/info.json @@ -127,7 +127,6 @@ {"label": "Backspace", "matrix": [9, 8], "x": 18.5, "y": 4} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -224,7 +223,6 @@ {"label": ".", "matrix": [9, 7], "x": 17.5, "y": 4} ] }, - "LAYOUT_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/info.json index 1d4a94deaa..9c9d2df7e1 100644 --- a/keyboards/caffeinated/serpent65/info.json +++ b/keyboards/caffeinated/serpent65/info.json @@ -98,7 +98,6 @@ {"label": "\u2192", "matrix": [9, 7], "x": 15.25, "y": 4.25} ] }, - "LAYOUT_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -173,7 +172,6 @@ { "label": "\u2192", "matrix": [9, 7], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_ansi_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -249,7 +247,6 @@ { "label": "\u2192", "matrix": [9, 7], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -325,7 +322,6 @@ { "label": "\u2192", "matrix": [9, 7], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_iso_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json index e952fd83b0..c9569143b8 100644 --- a/keyboards/cannonkeys/adelie/info.json +++ b/keyboards/cannonkeys/adelie/info.json @@ -85,7 +85,6 @@ {"label": "\u2192", "matrix": [3, 14], "x": 14.25, "y": 3.25} ] }, - "LAYOUT_rwkl": { "layout": [ { "label": "Esc/~", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -145,7 +144,6 @@ { "label": "Right", "matrix": [3, 14], "x": 14.25, "y": 3.25 } ] }, - "LAYOUT_wkl": { "layout": [ { "label": "Esc/~", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json index c299ecd08b..b08e26888f 100644 --- a/keyboards/cannonkeys/aella/info.json +++ b/keyboards/cannonkeys/aella/info.json @@ -114,7 +114,6 @@ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -205,7 +204,6 @@ { "label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5 } ] }, - "LAYOUT_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json index 913dea01c2..c548381f5c 100644 --- a/keyboards/cannonkeys/atlas_alps/info.json +++ b/keyboards/cannonkeys/atlas_alps/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Atlas", + "keyboard_name": "Atlas", "manufacturer": "CannonKeys", - "url": "https://geekhack.org/index.php?topic=106683.msg2975081#msg2975081", - "maintainer": "Nasp", + "url": "https://geekhack.org/index.php?topic=106683.msg2975081#msg2975081", + "maintainer": "Nasp", "usb": { "vid": "0xCA04", "pid": "0xA7A5", diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json b/keyboards/cannonkeys/bakeneko60_iso_hs/info.json index c5f9579356..4cb5e76436 100644 --- a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json +++ b/keyboards/cannonkeys/bakeneko60_iso_hs/info.json @@ -92,4 +92,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json index a4a1c3fe0e..2cd83045b2 100644 --- a/keyboards/cannonkeys/balance/info.json +++ b/keyboards/cannonkeys/balance/info.json @@ -133,7 +133,6 @@ {"label": "Enter", "matrix": [4, 19], "x": 19.5, "y": 4.25} ] }, - "LAYOUT_ansi": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0.25 }, @@ -228,7 +227,6 @@ { "label": "Enter", "matrix": [4, 19], "x": 19.5, "y": 4.25 } ] }, - "LAYOUT_ansi_split_bs": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0.25 }, @@ -324,7 +322,6 @@ { "label": "Enter", "matrix": [4, 19], "x": 19.5, "y": 4.25 } ] }, - "LAYOUT_iso": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0.25 }, @@ -420,7 +417,6 @@ { "label": "Enter", "matrix": [4, 19], "x": 19.5, "y": 4.25 } ] }, - "LAYOUT_iso_split_bs": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0.25 }, diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json index 8651cbf79b..13f1b12733 100644 --- a/keyboards/cannonkeys/brutalv2_1800/info.json +++ b/keyboards/cannonkeys/brutalv2_1800/info.json @@ -143,7 +143,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_rwkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -253,7 +252,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_rwkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -364,7 +362,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_wkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -473,7 +470,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_ansi_wkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -583,7 +579,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_rwkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -694,7 +689,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_rwkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -806,7 +800,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_wkl": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -916,7 +909,6 @@ {"label": "Enter", "matrix": [5, 17], "x": 18.5, "y": 5.25} ] }, - "LAYOUT_iso_wkl_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json index 198731cc9a..10a525593d 100644 --- a/keyboards/cannonkeys/brutalv2_65/info.json +++ b/keyboards/cannonkeys/brutalv2_65/info.json @@ -108,7 +108,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -184,7 +183,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -261,7 +259,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -336,7 +333,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -412,7 +408,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker": { "layout": [ { "label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -489,7 +484,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_split_bs": { "layout": [ { "label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -567,7 +561,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_tsangan": { "layout": [ { "label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -643,7 +636,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15, "y": 4 } ] }, - "LAYOUT_65_iso_blocker_tsangan_split_bs": { "layout": [ { "label": "\u00ac", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/info.json index 1b3bd40e67..d936f0e5bc 100644 --- a/keyboards/cannonkeys/caerdroia/info.json +++ b/keyboards/cannonkeys/caerdroia/info.json @@ -123,4 +123,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index d78ea190b9..055bd2479c 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -145,7 +145,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -242,7 +241,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -341,7 +339,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -439,7 +436,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index eb3230adc0..f374cd18f8 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -115,7 +115,6 @@ {"label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4} ] }, - "LAYOUT_tkl_nofrow_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -195,7 +194,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -277,7 +275,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -356,7 +353,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -437,7 +433,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -518,7 +513,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_iso_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -601,7 +595,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -681,7 +674,6 @@ { "label": "\u2192", "matrix": [4, 17], "x": 17.25, "y": 4 } ] }, - "LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 404f768afe..7f0cedbd3e 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -145,7 +145,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -243,7 +242,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -343,7 +341,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -440,7 +437,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -539,7 +535,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -638,7 +633,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -739,7 +733,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -837,7 +830,6 @@ { "label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json index 4ef03dc2a5..ea6d15648b 100644 --- a/keyboards/cannonkeys/ellipse/info.json +++ b/keyboards/cannonkeys/ellipse/info.json @@ -116,7 +116,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} ] }, - "LAYOUT_60_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -186,7 +185,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4.0, "w": 1.25 } ] }, - "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -258,7 +256,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4.0, "w": 1.25 } ] }, - "LAYOUT_60_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -327,7 +324,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -398,7 +394,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -469,7 +464,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4.0, "w": 1.25 } ] }, - "LAYOUT_60_iso_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -542,7 +536,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.75, "y": 4.0, "w": 1.25 } ] }, - "LAYOUT_60_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -612,7 +605,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_iso_tsangan_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json index cc945db822..523625ca73 100644 --- a/keyboards/cannonkeys/ellipse_hs/info.json +++ b/keyboards/cannonkeys/ellipse_hs/info.json @@ -100,7 +100,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_tsangan_split_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json index d98364fa10..5f2a5a26e4 100644 --- a/keyboards/cannonkeys/gentoo/info.json +++ b/keyboards/cannonkeys/gentoo/info.json @@ -104,7 +104,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4.25} ] }, - "LAYOUT_65_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -181,7 +180,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_ansi_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -259,7 +257,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_ansi_rwkl": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -335,7 +332,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_ansi_rwkl_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -412,7 +408,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_ansi_wkl": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -487,7 +482,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_ansi_wkl_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -563,7 +557,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -641,7 +634,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -720,7 +712,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso_rwkl": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -797,7 +788,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso_rwkl_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -875,7 +865,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso_wkl": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -951,7 +940,6 @@ { "label": "Right", "matrix": [4, 14], "x": 15.25, "y": 4.25 } ] }, - "LAYOUT_65_iso_wkl_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json index 39ee37d743..6249e51edd 100644 --- a/keyboards/cannonkeys/hoodrowg/info.json +++ b/keyboards/cannonkeys/hoodrowg/info.json @@ -132,7 +132,6 @@ {"label": "\u2192", "matrix": [11, 8], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [1, 0], "x": 0, "y": 0 }, @@ -234,7 +233,6 @@ { "label": "Right", "matrix": [11, 8], "x": 17.25, "y": 5.5 } ] }, - "LAYOUT_tkl_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [1, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json index 40f2fac6ab..0c6a47302f 100644 --- a/keyboards/cannonkeys/moment/info.json +++ b/keyboards/cannonkeys/moment/info.json @@ -111,7 +111,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -180,7 +179,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -251,7 +249,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_iso_tsangan": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, @@ -321,7 +318,6 @@ { "label": "Ctrl", "matrix": [4, 14], "x": 13.5, "y": 4.0, "w": 1.5 } ] }, - "LAYOUT_60_tsangan_hhkb_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json index d92b9a7859..231f636853 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/info.json @@ -105,7 +105,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5} ] }, - "LAYOUT_3u_space": { "layout": [ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index 941a0ba3d1..678ca4457a 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -118,7 +118,6 @@ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5.25} ] }, - "LAYOUT_ansi_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -209,7 +208,6 @@ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5.25} ] }, - "LAYOUT_ansi_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -301,7 +299,6 @@ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5.25} ] }, - "LAYOUT_iso_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -393,7 +390,6 @@ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5.25} ] }, - "LAYOUT_iso_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index 77eff5bddf..8be4673df4 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -116,7 +116,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -208,7 +207,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_ansi_split_bs_rshift": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -302,7 +300,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_ansi_tsangan": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -393,7 +390,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -486,7 +482,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_iso": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -579,7 +574,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_iso_split_bs_rshift": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -674,7 +668,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_iso_tsangan": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, @@ -766,7 +759,6 @@ {"label": "\u2192", "matrix": [4, 18], "x": 18.5, "y": 4} ] }, - "LAYOUT_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Play/Pause", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/info.json index d890703961..be9e5349cd 100644 --- a/keyboards/cannonkeys/ortho48v2/info.json +++ b/keyboards/cannonkeys/ortho48v2/info.json @@ -42,54 +42,54 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label":"Tab", "x":0, "y":0, "matrix": [0,0]}, - {"label":"Q", "x":1, "y":0, "matrix": [0,1]}, - {"label":"W", "x":2, "y":0, "matrix": [0,2]}, - {"label":"E", "x":3, "y":0, "matrix": [0,3]}, - {"label":"R", "x":4, "y":0, "matrix": [0,4]}, - {"label":"T", "x":5, "y":0, "matrix": [0,5]}, - {"label":"Y", "x":6, "y":0, "matrix": [0,6]}, - {"label":"U", "x":7, "y":0, "matrix": [0,7]}, - {"label":"I", "x":8, "y":0, "matrix": [0,8]}, - {"label":"O", "x":9, "y":0, "matrix": [0,9]}, - {"label":"P", "x":10, "y":0, "matrix": [0,10]}, - {"label":"Back Space", "x":11, "y":0, "matrix": [0,11]}, - {"label":"Esc", "x":0, "y":1, "matrix": [1,0]}, - {"label":"A", "x":1, "y":1, "matrix": [1,1]}, - {"label":"S", "x":2, "y":1, "matrix": [1,2]}, - {"label":"D", "x":3, "y":1, "matrix": [1,3]}, - {"label":"F", "x":4, "y":1, "matrix": [1,4]}, - {"label":"G", "x":5, "y":1, "matrix": [1,5]}, - {"label":"H", "x":6, "y":1, "matrix": [1,6]}, - {"label":"J", "x":7, "y":1, "matrix": [1,7]}, - {"label":"K", "x":8, "y":1, "matrix": [1,8]}, - {"label":"L", "x":9, "y":1, "matrix": [1,9]}, - {"label":";", "x":10, "y":1, "matrix": [1,10]}, - {"label":"'", "x":11, "y":1, "matrix": [1,11]}, - {"label":"Shift", "x":0, "y":2, "matrix": [2,0]}, - {"label":"Z", "x":1, "y":2, "matrix": [2,1]}, - {"label":"X", "x":2, "y":2, "matrix": [2,2]}, - {"label":"C", "x":3, "y":2, "matrix": [2,3]}, - {"label":"V", "x":4, "y":2, "matrix": [2,4]}, - {"label":"B", "x":5, "y":2, "matrix": [2,5]}, - {"label":"N", "x":6, "y":2, "matrix": [2,6]}, - {"label":"M", "x":7, "y":2, "matrix": [2,7]}, - {"label":",", "x":8, "y":2, "matrix": [2,8]}, - {"label":".", "x":9, "y":2, "matrix": [2,9]}, - {"label":"/", "x":10, "y":2, "matrix": [2,10]}, - {"label":"Return", "x":11, "y":2, "matrix": [2,11]}, - {"label":"", "x":0, "y":3, "matrix": [3,0]}, - {"label":"Ctrl", "x":1, "y":3, "matrix": [3,1]}, - {"label":"Alt", "x":2, "y":3, "matrix": [3,2]}, - {"label":"Super", "x":3, "y":3, "matrix": [3,3]}, - {"label":"⇓", "x":4, "y":3, "matrix": [3,4]}, - {"label":"", "x":5, "y":3, "matrix": [3,5]}, - {"label":"", "x":6, "y":3, "matrix": [3,6]}, - {"label":"⇑", "x":7, "y":3, "matrix": [3,7]}, - {"label":"←", "x":8, "y":3, "matrix": [3,8]}, - {"label":"↓", "x":9, "y":3, "matrix": [3,9]}, - {"label":"↑", "x":10, "y":3, "matrix": [3,10]}, - {"label":"→", "x":11, "y":3, "matrix": [3,11]}] + {"label":"Tab", "x":0, "y":0, "matrix": [0, 0]}, + {"label":"Q", "x":1, "y":0, "matrix": [0, 1]}, + {"label":"W", "x":2, "y":0, "matrix": [0, 2]}, + {"label":"E", "x":3, "y":0, "matrix": [0, 3]}, + {"label":"R", "x":4, "y":0, "matrix": [0, 4]}, + {"label":"T", "x":5, "y":0, "matrix": [0, 5]}, + {"label":"Y", "x":6, "y":0, "matrix": [0, 6]}, + {"label":"U", "x":7, "y":0, "matrix": [0, 7]}, + {"label":"I", "x":8, "y":0, "matrix": [0, 8]}, + {"label":"O", "x":9, "y":0, "matrix": [0, 9]}, + {"label":"P", "x":10, "y":0, "matrix": [0, 10]}, + {"label":"Back Space", "x":11, "y":0, "matrix": [0, 11]}, + {"label":"Esc", "x":0, "y":1, "matrix": [1, 0]}, + {"label":"A", "x":1, "y":1, "matrix": [1, 1]}, + {"label":"S", "x":2, "y":1, "matrix": [1, 2]}, + {"label":"D", "x":3, "y":1, "matrix": [1, 3]}, + {"label":"F", "x":4, "y":1, "matrix": [1, 4]}, + {"label":"G", "x":5, "y":1, "matrix": [1, 5]}, + {"label":"H", "x":6, "y":1, "matrix": [1, 6]}, + {"label":"J", "x":7, "y":1, "matrix": [1, 7]}, + {"label":"K", "x":8, "y":1, "matrix": [1, 8]}, + {"label":"L", "x":9, "y":1, "matrix": [1, 9]}, + {"label":";", "x":10, "y":1, "matrix": [1, 10]}, + {"label":"'", "x":11, "y":1, "matrix": [1, 11]}, + {"label":"Shift", "x":0, "y":2, "matrix": [2, 0]}, + {"label":"Z", "x":1, "y":2, "matrix": [2, 1]}, + {"label":"X", "x":2, "y":2, "matrix": [2, 2]}, + {"label":"C", "x":3, "y":2, "matrix": [2, 3]}, + {"label":"V", "x":4, "y":2, "matrix": [2, 4]}, + {"label":"B", "x":5, "y":2, "matrix": [2, 5]}, + {"label":"N", "x":6, "y":2, "matrix": [2, 6]}, + {"label":"M", "x":7, "y":2, "matrix": [2, 7]}, + {"label":",", "x":8, "y":2, "matrix": [2, 8]}, + {"label":".", "x":9, "y":2, "matrix": [2, 9]}, + {"label":"/", "x":10, "y":2, "matrix": [2, 10]}, + {"label":"Return", "x":11, "y":2, "matrix": [2, 11]}, + {"label":"", "x":0, "y":3, "matrix": [3, 0]}, + {"label":"Ctrl", "x":1, "y":3, "matrix": [3, 1]}, + {"label":"Alt", "x":2, "y":3, "matrix": [3, 2]}, + {"label":"Super", "x":3, "y":3, "matrix": [3, 3]}, + {"label":"⇓", "x":4, "y":3, "matrix": [3, 4]}, + {"label":"", "x":5, "y":3, "matrix": [3, 5]}, + {"label":"", "x":6, "y":3, "matrix": [3, 6]}, + {"label":"⇑", "x":7, "y":3, "matrix": [3, 7]}, + {"label":"←", "x":8, "y":3, "matrix": [3, 8]}, + {"label":"↓", "x":9, "y":3, "matrix": [3, 9]}, + {"label":"↑", "x":10, "y":3, "matrix": [3, 10]}, + {"label":"→", "x":11, "y":3, "matrix": [3, 11]}] } } } diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index 2bf4110ee6..04290b7ca9 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -144,7 +144,6 @@ {"label": ".", "matrix": [5, 17], "x": 17.5, "y": 5.25} ] }, - "LAYOUT_ansi": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -253,7 +252,6 @@ { "label": ".", "matrix": [5, 17], "x": 17.5, "y": 5.25 } ] }, - "LAYOUT_ansi_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -363,7 +361,6 @@ { "label": ".", "matrix": [5, 17], "x": 17.5, "y": 5.25 } ] }, - "LAYOUT_iso": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -473,7 +470,6 @@ { "label": ".", "matrix": [5, 17], "x": 17.5, "y": 5.25 } ] }, - "LAYOUT_iso_split_bs": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/cannonkeys/ripple_hs/info.json b/keyboards/cannonkeys/ripple_hs/info.json index 01a0441029..502e8db4a9 100644 --- a/keyboards/cannonkeys/ripple_hs/info.json +++ b/keyboards/cannonkeys/ripple_hs/info.json @@ -28,7 +28,7 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", - "community_layouts": [ "tkl_f13_ansi_tsangan" ], + "community_layouts": ["tkl_f13_ansi_tsangan"], "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json index 29cf8c7e72..3259baaca9 100644 --- a/keyboards/cannonkeys/serenity/info.json +++ b/keyboards/cannonkeys/serenity/info.json @@ -164,7 +164,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -262,7 +261,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -362,7 +360,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -461,7 +458,6 @@ {"label": "\u2192", "matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_f13_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/info.json index b80474f46e..b52b484184 100644 --- a/keyboards/cannonkeys/typeb/info.json +++ b/keyboards/cannonkeys/typeb/info.json @@ -94,4 +94,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/info.json index b9517131d5..09fd5b601f 100644 --- a/keyboards/cannonkeys/vector/info.json +++ b/keyboards/cannonkeys/vector/info.json @@ -106,7 +106,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -175,7 +174,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -246,7 +244,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_iso_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -316,7 +313,6 @@ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index 66860a95c3..c7d6660f13 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "CU24", + "keyboard_name": "CU24", "manufacturer": "Yiancar/CapsUnlocked", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json index 097ffe4d9f..8cd498e2ae 100644 --- a/keyboards/capsunlocked/cu80/v1/info.json +++ b/keyboards/capsunlocked/cu80/v1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "CU80", + "keyboard_name": "CU80", "manufacturer": "CapsUnlocked", - "url": "https://caps-unlocked.com/group-buy-cu80/", - "maintainer": "aHolland909", + "url": "https://caps-unlocked.com/group-buy-cu80/", + "maintainer": "aHolland909", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/cest73/tkm/info.json b/keyboards/cest73/tkm/info.json index b8560879f9..c460d76c96 100644 --- a/keyboards/cest73/tkm/info.json +++ b/keyboards/cest73/tkm/info.json @@ -161,7 +161,6 @@ {"label": "\u2192", "matrix": [7, 9], "x": 19.75, "y": 5.75} ] }, - "LAYOUT_ansi_split_bs": { "layout": [ { "label": "Fn", "matrix": [0, 0], "x": 0, "y": 0 }, @@ -279,7 +278,6 @@ { "label": "\u2192", "matrix": [7, 9], "x": 19.75, "y": 5.75 } ] }, - "LAYOUT_iso_split_bs": { "layout": [ { "label": "Fn", "matrix": [0, 0], "x": 0, "y": 0 }, diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json index d05533773a..12d28b1418 100644 --- a/keyboards/charue/charon/info.json +++ b/keyboards/charue/charon/info.json @@ -97,7 +97,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_ansi_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -171,7 +170,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_ansi_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -246,7 +244,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -321,7 +318,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_iso_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json index c4d9d0380e..502609402f 100644 --- a/keyboards/charue/sunsetter_r2/info.json +++ b/keyboards/charue/sunsetter_r2/info.json @@ -116,7 +116,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, @@ -207,7 +206,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_ansi_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, @@ -299,7 +297,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_iso": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, @@ -393,7 +390,6 @@ {"label": "\u2192", "matrix": [4, 15], "x": 17.25, "y": 4} ] }, - "LAYOUT_iso_split_bs": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/chavdai40/info.json b/keyboards/chavdai40/info.json index 081f7fc50e..503f0bdbbd 100644 --- a/keyboards/chavdai40/info.json +++ b/keyboards/chavdai40/info.json @@ -1,7 +1,7 @@ { "manufacturer": "t-miyajima", - "url": "https://github.com/dvorak55/chavdai40", - "maintainer": "t-miyajima", + "url": "https://github.com/dvorak55/chavdai40", + "maintainer": "t-miyajima", "usb": { "vid": "0x16D0", "pid": "0x0F95" diff --git a/keyboards/checkerboards/axon40/info.json b/keyboards/checkerboards/axon40/info.json index 88946e5323..6b47a8f679 100644 --- a/keyboards/checkerboards/axon40/info.json +++ b/keyboards/checkerboards/axon40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Axon40", + "keyboard_name": "Axon40", "manufacturer": "Nasp", - "url": "", - "maintainer": "nasp", + "url": "", + "maintainer": "nasp", "usb": { "vid": "0x7070", "pid": "0x1119", diff --git a/keyboards/checkerboards/g_idb60/info.json b/keyboards/checkerboards/g_idb60/info.json index 49c8d449c2..0bb9854f96 100644 --- a/keyboards/checkerboards/g_idb60/info.json +++ b/keyboards/checkerboards/g_idb60/info.json @@ -91,7 +91,6 @@ {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_tsangan_hhkb": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 1e77fae0e8..5bd7c644cf 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -184,4 +184,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/checkerboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json index 538abd8959..30d8df7edb 100644 --- a/keyboards/checkerboards/plexus75/info.json +++ b/keyboards/checkerboards/plexus75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Plexus75", + "keyboard_name": "Plexus75", "manufacturer": "Nasp", - "url": "", - "maintainer": "npspears", + "url": "", + "maintainer": "npspears", "usb": { "vid": "0x7070", "pid": "0x5338", diff --git a/keyboards/checkerboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json index c0accc8490..0f4394b87f 100644 --- a/keyboards/checkerboards/pursuit40/info.json +++ b/keyboards/checkerboards/pursuit40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Pursuit40", + "keyboard_name": "Pursuit40", "manufacturer": "Nasp", - "url": "https://panc.co/store/ols/products/panc40-keyboard", - "maintainer": "nasp", + "url": "https://panc.co/store/ols/products/panc40-keyboard", + "maintainer": "nasp", "usb": { "vid": "0x7070", "pid": "0x1620", diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json index fd8755121c..1b2fadd2a9 100644 --- a/keyboards/cherrybstudio/cb1800/info.json +++ b/keyboards/cherrybstudio/cb1800/info.json @@ -156,7 +156,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_ansi_split_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -285,7 +284,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_ansi_split_bs_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -415,7 +413,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_ansi_wkl_split_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -541,7 +538,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_ansi_wkl_split_bs_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -668,7 +664,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_iso_split_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -798,7 +793,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_iso_split_bs_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -929,7 +923,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_iso_wkl_split_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -1056,7 +1049,6 @@ {"label": "Enter", "matrix": [9, 8], "x": 18.5, "y": 6} ] }, - "LAYOUT_1800_f13_iso_wkl_split_bs_numenter": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json index ed76321c19..37038b214f 100644 --- a/keyboards/cherrybstudio/cb65/info.json +++ b/keyboards/cherrybstudio/cb65/info.json @@ -113,7 +113,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -190,7 +189,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -268,7 +266,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -344,7 +341,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -421,7 +417,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -499,7 +494,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -578,7 +572,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -655,7 +648,6 @@ {"label": "\u2192", "matrix": [8, 5], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker_tsangan_split_bs": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index d2af5bb20e..93eed31524 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -142,7 +142,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -249,7 +248,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -358,7 +356,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -464,7 +461,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -572,7 +568,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -680,7 +675,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -790,7 +784,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_iso_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -897,7 +890,6 @@ {"label": "\u2192", "matrix": [9, 0], "x": 17.25, "y": 5.5} ] }, - "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json index 6bfdf7ce91..8c35532c32 100644 --- a/keyboards/cherrybstudio/cb87v2/info.json +++ b/keyboards/cherrybstudio/cb87v2/info.json @@ -147,7 +147,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -252,7 +251,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_ansi_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -359,7 +357,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_ansi_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -463,7 +460,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -569,7 +565,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -675,7 +670,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_iso_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -783,7 +777,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_iso_tsangan": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -888,7 +881,6 @@ {"label": "\u2192", "matrix": [9, 2], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json index ed5f45a97b..e6f4333133 100644 --- a/keyboards/chromatonemini/info.json +++ b/keyboards/chromatonemini/info.json @@ -25,8 +25,8 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": [ "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6" ], - "rows": [ "E6", "D7", "C6", "D4", "D0", "D1" ] + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["E6", "D7", "C6", "D4", "D0", "D1"] }, "usb": { "vid": "0xFEED", diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json index 069c6f43ba..85a5f81c2b 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/info.json @@ -18,7 +18,7 @@ "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, - "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs" ], + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index 512b4ba960..749091f43b 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -9,16 +9,13 @@ "pid": "0x6374", "device_version": "0.0.1" }, - "matrix_pins": { - "rows": - ["B10","B1", "B0","A7","A6"], - "cols": - ["B12","B14","B15","A8","B13","B3","B4","B5","A1","A2","A0","A3","A4","A5","B11"] + "rows": + ["B10", "B1", "B0", "A7", "A6"], + "cols": + ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"] }, - "diode_direction": "COL2ROW", - "features": { "bootmagic": true, "mousekey": true, diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json index bd4f6c5958..66b4b484e2 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/info.json @@ -17,10 +17,10 @@ }, "features": { "mousekey": true, - "extrakey": true, - "console": true, - "command": true, - "audio": true + "extrakey": true, + "console": true, + "command": true, + "audio": true }, "usb": {"pid": "0x23B0"}, "layouts": { diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json index 78aefb1dbf..512d9063ce 100644 --- a/keyboards/contra/info.json +++ b/keyboards/contra/info.json @@ -78,7 +78,6 @@ {"label":"→", "matrix": [3, 11], "x":11, "y":3} ] }, - "LAYOUT_planck_mit": { "layout": [ {"label":"Tab", "matrix": [0, 0], "x":0, "y":0}, diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json index 9bfb402fab..c9884953c6 100644 --- a/keyboards/controllerworks/mini36/info.json +++ b/keyboards/controllerworks/mini36/info.json @@ -4,7 +4,7 @@ "maintainer": "controller-works", "processor": "RP2040", "url": "https://controller.works/products/mini36-low-profile-ergonomic-keyboard", - "tags": ["split", "RP2040", "choc v1", "choc spaced" ], + "tags": ["split", "RP2040", "choc v1", "choc spaced"], "usb": { "device_version": "1.0.0", "pid": "0x0004", @@ -17,10 +17,10 @@ }, "matrix_pins": { "direct": [ - ["GP3", "GP4", "GP5", "GP6", "GP7"], - ["GP9", "GP10", "GP11", "GP12", "GP13"], + ["GP3", "GP4", "GP5", "GP6", "GP7"], + ["GP9", "GP10", "GP11", "GP12", "GP13"], ["GP15", "GP16", "GP17", "GP18", "GP19"], - ["GP20", "GP21", "GP22", null, null] + ["GP20", "GP21", "GP22", null, null] ] }, "ws2812": { @@ -32,10 +32,10 @@ "matrix_pins": { "right": { "direct": [ - ["GP7", "GP6", "GP5", "GP4", "GP3"], - ["GP13", "GP12", "GP11", "GP10", "GP9"], + ["GP7", "GP6", "GP5", "GP4", "GP3"], + ["GP13", "GP12", "GP11", "GP10", "GP9"], ["GP19", "GP18", "GP17", "GP16", "GP15"], - ["GP22", "GP21", "GP20", null, null] + ["GP22", "GP21", "GP20", null, null] ] } }, @@ -54,7 +54,6 @@ "rgb_matrix": true, "oled": true }, - "rgb_matrix": { "driver": "WS2812", "layout": [ @@ -64,51 +63,50 @@ { "flags": 2, "x": 16, "y": 51 }, { "flags": 2, "x": 63, "y": 58 }, { "flags": 2, "x": 94, "y": 55 }, - { "flags": 1, "matrix": [3, 2], "x": 90, "y": 64 }, - { "flags": 4, "matrix": [2, 4], "x": 79, "y": 39 }, - { "flags": 4, "matrix": [1, 4], "x": 79, "y": 22 }, - { "flags": 4, "matrix": [0, 4], "x": 79, "y": 5 }, - { "flags": 4, "matrix": [0, 3], "x": 61, "y": 2 }, - { "flags": 4, "matrix": [1, 3], "x": 61, "y": 19 }, - { "flags": 4, "matrix": [2, 3], "x": 61, "y": 37 }, - { "flags": 1, "matrix": [3, 1], "x": 74, "y": 58 }, - { "flags": 1, "matrix": [3, 0], "x": 53, "y": 55 }, - { "flags": 4, "matrix": [2, 2], "x": 43, "y": 34 }, - { "flags": 4, "matrix": [1, 2], "x": 43, "y": 17 }, - { "flags": 4, "matrix": [0, 2], "x": 43, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 25, "y": 2 }, - { "flags": 4, "matrix": [1, 1], "x": 25, "y": 19 }, - { "flags": 4, "matrix": [2, 1], "x": 25, "y": 37 }, - { "flags": 4, "matrix": [2, 0], "x": 7, "y": 41 }, - { "flags": 4, "matrix": [1, 0], "x": 7, "y": 24 }, - { "flags": 4, "matrix": [0, 0], "x": 7, "y": 7 }, + { "flags": 1, "matrix": [3, 2], "x": 90, "y": 64 }, + { "flags": 4, "matrix": [2, 4], "x": 79, "y": 39 }, + { "flags": 4, "matrix": [1, 4], "x": 79, "y": 22 }, + { "flags": 4, "matrix": [0, 4], "x": 79, "y": 5 }, + { "flags": 4, "matrix": [0, 3], "x": 61, "y": 2 }, + { "flags": 4, "matrix": [1, 3], "x": 61, "y": 19 }, + { "flags": 4, "matrix": [2, 3], "x": 61, "y": 37 }, + { "flags": 1, "matrix": [3, 1], "x": 74, "y": 58 }, + { "flags": 1, "matrix": [3, 0], "x": 53, "y": 55 }, + { "flags": 4, "matrix": [2, 2], "x": 43, "y": 34 }, + { "flags": 4, "matrix": [1, 2], "x": 43, "y": 17 }, + { "flags": 4, "matrix": [0, 2], "x": 43, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 25, "y": 2 }, + { "flags": 4, "matrix": [1, 1], "x": 25, "y": 19 }, + { "flags": 4, "matrix": [2, 1], "x": 25, "y": 37 }, + { "flags": 4, "matrix": [2, 0], "x": 7, "y": 41 }, + { "flags": 4, "matrix": [1, 0], "x": 7, "y": 24 }, + { "flags": 4, "matrix": [0, 0], "x": 7, "y": 7 }, { "flags": 2, "x": 153, "y": 4 }, { "flags": 2, "x": 192, "y": 2 }, { "flags": 2, "x": 224, "y": 24 }, { "flags": 2, "x": 204, "y": 53 }, { "flags": 2, "x": 161, "y": 57 }, { "flags": 2, "x": 130, "y": 55 }, - { "flags": 1, "matrix": [7, 0], "x": 134, "y": 64 }, - { "flags": 4, "matrix": [6, 0], "x": 145, "y": 39 }, - { "flags": 4, "matrix": [5, 0], "x": 145, "y": 22 }, - { "flags": 4, "matrix": [4, 0], "x": 145, "y": 5 }, - { "flags": 4, "matrix": [4, 1], "x": 163, "y": 2 }, - { "flags": 4, "matrix": [5, 1], "x": 163, "y": 19 }, - { "flags": 4, "matrix": [6, 1], "x": 163, "y": 37 }, - { "flags": 1, "matrix": [7, 1], "x": 150, "y": 58 }, - { "flags": 1, "matrix": [7, 2], "x": 171, "y": 55 }, - { "flags": 4, "matrix": [6, 2], "x": 181, "y": 34 }, - { "flags": 4, "matrix": [5, 2], "x": 181, "y": 17 }, - { "flags": 4, "matrix": [4, 2], "x": 181, "y": 0 }, - { "flags": 4, "matrix": [4, 3], "x": 199, "y": 2 }, - { "flags": 4, "matrix": [5, 3], "x": 199, "y": 19 }, - { "flags": 4, "matrix": [6, 3], "x": 199, "y": 37 }, - { "flags": 4, "matrix": [6, 4], "x": 217, "y": 41 }, - { "flags": 4, "matrix": [5, 4], "x": 217, "y": 24 }, - { "flags": 4, "matrix": [4, 4], "x": 217, "y": 7 } + { "flags": 1, "matrix": [7, 0], "x": 134, "y": 64 }, + { "flags": 4, "matrix": [6, 0], "x": 145, "y": 39 }, + { "flags": 4, "matrix": [5, 0], "x": 145, "y": 22 }, + { "flags": 4, "matrix": [4, 0], "x": 145, "y": 5 }, + { "flags": 4, "matrix": [4, 1], "x": 163, "y": 2 }, + { "flags": 4, "matrix": [5, 1], "x": 163, "y": 19 }, + { "flags": 4, "matrix": [6, 1], "x": 163, "y": 37 }, + { "flags": 1, "matrix": [7, 1], "x": 150, "y": 58 }, + { "flags": 1, "matrix": [7, 2], "x": 171, "y": 55 }, + { "flags": 4, "matrix": [6, 2], "x": 181, "y": 34 }, + { "flags": 4, "matrix": [5, 2], "x": 181, "y": 17 }, + { "flags": 4, "matrix": [4, 2], "x": 181, "y": 0 }, + { "flags": 4, "matrix": [4, 3], "x": 199, "y": 2 }, + { "flags": 4, "matrix": [5, 3], "x": 199, "y": 19 }, + { "flags": 4, "matrix": [6, 3], "x": 199, "y": 37 }, + { "flags": 4, "matrix": [6, 4], "x": 217, "y": 41 }, + { "flags": 4, "matrix": [5, 4], "x": 217, "y": 24 }, + { "flags": 4, "matrix": [4, 4], "x": 217, "y": 7 } ] }, - "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json index c6e0f12aed..0d85d35f29 100644 --- a/keyboards/controllerworks/mini42/info.json +++ b/keyboards/controllerworks/mini42/info.json @@ -4,7 +4,7 @@ "maintainer": "controller-works", "processor": "RP2040", "url": "https://controller.works/products/mini42-low-profile-ergonomic-keyboard", - "tags": ["split", "RP2040", "choc v1", "choc spaced" ], + "tags": ["split", "RP2040", "choc v1", "choc spaced"], "usb": { "device_version": "1.0.0", "pid": "0x0003", @@ -17,7 +17,7 @@ }, "matrix_pins": { "direct": [ - ["GP2", "GP3", "GP4","GP5", "GP6", "GP7"], + ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"], ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13"], ["GP14", "GP15", "GP16", "GP17", "GP18", "GP19"], ["GP20", "GP21", "GP22", null, null, null] @@ -33,10 +33,10 @@ "matrix_pins": { "right": { "direct": [ - ["GP7", "GP6", "GP5","GP4", "GP3", "GP2"], + ["GP7", "GP6", "GP5", "GP4", "GP3", "GP2"], ["GP13", "GP12", "GP11", "GP10", "GP9", "GP8"], ["GP19", "GP18", "GP17", "GP16", "GP15", "GP14"], - ["GP22", "GP21", "GP20", null, null, null] + ["GP22", "GP21", "GP20", null, null, null] ] } }, @@ -65,54 +65,54 @@ { "flags": 2, "x": 8, "y": 43 }, { "flags": 2, "x": 49, "y": 51 }, { "flags": 2, "x": 95, "y": 55 }, - { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 }, - { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 }, - { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 }, - { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, - { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 }, - { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 }, - { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 }, - { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 }, - { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 }, - { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 }, - { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 }, - { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 }, - { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 }, - { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 }, - { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 }, - { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 }, - { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 }, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 }, - { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 }, - { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 }, + { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 }, + { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 }, + { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 }, + { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, + { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 }, + { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 }, + { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 }, + { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 }, + { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 }, + { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 }, + { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 }, + { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 }, + { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 }, + { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 }, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 }, + { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 }, + { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 }, + { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 }, { "flags": 2, "x": 149, "y": 4 }, { "flags": 2, "x": 184, "y": 2 }, { "flags": 2, "x": 216, "y": 8 }, { "flags": 2, "x": 216, "y": 43 }, { "flags": 2, "x": 175, "y": 51 }, { "flags": 2, "x": 129, "y": 55 }, - { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 }, - { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 }, - { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 }, - { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 }, - { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 }, - { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 }, - { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 }, - { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 }, - { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 }, - { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 }, - { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 }, - { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 }, - { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 }, - { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 }, - { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 }, - { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 }, - { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 }, - { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 }, - { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 }, - { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 }, - { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 } + { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 }, + { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 }, + { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 }, + { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 }, + { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 }, + { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 }, + { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 }, + { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 }, + { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 }, + { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 }, + { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 }, + { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 }, + { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 }, + { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 }, + { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 }, + { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 }, + { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 }, + { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 }, + { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 }, + { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 }, + { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 } ] }, "community_layouts": ["split_3x6_3"], diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index ab269afe97..6f11b01e5c 100644 --- a/keyboards/converter/a1200/info.json +++ b/keyboards/converter/a1200/info.json @@ -1,5 +1,5 @@ { - "maintainer": "8bits4ever", + "maintainer": "8bits4ever", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index cfbc3a51c4..c59df57e81 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "IBM Model M 101/102", "manufacturer": "iw0rm3r", - "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", - "maintainer": "iw0rm3r", + "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", + "maintainer": "iw0rm3r", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index f5558dcfff..86dc44de0e 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "IBM Model M 101/102", "manufacturer": "wangfuco", - "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", - "maintainer": "wangfuco", + "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", + "maintainer": "wangfuco", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index a6a81507ec..abec316be7 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Numeric Keypad IIe", + "keyboard_name": "Numeric Keypad IIe", "manufacturer": "Apple Inc.", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/copenhagen_click/click_pad_v1/info.json b/keyboards/copenhagen_click/click_pad_v1/info.json index 213425abc0..9eee0f4fec 100755 --- a/keyboards/copenhagen_click/click_pad_v1/info.json +++ b/keyboards/copenhagen_click/click_pad_v1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Click Pad V1", + "keyboard_name": "Click Pad V1", "manufacturer": "Copenhagen Click", - "url": "http://copenhagenclick.com/ClickPad-V1/", - "maintainer": "mini-ninja-64", + "url": "http://copenhagenclick.com/ClickPad-V1/", + "maintainer": "mini-ninja-64", "usb": { "vid": "0xFEED", "pid": "0x27DB", diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json index 9ce76c840a..6950e4d17c 100644 --- a/keyboards/coseyfannitutti/discipad/info.json +++ b/keyboards/coseyfannitutti/discipad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "DISCIPAD", + "keyboard_name": "DISCIPAD", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/discipad", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/discipad", + "maintainer": "coseyfannitutti", "usb": { "vid": "0x6B62", "pid": "0x1769", diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index f28e0cd4d8..82da2f800f 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "DISCIPLINE", + "keyboard_name": "DISCIPLINE", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/discipline", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/discipline", + "maintainer": "coseyfannitutti", "usb": { "vid": "0x6B62", "pid": "0x6869", diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json index c97d1815e2..695d0729c1 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "mullet", + "keyboard_name": "mullet", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/mullet", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/mullet", + "maintainer": "coseyfannitutti", "usb": { "vid": "0xFEED", "pid": "0x6969", diff --git a/keyboards/coseyfannitutti/mulletpad/info.json b/keyboards/coseyfannitutti/mulletpad/info.json index 454e2d2bec..7de583e8a9 100644 --- a/keyboards/coseyfannitutti/mulletpad/info.json +++ b/keyboards/coseyfannitutti/mulletpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "mulletpad", + "keyboard_name": "mulletpad", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/mulletpad", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/mulletpad", + "maintainer": "coseyfannitutti", "usb": { "vid": "0xFEED", "pid": "0x6666", diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json index 74813fc232..ff6e2de22b 100644 --- a/keyboards/coseyfannitutti/mysterium/info.json +++ b/keyboards/coseyfannitutti/mysterium/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MYSTERIUM", + "keyboard_name": "MYSTERIUM", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/mysterium", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/mysterium", + "maintainer": "coseyfannitutti", "usb": { "vid": "0x6B62", "pid": "0x8769", diff --git a/keyboards/coseyfannitutti/romeo/info.json b/keyboards/coseyfannitutti/romeo/info.json index 29a6cc52d8..54559abad6 100644 --- a/keyboards/coseyfannitutti/romeo/info.json +++ b/keyboards/coseyfannitutti/romeo/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ROMEO", + "keyboard_name": "ROMEO", "manufacturer": "coseyfannitutti", - "url": "https://github.com/coseyfannitutti/romeo", - "maintainer": "coseyfannitutti", + "url": "https://github.com/coseyfannitutti/romeo", + "maintainer": "coseyfannitutti", "usb": { "vid": "0x6B62", "pid": "0x4069", diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index 752b389d90..e227792440 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -20,7 +20,7 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": [ "ortho_4x12", "planck_mit" ], + "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT_crbn_1x2u": "LAYOUT_planck_mit", "LAYOUT_crbn_2x2u": "LAYOUT_2x2u" diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index 664a69e22e..0a967d11d6 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -15,8 +15,8 @@ }, "diode_direction": "COL2ROW", "indicators": { - "caps_lock": "B6", - "num_lock": "B5" + "caps_lock": "B6", + "num_lock": "B5" }, "processor": "atmega32a", "bootloader": "usbasploader", @@ -257,4 +257,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 867423ba64..b703dac44f 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -26,7 +26,6 @@ "matrix_pins": { "cols": ["F1", "F4", "E6", "B1", "B7", "B0", "E2", "D4", "D6", "D7", "B4", "B3", "B6", "C6"], "rows": ["D3", "D2", "F7", "F6", "F5", "F0"] - }, "rgblight": { "led_count": 48, diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index 11ac7db8d0..2b0b245b45 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Genesis Rev1", + "keyboard_name": "Genesis Rev1", "manufacturer": "customMK", - "url": "https://www.customMK.com", - "maintainer": "customMK", + "url": "https://www.customMK.com", + "maintainer": "customMK", "usb": { "vid": "0xF35B", "pid": "0xFAB0", @@ -78,6 +78,5 @@ {"matrix": [4, 3], "x": 2, "y": 4} ] } - } } diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index f084e6411f..079e37fdb0 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Genesis Rev2", + "keyboard_name": "Genesis Rev2", "manufacturer": "customMK", - "url": "https://www.customMK.com", - "maintainer": "customMK", + "url": "https://www.customMK.com", + "maintainer": "customMK", "usb": { "vid": "0xF35B", "pid": "0xFAB1", diff --git a/keyboards/cx60/info.json b/keyboards/cx60/info.json index 557542f329..89da7fa8b3 100644 --- a/keyboards/cx60/info.json +++ b/keyboards/cx60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "CX60", + "keyboard_name": "CX60", "manufacturer": "CX60", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4358", "pid": "0x3630", diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json index 752fc8c3d1..1da7fbec92 100644 --- a/keyboards/delikeeb/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/info.json @@ -88,5 +88,4 @@ ] } } - } diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json index 3a6d6af13b..e058d41b38 100644 --- a/keyboards/demiurge/info.json +++ b/keyboards/demiurge/info.json @@ -105,7 +105,6 @@ {"label": "Ctrl", "matrix": [4, 16], "x": 16, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_xt_tsangan_hhkb": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 7257ebabb8..c78e814505 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -58,5 +58,4 @@ ] } } - } diff --git a/keyboards/dmqdesign/spin/info.json b/keyboards/dmqdesign/spin/info.json index 7fbcf0db3a..52fc9f40ea 100644 --- a/keyboards/dmqdesign/spin/info.json +++ b/keyboards/dmqdesign/spin/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "SPIN", + "keyboard_name": "SPIN", "manufacturer": "DMQ Design", - "url": "https://www.DMQdesign.com", - "maintainer": "Quarren42", + "url": "https://www.DMQdesign.com", + "maintainer": "Quarren42", "usb": { "vid": "0xA455", "pid": "0x0001", diff --git a/keyboards/do60/info.json b/keyboards/do60/info.json index abc8258c82..9267a98141 100644 --- a/keyboards/do60/info.json +++ b/keyboards/do60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Do60", + "keyboard_name": "Do60", "manufacturer": "Doyu Studio", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4453", "pid": "0x6060", diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index 352702f814..9a468931b4 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -2,7 +2,7 @@ "manufacturer": "Doio", "keyboard_name": "doio/kb38", "maintainer": "PepperKats", - "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen", + "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { @@ -46,7 +46,7 @@ {"flags": 4, "matrix": [0, 5], "x":174.2, "y":0}, {"flags": 4, "matrix": [0, 6], "x":199.1, "y":0}, {"flags": 4, "matrix": [0, 7], "x":224, "y":0}, - + {"flags": 4, "matrix": [1, 0], "x":0, "y":12.8}, {"flags": 4, "matrix": [1, 1], "x":24.9, "y":12.8}, {"flags": 4, "matrix": [1, 2], "x":49.8, "y":12.8}, @@ -142,4 +142,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/donutcables/budget96/info.json b/keyboards/donutcables/budget96/info.json index 59bcf41c42..98c878d12f 100644 --- a/keyboards/donutcables/budget96/info.json +++ b/keyboards/donutcables/budget96/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Budget96", + "keyboard_name": "Budget96", "manufacturer": "DonutCables", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4443", "pid": "0xB960", diff --git a/keyboards/donutcables/scrabblepad/info.json b/keyboards/donutcables/scrabblepad/info.json index 8642865cd9..fb9b6f3a1d 100644 --- a/keyboards/donutcables/scrabblepad/info.json +++ b/keyboards/donutcables/scrabblepad/info.json @@ -33,7 +33,7 @@ {"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": 0, "y": 1}, {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1}, @@ -49,7 +49,7 @@ {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1}, {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1}, {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1}, - + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2}, @@ -65,7 +65,7 @@ {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2}, {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2}, {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2}, - + {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3}, @@ -81,7 +81,7 @@ {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3}, {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3}, {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3}, - + {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4}, {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4}, {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4}, @@ -97,7 +97,7 @@ {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4}, {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4}, {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4}, - + {"label": "k50", "matrix": [5, 0], "x": 0, "y": 5}, {"label": "k51", "matrix": [5, 1], "x": 1, "y": 5}, {"label": "k52", "matrix": [5, 2], "x": 2, "y": 5}, @@ -113,7 +113,7 @@ {"label": "k5C", "matrix": [5, 12], "x": 12, "y": 5}, {"label": "k5D", "matrix": [5, 13], "x": 13, "y": 5}, {"label": "k5E", "matrix": [5, 14], "x": 14, "y": 5}, - + {"label": "k60", "matrix": [6, 0], "x": 0, "y": 6}, {"label": "k61", "matrix": [6, 1], "x": 1, "y": 6}, {"label": "k62", "matrix": [6, 2], "x": 2, "y": 6}, @@ -129,7 +129,7 @@ {"label": "k6C", "matrix": [6, 12], "x": 12, "y": 6}, {"label": "k6D", "matrix": [6, 13], "x": 13, "y": 6}, {"label": "k6E", "matrix": [6, 14], "x": 14, "y": 6}, - + {"label": "k70", "matrix": [7, 0], "x": 0, "y": 7}, {"label": "k71", "matrix": [7, 1], "x": 1, "y": 7}, {"label": "k72", "matrix": [7, 2], "x": 2, "y": 7}, @@ -145,7 +145,7 @@ {"label": "k7C", "matrix": [7, 12], "x": 12, "y": 7}, {"label": "k7D", "matrix": [7, 13], "x": 13, "y": 7}, {"label": "k7E", "matrix": [7, 14], "x": 14, "y": 7}, - + {"label": "k80", "matrix": [8, 0], "x": 0, "y": 8}, {"label": "k81", "matrix": [8, 1], "x": 1, "y": 8}, {"label": "k82", "matrix": [8, 2], "x": 2, "y": 8}, @@ -161,7 +161,7 @@ {"label": "k8C", "matrix": [8, 12], "x": 12, "y": 8}, {"label": "k8D", "matrix": [8, 13], "x": 13, "y": 8}, {"label": "k8E", "matrix": [8, 14], "x": 14, "y": 8}, - + {"label": "k90", "matrix": [9, 0], "x": 0, "y": 9}, {"label": "k91", "matrix": [9, 1], "x": 1, "y": 9}, {"label": "k92", "matrix": [9, 2], "x": 2, "y": 9}, @@ -177,7 +177,7 @@ {"label": "k9C", "matrix": [9, 12], "x": 12, "y": 9}, {"label": "k9D", "matrix": [9, 13], "x": 13, "y": 9}, {"label": "k9E", "matrix": [9, 14], "x": 14, "y": 9}, - + {"label": "kA0", "matrix": [10, 0], "x": 0, "y": 10}, {"label": "kA1", "matrix": [10, 1], "x": 1, "y": 10}, {"label": "kA2", "matrix": [10, 2], "x": 2, "y": 10}, @@ -193,7 +193,7 @@ {"label": "kAC", "matrix": [10, 12], "x": 12, "y": 10}, {"label": "kAD", "matrix": [10, 13], "x": 13, "y": 10}, {"label": "kAE", "matrix": [10, 14], "x": 14, "y": 10}, - + {"label": "kB0", "matrix": [11, 0], "x": 0, "y": 11}, {"label": "kB1", "matrix": [11, 1], "x": 1, "y": 11}, {"label": "kB2", "matrix": [11, 2], "x": 2, "y": 11}, @@ -209,7 +209,7 @@ {"label": "kBC", "matrix": [11, 12], "x": 12, "y": 11}, {"label": "kBD", "matrix": [11, 13], "x": 13, "y": 11}, {"label": "kBE", "matrix": [11, 14], "x": 14, "y": 11}, - + {"label": "kC0", "matrix": [12, 0], "x": 0, "y": 12}, {"label": "kC1", "matrix": [12, 1], "x": 1, "y": 12}, {"label": "kC2", "matrix": [12, 2], "x": 2, "y": 12}, @@ -225,7 +225,7 @@ {"label": "kCC", "matrix": [12, 12], "x": 12, "y": 12}, {"label": "kCD", "matrix": [12, 13], "x": 13, "y": 12}, {"label": "kCE", "matrix": [12, 14], "x": 14, "y": 12}, - + {"label": "kD0", "matrix": [13, 0], "x": 0, "y": 13}, {"label": "kD1", "matrix": [13, 1], "x": 1, "y": 13}, {"label": "kD2", "matrix": [13, 2], "x": 2, "y": 13}, @@ -241,7 +241,7 @@ {"label": "kDC", "matrix": [13, 12], "x": 12, "y": 13}, {"label": "kDD", "matrix": [13, 13], "x": 13, "y": 13}, {"label": "kDE", "matrix": [13, 14], "x": 14, "y": 13}, - + {"label": "kE0", "matrix": [14, 0], "x": 0, "y": 14}, {"label": "kE1", "matrix": [14, 1], "x": 1, "y": 14}, {"label": "kE2", "matrix": [14, 2], "x": 2, "y": 14}, diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index a13225c1ca..83a3e68be7 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Doppelganger", + "keyboard_name": "Doppelganger", "manufacturer": "Yiancar-Designs", - "url": "", - "maintainer": "yiancar", + "url": "", + "maintainer": "yiancar", "usb": { "vid": "0x8968", "pid": "0x4447", diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json index c9dd368f4f..5149dd897f 100644 --- a/keyboards/dotmod/dymium65/info.json +++ b/keyboards/dotmod/dymium65/info.json @@ -11,19 +11,19 @@ }, "diode_direction": "ROW2COL", "matrix_pins": { - "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "C6", "B4", "B5", "B6","E2"], - "rows": ["F7", "F6", "F5", "F4", "F1","F0"] + "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "C6", "B4", "B5", "B6", "E2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "features": { - "bootmagic": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "mousekey": true, - "rgb_matrix": true + "bootmagic": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "mousekey": true, + "rgb_matrix": true }, "build": { "lto": true @@ -60,76 +60,76 @@ "solid_reactive_nexus": true, "splash": true } - }, + }, "layouts": { "LAYOUT": { "layout": [ - {"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": [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], "w": 2, "x": 13, "y": 0}, {"matrix": [4, 15], "x": 16, "y": 0}, - {"matrix": [2, 0 ], "w": 1.5, "x": 0, "y": 1}, - {"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, 0], "w": 1.5, "x": 0, "y": 1}, + {"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], "w": 1.5, "x": 13.5, "y": 1}, {"matrix": [3, 14], "x": 16, "y": 1}, - {"matrix": [3, 0 ], "w": 1.75, "x": 0, "y": 2}, - {"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, 0], "w": 1.75, "x": 0, "y": 2}, + {"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, 13], "w": 2.25, "x": 12.75, "y": 2}, {"matrix": [3, 15], "x": 16, "y": 2}, - {"matrix": [4, 0 ], "w": 2.25, "x": 0, "y": 3}, - {"matrix": [4, 2 ], "x": 2.25, "y": 3}, - {"matrix": [4, 3 ], "x": 3.25, "y": 3}, - {"matrix": [4, 4 ], "x": 4.25, "y": 3}, - {"matrix": [4, 5 ], "x": 5.25, "y": 3}, - {"matrix": [4, 6 ], "x": 6.25, "y": 3}, - {"matrix": [4, 7 ], "x": 7.25, "y": 3}, - {"matrix": [4, 8 ], "x": 8.25, "y": 3}, - {"matrix": [4, 9 ], "x": 9.25, "y": 3}, + {"matrix": [4, 0], "w": 2.25, "x": 0, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [4, 3], "x": 3.25, "y": 3}, + {"matrix": [4, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 5], "x": 5.25, "y": 3}, + {"matrix": [4, 6], "x": 6.25, "y": 3}, + {"matrix": [4, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 8], "x": 8.25, "y": 3}, + {"matrix": [4, 9], "x": 9.25, "y": 3}, {"matrix": [4, 10], "x": 10.25, "y": 3}, {"matrix": [4, 11], "x": 11.25, "y": 3}, {"matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 3}, {"matrix": [4, 14], "x": 15.25, "y": 3}, - {"matrix": [5, 0 ], "w": 1.25, "x": 0, "y": 4}, - {"matrix": [5, 1 ], "w": 1.25, "x": 1.25, "y": 4}, - {"matrix": [5, 2 ], "w": 1.25, "x": 2.5, "y": 4}, - {"matrix": [5, 6 ], "w": 6.25, "x": 3.75, "y": 4}, - {"matrix": [5, 9 ], "x": 10, "y": 4}, + {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 4}, + {"matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 4}, + {"matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 4}, + {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 4}, + {"matrix": [5, 9], "x": 10, "y": 4}, {"matrix": [5, 10], "x": 11, "y": 4}, {"matrix": [5, 12], "x": 12, "y": 4}, {"matrix": [5, 13], "x": 14.25, "y": 4}, diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json index 3f28e87826..05dba8b967 100644 --- a/keyboards/drhigsby/ogurec/info.json +++ b/keyboards/drhigsby/ogurec/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ogurec", + "keyboard_name": "ogurec", "manufacturer": "DrHigsby", - "url": "http://www.keyboard-layout-editor.com/#/gists/f1bda3a87822868599cf6e3c4340f594", - "maintainer": "drhigsby", + "url": "http://www.keyboard-layout-editor.com/#/gists/f1bda3a87822868599cf6e3c4340f594", + "maintainer": "drhigsby", "usb": { "vid": "0x0007", "pid": "0x0002", diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json index e3d55f1e6f..783a7da285 100644 --- a/keyboards/drop/sense75/info.json +++ b/keyboards/drop/sense75/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "SENSE75", + "keyboard_name": "SENSE75", "manufacturer": "Drop Inc.", "maintainer": "zvecr", "processor": "STM32F303", @@ -27,84 +27,84 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "label":"Esc", "x":0, "y":0}, - { "matrix": [0, 1], "label":"F1", "x":1.25, "y":0}, - { "matrix": [0, 2], "label":"F2", "x":2.25, "y":0}, - { "matrix": [0, 3], "label":"F3", "x":3.25, "y":0}, - { "matrix": [0, 4], "label":"F4", "x":4.25, "y":0}, - { "matrix": [0, 5], "label":"F5", "x":5.5, "y":0}, - { "matrix": [0, 6], "label":"F6", "x":6.5, "y":0}, - { "matrix": [0, 7], "label":"F7", "x":7.5, "y":0}, - { "matrix": [0, 8], "label":"F8", "x":8.5, "y":0}, - { "matrix": [0, 9], "label":"F9", "x":9.75, "y":0}, + { "matrix": [0, 0], "label":"Esc", "x":0, "y":0}, + { "matrix": [0, 1], "label":"F1", "x":1.25, "y":0}, + { "matrix": [0, 2], "label":"F2", "x":2.25, "y":0}, + { "matrix": [0, 3], "label":"F3", "x":3.25, "y":0}, + { "matrix": [0, 4], "label":"F4", "x":4.25, "y":0}, + { "matrix": [0, 5], "label":"F5", "x":5.5, "y":0}, + { "matrix": [0, 6], "label":"F6", "x":6.5, "y":0}, + { "matrix": [0, 7], "label":"F7", "x":7.5, "y":0}, + { "matrix": [0, 8], "label":"F8", "x":8.5, "y":0}, + { "matrix": [0, 9], "label":"F9", "x":9.75, "y":0}, { "matrix": [0, 10], "label":"F10", "x":10.75, "y":0}, { "matrix": [0, 11], "label":"F11", "x":11.75, "y":0}, { "matrix": [0, 12], "label":"F12", "x":12.75, "y":0}, { "matrix": [0, 13], "label":"PrtSc", "x":14, "y":0}, { "matrix": [0, 14], "label":"Mute", "x":15.25, "y":0}, - { "matrix": [1, 0], "label":"~", "x":0, "y":1.25}, - { "matrix": [1, 1], "label":"!", "x":1, "y":1.25}, - { "matrix": [1, 2], "label":"@", "x":2, "y":1.25}, - { "matrix": [1, 3], "label":"#", "x":3, "y":1.25}, - { "matrix": [1, 4], "label":"$", "x":4, "y":1.25}, - { "matrix": [1, 5], "label":"%", "x":5, "y":1.25}, - { "matrix": [1, 6], "label":"^", "x":6, "y":1.25}, - { "matrix": [1, 7], "label":"&", "x":7, "y":1.25}, - { "matrix": [1, 8], "label":"*", "x":8, "y":1.25}, - { "matrix": [1, 9], "label":"(", "x":9, "y":1.25}, + { "matrix": [1, 0], "label":"~", "x":0, "y":1.25}, + { "matrix": [1, 1], "label":"!", "x":1, "y":1.25}, + { "matrix": [1, 2], "label":"@", "x":2, "y":1.25}, + { "matrix": [1, 3], "label":"#", "x":3, "y":1.25}, + { "matrix": [1, 4], "label":"$", "x":4, "y":1.25}, + { "matrix": [1, 5], "label":"%", "x":5, "y":1.25}, + { "matrix": [1, 6], "label":"^", "x":6, "y":1.25}, + { "matrix": [1, 7], "label":"&", "x":7, "y":1.25}, + { "matrix": [1, 8], "label":"*", "x":8, "y":1.25}, + { "matrix": [1, 9], "label":"(", "x":9, "y":1.25}, { "matrix": [1, 10], "label":")", "x":10, "y":1.25}, { "matrix": [1, 11], "label":"_", "x":11, "y":1.25}, { "matrix": [1, 12], "label":"+", "x":12, "y":1.25}, { "matrix": [1, 13], "label":"Backspace", "x":13, "y":1.25, "w":2}, { "matrix": [1, 14], "label":"Del", "x":15.25, "y":1.25}, - { "matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5}, - { "matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25}, - { "matrix": [2, 2], "label":"W", "x":2.5, "y":2.25}, - { "matrix": [2, 3], "label":"E", "x":3.5, "y":2.25}, - { "matrix": [2, 4], "label":"R", "x":4.5, "y":2.25}, - { "matrix": [2, 5], "label":"T", "x":5.5, "y":2.25}, - { "matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25}, - { "matrix": [2, 7], "label":"U", "x":7.5, "y":2.25}, - { "matrix": [2, 8], "label":"I", "x":8.5, "y":2.25}, - { "matrix": [2, 9], "label":"O", "x":9.5, "y":2.25}, + { "matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5}, + { "matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25}, + { "matrix": [2, 2], "label":"W", "x":2.5, "y":2.25}, + { "matrix": [2, 3], "label":"E", "x":3.5, "y":2.25}, + { "matrix": [2, 4], "label":"R", "x":4.5, "y":2.25}, + { "matrix": [2, 5], "label":"T", "x":5.5, "y":2.25}, + { "matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25}, + { "matrix": [2, 7], "label":"U", "x":7.5, "y":2.25}, + { "matrix": [2, 8], "label":"I", "x":8.5, "y":2.25}, + { "matrix": [2, 9], "label":"O", "x":9.5, "y":2.25}, { "matrix": [2, 10], "label":"P", "x":10.5, "y":2.25}, { "matrix": [2, 11], "label":"{", "x":11.5, "y":2.25}, { "matrix": [2, 12], "label":"}", "x":12.5, "y":2.25}, { "matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5}, { "matrix": [2, 14], "label":"Page Up", "x":15.25, "y":2.25}, - { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - { "matrix": [3, 1], "label":"A", "x":1.75, "y":3.25}, - { "matrix": [3, 2], "label":"S", "x":2.75, "y":3.25}, - { "matrix": [3, 3], "label":"D", "x":3.75, "y":3.25}, - { "matrix": [3, 4], "label":"F", "x":4.75, "y":3.25}, - { "matrix": [3, 5], "label":"G", "x":5.75, "y":3.25}, - { "matrix": [3, 6], "label":"H", "x":6.75, "y":3.25}, - { "matrix": [3, 7], "label":"J", "x":7.75, "y":3.25}, - { "matrix": [3, 8], "label":"K", "x":8.75, "y":3.25}, - { "matrix": [3, 9], "label":"L", "x":9.75, "y":3.25}, + { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, + { "matrix": [3, 1], "label":"A", "x":1.75, "y":3.25}, + { "matrix": [3, 2], "label":"S", "x":2.75, "y":3.25}, + { "matrix": [3, 3], "label":"D", "x":3.75, "y":3.25}, + { "matrix": [3, 4], "label":"F", "x":4.75, "y":3.25}, + { "matrix": [3, 5], "label":"G", "x":5.75, "y":3.25}, + { "matrix": [3, 6], "label":"H", "x":6.75, "y":3.25}, + { "matrix": [3, 7], "label":"J", "x":7.75, "y":3.25}, + { "matrix": [3, 8], "label":"K", "x":8.75, "y":3.25}, + { "matrix": [3, 9], "label":"L", "x":9.75, "y":3.25}, { "matrix": [3, 10], "label":":", "x":10.75, "y":3.25}, { "matrix": [3, 11], "label":"\"", "x":11.75, "y":3.25}, { "matrix": [3, 12], "label":"Enter", "x":12.75, "y":3.25, "w":2.25}, { "matrix": [3, 14], "label":"Page Down", "x":15.25, "y":3.25}, - { "matrix": [4, 0], "label":"Shift", "x":0, "y":4.25, "w":2.25}, - { "matrix": [4, 1], "label":"Z", "x":2.25, "y":4.25}, - { "matrix": [4, 2], "label":"X", "x":3.25, "y":4.25}, - { "matrix": [4, 3], "label":"C", "x":4.25, "y":4.25}, - { "matrix": [4, 4], "label":"V", "x":5.25, "y":4.25}, - { "matrix": [4, 5], "label":"B", "x":6.25, "y":4.25}, - { "matrix": [4, 6], "label":"N", "x":7.25, "y":4.25}, - { "matrix": [4, 7], "label":"M", "x":8.25, "y":4.25}, - { "matrix": [4, 8], "label":"<", "x":9.25, "y":4.25}, - { "matrix": [4, 9], "label":">", "x":10.25, "y":4.25}, + { "matrix": [4, 0], "label":"Shift", "x":0, "y":4.25, "w":2.25}, + { "matrix": [4, 1], "label":"Z", "x":2.25, "y":4.25}, + { "matrix": [4, 2], "label":"X", "x":3.25, "y":4.25}, + { "matrix": [4, 3], "label":"C", "x":4.25, "y":4.25}, + { "matrix": [4, 4], "label":"V", "x":5.25, "y":4.25}, + { "matrix": [4, 5], "label":"B", "x":6.25, "y":4.25}, + { "matrix": [4, 6], "label":"N", "x":7.25, "y":4.25}, + { "matrix": [4, 7], "label":"M", "x":8.25, "y":4.25}, + { "matrix": [4, 8], "label":"<", "x":9.25, "y":4.25}, + { "matrix": [4, 9], "label":">", "x":10.25, "y":4.25}, { "matrix": [4, 10], "label":"?", "x":11.25, "y":4.25}, { "matrix": [4, 11], "label":"Shift", "x":12.25, "y":4.25, "w":1.75}, { "matrix": [4, 13], "label":"\u2191", "x":14.25, "y":4.5}, - { "matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - { "matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25}, - { "matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - { "matrix": [5, 5], "label":" ", "x":3.75, "y":5.25, "w":6.25}, - { "matrix": [5, 8], "label":"Alt", "x":10, "y":5.25}, - { "matrix": [5, 9], "label":"Fn", "x":11, "y":5.25}, + { "matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25}, + { "matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25}, + { "matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25}, + { "matrix": [5, 5], "label":" ", "x":3.75, "y":5.25, "w":6.25}, + { "matrix": [5, 8], "label":"Alt", "x":10, "y":5.25}, + { "matrix": [5, 9], "label":"Fn", "x":11, "y":5.25}, { "matrix": [5, 10], "label":"Ctrl", "x":12, "y":5.25}, { "matrix": [5, 12], "label":"\u2190", "x":13.25, "y":5.5}, { "matrix": [5, 13], "label":"\u2193", "x":14.25, "y":5.5}, @@ -218,10 +218,10 @@ { "flags": 4, "matrix": [5, 13], "x": 202, "y": 63 }, { "flags": 4, "matrix": [5, 14], "x": 217, "y": 63 }, { "flags": 2, "x": 224, "y": 51 }, - { "flags": 2, "x": 9, "y": 64 }, - { "flags": 2, "x": 38, "y": 64 }, - { "flags": 2, "x": 69, "y": 64 }, - { "flags": 2, "x": 96, "y": 64 }, + { "flags": 2, "x": 9, "y": 64 }, + { "flags": 2, "x": 38, "y": 64 }, + { "flags": 2, "x": 69, "y": 64 }, + { "flags": 2, "x": 96, "y": 64 }, { "flags": 2, "x": 125, "y": 64 }, { "flags": 2, "x": 154, "y": 64 }, { "flags": 2, "x": 182, "y": 64 }, diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index c657c029eb..bad71681c0 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -14,10 +14,10 @@ }, "diode_direction": "COL2ROW", "indicators": { - "caps_lock": "B6", - "num_lock": "B5", - "scroll_lock": "B7", - "on_state": 0 + "caps_lock": "B6", + "num_lock": "B5", + "scroll_lock": "B7", + "on_state": 0 }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index 63243c494d..35a7311112 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -72,4 +72,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index 8894e261be..68f7221d31 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -18,9 +18,9 @@ "breathing": true }, "indicators": { - "caps_lock": "D3", - "scroll_lock": "D5", - "on_state": 0 + "caps_lock": "D3", + "scroll_lock": "D5", + "on_state": 0 }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index 0224a00528..8186ce878e 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Octagon V1", + "keyboard_name": "Octagon V1", "manufacturer": "Duck", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x444B", "pid": "0x4F31", diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index 7f5dbb1579..f3bd30fbe5 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -117,7 +117,6 @@ {"matrix": [5, 15], "x": 15, "y": 5} ] }, - "LAYOUT_75_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 588d14003b..eff1e5f88c 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Orion V3", + "keyboard_name": "Orion V3", "manufacturer": "Duck", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x444B", "pid": "0x4F52", diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index 455aeda060..69f1033d22 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "TC-V3", + "keyboard_name": "TC-V3", "manufacturer": "Duck", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x444B", "pid": "0x5443", diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 6c26c11a05..72ba3c8ae8 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -94,7 +94,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4} ] }, - "LAYOUT_ansi": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, @@ -173,7 +172,6 @@ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4} ] }, - "LAYOUT_iso": { "layout": [ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json index 96706d84b6..5be344c17b 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/info.json @@ -52,4 +52,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/durgod/dgk6x/hades_iso/info.json b/keyboards/durgod/dgk6x/hades_iso/info.json index 42f4d08fe3..1d42b03667 100644 --- a/keyboards/durgod/dgk6x/hades_iso/info.json +++ b/keyboards/durgod/dgk6x/hades_iso/info.json @@ -94,80 +94,80 @@ "layouts": { "LAYOUT_65_iso": { "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0}, - {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, - {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, - {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, - {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, - {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, - {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, - {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, - {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1}, - {"label": "CapsLock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "G", "matrix": [2, 5], "x": 5.75, "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": "#", "matrix": [2, 12], "x": 12.75, "y": 2}, - {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2}, + {"label": "CapsLock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "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": "#", "matrix": [2, 12], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2}, - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3}, - {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, - {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, - {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, - {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, - {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, - {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3}, - {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3}, - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "K45", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "Fn1", "matrix": [4, 9], "x": 10, "y": 4}, - {"label": "Fn2", "matrix": [4, 10], "x": 11, "y": 4}, - {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4}, - {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4}, - {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4}, - {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4} + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K45", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Fn1", "matrix": [4, 9], "x": 10, "y": 4}, + {"label": "Fn2", "matrix": [4, 10], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4}, + {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4} ] } } -} \ No newline at end of file +} diff --git a/keyboards/dyz/dyz60_hs/info.json b/keyboards/dyz/dyz60_hs/info.json index 2403af79ad..c23b0dca6a 100644 --- a/keyboards/dyz/dyz60_hs/info.json +++ b/keyboards/dyz/dyz60_hs/info.json @@ -5,7 +5,7 @@ "maintainer": "dayatz", "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["F4", "F5", "B3", "B2", "B1", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1" ], + "cols": ["F4", "F5", "B3", "B2", "B1", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["E6", "B0", "F0", "F6", "F7"] }, "rgblight": { diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 5113532c7a..525ec93947 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "BOCC", + "keyboard_name": "BOCC", "manufacturer": "DZTECH", - "url": "", - "maintainer": "DZTECH", + "url": "", + "maintainer": "DZTECH", "usb": { "vid": "0x445A", "pid": "0x1010", diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 9c61c0303a..3d806edf41 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "DUO-S", + "keyboard_name": "DUO-S", "manufacturer": "DZTECH", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x445A", "pid": "0x1012", diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index 338c040255..9c36a687b7 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -169,4 +169,3 @@ } } } - diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json index eec8bc9579..be9249cca4 100644 --- a/keyboards/ealdin/quadrant/info.json +++ b/keyboards/ealdin/quadrant/info.json @@ -1,8 +1,8 @@ { "keyboard_name": "Quadrant E-C", "manufacturer": "Ealdin", - "url": "https://github.com/Ealdin/keyboards/tree/master/Quadrant", - "maintainer": "Ealdin Keyboards", + "url": "https://github.com/Ealdin/keyboards/tree/master/Quadrant", + "maintainer": "Ealdin Keyboards", "usb": { "vid": "0x0192", "pid": "0x5154", diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/info.json index b3a448ef1b..d198d65f2a 100644 --- a/keyboards/eason/greatsword80/info.json +++ b/keyboards/eason/greatsword80/info.json @@ -17,7 +17,7 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ + "layout": [ {"label": "K00 (D0,D6)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (D0,D7)", "matrix": [0, 1], "x": 1.25, "y": 0}, {"label": "K02 (D0,B4)", "matrix": [0, 2], "x": 2.25, "y": 0}, diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/info.json index d44ec001bd..8f4ef69f2d 100644 --- a/keyboards/ebastler/e80_1800/info.json +++ b/keyboards/ebastler/e80_1800/info.json @@ -22,8 +22,8 @@ "mousekey": false }, "matrix_pins": { - "cols": [ "A1", "A0", "C3", "C2", "F1", "F0", "C15", "C14", "C13", "C4", "C5", "B0", "B1", "B2", "B9", "A13", "A8", "C9", "C8" ], - "rows": [ "B7", "B3", "D2", "C12", "C11", "C10", "A15" ] + "cols": ["A1", "A0", "C3", "C2", "F1", "F0", "C15", "C14", "C13", "C4", "C5", "B0", "B1", "B2", "B9", "A13", "A8", "C9", "C8"], + "rows": ["B7", "B3", "D2", "C12", "C11", "C10", "A15"] }, "backlight": { "breathing": true, @@ -40,566 +40,566 @@ "layouts": { "LAYOUT_1800_all": { "layout": [ - {"matrix":[0,0], "label":"Esc", "x":0, "y":0}, - {"matrix":[0,1], "label":"F1", "x":1.25, "y":0}, - {"matrix":[0,2], "label":"F2", "x":2.25, "y":0}, - {"matrix":[0,3], "label":"F3", "x":3.25, "y":0}, - {"matrix":[0,4], "label":"F4", "x":4.25, "y":0}, - {"matrix":[0,6], "label":"F5", "x":5.5, "y":0}, - {"matrix":[0,7], "label":"F6", "x":6.5, "y":0}, - {"matrix":[0,8], "label":"F7", "x":7.5, "y":0}, - {"matrix":[0,9], "label":"F8", "x":8.5, "y":0}, - {"matrix":[0,10], "label":"F9", "x":9.75, "y":0}, - {"matrix":[0,11], "label":"F10", "x":10.75, "y":0}, - {"matrix":[0,12], "label":"F11", "x":11.75, "y":0}, - {"matrix":[0,13], "label":"F12", "x":12.75, "y":0}, - {"matrix":[0,15], "label":"Insert", "x":15.5, "y":0}, - {"matrix":[0,16], "label":"Home", "x":16.5, "y":0}, - {"matrix":[0,17], "label":"PgUp", "x":17.5, "y":0}, - {"matrix":[0,18], "label":"PrtSc", "x":18.5, "y":0}, + {"matrix":[0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0}, + {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0}, + {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0}, + {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0}, + {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0}, + {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0}, + {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0}, + {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0}, + {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0}, + {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0}, + {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0}, + {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0}, + {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0}, + {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0}, + {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0}, + {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0}, - {"matrix":[1,15], "label":"Delete", "x":15.5, "y":1}, - {"matrix":[1,16], "label":"End", "x":16.5, "y":1}, - {"matrix":[1,17], "label":"PgDn", "x":17.5, "y":1}, - {"matrix":[1,18], "label":"Scroll Lock", "x":18.5, "y":1}, + {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1}, + {"matrix":[1, 16], "label":"End", "x":16.5, "y":1}, + {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1}, + {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1}, - {"matrix":[2,0], "label":"tild", "x":0, "y":2}, - {"matrix":[2,1], "label":"1", "x":1, "y":2}, - {"matrix":[2,2], "label":"2", "x":2, "y":2}, - {"matrix":[2,3], "label":"3", "x":3, "y":2}, - {"matrix":[2,4], "label":"4", "x":4, "y":2}, - {"matrix":[2,5], "label":"5", "x":5, "y":2}, - {"matrix":[2,6], "label":"6", "x":6, "y":2}, - {"matrix":[2,7], "label":"7", "x":7, "y":2}, - {"matrix":[2,8], "label":"8", "x":8, "y":2}, - {"matrix":[2,9], "label":"9", "x":9, "y":2}, - {"matrix":[2,10], "label":"0", "x":10, "y":2}, - {"matrix":[2,11], "label":"-", "x":11, "y":2}, - {"matrix":[2,12], "label":"=", "x":12, "y":2}, - {"matrix":[2,14], "label":"Backspace", "x":13, "y":2, "w":2}, - {"matrix":[2,15], "label":"Num Lock", "x":15.5, "y":2}, - {"matrix":[2,16], "label":"/", "x":16.5, "y":2}, - {"matrix":[2,17], "label":"*", "x":17.5, "y":2}, - {"matrix":[2,18], "label":"Pause", "x":18.5, "y":2}, + {"matrix":[2, 0], "label":"tild", "x":0, "y":2}, + {"matrix":[2, 1], "label":"1", "x":1, "y":2}, + {"matrix":[2, 2], "label":"2", "x":2, "y":2}, + {"matrix":[2, 3], "label":"3", "x":3, "y":2}, + {"matrix":[2, 4], "label":"4", "x":4, "y":2}, + {"matrix":[2, 5], "label":"5", "x":5, "y":2}, + {"matrix":[2, 6], "label":"6", "x":6, "y":2}, + {"matrix":[2, 7], "label":"7", "x":7, "y":2}, + {"matrix":[2, 8], "label":"8", "x":8, "y":2}, + {"matrix":[2, 9], "label":"9", "x":9, "y":2}, + {"matrix":[2, 10], "label":"0", "x":10, "y":2}, + {"matrix":[2, 11], "label":"-", "x":11, "y":2}, + {"matrix":[2, 12], "label":"=", "x":12, "y":2}, + {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2}, + {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2}, + {"matrix":[2, 16], "label":"/", "x":16.5, "y":2}, + {"matrix":[2, 17], "label":"*", "x":17.5, "y":2}, + {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2}, - {"matrix":[3,0], "label":"Tab", "x":0, "y":3, "w":1.5}, - {"matrix":[3,2], "label":"Q", "x":1.5, "y":3}, - {"matrix":[3,3], "label":"W", "x":2.5, "y":3}, - {"matrix":[3,4], "label":"E", "x":3.5, "y":3}, - {"matrix":[3,5], "label":"R", "x":4.5, "y":3}, - {"matrix":[3,6], "label":"T", "x":5.5, "y":3}, - {"matrix":[3,7], "label":"Y", "x":6.5, "y":3}, - {"matrix":[3,8], "label":"U", "x":7.5, "y":3}, - {"matrix":[3,9], "label":"I", "x":8.5, "y":3}, - {"matrix":[3,10], "label":"O", "x":9.5, "y":3}, - {"matrix":[3,11], "label":"P", "x":10.5, "y":3}, - {"matrix":[3,12], "label":"[", "x":11.5, "y":3}, - {"matrix":[3,13], "label":"]", "x":12.5, "y":3}, - {"matrix":[3,14], "label":"|", "x":13.5, "y":3, "w":1.5}, - {"matrix":[3,15], "label":"7", "x":15.5, "y":3}, - {"matrix":[3,16], "label":"8", "x":16.5, "y":3}, - {"matrix":[3,17], "label":"9", "x":17.5, "y":3}, - {"matrix":[3,18], "label":"-", "x":18.5, "y":3}, + {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5}, + {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3}, + {"matrix":[3, 3], "label":"W", "x":2.5, "y":3}, + {"matrix":[3, 4], "label":"E", "x":3.5, "y":3}, + {"matrix":[3, 5], "label":"R", "x":4.5, "y":3}, + {"matrix":[3, 6], "label":"T", "x":5.5, "y":3}, + {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3}, + {"matrix":[3, 8], "label":"U", "x":7.5, "y":3}, + {"matrix":[3, 9], "label":"I", "x":8.5, "y":3}, + {"matrix":[3, 10], "label":"O", "x":9.5, "y":3}, + {"matrix":[3, 11], "label":"P", "x":10.5, "y":3}, + {"matrix":[3, 12], "label":"[", "x":11.5, "y":3}, + {"matrix":[3, 13], "label":"]", "x":12.5, "y":3}, + {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5}, + {"matrix":[3, 15], "label":"7", "x":15.5, "y":3}, + {"matrix":[3, 16], "label":"8", "x":16.5, "y":3}, + {"matrix":[3, 17], "label":"9", "x":17.5, "y":3}, + {"matrix":[3, 18], "label":"-", "x":18.5, "y":3}, - {"matrix":[4,0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"matrix":[4,2], "label":"A", "x":1.75, "y":4}, - {"matrix":[4,3], "label":"S", "x":2.75, "y":4}, - {"matrix":[4,4], "label":"D", "x":3.75, "y":4}, - {"matrix":[4,5], "label":"F", "x":4.75, "y":4}, - {"matrix":[4,6], "label":"G", "x":5.75, "y":4}, - {"matrix":[4,7], "label":"H", "x":6.75, "y":4}, - {"matrix":[4,8], "label":"J", "x":7.75, "y":4}, - {"matrix":[4,9], "label":"K", "x":8.75, "y":4}, - {"matrix":[4,10], "label":"L", "x":9.75, "y":4}, - {"matrix":[4,11], "label":";", "x":10.75, "y":4}, - {"matrix":[4,12], "label":"'", "x":11.75, "y":4}, - {"matrix":[4,13], "label":"#", "x":12.75, "y":4}, - {"matrix":[4,14], "label":"Enter", "x":13.75, "y":3, "w":1.25}, - {"matrix":[4,15], "label":"4", "x":15.5, "y":4}, - {"matrix":[4,16], "label":"5", "x":16.5, "y":4}, - {"matrix":[4,17], "label":"6", "x":17.5, "y":4}, - {"matrix":[4,18], "label":"+", "x":18.5, "y":4}, + {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, + {"matrix":[4, 2], "label":"A", "x":1.75, "y":4}, + {"matrix":[4, 3], "label":"S", "x":2.75, "y":4}, + {"matrix":[4, 4], "label":"D", "x":3.75, "y":4}, + {"matrix":[4, 5], "label":"F", "x":4.75, "y":4}, + {"matrix":[4, 6], "label":"G", "x":5.75, "y":4}, + {"matrix":[4, 7], "label":"H", "x":6.75, "y":4}, + {"matrix":[4, 8], "label":"J", "x":7.75, "y":4}, + {"matrix":[4, 9], "label":"K", "x":8.75, "y":4}, + {"matrix":[4, 10], "label":"L", "x":9.75, "y":4}, + {"matrix":[4, 11], "label":";", "x":10.75, "y":4}, + {"matrix":[4, 12], "label":"'", "x":11.75, "y":4}, + {"matrix":[4, 13], "label":"#", "x":12.75, "y":4}, + {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25}, + {"matrix":[4, 15], "label":"4", "x":15.5, "y":4}, + {"matrix":[4, 16], "label":"5", "x":16.5, "y":4}, + {"matrix":[4, 17], "label":"6", "x":17.5, "y":4}, + {"matrix":[4, 18], "label":"+", "x":18.5, "y":4}, - {"matrix":[5,0], "label":"Shift", "x":0, "y":5, "w":1.25}, - {"matrix":[5,1], "label":"|", "x":1.25, "y":5}, - {"matrix":[5,2], "label":"Z", "x":2.25, "y":5}, - {"matrix":[5,3], "label":"X", "x":3.25, "y":5}, - {"matrix":[5,4], "label":"C", "x":4.25, "y":5}, - {"matrix":[5,5], "label":"V", "x":5.25, "y":5}, - {"matrix":[5,6], "label":"B", "x":6.25, "y":5}, - {"matrix":[5,7], "label":"N", "x":7.25, "y":5}, - {"matrix":[5,8], "label":"M", "x":8.25, "y":5}, - {"matrix":[5,9], "label":"<", "x":9.25, "y":5}, - {"matrix":[5,10], "label":">", "x":10.25, "y":5}, - {"matrix":[5,11], "label":"?", "x":11.25, "y":5}, - {"matrix":[5,13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"matrix":[5,14], "label":"up", "x":14.25, "y":5.25}, - {"matrix":[5,15], "label":"1", "x":15.5, "y":5}, - {"matrix":[5,16], "label":"2", "x":16.5, "y":5}, - {"matrix":[5,17], "label":"3", "x":17.5, "y":5}, - {"matrix":[5,18], "label":"Enter", "x":18.5, "y":5, "h":2}, + {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25}, + {"matrix":[5, 1], "label":"|", "x":1.25, "y":5}, + {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5}, + {"matrix":[5, 3], "label":"X", "x":3.25, "y":5}, + {"matrix":[5, 4], "label":"C", "x":4.25, "y":5}, + {"matrix":[5, 5], "label":"V", "x":5.25, "y":5}, + {"matrix":[5, 6], "label":"B", "x":6.25, "y":5}, + {"matrix":[5, 7], "label":"N", "x":7.25, "y":5}, + {"matrix":[5, 8], "label":"M", "x":8.25, "y":5}, + {"matrix":[5, 9], "label":"<", "x":9.25, "y":5}, + {"matrix":[5, 10], "label":">", "x":10.25, "y":5}, + {"matrix":[5, 11], "label":"?", "x":11.25, "y":5}, + {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, + {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25}, + {"matrix":[5, 15], "label":"1", "x":15.5, "y":5}, + {"matrix":[5, 16], "label":"2", "x":16.5, "y":5}, + {"matrix":[5, 17], "label":"3", "x":17.5, "y":5}, + {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2}, - {"matrix":[6,0], "label":"Ctrl", "x":0, "y":6}, - {"matrix":[6,1], "label":"Win", "x":1, "y":6}, - {"matrix":[6,2], "label":"Alt", "x":2, "y":6}, - {"matrix":[6,6], "label":"Space", "x":3, "y":6, "w":6}, - {"matrix":[6,9], "label":"AltGr", "x":9, "y":6}, - {"matrix":[6,10], "label":"Win", "x":10, "y":6}, - {"matrix":[6,11], "label":"Menu", "x":11, "y":6}, - {"matrix":[6,12], "label":"Ctrl", "x":12, "y":6}, - {"matrix":[6,13], "label":"left", "x":13.25, "y":6.25}, - {"matrix":[6,14], "label":"down", "x":14.25, "y":6.25}, - {"matrix":[6,15], "label":"right", "x":15.25, "y":6.25}, - {"matrix":[6,16], "label":"0", "x":16.5, "y":6}, - {"matrix":[6,17], "label":".", "x":17.5, "y":6}] + {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6}, + {"matrix":[6, 1], "label":"Win", "x":1, "y":6}, + {"matrix":[6, 2], "label":"Alt", "x":2, "y":6}, + {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6}, + {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6}, + {"matrix":[6, 10], "label":"Win", "x":10, "y":6}, + {"matrix":[6, 11], "label":"Menu", "x":11, "y":6}, + {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6}, + {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25}, + {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25}, + {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25}, + {"matrix":[6, 16], "label":"0", "x":16.5, "y":6}, + {"matrix":[6, 17], "label":".", "x":17.5, "y":6}] }, "LAYOUT_1800_iso_6u": { "layout": [ - {"matrix":[0,0], "label":"Esc", "x":0, "y":0}, - {"matrix":[0,1], "label":"F1", "x":1.25, "y":0}, - {"matrix":[0,2], "label":"F2", "x":2.25, "y":0}, - {"matrix":[0,3], "label":"F3", "x":3.25, "y":0}, - {"matrix":[0,4], "label":"F4", "x":4.25, "y":0}, - {"matrix":[0,6], "label":"F5", "x":5.5, "y":0}, - {"matrix":[0,7], "label":"F6", "x":6.5, "y":0}, - {"matrix":[0,8], "label":"F7", "x":7.5, "y":0}, - {"matrix":[0,9], "label":"F8", "x":8.5, "y":0}, - {"matrix":[0,10], "label":"F9", "x":9.75, "y":0}, - {"matrix":[0,11], "label":"F10", "x":10.75, "y":0}, - {"matrix":[0,12], "label":"F11", "x":11.75, "y":0}, - {"matrix":[0,13], "label":"F12", "x":12.75, "y":0}, - {"matrix":[0,15], "label":"Insert", "x":15.5, "y":0}, - {"matrix":[0,16], "label":"Home", "x":16.5, "y":0}, - {"matrix":[0,17], "label":"PgUp", "x":17.5, "y":0}, - {"matrix":[0,18], "label":"PrtSc", "x":18.5, "y":0}, + {"matrix":[0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0}, + {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0}, + {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0}, + {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0}, + {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0}, + {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0}, + {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0}, + {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0}, + {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0}, + {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0}, + {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0}, + {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0}, + {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0}, + {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0}, + {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0}, + {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0}, - {"matrix":[1,15], "label":"Delete", "x":15.5, "y":1}, - {"matrix":[1,16], "label":"End", "x":16.5, "y":1}, - {"matrix":[1,17], "label":"PgDn", "x":17.5, "y":1}, - {"matrix":[1,18], "label":"Scroll Lock", "x":18.5, "y":1}, + {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1}, + {"matrix":[1, 16], "label":"End", "x":16.5, "y":1}, + {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1}, + {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1}, - {"matrix":[2,0], "label":"tild", "x":0, "y":2}, - {"matrix":[2,1], "label":"1", "x":1, "y":2}, - {"matrix":[2,2], "label":"2", "x":2, "y":2}, - {"matrix":[2,3], "label":"3", "x":3, "y":2}, - {"matrix":[2,4], "label":"4", "x":4, "y":2}, - {"matrix":[2,5], "label":"5", "x":5, "y":2}, - {"matrix":[2,6], "label":"6", "x":6, "y":2}, - {"matrix":[2,7], "label":"7", "x":7, "y":2}, - {"matrix":[2,8], "label":"8", "x":8, "y":2}, - {"matrix":[2,9], "label":"9", "x":9, "y":2}, - {"matrix":[2,10], "label":"0", "x":10, "y":2}, - {"matrix":[2,11], "label":"-", "x":11, "y":2}, - {"matrix":[2,12], "label":"=", "x":12, "y":2}, - {"matrix":[2,14], "label":"Backspace", "x":13, "y":2, "w":2}, - {"matrix":[2,15], "label":"Num Lock", "x":15.5, "y":2}, - {"matrix":[2,16], "label":"/", "x":16.5, "y":2}, - {"matrix":[2,17], "label":"*", "x":17.5, "y":2}, - {"matrix":[2,18], "label":"Pause", "x":18.5, "y":2}, + {"matrix":[2, 0], "label":"tild", "x":0, "y":2}, + {"matrix":[2, 1], "label":"1", "x":1, "y":2}, + {"matrix":[2, 2], "label":"2", "x":2, "y":2}, + {"matrix":[2, 3], "label":"3", "x":3, "y":2}, + {"matrix":[2, 4], "label":"4", "x":4, "y":2}, + {"matrix":[2, 5], "label":"5", "x":5, "y":2}, + {"matrix":[2, 6], "label":"6", "x":6, "y":2}, + {"matrix":[2, 7], "label":"7", "x":7, "y":2}, + {"matrix":[2, 8], "label":"8", "x":8, "y":2}, + {"matrix":[2, 9], "label":"9", "x":9, "y":2}, + {"matrix":[2, 10], "label":"0", "x":10, "y":2}, + {"matrix":[2, 11], "label":"-", "x":11, "y":2}, + {"matrix":[2, 12], "label":"=", "x":12, "y":2}, + {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2}, + {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2}, + {"matrix":[2, 16], "label":"/", "x":16.5, "y":2}, + {"matrix":[2, 17], "label":"*", "x":17.5, "y":2}, + {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2}, - {"matrix":[3,0], "label":"Tab", "x":0, "y":3, "w":1.5}, - {"matrix":[3,2], "label":"Q", "x":1.5, "y":3}, - {"matrix":[3,3], "label":"W", "x":2.5, "y":3}, - {"matrix":[3,4], "label":"E", "x":3.5, "y":3}, - {"matrix":[3,5], "label":"R", "x":4.5, "y":3}, - {"matrix":[3,6], "label":"T", "x":5.5, "y":3}, - {"matrix":[3,7], "label":"Y", "x":6.5, "y":3}, - {"matrix":[3,8], "label":"U", "x":7.5, "y":3}, - {"matrix":[3,9], "label":"I", "x":8.5, "y":3}, - {"matrix":[3,10], "label":"O", "x":9.5, "y":3}, - {"matrix":[3,11], "label":"P", "x":10.5, "y":3}, - {"matrix":[3,12], "label":"[", "x":11.5, "y":3}, - {"matrix":[3,13], "label":"]", "x":12.5, "y":3}, - {"matrix":[3,15], "label":"7", "x":15.5, "y":3}, - {"matrix":[3,16], "label":"8", "x":16.5, "y":3}, - {"matrix":[3,17], "label":"9", "x":17.5, "y":3}, - {"matrix":[3,18], "label":"-", "x":18.5, "y":3}, + {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5}, + {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3}, + {"matrix":[3, 3], "label":"W", "x":2.5, "y":3}, + {"matrix":[3, 4], "label":"E", "x":3.5, "y":3}, + {"matrix":[3, 5], "label":"R", "x":4.5, "y":3}, + {"matrix":[3, 6], "label":"T", "x":5.5, "y":3}, + {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3}, + {"matrix":[3, 8], "label":"U", "x":7.5, "y":3}, + {"matrix":[3, 9], "label":"I", "x":8.5, "y":3}, + {"matrix":[3, 10], "label":"O", "x":9.5, "y":3}, + {"matrix":[3, 11], "label":"P", "x":10.5, "y":3}, + {"matrix":[3, 12], "label":"[", "x":11.5, "y":3}, + {"matrix":[3, 13], "label":"]", "x":12.5, "y":3}, + {"matrix":[3, 15], "label":"7", "x":15.5, "y":3}, + {"matrix":[3, 16], "label":"8", "x":16.5, "y":3}, + {"matrix":[3, 17], "label":"9", "x":17.5, "y":3}, + {"matrix":[3, 18], "label":"-", "x":18.5, "y":3}, - {"matrix":[4,0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"matrix":[4,2], "label":"A", "x":1.75, "y":4}, - {"matrix":[4,3], "label":"S", "x":2.75, "y":4}, - {"matrix":[4,4], "label":"D", "x":3.75, "y":4}, - {"matrix":[4,5], "label":"F", "x":4.75, "y":4}, - {"matrix":[4,6], "label":"G", "x":5.75, "y":4}, - {"matrix":[4,7], "label":"H", "x":6.75, "y":4}, - {"matrix":[4,8], "label":"J", "x":7.75, "y":4}, - {"matrix":[4,9], "label":"K", "x":8.75, "y":4}, - {"matrix":[4,10], "label":"L", "x":9.75, "y":4}, - {"matrix":[4,11], "label":";", "x":10.75, "y":4}, - {"matrix":[4,12], "label":"'", "x":11.75, "y":4}, - {"matrix":[4,13], "label":"#", "x":12.75, "y":4}, - {"matrix":[4,14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, - {"matrix":[4,15], "label":"4", "x":15.5, "y":4}, - {"matrix":[4,16], "label":"5", "x":16.5, "y":4}, - {"matrix":[4,17], "label":"6", "x":17.5, "y":4}, - {"matrix":[4,18], "label":"+", "x":18.5, "y":4}, + {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, + {"matrix":[4, 2], "label":"A", "x":1.75, "y":4}, + {"matrix":[4, 3], "label":"S", "x":2.75, "y":4}, + {"matrix":[4, 4], "label":"D", "x":3.75, "y":4}, + {"matrix":[4, 5], "label":"F", "x":4.75, "y":4}, + {"matrix":[4, 6], "label":"G", "x":5.75, "y":4}, + {"matrix":[4, 7], "label":"H", "x":6.75, "y":4}, + {"matrix":[4, 8], "label":"J", "x":7.75, "y":4}, + {"matrix":[4, 9], "label":"K", "x":8.75, "y":4}, + {"matrix":[4, 10], "label":"L", "x":9.75, "y":4}, + {"matrix":[4, 11], "label":";", "x":10.75, "y":4}, + {"matrix":[4, 12], "label":"'", "x":11.75, "y":4}, + {"matrix":[4, 13], "label":"#", "x":12.75, "y":4}, + {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, + {"matrix":[4, 15], "label":"4", "x":15.5, "y":4}, + {"matrix":[4, 16], "label":"5", "x":16.5, "y":4}, + {"matrix":[4, 17], "label":"6", "x":17.5, "y":4}, + {"matrix":[4, 18], "label":"+", "x":18.5, "y":4}, - {"matrix":[5,0], "label":"Shift", "x":0, "y":5, "w":1.25}, - {"matrix":[5,1], "label":"|", "x":1.25, "y":5}, - {"matrix":[5,2], "label":"Z", "x":2.25, "y":5}, - {"matrix":[5,3], "label":"X", "x":3.25, "y":5}, - {"matrix":[5,4], "label":"C", "x":4.25, "y":5}, - {"matrix":[5,5], "label":"V", "x":5.25, "y":5}, - {"matrix":[5,6], "label":"B", "x":6.25, "y":5}, - {"matrix":[5,7], "label":"N", "x":7.25, "y":5}, - {"matrix":[5,8], "label":"M", "x":8.25, "y":5}, - {"matrix":[5,9], "label":"<", "x":9.25, "y":5}, - {"matrix":[5,10], "label":">", "x":10.25, "y":5}, - {"matrix":[5,11], "label":"?", "x":11.25, "y":5}, - {"matrix":[5,13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"matrix":[5,14], "label":"up", "x":14.25, "y":5.25}, - {"matrix":[5,15], "label":"1", "x":15.5, "y":5}, - {"matrix":[5,16], "label":"2", "x":16.5, "y":5}, - {"matrix":[5,17], "label":"3", "x":17.5, "y":5}, - {"matrix":[5,18], "label":"Enter", "x":18.5, "y":5, "h":2}, + {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25}, + {"matrix":[5, 1], "label":"|", "x":1.25, "y":5}, + {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5}, + {"matrix":[5, 3], "label":"X", "x":3.25, "y":5}, + {"matrix":[5, 4], "label":"C", "x":4.25, "y":5}, + {"matrix":[5, 5], "label":"V", "x":5.25, "y":5}, + {"matrix":[5, 6], "label":"B", "x":6.25, "y":5}, + {"matrix":[5, 7], "label":"N", "x":7.25, "y":5}, + {"matrix":[5, 8], "label":"M", "x":8.25, "y":5}, + {"matrix":[5, 9], "label":"<", "x":9.25, "y":5}, + {"matrix":[5, 10], "label":">", "x":10.25, "y":5}, + {"matrix":[5, 11], "label":"?", "x":11.25, "y":5}, + {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, + {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25}, + {"matrix":[5, 15], "label":"1", "x":15.5, "y":5}, + {"matrix":[5, 16], "label":"2", "x":16.5, "y":5}, + {"matrix":[5, 17], "label":"3", "x":17.5, "y":5}, + {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2}, - {"matrix":[6,0], "label":"Ctrl", "x":0, "y":6}, - {"matrix":[6,1], "label":"Win", "x":1, "y":6}, - {"matrix":[6,2], "label":"Alt", "x":2, "y":6}, - {"matrix":[6,6], "label":"Space", "x":3, "y":6, "w":6}, - {"matrix":[6,9], "label":"AltGr", "x":9, "y":6}, - {"matrix":[6,10], "label":"Win", "x":10, "y":6}, - {"matrix":[6,11], "label":"Menu", "x":11, "y":6}, - {"matrix":[6,12], "label":"Ctrl", "x":12, "y":6}, - {"matrix":[6,13], "label":"left", "x":13.25, "y":6.25}, - {"matrix":[6,14], "label":"down", "x":14.25, "y":6.25}, - {"matrix":[6,15], "label":"right", "x":15.25, "y":6.25}, - {"matrix":[6,16], "label":"0", "x":16.5, "y":6}, - {"matrix":[6,17], "label":".", "x":17.5, "y":6}] + {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6}, + {"matrix":[6, 1], "label":"Win", "x":1, "y":6}, + {"matrix":[6, 2], "label":"Alt", "x":2, "y":6}, + {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6}, + {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6}, + {"matrix":[6, 10], "label":"Win", "x":10, "y":6}, + {"matrix":[6, 11], "label":"Menu", "x":11, "y":6}, + {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6}, + {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25}, + {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25}, + {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25}, + {"matrix":[6, 16], "label":"0", "x":16.5, "y":6}, + {"matrix":[6, 17], "label":".", "x":17.5, "y":6}] }, "LAYOUT_1800_iso_7u": { "layout": [ - {"matrix":[0,0], "label":"Esc", "x":0, "y":0}, - {"matrix":[0,1], "label":"F1", "x":1.25, "y":0}, - {"matrix":[0,2], "label":"F2", "x":2.25, "y":0}, - {"matrix":[0,3], "label":"F3", "x":3.25, "y":0}, - {"matrix":[0,4], "label":"F4", "x":4.25, "y":0}, - {"matrix":[0,6], "label":"F5", "x":5.5, "y":0}, - {"matrix":[0,7], "label":"F6", "x":6.5, "y":0}, - {"matrix":[0,8], "label":"F7", "x":7.5, "y":0}, - {"matrix":[0,9], "label":"F8", "x":8.5, "y":0}, - {"matrix":[0,10], "label":"F9", "x":9.75, "y":0}, - {"matrix":[0,11], "label":"F10", "x":10.75, "y":0}, - {"matrix":[0,12], "label":"F11", "x":11.75, "y":0}, - {"matrix":[0,13], "label":"F12", "x":12.75, "y":0}, - {"matrix":[0,15], "label":"Insert", "x":15.5, "y":0}, - {"matrix":[0,16], "label":"Home", "x":16.5, "y":0}, - {"matrix":[0,17], "label":"PgUp", "x":17.5, "y":0}, - {"matrix":[0,18], "label":"PrtSc", "x":18.5, "y":0}, + {"matrix":[0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0}, + {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0}, + {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0}, + {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0}, + {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0}, + {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0}, + {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0}, + {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0}, + {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0}, + {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0}, + {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0}, + {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0}, + {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0}, + {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0}, + {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0}, + {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0}, - {"matrix":[1,15], "label":"Delete", "x":15.5, "y":1}, - {"matrix":[1,16], "label":"End", "x":16.5, "y":1}, - {"matrix":[1,17], "label":"PgDn", "x":17.5, "y":1}, - {"matrix":[1,18], "label":"Scroll Lock", "x":18.5, "y":1}, + {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1}, + {"matrix":[1, 16], "label":"End", "x":16.5, "y":1}, + {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1}, + {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1}, - {"matrix":[2,0], "label":"tild", "x":0, "y":2}, - {"matrix":[2,1], "label":"1", "x":1, "y":2}, - {"matrix":[2,2], "label":"2", "x":2, "y":2}, - {"matrix":[2,3], "label":"3", "x":3, "y":2}, - {"matrix":[2,4], "label":"4", "x":4, "y":2}, - {"matrix":[2,5], "label":"5", "x":5, "y":2}, - {"matrix":[2,6], "label":"6", "x":6, "y":2}, - {"matrix":[2,7], "label":"7", "x":7, "y":2}, - {"matrix":[2,8], "label":"8", "x":8, "y":2}, - {"matrix":[2,9], "label":"9", "x":9, "y":2}, - {"matrix":[2,10], "label":"0", "x":10, "y":2}, - {"matrix":[2,11], "label":"-", "x":11, "y":2}, - {"matrix":[2,12], "label":"=", "x":12, "y":2}, - {"matrix":[2,14], "label":"Backspace", "x":13, "y":2, "w":2}, - {"matrix":[2,15], "label":"Num Lock", "x":15.5, "y":2}, - {"matrix":[2,16], "label":"/", "x":16.5, "y":2}, - {"matrix":[2,17], "label":"*", "x":17.5, "y":2}, - {"matrix":[2,18], "label":"Pause", "x":18.5, "y":2}, + {"matrix":[2, 0], "label":"tild", "x":0, "y":2}, + {"matrix":[2, 1], "label":"1", "x":1, "y":2}, + {"matrix":[2, 2], "label":"2", "x":2, "y":2}, + {"matrix":[2, 3], "label":"3", "x":3, "y":2}, + {"matrix":[2, 4], "label":"4", "x":4, "y":2}, + {"matrix":[2, 5], "label":"5", "x":5, "y":2}, + {"matrix":[2, 6], "label":"6", "x":6, "y":2}, + {"matrix":[2, 7], "label":"7", "x":7, "y":2}, + {"matrix":[2, 8], "label":"8", "x":8, "y":2}, + {"matrix":[2, 9], "label":"9", "x":9, "y":2}, + {"matrix":[2, 10], "label":"0", "x":10, "y":2}, + {"matrix":[2, 11], "label":"-", "x":11, "y":2}, + {"matrix":[2, 12], "label":"=", "x":12, "y":2}, + {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2}, + {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2}, + {"matrix":[2, 16], "label":"/", "x":16.5, "y":2}, + {"matrix":[2, 17], "label":"*", "x":17.5, "y":2}, + {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2}, - {"matrix":[3,0], "label":"Tab", "x":0, "y":3, "w":1.5}, - {"matrix":[3,2], "label":"Q", "x":1.5, "y":3}, - {"matrix":[3,3], "label":"W", "x":2.5, "y":3}, - {"matrix":[3,4], "label":"E", "x":3.5, "y":3}, - {"matrix":[3,5], "label":"R", "x":4.5, "y":3}, - {"matrix":[3,6], "label":"T", "x":5.5, "y":3}, - {"matrix":[3,7], "label":"Y", "x":6.5, "y":3}, - {"matrix":[3,8], "label":"U", "x":7.5, "y":3}, - {"matrix":[3,9], "label":"I", "x":8.5, "y":3}, - {"matrix":[3,10], "label":"O", "x":9.5, "y":3}, - {"matrix":[3,11], "label":"P", "x":10.5, "y":3}, - {"matrix":[3,12], "label":"[", "x":11.5, "y":3}, - {"matrix":[3,13], "label":"]", "x":12.5, "y":3}, - {"matrix":[3,15], "label":"7", "x":15.5, "y":3}, - {"matrix":[3,16], "label":"8", "x":16.5, "y":3}, - {"matrix":[3,17], "label":"9", "x":17.5, "y":3}, - {"matrix":[3,18], "label":"-", "x":18.5, "y":3}, + {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5}, + {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3}, + {"matrix":[3, 3], "label":"W", "x":2.5, "y":3}, + {"matrix":[3, 4], "label":"E", "x":3.5, "y":3}, + {"matrix":[3, 5], "label":"R", "x":4.5, "y":3}, + {"matrix":[3, 6], "label":"T", "x":5.5, "y":3}, + {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3}, + {"matrix":[3, 8], "label":"U", "x":7.5, "y":3}, + {"matrix":[3, 9], "label":"I", "x":8.5, "y":3}, + {"matrix":[3, 10], "label":"O", "x":9.5, "y":3}, + {"matrix":[3, 11], "label":"P", "x":10.5, "y":3}, + {"matrix":[3, 12], "label":"[", "x":11.5, "y":3}, + {"matrix":[3, 13], "label":"]", "x":12.5, "y":3}, + {"matrix":[3, 15], "label":"7", "x":15.5, "y":3}, + {"matrix":[3, 16], "label":"8", "x":16.5, "y":3}, + {"matrix":[3, 17], "label":"9", "x":17.5, "y":3}, + {"matrix":[3, 18], "label":"-", "x":18.5, "y":3}, - {"matrix":[4,0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"matrix":[4,2], "label":"A", "x":1.75, "y":4}, - {"matrix":[4,3], "label":"S", "x":2.75, "y":4}, - {"matrix":[4,4], "label":"D", "x":3.75, "y":4}, - {"matrix":[4,5], "label":"F", "x":4.75, "y":4}, - {"matrix":[4,6], "label":"G", "x":5.75, "y":4}, - {"matrix":[4,7], "label":"H", "x":6.75, "y":4}, - {"matrix":[4,8], "label":"J", "x":7.75, "y":4}, - {"matrix":[4,9], "label":"K", "x":8.75, "y":4}, - {"matrix":[4,10], "label":"L", "x":9.75, "y":4}, - {"matrix":[4,11], "label":";", "x":10.75, "y":4}, - {"matrix":[4,12], "label":"'", "x":11.75, "y":4}, - {"matrix":[4,13], "label":"#", "x":12.75, "y":4}, - {"matrix":[4,14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, - {"matrix":[4,15], "label":"4", "x":15.5, "y":4}, - {"matrix":[4,16], "label":"5", "x":16.5, "y":4}, - {"matrix":[4,17], "label":"6", "x":17.5, "y":4}, - {"matrix":[4,18], "label":"+", "x":18.5, "y":4}, + {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, + {"matrix":[4, 2], "label":"A", "x":1.75, "y":4}, + {"matrix":[4, 3], "label":"S", "x":2.75, "y":4}, + {"matrix":[4, 4], "label":"D", "x":3.75, "y":4}, + {"matrix":[4, 5], "label":"F", "x":4.75, "y":4}, + {"matrix":[4, 6], "label":"G", "x":5.75, "y":4}, + {"matrix":[4, 7], "label":"H", "x":6.75, "y":4}, + {"matrix":[4, 8], "label":"J", "x":7.75, "y":4}, + {"matrix":[4, 9], "label":"K", "x":8.75, "y":4}, + {"matrix":[4, 10], "label":"L", "x":9.75, "y":4}, + {"matrix":[4, 11], "label":";", "x":10.75, "y":4}, + {"matrix":[4, 12], "label":"'", "x":11.75, "y":4}, + {"matrix":[4, 13], "label":"#", "x":12.75, "y":4}, + {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2}, + {"matrix":[4, 15], "label":"4", "x":15.5, "y":4}, + {"matrix":[4, 16], "label":"5", "x":16.5, "y":4}, + {"matrix":[4, 17], "label":"6", "x":17.5, "y":4}, + {"matrix":[4, 18], "label":"+", "x":18.5, "y":4}, - {"matrix":[5,0], "label":"Shift", "x":0, "y":5, "w":1.25}, - {"matrix":[5,1], "label":"|", "x":1.25, "y":5}, - {"matrix":[5,2], "label":"Z", "x":2.25, "y":5}, - {"matrix":[5,3], "label":"X", "x":3.25, "y":5}, - {"matrix":[5,4], "label":"C", "x":4.25, "y":5}, - {"matrix":[5,5], "label":"V", "x":5.25, "y":5}, - {"matrix":[5,6], "label":"B", "x":6.25, "y":5}, - {"matrix":[5,7], "label":"N", "x":7.25, "y":5}, - {"matrix":[5,8], "label":"M", "x":8.25, "y":5}, - {"matrix":[5,9], "label":"<", "x":9.25, "y":5}, - {"matrix":[5,10], "label":">", "x":10.25, "y":5}, - {"matrix":[5,11], "label":"?", "x":11.25, "y":5}, - {"matrix":[5,13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"matrix":[5,14], "label":"up", "x":14.25, "y":5.25}, - {"matrix":[5,15], "label":"1", "x":15.5, "y":5}, - {"matrix":[5,16], "label":"2", "x":16.5, "y":5}, - {"matrix":[5,17], "label":"3", "x":17.5, "y":5}, - {"matrix":[5,18], "label":"Enter", "x":18.5, "y":5, "h":2}, + {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25}, + {"matrix":[5, 1], "label":"|", "x":1.25, "y":5}, + {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5}, + {"matrix":[5, 3], "label":"X", "x":3.25, "y":5}, + {"matrix":[5, 4], "label":"C", "x":4.25, "y":5}, + {"matrix":[5, 5], "label":"V", "x":5.25, "y":5}, + {"matrix":[5, 6], "label":"B", "x":6.25, "y":5}, + {"matrix":[5, 7], "label":"N", "x":7.25, "y":5}, + {"matrix":[5, 8], "label":"M", "x":8.25, "y":5}, + {"matrix":[5, 9], "label":"<", "x":9.25, "y":5}, + {"matrix":[5, 10], "label":">", "x":10.25, "y":5}, + {"matrix":[5, 11], "label":"?", "x":11.25, "y":5}, + {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, + {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25}, + {"matrix":[5, 15], "label":"1", "x":15.5, "y":5}, + {"matrix":[5, 16], "label":"2", "x":16.5, "y":5}, + {"matrix":[5, 17], "label":"3", "x":17.5, "y":5}, + {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2}, - {"matrix":[6,0], "label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"matrix":[6,2], "label":"Alt", "x":1.5, "y":6, "w":1.5}, - {"matrix":[6,6], "label":"Space", "x":3, "y":6, "w":7}, - {"matrix":[6,9], "label":"AltGr", "x":10, "y":6, "w":1.5}, - {"matrix":[6,12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5}, - {"matrix":[6,13], "label":"left", "x":13.25, "y":6.25}, - {"matrix":[6,14], "label":"down", "x":14.25, "y":6.25}, - {"matrix":[6,15], "label":"right", "x":15.25, "y":6.25}, - {"matrix":[6,16], "label":"0", "x":16.5, "y":6}, - {"matrix":[6,17], "label":".", "x":17.5, "y":6}] + {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5}, + {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5}, + {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7}, + {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5}, + {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5}, + {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25}, + {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25}, + {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25}, + {"matrix":[6, 16], "label":"0", "x":16.5, "y":6}, + {"matrix":[6, 17], "label":".", "x":17.5, "y":6}] }, "LAYOUT_1800_ansi_6u": { "layout": [ - {"matrix":[0,0], "label":"Esc", "x":0, "y":0}, - {"matrix":[0,1], "label":"F1", "x":1.25, "y":0}, - {"matrix":[0,2], "label":"F2", "x":2.25, "y":0}, - {"matrix":[0,3], "label":"F3", "x":3.25, "y":0}, - {"matrix":[0,4], "label":"F4", "x":4.25, "y":0}, - {"matrix":[0,6], "label":"F5", "x":5.5, "y":0}, - {"matrix":[0,7], "label":"F6", "x":6.5, "y":0}, - {"matrix":[0,8], "label":"F7", "x":7.5, "y":0}, - {"matrix":[0,9], "label":"F8", "x":8.5, "y":0}, - {"matrix":[0,10], "label":"F9", "x":9.75, "y":0}, - {"matrix":[0,11], "label":"F10", "x":10.75, "y":0}, - {"matrix":[0,12], "label":"F11", "x":11.75, "y":0}, - {"matrix":[0,13], "label":"F12", "x":12.75, "y":0}, - {"matrix":[0,15], "label":"Insert", "x":15.5, "y":0}, - {"matrix":[0,16], "label":"Home", "x":16.5, "y":0}, - {"matrix":[0,17], "label":"PgUp", "x":17.5, "y":0}, - {"matrix":[0,18], "label":"PrtSc", "x":18.5, "y":0}, + {"matrix":[0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0}, + {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0}, + {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0}, + {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0}, + {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0}, + {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0}, + {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0}, + {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0}, + {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0}, + {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0}, + {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0}, + {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0}, + {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0}, + {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0}, + {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0}, + {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0}, - {"matrix":[1,15], "label":"Delete", "x":15.5, "y":1}, - {"matrix":[1,16], "label":"End", "x":16.5, "y":1}, - {"matrix":[1,17], "label":"PgDn", "x":17.5, "y":1}, - {"matrix":[1,18], "label":"Scroll Lock", "x":18.5, "y":1}, + {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1}, + {"matrix":[1, 16], "label":"End", "x":16.5, "y":1}, + {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1}, + {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1}, - {"matrix":[2,0], "label":"tild", "x":0, "y":2}, - {"matrix":[2,1], "label":"1", "x":1, "y":2}, - {"matrix":[2,2], "label":"2", "x":2, "y":2}, - {"matrix":[2,3], "label":"3", "x":3, "y":2}, - {"matrix":[2,4], "label":"4", "x":4, "y":2}, - {"matrix":[2,5], "label":"5", "x":5, "y":2}, - {"matrix":[2,6], "label":"6", "x":6, "y":2}, - {"matrix":[2,7], "label":"7", "x":7, "y":2}, - {"matrix":[2,8], "label":"8", "x":8, "y":2}, - {"matrix":[2,9], "label":"9", "x":9, "y":2}, - {"matrix":[2,10], "label":"0", "x":10, "y":2}, - {"matrix":[2,11], "label":"-", "x":11, "y":2}, - {"matrix":[2,12], "label":"=", "x":12, "y":2}, - {"matrix":[2,14], "label":"Backspace", "x":13, "y":2, "w":2}, - {"matrix":[2,15], "label":"Num Lock", "x":15.5, "y":2}, - {"matrix":[2,16], "label":"/", "x":16.5, "y":2}, - {"matrix":[2,17], "label":"*", "x":17.5, "y":2}, - {"matrix":[2,18], "label":"Pause", "x":18.5, "y":2}, + {"matrix":[2, 0], "label":"tild", "x":0, "y":2}, + {"matrix":[2, 1], "label":"1", "x":1, "y":2}, + {"matrix":[2, 2], "label":"2", "x":2, "y":2}, + {"matrix":[2, 3], "label":"3", "x":3, "y":2}, + {"matrix":[2, 4], "label":"4", "x":4, "y":2}, + {"matrix":[2, 5], "label":"5", "x":5, "y":2}, + {"matrix":[2, 6], "label":"6", "x":6, "y":2}, + {"matrix":[2, 7], "label":"7", "x":7, "y":2}, + {"matrix":[2, 8], "label":"8", "x":8, "y":2}, + {"matrix":[2, 9], "label":"9", "x":9, "y":2}, + {"matrix":[2, 10], "label":"0", "x":10, "y":2}, + {"matrix":[2, 11], "label":"-", "x":11, "y":2}, + {"matrix":[2, 12], "label":"=", "x":12, "y":2}, + {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2}, + {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2}, + {"matrix":[2, 16], "label":"/", "x":16.5, "y":2}, + {"matrix":[2, 17], "label":"*", "x":17.5, "y":2}, + {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2}, - {"matrix":[3,0], "label":"Tab", "x":0, "y":3, "w":1.5}, - {"matrix":[3,2], "label":"Q", "x":1.5, "y":3}, - {"matrix":[3,3], "label":"W", "x":2.5, "y":3}, - {"matrix":[3,4], "label":"E", "x":3.5, "y":3}, - {"matrix":[3,5], "label":"R", "x":4.5, "y":3}, - {"matrix":[3,6], "label":"T", "x":5.5, "y":3}, - {"matrix":[3,7], "label":"Y", "x":6.5, "y":3}, - {"matrix":[3,8], "label":"U", "x":7.5, "y":3}, - {"matrix":[3,9], "label":"I", "x":8.5, "y":3}, - {"matrix":[3,10], "label":"O", "x":9.5, "y":3}, - {"matrix":[3,11], "label":"P", "x":10.5, "y":3}, - {"matrix":[3,12], "label":"[", "x":11.5, "y":3}, - {"matrix":[3,13], "label":"]", "x":12.5, "y":3}, - {"matrix":[3,14], "label":"|", "x":13.5, "y":3, "w":1.5}, - {"matrix":[3,15], "label":"7", "x":15.5, "y":3}, - {"matrix":[3,16], "label":"8", "x":16.5, "y":3}, - {"matrix":[3,17], "label":"9", "x":17.5, "y":3}, - {"matrix":[3,18], "label":"-", "x":18.5, "y":3}, + {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5}, + {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3}, + {"matrix":[3, 3], "label":"W", "x":2.5, "y":3}, + {"matrix":[3, 4], "label":"E", "x":3.5, "y":3}, + {"matrix":[3, 5], "label":"R", "x":4.5, "y":3}, + {"matrix":[3, 6], "label":"T", "x":5.5, "y":3}, + {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3}, + {"matrix":[3, 8], "label":"U", "x":7.5, "y":3}, + {"matrix":[3, 9], "label":"I", "x":8.5, "y":3}, + {"matrix":[3, 10], "label":"O", "x":9.5, "y":3}, + {"matrix":[3, 11], "label":"P", "x":10.5, "y":3}, + {"matrix":[3, 12], "label":"[", "x":11.5, "y":3}, + {"matrix":[3, 13], "label":"]", "x":12.5, "y":3}, + {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5}, + {"matrix":[3, 15], "label":"7", "x":15.5, "y":3}, + {"matrix":[3, 16], "label":"8", "x":16.5, "y":3}, + {"matrix":[3, 17], "label":"9", "x":17.5, "y":3}, + {"matrix":[3, 18], "label":"-", "x":18.5, "y":3}, - {"matrix":[4,0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"matrix":[4,2], "label":"A", "x":1.75, "y":4}, - {"matrix":[4,3], "label":"S", "x":2.75, "y":4}, - {"matrix":[4,4], "label":"D", "x":3.75, "y":4}, - {"matrix":[4,5], "label":"F", "x":4.75, "y":4}, - {"matrix":[4,6], "label":"G", "x":5.75, "y":4}, - {"matrix":[4,7], "label":"H", "x":6.75, "y":4}, - {"matrix":[4,8], "label":"J", "x":7.75, "y":4}, - {"matrix":[4,9], "label":"K", "x":8.75, "y":4}, - {"matrix":[4,10], "label":"L", "x":9.75, "y":4}, - {"matrix":[4,11], "label":";", "x":10.75, "y":4}, - {"matrix":[4,12], "label":"'", "x":11.75, "y":4}, - {"matrix":[4,14], "label":"Enter", "x":12.75, "y":3, "w":2.25}, - {"matrix":[4,15], "label":"4", "x":15.5, "y":4}, - {"matrix":[4,16], "label":"5", "x":16.5, "y":4}, - {"matrix":[4,17], "label":"6", "x":17.5, "y":4}, - {"matrix":[4,18], "label":"+", "x":18.5, "y":4}, + {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, + {"matrix":[4, 2], "label":"A", "x":1.75, "y":4}, + {"matrix":[4, 3], "label":"S", "x":2.75, "y":4}, + {"matrix":[4, 4], "label":"D", "x":3.75, "y":4}, + {"matrix":[4, 5], "label":"F", "x":4.75, "y":4}, + {"matrix":[4, 6], "label":"G", "x":5.75, "y":4}, + {"matrix":[4, 7], "label":"H", "x":6.75, "y":4}, + {"matrix":[4, 8], "label":"J", "x":7.75, "y":4}, + {"matrix":[4, 9], "label":"K", "x":8.75, "y":4}, + {"matrix":[4, 10], "label":"L", "x":9.75, "y":4}, + {"matrix":[4, 11], "label":";", "x":10.75, "y":4}, + {"matrix":[4, 12], "label":"'", "x":11.75, "y":4}, + {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25}, + {"matrix":[4, 15], "label":"4", "x":15.5, "y":4}, + {"matrix":[4, 16], "label":"5", "x":16.5, "y":4}, + {"matrix":[4, 17], "label":"6", "x":17.5, "y":4}, + {"matrix":[4, 18], "label":"+", "x":18.5, "y":4}, - {"matrix":[5,0], "label":"Shift", "x":0, "y":5, "w":2.25}, - {"matrix":[5,2], "label":"Z", "x":2.25, "y":5}, - {"matrix":[5,3], "label":"X", "x":3.25, "y":5}, - {"matrix":[5,4], "label":"C", "x":4.25, "y":5}, - {"matrix":[5,5], "label":"V", "x":5.25, "y":5}, - {"matrix":[5,6], "label":"B", "x":6.25, "y":5}, - {"matrix":[5,7], "label":"N", "x":7.25, "y":5}, - {"matrix":[5,8], "label":"M", "x":8.25, "y":5}, - {"matrix":[5,9], "label":"<", "x":9.25, "y":5}, - {"matrix":[5,10], "label":">", "x":10.25, "y":5}, - {"matrix":[5,11], "label":"?", "x":11.25, "y":5}, - {"matrix":[5,13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"matrix":[5,14], "label":"up", "x":14.25, "y":5.25}, - {"matrix":[5,15], "label":"1", "x":15.5, "y":5}, - {"matrix":[5,16], "label":"2", "x":16.5, "y":5}, - {"matrix":[5,17], "label":"3", "x":17.5, "y":5}, - {"matrix":[5,18], "label":"Enter", "x":18.5, "y":5, "h":2}, + {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25}, + {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5}, + {"matrix":[5, 3], "label":"X", "x":3.25, "y":5}, + {"matrix":[5, 4], "label":"C", "x":4.25, "y":5}, + {"matrix":[5, 5], "label":"V", "x":5.25, "y":5}, + {"matrix":[5, 6], "label":"B", "x":6.25, "y":5}, + {"matrix":[5, 7], "label":"N", "x":7.25, "y":5}, + {"matrix":[5, 8], "label":"M", "x":8.25, "y":5}, + {"matrix":[5, 9], "label":"<", "x":9.25, "y":5}, + {"matrix":[5, 10], "label":">", "x":10.25, "y":5}, + {"matrix":[5, 11], "label":"?", "x":11.25, "y":5}, + {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, + {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25}, + {"matrix":[5, 15], "label":"1", "x":15.5, "y":5}, + {"matrix":[5, 16], "label":"2", "x":16.5, "y":5}, + {"matrix":[5, 17], "label":"3", "x":17.5, "y":5}, + {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2}, - {"matrix":[6,0], "label":"Ctrl", "x":0, "y":6}, - {"matrix":[6,1], "label":"Win", "x":1, "y":6}, - {"matrix":[6,2], "label":"Alt", "x":2, "y":6}, - {"matrix":[6,6], "label":"Space", "x":3, "y":6, "w":6}, - {"matrix":[6,9], "label":"AltGr", "x":9, "y":6}, - {"matrix":[6,10], "label":"Win", "x":10, "y":6}, - {"matrix":[6,11], "label":"Menu", "x":11, "y":6}, - {"matrix":[6,12], "label":"Ctrl", "x":12, "y":6}, - {"matrix":[6,13], "label":"left", "x":13.25, "y":6.25}, - {"matrix":[6,14], "label":"down", "x":14.25, "y":6.25}, - {"matrix":[6,15], "label":"right", "x":15.25, "y":6.25}, - {"matrix":[6,16], "label":"0", "x":16.5, "y":6}, - {"matrix":[6,17], "label":".", "x":17.5, "y":6}] + {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6}, + {"matrix":[6, 1], "label":"Win", "x":1, "y":6}, + {"matrix":[6, 2], "label":"Alt", "x":2, "y":6}, + {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6}, + {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6}, + {"matrix":[6, 10], "label":"Win", "x":10, "y":6}, + {"matrix":[6, 11], "label":"Menu", "x":11, "y":6}, + {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6}, + {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25}, + {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25}, + {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25}, + {"matrix":[6, 16], "label":"0", "x":16.5, "y":6}, + {"matrix":[6, 17], "label":".", "x":17.5, "y":6}] }, "LAYOUT_1800_ansi_7u": { "layout": [ - {"matrix":[0,0], "label":"Esc", "x":0, "y":0}, - {"matrix":[0,1], "label":"F1", "x":1.25, "y":0}, - {"matrix":[0,2], "label":"F2", "x":2.25, "y":0}, - {"matrix":[0,3], "label":"F3", "x":3.25, "y":0}, - {"matrix":[0,4], "label":"F4", "x":4.25, "y":0}, - {"matrix":[0,6], "label":"F5", "x":5.5, "y":0}, - {"matrix":[0,7], "label":"F6", "x":6.5, "y":0}, - {"matrix":[0,8], "label":"F7", "x":7.5, "y":0}, - {"matrix":[0,9], "label":"F8", "x":8.5, "y":0}, - {"matrix":[0,10], "label":"F9", "x":9.75, "y":0}, - {"matrix":[0,11], "label":"F10", "x":10.75, "y":0}, - {"matrix":[0,12], "label":"F11", "x":11.75, "y":0}, - {"matrix":[0,13], "label":"F12", "x":12.75, "y":0}, - {"matrix":[0,15], "label":"Insert", "x":15.5, "y":0}, - {"matrix":[0,16], "label":"Home", "x":16.5, "y":0}, - {"matrix":[0,17], "label":"PgUp", "x":17.5, "y":0}, - {"matrix":[0,18], "label":"PrtSc", "x":18.5, "y":0}, + {"matrix":[0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0}, + {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0}, + {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0}, + {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0}, + {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0}, + {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0}, + {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0}, + {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0}, + {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0}, + {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0}, + {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0}, + {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0}, + {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0}, + {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0}, + {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0}, + {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0}, - {"matrix":[1,15], "label":"Delete", "x":15.5, "y":1}, - {"matrix":[1,16], "label":"End", "x":16.5, "y":1}, - {"matrix":[1,17], "label":"PgDn", "x":17.5, "y":1}, - {"matrix":[1,18], "label":"Scroll Lock", "x":18.5, "y":1}, + {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1}, + {"matrix":[1, 16], "label":"End", "x":16.5, "y":1}, + {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1}, + {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1}, - {"matrix":[2,0], "label":"tild", "x":0, "y":2}, - {"matrix":[2,1], "label":"1", "x":1, "y":2}, - {"matrix":[2,2], "label":"2", "x":2, "y":2}, - {"matrix":[2,3], "label":"3", "x":3, "y":2}, - {"matrix":[2,4], "label":"4", "x":4, "y":2}, - {"matrix":[2,5], "label":"5", "x":5, "y":2}, - {"matrix":[2,6], "label":"6", "x":6, "y":2}, - {"matrix":[2,7], "label":"7", "x":7, "y":2}, - {"matrix":[2,8], "label":"8", "x":8, "y":2}, - {"matrix":[2,9], "label":"9", "x":9, "y":2}, - {"matrix":[2,10], "label":"0", "x":10, "y":2}, - {"matrix":[2,11], "label":"-", "x":11, "y":2}, - {"matrix":[2,12], "label":"=", "x":12, "y":2}, - {"matrix":[2,14], "label":"Backspace", "x":13, "y":2, "w":2}, - {"matrix":[2,15], "label":"Num Lock", "x":15.5, "y":2}, - {"matrix":[2,16], "label":"/", "x":16.5, "y":2}, - {"matrix":[2,17], "label":"*", "x":17.5, "y":2}, - {"matrix":[2,18], "label":"Pause", "x":18.5, "y":2}, + {"matrix":[2, 0], "label":"tild", "x":0, "y":2}, + {"matrix":[2, 1], "label":"1", "x":1, "y":2}, + {"matrix":[2, 2], "label":"2", "x":2, "y":2}, + {"matrix":[2, 3], "label":"3", "x":3, "y":2}, + {"matrix":[2, 4], "label":"4", "x":4, "y":2}, + {"matrix":[2, 5], "label":"5", "x":5, "y":2}, + {"matrix":[2, 6], "label":"6", "x":6, "y":2}, + {"matrix":[2, 7], "label":"7", "x":7, "y":2}, + {"matrix":[2, 8], "label":"8", "x":8, "y":2}, + {"matrix":[2, 9], "label":"9", "x":9, "y":2}, + {"matrix":[2, 10], "label":"0", "x":10, "y":2}, + {"matrix":[2, 11], "label":"-", "x":11, "y":2}, + {"matrix":[2, 12], "label":"=", "x":12, "y":2}, + {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2}, + {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2}, + {"matrix":[2, 16], "label":"/", "x":16.5, "y":2}, + {"matrix":[2, 17], "label":"*", "x":17.5, "y":2}, + {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2}, - {"matrix":[3,0], "label":"Tab", "x":0, "y":3, "w":1.5}, - {"matrix":[3,2], "label":"Q", "x":1.5, "y":3}, - {"matrix":[3,3], "label":"W", "x":2.5, "y":3}, - {"matrix":[3,4], "label":"E", "x":3.5, "y":3}, - {"matrix":[3,5], "label":"R", "x":4.5, "y":3}, - {"matrix":[3,6], "label":"T", "x":5.5, "y":3}, - {"matrix":[3,7], "label":"Y", "x":6.5, "y":3}, - {"matrix":[3,8], "label":"U", "x":7.5, "y":3}, - {"matrix":[3,9], "label":"I", "x":8.5, "y":3}, - {"matrix":[3,10], "label":"O", "x":9.5, "y":3}, - {"matrix":[3,11], "label":"P", "x":10.5, "y":3}, - {"matrix":[3,12], "label":"[", "x":11.5, "y":3}, - {"matrix":[3,13], "label":"]", "x":12.5, "y":3}, - {"matrix":[3,14], "label":"|", "x":13.5, "y":3, "w":1.5}, - {"matrix":[3,15], "label":"7", "x":15.5, "y":3}, - {"matrix":[3,16], "label":"8", "x":16.5, "y":3}, - {"matrix":[3,17], "label":"9", "x":17.5, "y":3}, - {"matrix":[3,18], "label":"-", "x":18.5, "y":3}, + {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5}, + {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3}, + {"matrix":[3, 3], "label":"W", "x":2.5, "y":3}, + {"matrix":[3, 4], "label":"E", "x":3.5, "y":3}, + {"matrix":[3, 5], "label":"R", "x":4.5, "y":3}, + {"matrix":[3, 6], "label":"T", "x":5.5, "y":3}, + {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3}, + {"matrix":[3, 8], "label":"U", "x":7.5, "y":3}, + {"matrix":[3, 9], "label":"I", "x":8.5, "y":3}, + {"matrix":[3, 10], "label":"O", "x":9.5, "y":3}, + {"matrix":[3, 11], "label":"P", "x":10.5, "y":3}, + {"matrix":[3, 12], "label":"[", "x":11.5, "y":3}, + {"matrix":[3, 13], "label":"]", "x":12.5, "y":3}, + {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5}, + {"matrix":[3, 15], "label":"7", "x":15.5, "y":3}, + {"matrix":[3, 16], "label":"8", "x":16.5, "y":3}, + {"matrix":[3, 17], "label":"9", "x":17.5, "y":3}, + {"matrix":[3, 18], "label":"-", "x":18.5, "y":3}, - {"matrix":[4,0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"matrix":[4,2], "label":"A", "x":1.75, "y":4}, - {"matrix":[4,3], "label":"S", "x":2.75, "y":4}, - {"matrix":[4,4], "label":"D", "x":3.75, "y":4}, - {"matrix":[4,5], "label":"F", "x":4.75, "y":4}, - {"matrix":[4,6], "label":"G", "x":5.75, "y":4}, - {"matrix":[4,7], "label":"H", "x":6.75, "y":4}, - {"matrix":[4,8], "label":"J", "x":7.75, "y":4}, - {"matrix":[4,9], "label":"K", "x":8.75, "y":4}, - {"matrix":[4,10], "label":"L", "x":9.75, "y":4}, - {"matrix":[4,11], "label":";", "x":10.75, "y":4}, - {"matrix":[4,12], "label":"'", "x":11.75, "y":4}, - {"matrix":[4,14], "label":"Enter", "x":12.75, "y":3, "w":2.25}, - {"matrix":[4,15], "label":"4", "x":15.5, "y":4}, - {"matrix":[4,16], "label":"5", "x":16.5, "y":4}, - {"matrix":[4,17], "label":"6", "x":17.5, "y":4}, - {"matrix":[4,18], "label":"+", "x":18.5, "y":4}, + {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75}, + {"matrix":[4, 2], "label":"A", "x":1.75, "y":4}, + {"matrix":[4, 3], "label":"S", "x":2.75, "y":4}, + {"matrix":[4, 4], "label":"D", "x":3.75, "y":4}, + {"matrix":[4, 5], "label":"F", "x":4.75, "y":4}, + {"matrix":[4, 6], "label":"G", "x":5.75, "y":4}, + {"matrix":[4, 7], "label":"H", "x":6.75, "y":4}, + {"matrix":[4, 8], "label":"J", "x":7.75, "y":4}, + {"matrix":[4, 9], "label":"K", "x":8.75, "y":4}, + {"matrix":[4, 10], "label":"L", "x":9.75, "y":4}, + {"matrix":[4, 11], "label":";", "x":10.75, "y":4}, + {"matrix":[4, 12], "label":"'", "x":11.75, "y":4}, + {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25}, + {"matrix":[4, 15], "label":"4", "x":15.5, "y":4}, + {"matrix":[4, 16], "label":"5", "x":16.5, "y":4}, + {"matrix":[4, 17], "label":"6", "x":17.5, "y":4}, + {"matrix":[4, 18], "label":"+", "x":18.5, "y":4}, - {"matrix":[5,0], "label":"Shift", "x":0, "y":5, "w":2.25}, - {"matrix":[5,2], "label":"Z", "x":2.25, "y":5}, - {"matrix":[5,3], "label":"X", "x":3.25, "y":5}, - {"matrix":[5,4], "label":"C", "x":4.25, "y":5}, - {"matrix":[5,5], "label":"V", "x":5.25, "y":5}, - {"matrix":[5,6], "label":"B", "x":6.25, "y":5}, - {"matrix":[5,7], "label":"N", "x":7.25, "y":5}, - {"matrix":[5,8], "label":"M", "x":8.25, "y":5}, - {"matrix":[5,9], "label":"<", "x":9.25, "y":5}, - {"matrix":[5,10], "label":">", "x":10.25, "y":5}, - {"matrix":[5,11], "label":"?", "x":11.25, "y":5}, - {"matrix":[5,13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, - {"matrix":[5,14], "label":"up", "x":14.25, "y":5.25}, - {"matrix":[5,15], "label":"1", "x":15.5, "y":5}, - {"matrix":[5,16], "label":"2", "x":16.5, "y":5}, - {"matrix":[5,17], "label":"3", "x":17.5, "y":5}, - {"matrix":[5,18], "label":"Enter", "x":18.5, "y":5, "h":2}, + {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25}, + {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5}, + {"matrix":[5, 3], "label":"X", "x":3.25, "y":5}, + {"matrix":[5, 4], "label":"C", "x":4.25, "y":5}, + {"matrix":[5, 5], "label":"V", "x":5.25, "y":5}, + {"matrix":[5, 6], "label":"B", "x":6.25, "y":5}, + {"matrix":[5, 7], "label":"N", "x":7.25, "y":5}, + {"matrix":[5, 8], "label":"M", "x":8.25, "y":5}, + {"matrix":[5, 9], "label":"<", "x":9.25, "y":5}, + {"matrix":[5, 10], "label":">", "x":10.25, "y":5}, + {"matrix":[5, 11], "label":"?", "x":11.25, "y":5}, + {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75}, + {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25}, + {"matrix":[5, 15], "label":"1", "x":15.5, "y":5}, + {"matrix":[5, 16], "label":"2", "x":16.5, "y":5}, + {"matrix":[5, 17], "label":"3", "x":17.5, "y":5}, + {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2}, - {"matrix":[6,0], "label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"matrix":[6,2], "label":"Alt", "x":1.5, "y":6, "w":1.5}, - {"matrix":[6,6], "label":"Space", "x":3, "y":6, "w":7}, - {"matrix":[6,9], "label":"AltGr", "x":10, "y":6, "w":1.5}, - {"matrix":[6,12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5}, - {"matrix":[6,13], "label":"left", "x":13.25, "y":6.25}, - {"matrix":[6,14], "label":"down", "x":14.25, "y":6.25}, - {"matrix":[6,15], "label":"right", "x":15.25, "y":6.25}, - {"matrix":[6,16], "label":"0", "x":16.5, "y":6}, - {"matrix":[6,17], "label":".", "x":17.5, "y":6}] + {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5}, + {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5}, + {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7}, + {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5}, + {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5}, + {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25}, + {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25}, + {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25}, + {"matrix":[6, 16], "label":"0", "x":16.5, "y":6}, + {"matrix":[6, 17], "label":".", "x":17.5, "y":6}] } } -} \ No newline at end of file +} diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json index 3091643e4f..f4ea062e49 100644 --- a/keyboards/eek/silk_down/info.json +++ b/keyboards/eek/silk_down/info.json @@ -48,4 +48,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json index a810549d55..1b80d66e96 100644 --- a/keyboards/eek/silk_up/info.json +++ b/keyboards/eek/silk_up/info.json @@ -48,4 +48,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index 5e0f694135..c4406cec31 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Emi20", + "keyboard_name": "Emi20", "manufacturer": "Aquacylinder", - "url": "", - "maintainer": "Aquacylinder", + "url": "", + "maintainer": "Aquacylinder", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/era/era65/info.json b/keyboards/era/era65/info.json index 17ca98fecf..a083245491 100644 --- a/keyboards/era/era65/info.json +++ b/keyboards/era/era65/info.json @@ -11,8 +11,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "backlight": true - + "backlight": true }, "matrix_pins": { "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP22", "GP23", "GP3"], @@ -79,10 +78,10 @@ { "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], "w": 1.25, "x": 13.75, "y": 2 }, + { "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, { "matrix": [2, 14], "x": 15.5, "y": 2 }, { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1.25, "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 }, @@ -109,4 +108,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index efcbcf2ab0..36a39c1abe 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "NumDiscipline", + "keyboard_name": "NumDiscipline", "manufacturer": "ELau", - "url": "https://github.com/ericrlau/NumDiscipline", - "maintainer": "ericrlau", + "url": "https://github.com/ericrlau/NumDiscipline", + "maintainer": "ericrlau", "usb": { "vid": "0x454C", "pid": "0x0001", diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json index bfa9da1851..5d4cdd9e03 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GetawayVan", + "keyboard_name": "GetawayVan", "manufacturer": "esca", - "url": "", - "maintainer": "esca", + "url": "", + "maintainer": "esca", "usb": { "vid": "0xE5CA", "pid": "0x0401", diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json index c514b14e51..152e76217f 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GetawayVan", + "keyboard_name": "GetawayVan", "manufacturer": "esca", - "url": "", - "maintainer": "esca", + "url": "", + "maintainer": "esca", "usb": { "vid": "0xE5CA", "pid": "0x0401", diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json index 5c98daa8ae..688dda6341 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/info.json @@ -53,4 +53,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/eve/meteor/info.json b/keyboards/eve/meteor/info.json index 983051b07a..ba8e456958 100644 --- a/keyboards/eve/meteor/info.json +++ b/keyboards/eve/meteor/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Meteor", + "keyboard_name": "Meteor", "manufacturer": "EVE", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4556", "pid": "0x4D54", diff --git a/keyboards/evolv/info.json b/keyboards/evolv/info.json index 6510da93ea..ae72abef76 100644 --- a/keyboards/evolv/info.json +++ b/keyboards/evolv/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Evolv75", + "keyboard_name": "Evolv75", "manufacturer": "NathanAlpha", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x7865", "pid": "0x0E75", diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 445aa8db9b..b1642612ea 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Atom47 rev2", + "keyboard_name": "Atom47 rev2", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x8E66", diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index 39c5325bae..dc9b13961f 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Atom47 rev3", + "keyboard_name": "Atom47 rev3", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x0E6D", diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index 1e83924bad..b2b4bf9ef2 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Atom47 rev4", + "keyboard_name": "Atom47 rev4", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x8446", diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json index 30005a992c..c442c74549 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Atom47 rev5", + "keyboard_name": "Atom47 rev5", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x92EA", diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index fb577ebb29..ce989e1d2a 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Eon40", + "keyboard_name": "Eon40", "manufacturer": "Evyd13", - "url": "https://maartenwut.com/product/eon40/", - "maintainer": "qmk", + "url": "https://maartenwut.com/product/eon40/", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0x0140", diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json index 26ff4e2af3..a58c3a5233 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Eon65", + "keyboard_name": "Eon65", "manufacturer": "Evyd13", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0xAEB4", diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json index a165c08f3a..07a5554910 100644 --- a/keyboards/evyd13/eon75/info.json +++ b/keyboards/evyd13/eon75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Eon75", + "keyboard_name": "Eon75", "manufacturer": "Evyd13", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0x5C62", diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json index 8df5602a8f..8e2b0a5034 100644 --- a/keyboards/evyd13/eon95/info.json +++ b/keyboards/evyd13/eon95/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Eon95", + "keyboard_name": "Eon95", "manufacturer": "Evyd13", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0x8A18", diff --git a/keyboards/evyd13/fin_pad/info.json b/keyboards/evyd13/fin_pad/info.json index f2fb0b90a7..461cb4f9b8 100644 --- a/keyboards/evyd13/fin_pad/info.json +++ b/keyboards/evyd13/fin_pad/info.json @@ -85,4 +85,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json index c96452403c..86a7eaf9b4 100644 --- a/keyboards/evyd13/gh80_1800/info.json +++ b/keyboards/evyd13/gh80_1800/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GH80-1800", + "keyboard_name": "GH80-1800", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-1800", - "maintainer": "evyd13", + "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-1800", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x8B23", diff --git a/keyboards/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json index ac66909e59..6f4f5c3e4f 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GH80-3700", + "keyboard_name": "GH80-3700", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-3700", - "maintainer": "evyd13", + "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-3700", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x633A", diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json index b18fcedf2b..8e4b719943 100644 --- a/keyboards/evyd13/gud70/info.json +++ b/keyboards/evyd13/gud70/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Gud70", + "keyboard_name": "Gud70", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/gud70-pcb", - "maintainer": "evyd13", + "url": "https://github.com/evyd13/gud70-pcb", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x198B", diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json index 1948089272..3146b51410 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Minitomic", + "keyboard_name": "Minitomic", "manufacturer": "Evyd13", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0x0145", diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json index 38c9712196..b9c7e54a57 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MX-5160", + "keyboard_name": "MX-5160", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/mx-5160", - "maintainer": "qmk", + "url": "https://github.com/evyd13/mx-5160", + "maintainer": "qmk", "usb": { "vid": "0x4705", "pid": "0x5160", diff --git a/keyboards/evyd13/nt210/info.json b/keyboards/evyd13/nt210/info.json index c467ae33a1..d52af9abf5 100644 --- a/keyboards/evyd13/nt210/info.json +++ b/keyboards/evyd13/nt210/info.json @@ -81,4 +81,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/info.json index 3cb5cf6286..a2c1fac784 100644 --- a/keyboards/evyd13/nt650/info.json +++ b/keyboards/evyd13/nt650/info.json @@ -102,4 +102,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index 7fd9858ef6..c222aba700 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nt660", + "keyboard_name": "nt660", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x1F02", diff --git a/keyboards/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json index a23e8756aa..b12c2b5352 100644 --- a/keyboards/evyd13/nt750/info.json +++ b/keyboards/evyd13/nt750/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nt750", + "keyboard_name": "nt750", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/nt-series/tree/main/nt-750", - "maintainer": "evyd13", + "url": "https://github.com/evyd13/nt-series/tree/main/nt-750", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x3320", diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json index d922c0c260..d8d31e0e7f 100644 --- a/keyboards/evyd13/nt980/info.json +++ b/keyboards/evyd13/nt980/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nt980", + "keyboard_name": "nt980", "manufacturer": "Evyd13", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0xAAF8", diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index 30010ad30b..eda670af11 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PocketType", + "keyboard_name": "PocketType", "manufacturer": "Evyd13", - "url": "https://mechboards.co.uk/shop/kits/pockettype/", - "maintainer": "evyd13", + "url": "https://mechboards.co.uk/shop/kits/pockettype/", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0xFA7D", diff --git a/keyboards/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json index b0be1ab422..a08f786027 100644 --- a/keyboards/evyd13/solheim68/info.json +++ b/keyboards/evyd13/solheim68/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Solheim68", + "keyboard_name": "Solheim68", "manufacturer": "Evyd13", - "url": "https://github.com/evyd13/solheim68", - "maintainer": "evyd13", + "url": "https://github.com/evyd13/solheim68", + "maintainer": "evyd13", "usb": { "vid": "0x4705", "pid": "0x7BFF", diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json index 43ad89747d..8fbbcbfea3 100644 --- a/keyboards/exclusive/e6v2/le/info.json +++ b/keyboards/exclusive/e6v2/le/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "E6-V2 LE", + "keyboard_name": "E6-V2 LE", "manufacturer": "Exclusive / E-Team", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json index bd5833f8a9..c0d2ffa868 100644 --- a/keyboards/exclusive/e6v2/le_bmc/info.json +++ b/keyboards/exclusive/e6v2/le_bmc/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "E6-V2 LE BMC", "manufacturer": "Exclusive / E-Team", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x4558", "pid": "0xE62D", diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json index 13eacf7190..622d7db564 100644 --- a/keyboards/exclusive/e6v2/oe_bmc/info.json +++ b/keyboards/exclusive/e6v2/oe_bmc/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "E6-V2 OE BMC", "manufacturer": "Exclusive / E-Team", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x4558", "pid": "0xE62B", diff --git a/keyboards/eyeohdesigns/babyv/info.json b/keyboards/eyeohdesigns/babyv/info.json index 96784d0444..f2d0ea53e6 100644 --- a/keyboards/eyeohdesigns/babyv/info.json +++ b/keyboards/eyeohdesigns/babyv/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "babyv", + "keyboard_name": "babyv", "manufacturer": "Eye Oh Designs", - "url": "", - "maintainer": "eye oh designs", + "url": "", + "maintainer": "eye oh designs", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json index a4eed41e41..a94968a989 100644 --- a/keyboards/eyeohdesigns/theboulevard/info.json +++ b/keyboards/eyeohdesigns/theboulevard/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "the boulevard", + "keyboard_name": "the boulevard", "manufacturer": "eye oh designs", - "url": "", - "maintainer": "eye oh designs", + "url": "", + "maintainer": "eye oh designs", "usb": { "vid": "0xFEED", "pid": "0x0000", @@ -685,4 +685,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json index 18fdd7542a..ed6b5fb376 100644 --- a/keyboards/ez_maker/directpins/teensy_32/info.json +++ b/keyboards/ez_maker/directpins/teensy_32/info.json @@ -11,19 +11,19 @@ }, "matrix_pins": { "direct": [ - ["LINE_PIN0", null, null], - ["LINE_PIN1", null, null], - ["LINE_PIN2", null, "LINE_PIN23"], - ["LINE_PIN3", "LINE_PIN24", "LINE_PIN22"], - ["LINE_PIN4", "LINE_PIN25", "LINE_PIN21"], - ["LINE_PIN5", null, "LINE_PIN20"], - ["LINE_PIN6", null, "LINE_PIN19"], - ["LINE_PIN7", null, "LINE_PIN18"], - ["LINE_PIN8", null, "LINE_PIN17"], - ["LINE_PIN9", null, "LINE_PIN16"], - ["LINE_PIN10", null, "LINE_PIN15"], - ["LINE_PIN11", null, "LINE_PIN14"], - ["LINE_PIN12", "E30", "LINE_PIN13"] + ["LINE_PIN0", null, null], + ["LINE_PIN1", null, null], + ["LINE_PIN2", null, "LINE_PIN23"], + ["LINE_PIN3", "LINE_PIN24", "LINE_PIN22"], + ["LINE_PIN4", "LINE_PIN25", "LINE_PIN21"], + ["LINE_PIN5", null, "LINE_PIN20"], + ["LINE_PIN6", null, "LINE_PIN19"], + ["LINE_PIN7", null, "LINE_PIN18"], + ["LINE_PIN8", null, "LINE_PIN17"], + ["LINE_PIN9", null, "LINE_PIN16"], + ["LINE_PIN10", null, "LINE_PIN15"], + ["LINE_PIN11", null, "LINE_PIN14"], + ["LINE_PIN12", "E30", "LINE_PIN13"] ] }, "usb": { diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json index 4af0768e3c..685788a832 100644 --- a/keyboards/ez_maker/directpins/teensy_lc/info.json +++ b/keyboards/ez_maker/directpins/teensy_lc/info.json @@ -11,19 +11,19 @@ }, "matrix_pins": { "direct": [ - ["LINE_PIN0", null, null], - ["LINE_PIN1", null, null], - ["LINE_PIN2", null, "LINE_PIN23"], - ["LINE_PIN3", "LINE_PIN24", "LINE_PIN22"], - ["LINE_PIN4", "LINE_PIN25", "LINE_PIN21"], - ["LINE_PIN5", null, "LINE_PIN20"], - ["LINE_PIN6", null, "LINE_PIN19"], - ["LINE_PIN7", null, "LINE_PIN18"], - ["LINE_PIN8", null, "LINE_PIN17"], - ["LINE_PIN9", null, "LINE_PIN16"], - ["LINE_PIN10", null, "LINE_PIN15"], - ["LINE_PIN11", null, "LINE_PIN14"], - ["LINE_PIN12", "E30", "LINE_PIN13"] + ["LINE_PIN0", null, null], + ["LINE_PIN1", null, null], + ["LINE_PIN2", null, "LINE_PIN23"], + ["LINE_PIN3", "LINE_PIN24", "LINE_PIN22"], + ["LINE_PIN4", "LINE_PIN25", "LINE_PIN21"], + ["LINE_PIN5", null, "LINE_PIN20"], + ["LINE_PIN6", null, "LINE_PIN19"], + ["LINE_PIN7", null, "LINE_PIN18"], + ["LINE_PIN8", null, "LINE_PIN17"], + ["LINE_PIN9", null, "LINE_PIN16"], + ["LINE_PIN10", null, "LINE_PIN15"], + ["LINE_PIN11", null, "LINE_PIN14"], + ["LINE_PIN12", "E30", "LINE_PIN13"] ] }, "usb": { diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index d782d2d0fb..e51283eb19 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Fallacy", + "keyboard_name": "Fallacy", "manufacturer": "SheuBox", - "maintainer": "Toraifu", + "maintainer": "Toraifu", "usb": { "vid": "0xBF00", "pid": "0xBFFA", diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json index c0385fa37f..8250619bdc 100644 --- a/keyboards/fc660c/info.json +++ b/keyboards/fc660c/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "FC660C", + "keyboard_name": "FC660C", "manufacturer": "Hasu", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4853", "pid": "0x660C", diff --git a/keyboards/flehrad/snagpad/info.json b/keyboards/flehrad/snagpad/info.json index 956482bbea..7795b0a6b7 100644 --- a/keyboards/flehrad/snagpad/info.json +++ b/keyboards/flehrad/snagpad/info.json @@ -17,7 +17,6 @@ "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { - "LAYOUT_ortho_5x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json index 5f98a46967..c2ff091ace 100644 --- a/keyboards/fleuron/info.json +++ b/keyboards/fleuron/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Fleuron v1", + "keyboard_name": "Fleuron v1", "manufacturer": "Fleuron", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json index 75a8080402..f8b3c35edd 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Leaf 60 Hotswap", + "keyboard_name": "Leaf 60 Hotswap", "manufacturer": "Fox Lab", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x464C", "pid": "0x0001", diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json index 7effd345d2..a277830d9d 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Leaf 60 Universal", + "keyboard_name": "Leaf 60 Universal", "manufacturer": "Fox Lab", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x464C", "pid": "0x0002", diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json index 066af0b9a7..3eb325d0eb 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Southpaw75", + "keyboard_name": "Southpaw75", "manufacturer": "kelvinhall05", - "url": "https://github.com/kelvinhall05/southpaw75", - "maintainer": "kelvinhall05", + "url": "https://github.com/kelvinhall05/southpaw75", + "maintainer": "kelvinhall05", "usb": { "vid": "0xFEED", "pid": "0x350C", diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json index e89273785b..cf641d2e01 100644 --- a/keyboards/fr4/unix60/info.json +++ b/keyboards/fr4/unix60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "unix60", + "keyboard_name": "unix60", "manufacturer": "FR4Boards", - "url": "https://github.com/mkdl/Unix60", - "maintainer": "mkdl", + "url": "https://github.com/mkdl/Unix60", + "maintainer": "mkdl", "usb": { "vid": "0x4652", "pid": "0x5558", diff --git a/keyboards/friedrich/info.json b/keyboards/friedrich/info.json index 321bacdbd5..d3d3fc950e 100644 --- a/keyboards/friedrich/info.json +++ b/keyboards/friedrich/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Friedrich", + "keyboard_name": "Friedrich", "manufacturer": "kb-elmo", "url": "https://github.com/MarvFPV/Friedrich", - "maintainer": "kb-elmo", + "maintainer": "kb-elmo", "usb": { "vid": "0x6481", "pid": "0xB4A2", diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json index f639ab9b7a..ccd76a7736 100644 --- a/keyboards/frobiac/blackbowl/info.json +++ b/keyboards/frobiac/blackbowl/info.json @@ -28,57 +28,57 @@ "vid": "0x6033" }, "matrix_pins": { - "cols": [ null, null, null, null ], - "rows": [ null, null, null, null, null, null, null, null, null, null ] + "cols": [null, null, null, null], + "rows": [null, null, null, null, null, null, null, null, null, null] }, "layouts": { "LAYOUT": { "layout": [ - {"matrix": [5, 3], "label":"K", "x":0, "y":1}, - {"matrix": [6, 3], "label":"U", "x":1, "y":0.5}, - {"matrix": [7, 3], "label":"Q", "x":2, "y":0}, - {"matrix": [8, 3], "label":".", "x":3, "y":0}, - {"matrix": [9, 3], "label":"J", "x":4, "y":0}, + {"matrix": [5, 3], "label":"K", "x":0, "y":1}, + {"matrix": [6, 3], "label":"U", "x":1, "y":0.5}, + {"matrix": [7, 3], "label":"Q", "x":2, "y":0}, + {"matrix": [8, 3], "label":".", "x":3, "y":0}, + {"matrix": [9, 3], "label":"J", "x":4, "y":0}, - {"matrix": [0, 3], "label":"P", "x":6, "y":0}, - {"matrix": [1, 3], "label":"C", "x":7, "y":0}, - {"matrix": [2, 3], "label":"L", "x":8, "y":0}, - {"matrix": [3, 3], "label":"M", "x":9, "y":0.5}, - {"matrix": [4, 3], "label":"F", "x":10, "y":1}, + {"matrix": [0, 3], "label":"P", "x":6, "y":0}, + {"matrix": [1, 3], "label":"C", "x":7, "y":0}, + {"matrix": [2, 3], "label":"L", "x":8, "y":0}, + {"matrix": [3, 3], "label":"M", "x":9, "y":0.5}, + {"matrix": [4, 3], "label":"F", "x":10, "y":1}, - {"matrix": [5, 2], "label":"H", "x":0, "y":2}, - {"matrix": [6, 2], "label":"I", "x":1, "y":1.5}, - {"matrix": [7, 2], "label":"E", "x":2, "y":1}, - {"matrix": [8, 2], "label":"A", "x":3, "y":1}, - {"matrix": [9, 2], "label":"O", "x":4, "y":1}, + {"matrix": [5, 2], "label":"H", "x":0, "y":2}, + {"matrix": [6, 2], "label":"I", "x":1, "y":1.5}, + {"matrix": [7, 2], "label":"E", "x":2, "y":1}, + {"matrix": [8, 2], "label":"A", "x":3, "y":1}, + {"matrix": [9, 2], "label":"O", "x":4, "y":1}, - {"matrix": [0, 2], "label":"D", "x":6, "y":1}, - {"matrix": [1, 2], "label":"T", "x":7, "y":1}, - {"matrix": [2, 2], "label":"R", "x":8, "y":1}, - {"matrix": [3, 2], "label":"N", "x":9, "y":1.5}, - {"matrix": [4, 2], "label":"S", "x":10, "y":2}, + {"matrix": [0, 2], "label":"D", "x":6, "y":1}, + {"matrix": [1, 2], "label":"T", "x":7, "y":1}, + {"matrix": [2, 2], "label":"R", "x":8, "y":1}, + {"matrix": [3, 2], "label":"N", "x":9, "y":1.5}, + {"matrix": [4, 2], "label":"S", "x":10, "y":2}, - {"matrix": [5, 1], "label":"X", "x":0, "y":3}, - {"matrix": [6, 1], "label":"Y", "x":1, "y":2.5}, - {"matrix": [7, 1], "label":"-", "x":2, "y":2}, - {"matrix": [8, 1], "label":",", "x":3, "y":2}, - {"matrix": [9, 1], "label":"/", "x":4, "y":2}, + {"matrix": [5, 1], "label":"X", "x":0, "y":3}, + {"matrix": [6, 1], "label":"Y", "x":1, "y":2.5}, + {"matrix": [7, 1], "label":"-", "x":2, "y":2}, + {"matrix": [8, 1], "label":",", "x":3, "y":2}, + {"matrix": [9, 1], "label":"/", "x":4, "y":2}, - {"matrix": [0, 1], "label":"B", "x":6, "y":2}, - {"matrix": [1, 1], "label":"G", "x":7, "y":2}, - {"matrix": [2, 1], "label":"W", "x":8, "y":2}, - {"matrix": [3, 1], "label":"V", "x":9, "y":2.5}, - {"matrix": [4, 1], "label":"Z", "x":10, "y":3}, + {"matrix": [0, 1], "label":"B", "x":6, "y":2}, + {"matrix": [1, 1], "label":"G", "x":7, "y":2}, + {"matrix": [2, 1], "label":"W", "x":8, "y":2}, + {"matrix": [3, 1], "label":"V", "x":9, "y":2.5}, + {"matrix": [4, 1], "label":"Z", "x":10, "y":3}, - {"matrix": [5, 0], "label":" ", "x":0, "y":0}, - {"matrix": [7, 0], "label":"Gui", "x":2, "y":3}, - {"matrix": [8, 0], "label":"tab", "x":3, "y":3}, - {"matrix": [9, 0], "label":"spc", "x":4, "y":3}, + {"matrix": [5, 0], "label":" ", "x":0, "y":0}, + {"matrix": [7, 0], "label":"Gui", "x":2, "y":3}, + {"matrix": [8, 0], "label":"tab", "x":3, "y":3}, + {"matrix": [9, 0], "label":"spc", "x":4, "y":3}, - {"matrix": [0, 0], "label":"L2", "x":6, "y":3}, - {"matrix": [1, 0], "label":"Sh", "x":7, "y":3}, - {"matrix": [2, 0], "label":"L3", "x":8, "y":3}, - {"matrix": [4, 0], "label":"Fx", "x":10, "y":0} + {"matrix": [0, 0], "label":"L2", "x":6, "y":3}, + {"matrix": [1, 0], "label":"Sh", "x":7, "y":3}, + {"matrix": [2, 0], "label":"L3", "x":8, "y":3}, + {"matrix": [4, 0], "label":"Fx", "x":10, "y":0} ] } } diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json index 10f5842fa6..08fc2745a4 100644 --- a/keyboards/frobiac/blackflat/info.json +++ b/keyboards/frobiac/blackflat/info.json @@ -34,51 +34,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "label":"K", "x":0, "y":1}, - {"matrix": [0, 1], "label":"U", "x":1, "y":0.5}, - {"matrix": [0, 2], "label":"Q", "x":2, "y":0}, - {"matrix": [0, 3], "label":".", "x":3, "y":0}, - {"matrix": [0, 4], "label":"J", "x":4, "y":0}, + {"matrix": [0, 0], "label":"K", "x":0, "y":1}, + {"matrix": [0, 1], "label":"U", "x":1, "y":0.5}, + {"matrix": [0, 2], "label":"Q", "x":2, "y":0}, + {"matrix": [0, 3], "label":".", "x":3, "y":0}, + {"matrix": [0, 4], "label":"J", "x":4, "y":0}, - {"matrix": [4, 0], "label":"P", "x":6, "y":0}, - {"matrix": [4, 1], "label":"C", "x":7, "y":0}, - {"matrix": [4, 2], "label":"L", "x":8, "y":0}, - {"matrix": [4, 3], "label":"M", "x":9, "y":0.5}, - {"matrix": [4, 4], "label":"F", "x":10, "y":1}, + {"matrix": [4, 0], "label":"P", "x":6, "y":0}, + {"matrix": [4, 1], "label":"C", "x":7, "y":0}, + {"matrix": [4, 2], "label":"L", "x":8, "y":0}, + {"matrix": [4, 3], "label":"M", "x":9, "y":0.5}, + {"matrix": [4, 4], "label":"F", "x":10, "y":1}, - {"matrix": [1, 0], "label":"H", "x":0, "y":2}, - {"matrix": [1, 1], "label":"I", "x":1, "y":1.5}, - {"matrix": [1, 2], "label":"E", "x":2, "y":1}, - {"matrix": [1, 3], "label":"A", "x":3, "y":1}, - {"matrix": [1, 4], "label":"O", "x":4, "y":1}, + {"matrix": [1, 0], "label":"H", "x":0, "y":2}, + {"matrix": [1, 1], "label":"I", "x":1, "y":1.5}, + {"matrix": [1, 2], "label":"E", "x":2, "y":1}, + {"matrix": [1, 3], "label":"A", "x":3, "y":1}, + {"matrix": [1, 4], "label":"O", "x":4, "y":1}, - {"matrix": [5, 0], "label":"D", "x":6, "y":1}, - {"matrix": [5, 1], "label":"T", "x":7, "y":1}, - {"matrix": [5, 2], "label":"R", "x":8, "y":1}, - {"matrix": [5, 3], "label":"N", "x":9, "y":1.5}, - {"matrix": [5, 4], "label":"S", "x":10, "y":2}, + {"matrix": [5, 0], "label":"D", "x":6, "y":1}, + {"matrix": [5, 1], "label":"T", "x":7, "y":1}, + {"matrix": [5, 2], "label":"R", "x":8, "y":1}, + {"matrix": [5, 3], "label":"N", "x":9, "y":1.5}, + {"matrix": [5, 4], "label":"S", "x":10, "y":2}, - {"matrix": [2, 0], "label":"X", "x":0, "y":3}, - {"matrix": [2, 1], "label":"Y", "x":1, "y":2.5}, - {"matrix": [2, 2], "label":"-", "x":2, "y":2}, - {"matrix": [2, 3], "label":",", "x":3, "y":2}, - {"matrix": [2, 4], "label":"/", "x":4, "y":2}, + {"matrix": [2, 0], "label":"X", "x":0, "y":3}, + {"matrix": [2, 1], "label":"Y", "x":1, "y":2.5}, + {"matrix": [2, 2], "label":"-", "x":2, "y":2}, + {"matrix": [2, 3], "label":",", "x":3, "y":2}, + {"matrix": [2, 4], "label":"/", "x":4, "y":2}, - {"matrix": [6, 0], "label":"B", "x":6, "y":2}, - {"matrix": [6, 1], "label":"G", "x":7, "y":2}, - {"matrix": [6, 2], "label":"W", "x":8, "y":2}, - {"matrix": [6, 3], "label":"V", "x":9, "y":2.5}, - {"matrix": [6, 4], "label":"Z", "x":10, "y":3}, + {"matrix": [6, 0], "label":"B", "x":6, "y":2}, + {"matrix": [6, 1], "label":"G", "x":7, "y":2}, + {"matrix": [6, 2], "label":"W", "x":8, "y":2}, + {"matrix": [6, 3], "label":"V", "x":9, "y":2.5}, + {"matrix": [6, 4], "label":"Z", "x":10, "y":3}, - {"matrix": [3, 0], "label":"", "x":0, "y":0}, - {"matrix": [3, 2], "label":"Gui", "x":2, "y":3}, - {"matrix": [3, 3], "label":"Tab", "x":3, "y":3}, - {"matrix": [3, 4], "label":"Spc", "x":4, "y":3}, + {"matrix": [3, 0], "label":"", "x":0, "y":0}, + {"matrix": [3, 2], "label":"Gui", "x":2, "y":3}, + {"matrix": [3, 3], "label":"Tab", "x":3, "y":3}, + {"matrix": [3, 4], "label":"Spc", "x":4, "y":3}, - {"matrix": [7, 0], "label":"L2", "x":6, "y":3}, - {"matrix": [7, 1], "label":"Sh", "x":7, "y":3}, - {"matrix": [7, 2], "label":"L3", "x":8, "y":3}, - {"matrix": [7, 4], "label":"Fx", "x":10, "y":0} + {"matrix": [7, 0], "label":"L2", "x":6, "y":3}, + {"matrix": [7, 1], "label":"Sh", "x":7, "y":3}, + {"matrix": [7, 2], "label":"L3", "x":8, "y":3}, + {"matrix": [7, 4], "label":"Fx", "x":10, "y":0} ] } } diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/info.json index 30113e182e..539a70ca25 100644 --- a/keyboards/frobiac/hypernano/info.json +++ b/keyboards/frobiac/hypernano/info.json @@ -34,50 +34,50 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "label":"K", "x":0, "y":0, "w":1.5}, - { "matrix": [0, 1], "label":"U", "x":1.5, "y":0}, - { "matrix": [0, 2], "label":"Q", "x":2.5, "y":0}, - { "matrix": [0, 3], "label":".", "x":3.5, "y":0}, - { "matrix": [0, 4], "label":"J", "x":4.5, "y":0}, - { "matrix": [1, 1], "label":"P", "x":7.5, "y":0}, - { "matrix": [1, 2], "label":"C", "x":8.5, "y":0}, - { "matrix": [1, 3], "label":"L", "x":9.5, "y":0}, - { "matrix": [1, 4], "label":"M", "x":10.5, "y":0}, - { "matrix": [1, 5], "label":"F", "x":11.5, "y":0, "w":1.5}, - { "matrix": [2, 0], "label":"H", "x":0, "y":1, "w":1.25}, - { "matrix": [2, 1], "label":"I", "x":1.25, "y":1}, - { "matrix": [2, 2], "label":"E", "x":2.25, "y":1}, - { "matrix": [2, 3], "label":"A", "x":3.25, "y":1}, - { "matrix": [2, 4], "label":"O", "x":4.25, "y":1}, - { "matrix": [3, 1], "label":"D", "x":7.75, "y":1}, - { "matrix": [3, 2], "label":"T", "x":8.75, "y":1}, - { "matrix": [3, 3], "label":"R", "x":9.75, "y":1}, - { "matrix": [3, 4], "label":"N", "x":10.75, "y":1}, - { "matrix": [3, 5], "label":"S", "x":11.75, "y":1, "w":1.25}, - { "matrix": [4, 0], "label":"X", "x":0, "y":2}, - { "matrix": [4, 1], "label":"Y", "x":1, "y":2}, - { "matrix": [4, 2], "label":"-", "x":2, "y":2}, - { "matrix": [4, 3], "label":",", "x":3, "y":2}, - { "matrix": [4, 4], "label":"/", "x":4, "y":2}, - { "matrix": [4, 5], "label":"", "x":5, "y":2}, - { "matrix": [5, 0], "label":"", "x":7, "y":2}, - { "matrix": [5, 1], "label":"B", "x":8, "y":2}, - { "matrix": [5, 2], "label":"G", "x":9, "y":2}, - { "matrix": [5, 3], "label":"W", "x":10, "y":2}, - { "matrix": [5, 4], "label":"V", "x":11, "y":2}, - { "matrix": [5, 5], "label":"Z", "x":12, "y":2}, - { "matrix": [6, 0], "label":"", "x":0, "y":3, "w":1.25}, - { "matrix": [6, 1], "label":"", "x":1.25, "y":3}, - { "matrix": [6, 2], "label":"Gui", "x":2.25, "y":3}, - { "matrix": [6, 3], "label":"Tab", "x":3.25, "y":3}, - { "matrix": [6, 4], "label":"Spc", "x":4.25, "y":3}, - { "matrix": [6, 5], "label":"", "x":5.25, "y":3}, - { "matrix": [7, 0], "label":"", "x":6.75, "y":3}, - { "matrix": [7, 1], "label":"L2", "x":7.75, "y":3}, - { "matrix": [7, 2], "label":"Sh", "x":8.75, "y":3}, - { "matrix": [7, 3], "label":"L3", "x":9.75, "y":3}, - { "matrix": [7, 4], "label":"", "x":10.75, "y":3}, - { "matrix": [7, 5], "label":"", "x":11.75, "y":3, "w":1.25} + { "matrix": [0, 0], "label":"K", "x":0, "y":0, "w":1.5}, + { "matrix": [0, 1], "label":"U", "x":1.5, "y":0}, + { "matrix": [0, 2], "label":"Q", "x":2.5, "y":0}, + { "matrix": [0, 3], "label":".", "x":3.5, "y":0}, + { "matrix": [0, 4], "label":"J", "x":4.5, "y":0}, + { "matrix": [1, 1], "label":"P", "x":7.5, "y":0}, + { "matrix": [1, 2], "label":"C", "x":8.5, "y":0}, + { "matrix": [1, 3], "label":"L", "x":9.5, "y":0}, + { "matrix": [1, 4], "label":"M", "x":10.5, "y":0}, + { "matrix": [1, 5], "label":"F", "x":11.5, "y":0, "w":1.5}, + { "matrix": [2, 0], "label":"H", "x":0, "y":1, "w":1.25}, + { "matrix": [2, 1], "label":"I", "x":1.25, "y":1}, + { "matrix": [2, 2], "label":"E", "x":2.25, "y":1}, + { "matrix": [2, 3], "label":"A", "x":3.25, "y":1}, + { "matrix": [2, 4], "label":"O", "x":4.25, "y":1}, + { "matrix": [3, 1], "label":"D", "x":7.75, "y":1}, + { "matrix": [3, 2], "label":"T", "x":8.75, "y":1}, + { "matrix": [3, 3], "label":"R", "x":9.75, "y":1}, + { "matrix": [3, 4], "label":"N", "x":10.75, "y":1}, + { "matrix": [3, 5], "label":"S", "x":11.75, "y":1, "w":1.25}, + { "matrix": [4, 0], "label":"X", "x":0, "y":2}, + { "matrix": [4, 1], "label":"Y", "x":1, "y":2}, + { "matrix": [4, 2], "label":"-", "x":2, "y":2}, + { "matrix": [4, 3], "label":",", "x":3, "y":2}, + { "matrix": [4, 4], "label":"/", "x":4, "y":2}, + { "matrix": [4, 5], "label":"", "x":5, "y":2}, + { "matrix": [5, 0], "label":"", "x":7, "y":2}, + { "matrix": [5, 1], "label":"B", "x":8, "y":2}, + { "matrix": [5, 2], "label":"G", "x":9, "y":2}, + { "matrix": [5, 3], "label":"W", "x":10, "y":2}, + { "matrix": [5, 4], "label":"V", "x":11, "y":2}, + { "matrix": [5, 5], "label":"Z", "x":12, "y":2}, + { "matrix": [6, 0], "label":"", "x":0, "y":3, "w":1.25}, + { "matrix": [6, 1], "label":"", "x":1.25, "y":3}, + { "matrix": [6, 2], "label":"Gui", "x":2.25, "y":3}, + { "matrix": [6, 3], "label":"Tab", "x":3.25, "y":3}, + { "matrix": [6, 4], "label":"Spc", "x":4.25, "y":3}, + { "matrix": [6, 5], "label":"", "x":5.25, "y":3}, + { "matrix": [7, 0], "label":"", "x":6.75, "y":3}, + { "matrix": [7, 1], "label":"L2", "x":7.75, "y":3}, + { "matrix": [7, 2], "label":"Sh", "x":8.75, "y":3}, + { "matrix": [7, 3], "label":"L3", "x":9.75, "y":3}, + { "matrix": [7, 4], "label":"", "x":10.75, "y":3}, + { "matrix": [7, 5], "label":"", "x":11.75, "y":3, "w":1.25} ] } } diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json index c7702ee3e8..633ca1d32d 100644 --- a/keyboards/frobiac/redtilt/info.json +++ b/keyboards/frobiac/redtilt/info.json @@ -91,4 +91,3 @@ } } } - diff --git a/keyboards/ft/mars80/info.json b/keyboards/ft/mars80/info.json index c2d0f0a5a6..5801c63a23 100644 --- a/keyboards/ft/mars80/info.json +++ b/keyboards/ft/mars80/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Mars 8.0", + "keyboard_name": "Mars 8.0", "manufacturer": "FT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x20A0", "pid": "0x422D", diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index c8a3248124..2874f3d5e4 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -119,4 +119,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/funky40/info.json b/keyboards/funky40/info.json index 66dbe4b0f2..43a424a664 100644 --- a/keyboards/funky40/info.json +++ b/keyboards/funky40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Funky40", + "keyboard_name": "Funky40", "manufacturer": "TheFourthCow", - "url": "", - "maintainer": "TheFourthCow", + "url": "", + "maintainer": "TheFourthCow", "usb": { "vid": "0xFEED", "pid": "0xC4B5", diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json index 1c6ca27ee1..547f04bc89 100644 --- a/keyboards/geistmaschine/geist/info.json +++ b/keyboards/geistmaschine/geist/info.json @@ -14,8 +14,8 @@ "encoder": true }, "matrix_pins": { - "cols": [ "D2", "D5", "D4", "D7", "B6", "C7", "F7", "F6" ], - "rows": [ "D6", "B4", "B5", "C6", "F0", "D3", "F5", "F4", "F1", "E6" ] + "cols": ["D2", "D5", "D4", "D7", "B6", "C7", "F7", "F6"], + "rows": ["D6", "B4", "B5", "C6", "F0", "D3", "F5", "F4", "F1", "E6"] }, "processor": "atmega32u4", "url": "https://geistmaschine.io/", @@ -33,238 +33,238 @@ "layouts": { "LAYOUT_65_all": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "y":0, "matrix":[0,3] }, - {"x":8.25, "y":0, "matrix":[1,3] }, - {"x":9.25, "y":0, "matrix":[0,4] }, - {"x":10.25, "y":0, "matrix":[1,4] }, - {"x":11.25, "y":0, "matrix":[0,5] }, - {"x":12.25, "y":0, "matrix":[1,5] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "matrix":[1,6] }, - {"x":15.25, "y":0, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "matrix":[4,6] }, - {"x":14, "y":2, "w":2.25, "matrix":[5,6] }, - {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] }, - {"x":16.25, "y":2, "matrix":[5,7] }, - - {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] }, - {"x":2.5, "y":3, "matrix":[7,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":2.25, "matrix":[8,2] }, - {"x":7.25, "y":4, "w":1.25, "matrix":[8,3] }, - {"x":8.5, "y":4, "w":2.75, "matrix":[8,4] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x":0, "y":0, "matrix":[9, 1] }, + {"x":1.25, "y":0, "matrix":[0, 0] }, + {"x":2.25, "y":0, "matrix":[1, 0] }, + {"x":3.25, "y":0, "matrix":[0, 1] }, + {"x":4.25, "y":0, "matrix":[1, 1] }, + {"x":5.25, "y":0, "matrix":[0, 2] }, + {"x":6.25, "y":0, "matrix":[1, 2] }, + {"x":7.25, "y":0, "matrix":[0, 3] }, + {"x":8.25, "y":0, "matrix":[1, 3] }, + {"x":9.25, "y":0, "matrix":[0, 4] }, + {"x":10.25, "y":0, "matrix":[1, 4] }, + {"x":11.25, "y":0, "matrix":[0, 5] }, + {"x":12.25, "y":0, "matrix":[1, 5] }, + {"x":13.25, "y":0, "matrix":[0, 6] }, + {"x":14.25, "y":0, "matrix":[1, 6] }, + {"x":15.25, "y":0, "matrix":[0, 7] }, + {"x":16.25, "y":0, "matrix":[1, 7] }, + + {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] }, + {"x":2.75, "y":1, "matrix":[3, 0] }, + {"x":3.75, "y":1, "matrix":[2, 1] }, + {"x":4.75, "y":1, "matrix":[3, 1] }, + {"x":5.75, "y":1, "matrix":[2, 2] }, + {"x":6.75, "y":1, "matrix":[3, 2] }, + {"x":7.75, "y":1, "matrix":[2, 3] }, + {"x":8.75, "y":1, "matrix":[3, 3] }, + {"x":9.75, "y":1, "matrix":[2, 4] }, + {"x":10.75, "y":1, "matrix":[3, 4] }, + {"x":11.75, "y":1, "matrix":[2, 5] }, + {"x":12.75, "y":1, "matrix":[3, 5] }, + {"x":13.75, "y":1, "matrix":[2, 6] }, + {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] }, + {"x":16.25, "y":1, "matrix":[3, 7] }, + + {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] }, + {"x":3, "y":2, "matrix":[5, 0] }, + {"x":4, "y":2, "matrix":[4, 1] }, + {"x":5, "y":2, "matrix":[5, 1] }, + {"x":6, "y":2, "matrix":[4, 2] }, + {"x":7, "y":2, "matrix":[5, 2] }, + {"x":8, "y":2, "matrix":[4, 3] }, + {"x":9, "y":2, "matrix":[5, 3] }, + {"x":10, "y":2, "matrix":[4, 4] }, + {"x":11, "y":2, "matrix":[5, 4] }, + {"x":12, "y":2, "matrix":[4, 5] }, + {"x":13, "y":2, "matrix":[5, 5] }, + {"x":14, "y":2, "matrix":[4, 6] }, + {"x":14, "y":2, "w":2.25, "matrix":[5, 6] }, + {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] }, + {"x":16.25, "y":2, "matrix":[5, 7] }, + + {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] }, + {"x":2.5, "y":3, "matrix":[7, 0] }, + {"x":3.5, "y":3, "matrix":[6, 1] }, + {"x":4.5, "y":3, "matrix":[7, 1] }, + {"x":5.5, "y":3, "matrix":[6, 2] }, + {"x":6.5, "y":3, "matrix":[7, 2] }, + {"x":7.5, "y":3, "matrix":[6, 3] }, + {"x":8.5, "y":3, "matrix":[7, 3] }, + {"x":9.5, "y":3, "matrix":[6, 4] }, + {"x":10.5, "y":3, "matrix":[7, 4] }, + {"x":11.5, "y":3, "matrix":[6, 5] }, + {"x":12.5, "y":3, "matrix":[7, 5] }, + {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] }, + {"x":15.25, "y":3, "matrix":[6, 7] }, + {"x":16.25, "y":3, "matrix":[7, 7] }, + + {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] }, + {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] }, + {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] }, + {"x":5, "y":4, "w":2.25, "matrix":[8, 2] }, + {"x":7.25, "y":4, "w":1.25, "matrix":[8, 3] }, + {"x":8.5, "y":4, "w":2.75, "matrix":[8, 4] }, + {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] }, + {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] }, + {"x":14.25, "y":4, "matrix":[9, 6] }, + {"x":15.25, "y":4, "matrix":[8, 7] }, + {"x":16.25, "y":4, "matrix":[9, 7] } ] }, "LAYOUT_65_ansi": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "y":0, "matrix":[0,3] }, - {"x":8.25, "y":0, "matrix":[1,3] }, - {"x":9.25, "y":0, "matrix":[0,4] }, - {"x":10.25, "y":0, "matrix":[1,4] }, - {"x":11.25, "y":0, "matrix":[0,5] }, - {"x":12.25, "y":0, "matrix":[1,5] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "w":2, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":14.75, "y":1, "w":1.5, "matrix":[3,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "w":2.25, "matrix":[5,6] }, - {"x":16.25, "y":2, "matrix":[5,7] }, + {"x":0, "y":0, "matrix":[9, 1] }, + {"x":1.25, "y":0, "matrix":[0, 0] }, + {"x":2.25, "y":0, "matrix":[1, 0] }, + {"x":3.25, "y":0, "matrix":[0, 1] }, + {"x":4.25, "y":0, "matrix":[1, 1] }, + {"x":5.25, "y":0, "matrix":[0, 2] }, + {"x":6.25, "y":0, "matrix":[1, 2] }, + {"x":7.25, "y":0, "matrix":[0, 3] }, + {"x":8.25, "y":0, "matrix":[1, 3] }, + {"x":9.25, "y":0, "matrix":[0, 4] }, + {"x":10.25, "y":0, "matrix":[1, 4] }, + {"x":11.25, "y":0, "matrix":[0, 5] }, + {"x":12.25, "y":0, "matrix":[1, 5] }, + {"x":13.25, "y":0, "matrix":[0, 6] }, + {"x":14.25, "y":0, "w":2, "matrix":[0, 7] }, + {"x":16.25, "y":0, "matrix":[1, 7] }, + + {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] }, + {"x":2.75, "y":1, "matrix":[3, 0] }, + {"x":3.75, "y":1, "matrix":[2, 1] }, + {"x":4.75, "y":1, "matrix":[3, 1] }, + {"x":5.75, "y":1, "matrix":[2, 2] }, + {"x":6.75, "y":1, "matrix":[3, 2] }, + {"x":7.75, "y":1, "matrix":[2, 3] }, + {"x":8.75, "y":1, "matrix":[3, 3] }, + {"x":9.75, "y":1, "matrix":[2, 4] }, + {"x":10.75, "y":1, "matrix":[3, 4] }, + {"x":11.75, "y":1, "matrix":[2, 5] }, + {"x":12.75, "y":1, "matrix":[3, 5] }, + {"x":13.75, "y":1, "matrix":[2, 6] }, + {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] }, + {"x":16.25, "y":1, "matrix":[3, 7] }, - {"x":1.25, "y":3, "w":2.25, "matrix":[6,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":6.25, "matrix":[8,3] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] }, + {"x":3, "y":2, "matrix":[5, 0] }, + {"x":4, "y":2, "matrix":[4, 1] }, + {"x":5, "y":2, "matrix":[5, 1] }, + {"x":6, "y":2, "matrix":[4, 2] }, + {"x":7, "y":2, "matrix":[5, 2] }, + {"x":8, "y":2, "matrix":[4, 3] }, + {"x":9, "y":2, "matrix":[5, 3] }, + {"x":10, "y":2, "matrix":[4, 4] }, + {"x":11, "y":2, "matrix":[5, 4] }, + {"x":12, "y":2, "matrix":[4, 5] }, + {"x":13, "y":2, "matrix":[5, 5] }, + {"x":14, "y":2, "w":2.25, "matrix":[5, 6] }, + {"x":16.25, "y":2, "matrix":[5, 7] }, + + {"x":1.25, "y":3, "w":2.25, "matrix":[6, 0] }, + {"x":3.5, "y":3, "matrix":[6, 1] }, + {"x":4.5, "y":3, "matrix":[7, 1] }, + {"x":5.5, "y":3, "matrix":[6, 2] }, + {"x":6.5, "y":3, "matrix":[7, 2] }, + {"x":7.5, "y":3, "matrix":[6, 3] }, + {"x":8.5, "y":3, "matrix":[7, 3] }, + {"x":9.5, "y":3, "matrix":[6, 4] }, + {"x":10.5, "y":3, "matrix":[7, 4] }, + {"x":11.5, "y":3, "matrix":[6, 5] }, + {"x":12.5, "y":3, "matrix":[7, 5] }, + {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] }, + {"x":15.25, "y":3, "matrix":[6, 7] }, + {"x":16.25, "y":3, "matrix":[7, 7] }, + + {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] }, + {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] }, + {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] }, + {"x":5, "y":4, "w":6.25, "matrix":[8, 3] }, + {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] }, + {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] }, + {"x":14.25, "y":4, "matrix":[9, 6] }, + {"x":15.25, "y":4, "matrix":[8, 7] }, + {"x":16.25, "y":4, "matrix":[9, 7] } ] }, "LAYOUT_65_iso": { "layout": [ - {"x":0, "y":0, "matrix":[9,1] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[1,0] }, - {"x":3.25, "y":0, "matrix":[0,1] }, - {"x":4.25, "y":0, "matrix":[1,1] }, - {"x":5.25, "y":0, "matrix":[0,2] }, - {"x":6.25, "y":0, "matrix":[1,2] }, - {"x":7.25, "y":0, "matrix":[0,3] }, - {"x":8.25, "y":0, "matrix":[1,3] }, - {"x":9.25, "y":0, "matrix":[0,4] }, - {"x":10.25, "y":0, "matrix":[1,4] }, - {"x":11.25, "y":0, "matrix":[0,5] }, - {"x":12.25, "y":0, "matrix":[1,5] }, - {"x":13.25, "y":0, "matrix":[0,6] }, - {"x":14.25, "y":0, "w":2, "matrix":[0,7] }, - {"x":16.25, "y":0, "matrix":[1,7] }, - - {"x":1.25, "y":1, "w":1.5, "matrix":[2,0] }, - {"x":2.75, "y":1, "matrix":[3,0] }, - {"x":3.75, "y":1, "matrix":[2,1] }, - {"x":4.75, "y":1, "matrix":[3,1] }, - {"x":5.75, "y":1, "matrix":[2,2] }, - {"x":6.75, "y":1, "matrix":[3,2] }, - {"x":7.75, "y":1, "matrix":[2,3] }, - {"x":8.75, "y":1, "matrix":[3,3] }, - {"x":9.75, "y":1, "matrix":[2,4] }, - {"x":10.75, "y":1, "matrix":[3,4] }, - {"x":11.75, "y":1, "matrix":[2,5] }, - {"x":12.75, "y":1, "matrix":[3,5] }, - {"x":13.75, "y":1, "matrix":[2,6] }, - {"x":16.25, "y":1, "matrix":[3,7] }, - - {"x":1.25, "y":2, "w":1.75, "matrix":[4,0] }, - {"x":3, "y":2, "matrix":[5,0] }, - {"x":4, "y":2, "matrix":[4,1] }, - {"x":5, "y":2, "matrix":[5,1] }, - {"x":6, "y":2, "matrix":[4,2] }, - {"x":7, "y":2, "matrix":[5,2] }, - {"x":8, "y":2, "matrix":[4,3] }, - {"x":9, "y":2, "matrix":[5,3] }, - {"x":10, "y":2, "matrix":[4,4] }, - {"x":11, "y":2, "matrix":[5,4] }, - {"x":12, "y":2, "matrix":[4,5] }, - {"x":13, "y":2, "matrix":[5,5] }, - {"x":14, "y":2, "matrix":[4,6] }, - {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4,7] }, - {"x":16.25, "y":2, "matrix":[5,7] }, + {"x":0, "y":0, "matrix":[9, 1] }, + {"x":1.25, "y":0, "matrix":[0, 0] }, + {"x":2.25, "y":0, "matrix":[1, 0] }, + {"x":3.25, "y":0, "matrix":[0, 1] }, + {"x":4.25, "y":0, "matrix":[1, 1] }, + {"x":5.25, "y":0, "matrix":[0, 2] }, + {"x":6.25, "y":0, "matrix":[1, 2] }, + {"x":7.25, "y":0, "matrix":[0, 3] }, + {"x":8.25, "y":0, "matrix":[1, 3] }, + {"x":9.25, "y":0, "matrix":[0, 4] }, + {"x":10.25, "y":0, "matrix":[1, 4] }, + {"x":11.25, "y":0, "matrix":[0, 5] }, + {"x":12.25, "y":0, "matrix":[1, 5] }, + {"x":13.25, "y":0, "matrix":[0, 6] }, + {"x":14.25, "y":0, "w":2, "matrix":[0, 7] }, + {"x":16.25, "y":0, "matrix":[1, 7] }, + + {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] }, + {"x":2.75, "y":1, "matrix":[3, 0] }, + {"x":3.75, "y":1, "matrix":[2, 1] }, + {"x":4.75, "y":1, "matrix":[3, 1] }, + {"x":5.75, "y":1, "matrix":[2, 2] }, + {"x":6.75, "y":1, "matrix":[3, 2] }, + {"x":7.75, "y":1, "matrix":[2, 3] }, + {"x":8.75, "y":1, "matrix":[3, 3] }, + {"x":9.75, "y":1, "matrix":[2, 4] }, + {"x":10.75, "y":1, "matrix":[3, 4] }, + {"x":11.75, "y":1, "matrix":[2, 5] }, + {"x":12.75, "y":1, "matrix":[3, 5] }, + {"x":13.75, "y":1, "matrix":[2, 6] }, + {"x":16.25, "y":1, "matrix":[3, 7] }, + + {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] }, + {"x":3, "y":2, "matrix":[5, 0] }, + {"x":4, "y":2, "matrix":[4, 1] }, + {"x":5, "y":2, "matrix":[5, 1] }, + {"x":6, "y":2, "matrix":[4, 2] }, + {"x":7, "y":2, "matrix":[5, 2] }, + {"x":8, "y":2, "matrix":[4, 3] }, + {"x":9, "y":2, "matrix":[5, 3] }, + {"x":10, "y":2, "matrix":[4, 4] }, + {"x":11, "y":2, "matrix":[5, 4] }, + {"x":12, "y":2, "matrix":[4, 5] }, + {"x":13, "y":2, "matrix":[5, 5] }, + {"x":14, "y":2, "matrix":[4, 6] }, + {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] }, + {"x":16.25, "y":2, "matrix":[5, 7] }, + + {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] }, + {"x":2.5, "y":3, "matrix":[7, 0] }, + {"x":3.5, "y":3, "matrix":[6, 1] }, + {"x":4.5, "y":3, "matrix":[7, 1] }, + {"x":5.5, "y":3, "matrix":[6, 2] }, + {"x":6.5, "y":3, "matrix":[7, 2] }, + {"x":7.5, "y":3, "matrix":[6, 3] }, + {"x":8.5, "y":3, "matrix":[7, 3] }, + {"x":9.5, "y":3, "matrix":[6, 4] }, + {"x":10.5, "y":3, "matrix":[7, 4] }, + {"x":11.5, "y":3, "matrix":[6, 5] }, + {"x":12.5, "y":3, "matrix":[7, 5] }, + {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] }, + {"x":15.25, "y":3, "matrix":[6, 7] }, + {"x":16.25, "y":3, "matrix":[7, 7] }, - {"x":1.25, "y":3, "w":1.25, "matrix":[6,0] }, - {"x":2.5, "y":3, "matrix":[7,0] }, - {"x":3.5, "y":3, "matrix":[6,1] }, - {"x":4.5, "y":3, "matrix":[7,1] }, - {"x":5.5, "y":3, "matrix":[6,2] }, - {"x":6.5, "y":3, "matrix":[7,2] }, - {"x":7.5, "y":3, "matrix":[6,3] }, - {"x":8.5, "y":3, "matrix":[7,3] }, - {"x":9.5, "y":3, "matrix":[6,4] }, - {"x":10.5, "y":3, "matrix":[7,4] }, - {"x":11.5, "y":3, "matrix":[6,5] }, - {"x":12.5, "y":3, "matrix":[7,5] }, - {"x":13.5, "y":3, "w":1.75, "matrix":[6,6] }, - {"x":15.25, "y":3, "matrix":[6,7] }, - {"x":16.25, "y":3, "matrix":[7,7] }, - - {"x":1.25, "y":4, "w":1.25, "matrix":[8,0] }, - {"x":2.5, "y":4, "w":1.25, "matrix":[9,0] }, - {"x":3.75, "y":4, "w":1.25, "matrix":[8,1] }, - {"x":5, "y":4, "w":6.25, "matrix":[8,3] }, - {"x":11.25, "y":4, "w":1.25, "matrix":[8,5] }, - {"x":12.5, "y":4, "w":1.25, "matrix":[9,5] }, - {"x":14.25, "y":4, "matrix":[9,6] }, - {"x":15.25, "y":4, "matrix":[8,7] }, - {"x":16.25, "y":4, "matrix":[9,7] } + {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] }, + {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] }, + {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] }, + {"x":5, "y":4, "w":6.25, "matrix":[8, 3] }, + {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] }, + {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] }, + {"x":14.25, "y":4, "matrix":[9, 6] }, + {"x":15.25, "y":4, "matrix":[8, 7] }, + {"x":16.25, "y":4, "matrix":[9, 7] } ] } } -} \ No newline at end of file +} diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/info.json index 087d28c39a..39e67c048a 100644 --- a/keyboards/geistmaschine/macropod/info.json +++ b/keyboards/geistmaschine/macropod/info.json @@ -11,13 +11,13 @@ "vid": "0x676D" }, "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "encoder": true + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "encoder": true }, "encoder": { "rotary": [ @@ -27,11 +27,11 @@ "layouts": { "LAYOUT_fourkey": { "layout": [ - {"x":0, "y":0, "matrix":[0,0] }, - {"x":0, "y":1.25, "matrix":[0,1] }, - {"x":0, "y":2.25, "matrix":[0,2] }, - {"x":0, "y":3.25, "matrix":[0,3] } + {"x":0, "y":0, "matrix":[0, 0]}, + {"x":0, "y":1.25, "matrix":[0, 1]}, + {"x":0, "y":2.25, "matrix":[0, 2]}, + {"x":0, "y":3.25, "matrix":[0, 3]} ] } } -} \ No newline at end of file +} diff --git a/keyboards/geonworks/frogmini/fmh/info.json b/keyboards/geonworks/frogmini/fmh/info.json index 4dbe861526..a8c0645a70 100644 --- a/keyboards/geonworks/frogmini/fmh/info.json +++ b/keyboards/geonworks/frogmini/fmh/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Frog Mini FM-H", + "keyboard_name": "Frog Mini FM-H", "manufacturer": "GeonWorks", - "url": "https://geon.works", - "maintainer": "gondolindrim", + "url": "https://geon.works", + "maintainer": "gondolindrim", "usb": { "vid": "0x6777", "pid": "0x2D28", diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json index 44b80ce9a4..d65f543776 100644 --- a/keyboards/ghs/jem/info.json +++ b/keyboards/ghs/jem/info.json @@ -20,8 +20,8 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": [ "E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], - "rows": [ "F1", "F0", "F7", "F6", "F5" ] + "cols": ["E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F1", "F0", "F7", "F6", "F5"] }, "indicators": { "caps_lock": "B7" @@ -48,230 +48,230 @@ "layouts": { "LAYOUT_ansi": { "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,14], "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": [1, 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": [2,14], "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": [2, 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": [3,14], "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": [3, 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": [4,14], "x":15, "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 }, + { "matrix": [4, 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,7], "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 } + { "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, 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 } ] }, "LAYOUT_iso": { "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,14], "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": [1, 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": [2,14], "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": [2, 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 }, - { "matrix": [1,13], "x":13.75, "y":1, "w":1.25, "h":2 }, - { "matrix": [3,14], "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 }, + { "matrix": [1, 13], "x":13.75, "y":1, "w":1.25, "h":2 }, + { "matrix": [3, 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": [4,14], "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": [4, 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,7], "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 } + { "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, 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 } ] }, "LAYOUT_all": { "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, "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": [1, 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": [2,14], "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": [2, 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": [3,14], "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": [3, 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": [4,14], "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": [4, 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,7], "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 } + { "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, 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/giabalanai/keymaps/default_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json +++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json @@ -11,18 +11,18 @@ "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": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"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": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"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": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"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": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/info.json b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/giabarinaix2led/info.json +++ b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json @@ -11,18 +11,18 @@ "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": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"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": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"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": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"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": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json +++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json @@ -11,18 +11,18 @@ "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": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"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": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"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": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"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": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index add8dc6c41..bc9b1cacfa 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "a52gl", + "keyboard_name": "a52gl", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xE8D1", diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index f74d45fd3c..a34c1e6c4c 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "j73gl", + "keyboard_name": "j73gl", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xE8D0", diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index bcf466cea4..9da8930c60 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "n51gl", + "keyboard_name": "n51gl", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xE8CF", diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json index f3020aa3f4..4df94d45ee 100644 --- a/keyboards/gmmk/numpad/info.json +++ b/keyboards/gmmk/numpad/info.json @@ -30,7 +30,7 @@ {"label": "/", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "*", "matrix": [0, 2], "x": 2, "y": 0}, {"label": "-", "matrix": [0, 3], "x": 3, "y": 0}, - + {"label": "7", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "8", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "9", "matrix": [1, 2], "x": 2, "y": 1}, diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 7400917333..dbdf673f3e 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GG86 Tai-Chi", + "keyboard_name": "GG86 Tai-Chi", "manufacturer": "Gopolar", - "url": "", - "maintainer": "Gopolar", + "url": "", + "maintainer": "Gopolar", "usb": { "vid": "0x0007", "pid": "0x0007", diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index f87e0a76b3..0ac953a102 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Aero 75", - "url": "https://graystudio.site/en/aero75/", - "maintainer": "edwardslau", + "keyboard_name": "Aero 75", + "url": "https://graystudio.site/en/aero75/", + "maintainer": "edwardslau", "manufacturer":"GrayStudio", "usb": { "vid": "0x4753", diff --git a/keyboards/gray_studio/hb85/info.json b/keyboards/gray_studio/hb85/info.json index e058e230fb..138b1bfe5c 100644 --- a/keyboards/gray_studio/hb85/info.json +++ b/keyboards/gray_studio/hb85/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "HB85", + "keyboard_name": "HB85", "manufacturer": "Gray Studio", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4753", "pid": "0x2000", diff --git a/keyboards/grid600/press/info.json b/keyboards/grid600/press/info.json index 9061f77620..6a5d86e0c7 100644 --- a/keyboards/grid600/press/info.json +++ b/keyboards/grid600/press/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PRESS", + "keyboard_name": "PRESS", "manufacturer": "Grid", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x7539", diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json index c969f4a00c..96a23f7f61 100644 --- a/keyboards/h0oni/deskpad/info.json +++ b/keyboards/h0oni/deskpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Deskpad", + "keyboard_name": "Deskpad", "manufacturer": "Hydrogen", - "url": "", - "maintainer": "Hydrogen BD", + "url": "", + "maintainer": "Hydrogen BD", "usb": { "vid": "0x4D53", "pid": "0x4450", diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json index be392c1135..6e8e2e6144 100644 --- a/keyboards/h0oni/hotduck/info.json +++ b/keyboards/h0oni/hotduck/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "hotDuck", + "keyboard_name": "hotDuck", "manufacturer": "h0oni", - "url": "", - "maintainer": "h0oni", + "url": "", + "maintainer": "h0oni", "usb": { "vid": "0x4D53", "pid": "0x6844", diff --git a/keyboards/hadron/info.json b/keyboards/hadron/info.json index e7ab72714c..1d25e18f30 100644 --- a/keyboards/hadron/info.json +++ b/keyboards/hadron/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Hadron", + "keyboard_name": "Hadron", "manufacturer": "ishtob", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFB30", "pid": "0x5F37" diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 820babd432..fb0666fbf4 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "halfcliff", + "keyboard_name": "halfcliff", "manufacturer": "n2", - "url": "https://github.com/N2-Sumikko", - "maintainer": "n2", + "url": "https://github.com/N2-Sumikko", + "maintainer": "n2", "usb": { "vid": "0x0335", "pid": "0x0021", diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json index 0789f0d1a9..0373a5e658 100644 --- a/keyboards/han60/info.json +++ b/keyboards/han60/info.json @@ -375,4 +375,3 @@ } } } - diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json index 6974199846..c1fec23580 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/info.json @@ -95,4 +95,4 @@ } }, "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} \ No newline at end of file +} diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json index b5a872bfca..be2a1ee8fd 100644 --- a/keyboards/handwired/alcor_dactyl/info.json +++ b/keyboards/handwired/alcor_dactyl/info.json @@ -40,94 +40,94 @@ "layouts": { "LAYOUT":{ "layout":[ - {"matrix":[0,0], "x":0, "y":0.25, "w":1.5}, - {"matrix":[0,1], "x":1.5, "y":0.25}, - {"matrix":[0,2], "x":2.5, "y":0}, - {"matrix":[0,3], "x":3.5, "y":0.125}, - {"matrix":[0,4], "x":4.5, "y":0.125}, - {"matrix":[0,5], "x":5.5, "y":0.125}, - {"matrix":[0,6], "x":6.5, "y":0.125}, + {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5}, + {"matrix":[0, 1], "x":1.5, "y":0.25}, + {"matrix":[0, 2], "x":2.5, "y":0}, + {"matrix":[0, 3], "x":3.5, "y":0.125}, + {"matrix":[0, 4], "x":4.5, "y":0.125}, + {"matrix":[0, 5], "x":5.5, "y":0.125}, + {"matrix":[0, 6], "x":6.5, "y":0.125}, - {"matrix":[6,6], "x":10.5, "y":0.125}, - {"matrix":[6,5], "x":11.5, "y":0.125}, - {"matrix":[6,4], "x":12.5, "y":0.125}, - {"matrix":[6,3], "x":13.5, "y":0.125}, - {"matrix":[6,2], "x":14.5, "y":0}, - {"matrix":[6,1], "x":15.5, "y":0.25}, - {"matrix":[6,0], "x":16.5, "y":0.25, "w":1.5}, + {"matrix":[6, 6], "x":10.5, "y":0.125}, + {"matrix":[6, 5], "x":11.5, "y":0.125}, + {"matrix":[6, 4], "x":12.5, "y":0.125}, + {"matrix":[6, 3], "x":13.5, "y":0.125}, + {"matrix":[6, 2], "x":14.5, "y":0}, + {"matrix":[6, 1], "x":15.5, "y":0.25}, + {"matrix":[6, 0], "x":16.5, "y":0.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}, - {"matrix":[1,3], "x":3.5, "y":1.125}, - {"matrix":[1,4], "x":4.5, "y":1.125}, - {"matrix":[1,5], "x":5.5, "y":1.125}, - {"matrix":[1,6], "x":6.5, "y":1.125}, + {"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}, + {"matrix":[1, 3], "x":3.5, "y":1.125}, + {"matrix":[1, 4], "x":4.5, "y":1.125}, + {"matrix":[1, 5], "x":5.5, "y":1.125}, + {"matrix":[1, 6], "x":6.5, "y":1.125}, - {"matrix":[7,6], "x":10.5, "y":1.125}, - {"matrix":[7,5], "x":11.5, "y":1.125}, - {"matrix":[7,4], "x":12.5, "y":1.125}, - {"matrix":[7,3], "x":13.5, "y":1.125}, - {"matrix":[7,2], "x":14.5, "y":1}, - {"matrix":[7,1], "x":15.5, "y":1.25}, - {"matrix":[7,0], "x":16.5, "y":1.25, "w":1.5}, + {"matrix":[7, 6], "x":10.5, "y":1.125}, + {"matrix":[7, 5], "x":11.5, "y":1.125}, + {"matrix":[7, 4], "x":12.5, "y":1.125}, + {"matrix":[7, 3], "x":13.5, "y":1.125}, + {"matrix":[7, 2], "x":14.5, "y":1}, + {"matrix":[7, 1], "x":15.5, "y":1.25}, + {"matrix":[7, 0], "x":16.5, "y":1.25, "w":1.5}, - {"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}, - {"matrix":[2,3], "x":3.5, "y":2.125}, - {"matrix":[2,4], "x":4.5, "y":2.125}, - {"matrix":[2,5], "x":5.5, "y":2.125}, - {"matrix":[2,6], "x":6.5, "y":2.125}, + {"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}, + {"matrix":[2, 3], "x":3.5, "y":2.125}, + {"matrix":[2, 4], "x":4.5, "y":2.125}, + {"matrix":[2, 5], "x":5.5, "y":2.125}, + {"matrix":[2, 6], "x":6.5, "y":2.125}, - {"matrix":[8,6], "x":10.5, "y":2.125}, - {"matrix":[8,5], "x":11.5, "y":2.125}, - {"matrix":[8,4], "x":12.5, "y":2.125}, - {"matrix":[8,3], "x":13.5, "y":2.125}, - {"matrix":[8,2], "x":14.5, "y":2}, - {"matrix":[8,1], "x":15.5, "y":2.25}, - {"matrix":[8,0], "x":16.5, "y":2.25, "w":1.5}, + {"matrix":[8, 6], "x":10.5, "y":2.125}, + {"matrix":[8, 5], "x":11.5, "y":2.125}, + {"matrix":[8, 4], "x":12.5, "y":2.125}, + {"matrix":[8, 3], "x":13.5, "y":2.125}, + {"matrix":[8, 2], "x":14.5, "y":2}, + {"matrix":[8, 1], "x":15.5, "y":2.25}, + {"matrix":[8, 0], "x":16.5, "y":2.25, "w":1.5}, - {"matrix":[3,0], "x":0, "y":3.25, "w":1.5}, - {"matrix":[3,1], "x":1.5, "y":3.25}, - {"matrix":[3,2], "x":2.5, "y":3}, - {"matrix":[3,3], "x":3.5, "y":3.125}, - {"matrix":[3,4], "x":4.5, "y":3.125}, - {"matrix":[3,5], "x":5.5, "y":3.125}, + {"matrix":[3, 0], "x":0, "y":3.25, "w":1.5}, + {"matrix":[3, 1], "x":1.5, "y":3.25}, + {"matrix":[3, 2], "x":2.5, "y":3}, + {"matrix":[3, 3], "x":3.5, "y":3.125}, + {"matrix":[3, 4], "x":4.5, "y":3.125}, + {"matrix":[3, 5], "x":5.5, "y":3.125}, - {"matrix":[9,5], "x":11.5, "y":3.125}, - {"matrix":[9,4], "x":12.5, "y":3.125}, - {"matrix":[9,3], "x":13.5, "y":3.125}, - {"matrix":[9,2], "x":14.5, "y":3}, - {"matrix":[9,1], "x":15.5, "y":3.25}, - {"matrix":[9,0], "x":16.5, "y":3.25, "w":1.5}, + {"matrix":[9, 5], "x":11.5, "y":3.125}, + {"matrix":[9, 4], "x":12.5, "y":3.125}, + {"matrix":[9, 3], "x":13.5, "y":3.125}, + {"matrix":[9, 2], "x":14.5, "y":3}, + {"matrix":[9, 1], "x":15.5, "y":3.25}, + {"matrix":[9, 0], "x":16.5, "y":3.25, "w":1.5}, - {"matrix":[4,0], "x":0.5, "y":4.25}, - {"matrix":[4,1], "x":1.5, "y":4.25}, - {"matrix":[4,2], "x":2.5, "y":4}, - {"matrix":[4,3], "x":3.5, "y":4.125}, + {"matrix":[4, 0], "x":0.5, "y":4.25}, + {"matrix":[4, 1], "x":1.5, "y":4.25}, + {"matrix":[4, 2], "x":2.5, "y":4}, + {"matrix":[4, 3], "x":3.5, "y":4.125}, - {"matrix":[10,3], "x":13.5, "y":4.125}, - {"matrix":[10,2], "x":14.5, "y":4}, - {"matrix":[10,1], "x":15.5, "y":4.25}, - {"matrix":[10,0], "x":16.5, "y":4.25}, + {"matrix":[10, 3], "x":13.5, "y":4.125}, + {"matrix":[10, 2], "x":14.5, "y":4}, + {"matrix":[10, 1], "x":15.5, "y":4.25}, + {"matrix":[10, 0], "x":16.5, "y":4.25}, - {"matrix":[4,4], "x":5, "y":4.375, "h":2}, - {"matrix":[4,5], "x":6.25, "y":4.375, "h":1.5}, - {"matrix":[10,5], "x":10.75, "y":4.375, "h":1.5}, - {"matrix":[10,4], "x":12, "y":4.375, "h":2}, + {"matrix":[4, 4], "x":5, "y":4.375, "h":2}, + {"matrix":[4, 5], "x":6.25, "y":4.375, "h":1.5}, + {"matrix":[10, 5], "x":10.75, "y":4.375, "h":1.5}, + {"matrix":[10, 4], "x":12, "y":4.375, "h":2}, - {"matrix":[5,4], "x":6.25, "y":6.125}, - {"matrix":[5,5], "x":7.5, "y":6.125}, + {"matrix":[5, 4], "x":6.25, "y":6.125}, + {"matrix":[5, 5], "x":7.5, "y":6.125}, - {"matrix":[11,5], "x":9.5, "y":6.125}, - {"matrix":[11,4], "x":10.75, "y":6.125}, + {"matrix":[11, 5], "x":9.5, "y":6.125}, + {"matrix":[11, 4], "x":10.75, "y":6.125}, - {"matrix":[5,2], "x":6.25, "y":7.125}, - {"matrix":[5,3], "x":7.25, "y":7.125}, + {"matrix":[5, 2], "x":6.25, "y":7.125}, + {"matrix":[5, 3], "x":7.25, "y":7.125}, - {"matrix":[11,3], "x":9.75, "y":7.125}, - {"matrix":[11,2], "x":10.75, "y":7.125} + {"matrix":[11, 3], "x":9.75, "y":7.125}, + {"matrix":[11, 2], "x":10.75, "y":7.125} ] } } diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json index b9377ae6c4..2481a63db5 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/info.json @@ -117,5 +117,4 @@ ] } } - } diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json index 69d9e9e24f..d05e3a5d79 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "dactyl_left", + "keyboard_name": "dactyl_left", "manufacturer": "RedForty", - "url": "", - "maintainer": "RedForty", + "url": "", + "maintainer": "RedForty", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 849d8b4e4e..7de3ef0b0d 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -92,5 +92,4 @@ ] } } - } diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json index db29e436b6..f82f84da9c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json @@ -21,80 +21,80 @@ "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": 14, "y": 0, "matrix": [6,0]}, - {"x": 15, "y": 0, "matrix": [6,1]}, - {"x": 16, "y": 0, "matrix": [6,2]}, - {"x": 17, "y": 0, "matrix": [6,3]}, - {"x": 18, "y": 0, "matrix": [6,4]}, - {"x": 19, "y": 0, "matrix": [6,5]}, + {"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": 14, "y": 0, "matrix": [6, 0]}, + {"x": 15, "y": 0, "matrix": [6, 1]}, + {"x": 16, "y": 0, "matrix": [6, 2]}, + {"x": 17, "y": 0, "matrix": [6, 3]}, + {"x": 18, "y": 0, "matrix": [6, 4]}, + {"x": 19, "y": 0, "matrix": [6, 5]}, - {"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": 14, "y": 1, "matrix": [7,0]}, - {"x": 15, "y": 1, "matrix": [7,1]}, - {"x": 16, "y": 1, "matrix": [7,2]}, - {"x": 17, "y": 1, "matrix": [7,3]}, - {"x": 18, "y": 1, "matrix": [7,4]}, - {"x": 19, "y": 1, "matrix": [7,5]}, + {"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": 14, "y": 1, "matrix": [7, 0]}, + {"x": 15, "y": 1, "matrix": [7, 1]}, + {"x": 16, "y": 1, "matrix": [7, 2]}, + {"x": 17, "y": 1, "matrix": [7, 3]}, + {"x": 18, "y": 1, "matrix": [7, 4]}, + {"x": 19, "y": 1, "matrix": [7, 5]}, - {"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": 14, "y": 2, "matrix": [8,0]}, - {"x": 15, "y": 2, "matrix": [8,1]}, - {"x": 16, "y": 2, "matrix": [8,2]}, - {"x": 17, "y": 2, "matrix": [8,3]}, - {"x": 18, "y": 2, "matrix": [8,4]}, - {"x": 19, "y": 2, "matrix": [8,5]}, + {"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": 14, "y": 2, "matrix": [8, 0]}, + {"x": 15, "y": 2, "matrix": [8, 1]}, + {"x": 16, "y": 2, "matrix": [8, 2]}, + {"x": 17, "y": 2, "matrix": [8, 3]}, + {"x": 18, "y": 2, "matrix": [8, 4]}, + {"x": 19, "y": 2, "matrix": [8, 5]}, - {"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": 14, "y": 3, "matrix": [9,0]}, - {"x": 15, "y": 3, "matrix": [9,1]}, - {"x": 16, "y": 3, "matrix": [9,2]}, - {"x": 17, "y": 3, "matrix": [9,3]}, - {"x": 18, "y": 3, "matrix": [9,4]}, - {"x": 19, "y": 3, "matrix": [9,5]}, + {"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": 14, "y": 3, "matrix": [9, 0]}, + {"x": 15, "y": 3, "matrix": [9, 1]}, + {"x": 16, "y": 3, "matrix": [9, 2]}, + {"x": 17, "y": 3, "matrix": [9, 3]}, + {"x": 18, "y": 3, "matrix": [9, 4]}, + {"x": 19, "y": 3, "matrix": [9, 5]}, - {"x": 0, "y": 4, "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": 16, "y": 4, "matrix": [10,2]}, - {"x": 17, "y": 4, "matrix": [10,3]}, - {"x": 18, "y": 4, "matrix": [10,4]}, - {"x": 19, "y": 4, "matrix": [10,5]}, + {"x": 0, "y": 4, "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": 16, "y": 4, "matrix": [10, 2]}, + {"x": 17, "y": 4, "matrix": [10, 3]}, + {"x": 18, "y": 4, "matrix": [10, 4]}, + {"x": 19, "y": 4, "matrix": [10, 5]}, - {"x": 5, "y": 5, "matrix": [5,0]}, - {"x": 6, "y": 5, "matrix": [5,1]}, - {"x": 7, "y": 5, "matrix": [5,2]}, - {"x": 13, "y": 5, "matrix": [11,0]}, - {"x": 14, "y": 5, "matrix": [11,1]}, - {"x": 15, "y": 5, "matrix": [11,2]}, - - {"x": 5, "y": 6, "matrix": [5,3]}, - {"x": 6, "y": 6, "matrix": [5,4]}, - {"x": 7, "y": 6, "matrix": [5,5]}, - {"x": 13, "y": 6, "matrix": [11,3]}, - {"x": 14, "y": 6, "matrix": [11,4]}, - {"x": 15, "y": 6, "matrix": [11,5]} + {"x": 5, "y": 5, "matrix": [5, 0]}, + {"x": 6, "y": 5, "matrix": [5, 1]}, + {"x": 7, "y": 5, "matrix": [5, 2]}, + {"x": 13, "y": 5, "matrix": [11, 0]}, + {"x": 14, "y": 5, "matrix": [11, 1]}, + {"x": 15, "y": 5, "matrix": [11, 2]}, + + {"x": 5, "y": 6, "matrix": [5, 3]}, + {"x": 6, "y": 6, "matrix": [5, 4]}, + {"x": 7, "y": 6, "matrix": [5, 5]}, + {"x": 13, "y": 6, "matrix": [11, 3]}, + {"x": 14, "y": 6, "matrix": [11, 4]}, + {"x": 15, "y": 6, "matrix": [11, 5]} ] } } diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json index 2a0f5df409..a077e7925d 100644 --- a/keyboards/handwired/ddg_56/info.json +++ b/keyboards/handwired/ddg_56/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "DDG_56", + "keyboard_name": "DDG_56", "manufacturer": "Spaceman", - "url": "", - "maintainer": "spaceman", + "url": "", + "maintainer": "spaceman", "usb": { "vid": "0xFEED", "pid": "0xB195", diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json index a321bf8ed1..7e40afdedd 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "II", + "keyboard_name": "II", "manufacturer": "Eagle", - "url": "", - "maintainer": "Spaceman", + "url": "", + "maintainer": "Spaceman", "usb": { "vid": "0xFEED", "pid": "0x9789", diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json index 8528b0abc2..41c1ab563f 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "fc200rt_qmk", + "keyboard_name": "fc200rt_qmk", "manufacturer": "NaCly", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xBEEF", "pid": "0xFFFF", @@ -121,5 +121,4 @@ ] } } - } diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json index bb12b3b1f7..78dbfce5f7 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GameNum", + "keyboard_name": "GameNum", "manufacturer": "Seth-Senpai", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x1234", "pid": "0x5678", diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index 728d6dbc59..b35f3fc40c 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Hnah40", + "keyboard_name": "Hnah40", "manufacturer": "HnahKB", - "url": "https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega328p/PCB_V1/PCB", - "maintainer": "HnahKB", + "url": "https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega328p/PCB_V1/PCB", + "maintainer": "HnahKB", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index f2e1925ee1..9f952d685a 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Hnah40V2", + "keyboard_name": "Hnah40V2", "manufacturer": "HnahKB", "url": "", - "maintainer": "HnahKB", + "maintainer": "HnahKB", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/handwired/jscotto/scotto36/info.json b/keyboards/handwired/jscotto/scotto36/info.json index b6828edd21..647d4bbb06 100644 --- a/keyboards/handwired/jscotto/scotto36/info.json +++ b/keyboards/handwired/jscotto/scotto36/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0 "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], - // 15, 14, 16, 10 "rows": ["B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json index d29ccc3fd1..fc3837ad2e 100644 --- a/keyboards/handwired/jscotto/scotto9/info.json +++ b/keyboards/handwired/jscotto/scotto9/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // 4, 5, 6 "cols": ["D4", "C6", "D7"], - // 15, 14, 16 "rows": ["B1", "B3", "B2"] }, diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json index 51bf76595d..6ef96b29d7 100644 --- a/keyboards/handwired/jscotto/scottocmd/info.json +++ b/keyboards/handwired/jscotto/scottocmd/info.json @@ -27,7 +27,6 @@ "F5", "F6" ], - // A0, 15, 14, 16, 10 "rows": ["F7", "B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json index 08bccff0d3..2d1388da44 100644 --- a/keyboards/handwired/jscotto/scottostarter/info.json +++ b/keyboards/handwired/jscotto/scottostarter/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1, TX0 "cols": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "D3"], - // A0, 15, 14, 16, 10 "rows": ["F7", "B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json index 57d9d71691..d723557d4b 100644 --- a/keyboards/handwired/juliet/info.json +++ b/keyboards/handwired/juliet/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "juliet", + "keyboard_name": "juliet", "manufacturer": "nacly", - "url": "https://github.com/Na-Cly/juliet", - "maintainer": "Na-Cly", + "url": "https://github.com/Na-Cly/juliet", + "maintainer": "Na-Cly", "usb": { "vid": "0x6B62", "pid": "0x4069", diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index a6b2ee19de..41342fc2ec 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "5x5_macropad", + "keyboard_name": "5x5_macropad", "manufacturer": "m40", - "url": "https://www.thingiverse.com/thing:5239739", - "maintainer": "m40-dev", + "url": "https://www.thingiverse.com/thing:5239739", + "maintainer": "m40-dev", "usb": { - "vid": "0xFEED", - "pid": "0x0000", - "device_version": "0.0.1" + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7"], @@ -50,4 +50,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json index da77c2b91c..dcffe0f5d7 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/info.json @@ -97,5 +97,4 @@ ] } } - } diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 4a6ab83a90..7b62bfeb7a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -1,38 +1,38 @@ { - "keyboard_name": "keydeck8", - "manufacturer": "Maverick0197", - "maintainer": "Maverick0197", + "keyboard_name": "keydeck8", + "manufacturer": "Maverick0197", + "maintainer": "Maverick0197", "development_board": "promicro", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "encoder": true - }, - "encoder": { - "rotary": [ - {"pin_a": "D3", "pin_b": "D2", "resolution": 4} - ] - }, - "matrix_pins": { - "direct": [ - ["D0", "D1", "D4"], - ["C6", "D7", "E6"], - ["B4", "B5", "B6"] - ] - }, - "usb": { - "device_version": "0.0.1", - "pid": "0x3031", - "vid": "0x4D76" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0}, - {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1}, - {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2} - ] - } - } + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "encoder": true + }, + "encoder": { + "rotary": [ + {"pin_a": "D3", "pin_b": "D2", "resolution": 4} + ] + }, + "matrix_pins": { + "direct": [ + ["D0", "D1", "D4"], + ["C6", "D7", "E6"], + ["B4", "B5", "B6"] + ] + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x3031", + "vid": "0x4D76" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0}, + {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1}, + {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2} + ] + } + } } diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json index 7da646d1fe..a61a11bc94 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Mechboards Micropad", + "keyboard_name": "Mechboards Micropad", "manufacturer": "Yiancar", - "url": "", - "maintainer": "yiancar", + "url": "", + "maintainer": "yiancar", "usb": { "vid": "0x8968", "pid": "0x0001", diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index cc607adc71..ff3aeb7e89 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Owlet60", + "keyboard_name": "Owlet60", "manufacturer": "worthlessowl", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/", - "maintainer": "worthlessowl", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/", + "maintainer": "worthlessowl", "usb": { "vid": "0xFEED", "pid": "0xDA19", diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json index 5caea79983..63856fa739 100644 --- a/keyboards/handwired/polly40/info.json +++ b/keyboards/handwired/polly40/info.json @@ -74,4 +74,4 @@ } }, "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} \ No newline at end of file +} diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json index fcfffc6f02..69c3ae8bfe 100644 --- a/keyboards/handwired/prkl30/promicro/info.json +++ b/keyboards/handwired/prkl30/promicro/info.json @@ -12,4 +12,4 @@ {"pin_a": "D3", "pin_b": "D2"} ] } -} \ No newline at end of file +} diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/info.json index 1d39802cf8..f2cfef37a8 100644 --- a/keyboards/handwired/sejin_eat1010r2/info.json +++ b/keyboards/handwired/sejin_eat1010r2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "EAT-1010R2", + "keyboard_name": "EAT-1010R2", "manufacturer": "Sejin", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0x515A", "pid": "0x4D4D", diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index 7f0f34555e..24cb90487c 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -4,12 +4,12 @@ "url": "https://github.com/Bpendragon/Selene-Keyboard", "maintainer": "Bpendragon", "usb": { - "vid": "0x4244", - "pid": "0x0001", - "device_version": "0.0.1" + "vid": "0x4244", + "pid": "0x0001", + "device_version": "0.0.1" }, "ws2812": { - "pin": "A3" + "pin": "A3" }, "matrix_pins": { "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json index e9424105a1..57b78c81bf 100644 --- a/keyboards/handwired/sono1/info.json +++ b/keyboards/handwired/sono1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Sono1", + "keyboard_name": "Sono1", "manufacturer": "ASKeyboard", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0x515A", "pid": "0x5331" diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json index 719eb05455..793ebbd32f 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/info.json @@ -27,95 +27,95 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "matrix": [0, 4], "x":0 , "y":0}, - {"label":"F1" , "matrix": [0, 5], "x":2 , "y":0}, - {"label":"F2" , "matrix": [0, 6], "x":3 , "y":0}, - {"label":"F3" , "matrix": [0, 7], "x":4 , "y":0}, - {"label":"F4" , "matrix": [0, 8], "x":5 , "y":0}, - {"label":"F5" , "matrix": [0, 9], "x":6 , "y":0}, - {"label":"F6" , "matrix": [6, 0], "x":10.25 , "y":0}, - {"label":"F7" , "matrix": [6, 1], "x":11.25 , "y":0}, - {"label":"F8" , "matrix": [6, 2], "x":12.25 , "y":0}, - {"label":"F9" , "matrix": [6, 3], "x":13.75 , "y":0}, - {"label":"F10" , "matrix": [6, 4], "x":14.75 , "y":0}, - {"label":"F11" , "matrix": [6, 5], "x":15.75 , "y":0}, - {"label":"F12" , "matrix": [6, 6], "x":16.75 , "y":0}, - {"label":"PrtSc" , "matrix": [6, 7], "x":18 , "y":0}, - {"label":"Scroll Lock" , "matrix": [6, 8], "x":19 , "y":0}, - {"label":"Pause" , "matrix": [6, 9], "x":20 , "y":0}, - {"label":"~" , "matrix": [2, 4], "x":0 , "y":1.5}, - {"label":"1!" , "matrix": [1, 4], "x":1 , "y":1.5}, - {"label":"2@" , "matrix": [1, 5], "x":2 , "y":1.5}, - {"label":"3#" , "matrix": [1, 6], "x":3 , "y":1.5}, - {"label":"4$" , "matrix": [1, 7], "x":4 , "y":1.5}, - {"label":"5%" , "matrix": [1, 8], "x":5 , "y":1.5}, - {"label":"6^" , "matrix": [1, 9], "x":6 , "y":1.5}, - {"label":"7&" , "matrix": [7, 0], "x":9.75 , "y":1.5}, - {"label":"8*" , "matrix": [7, 1], "x":10.75 , "y":1.5}, - {"label":"9(" , "matrix": [7, 2], "x":11.75 , "y":1.5}, - {"label":"0)" , "matrix": [7, 3], "x":12.75 , "y":1.5}, - {"label":"-_" , "matrix": [7, 4], "x":13.75 , "y":1.5}, - {"label":"=+" , "matrix": [7, 5], "x":14.75 , "y":1.5}, - {"label":"Backspace" , "matrix": [7, 6], "x":15.75 , "y":1.5 , "w":2}, - {"label":"Insert" , "matrix": [7, 7], "x":18 , "y":1.5}, - {"label":"Home" , "matrix": [7, 8], "x":19 , "y":1.5}, - {"label":"PgUp" , "matrix": [7, 9], "x":20 , "y":1.5}, - {"label":"Tab" , "matrix": [3, 4], "x":0 , "y":2.5 , "w":1.5}, - {"label":"Q" , "matrix": [2, 5], "x":1.5 , "y":2.5}, - {"label":"W" , "matrix": [2, 6], "x":2.5 , "y":2.5}, - {"label":"E" , "matrix": [2, 7], "x":3.5 , "y":2.5}, - {"label":"R" , "matrix": [2, 8], "x":4.5 , "y":2.5}, - {"label":"T" , "matrix": [2, 9], "x":5.5 , "y":2.5}, - {"label":"Y" , "matrix": [9, 0], "x":9.25 , "y":2.5}, - {"label":"U" , "matrix": [8, 0], "x":10.25 , "y":2.5}, - {"label":"I" , "matrix": [8, 1], "x":11.25 , "y":2.5}, - {"label":"O" , "matrix": [8, 2], "x":12.25 , "y":2.5}, - {"label":"P" , "matrix": [8, 3], "x":13.25 , "y":2.5}, - {"label":"{" , "matrix": [8, 4], "x":14.25 , "y":2.5}, - {"label":"}" , "matrix": [8, 5], "x":15.25 , "y":2.5}, - {"label":"|" , "matrix": [8, 6], "x":16.25 , "y":2.5 , "w":1.5}, - {"label":"Delete" , "matrix": [8, 7], "x":18 , "y":2.5}, - {"label":"End" , "matrix": [8, 8], "x":19 , "y":2.5}, - {"label":"PgDn" , "matrix": [8, 9], "x":20 , "y":2.5}, - {"label":"Caps Lock" , "matrix": [4, 4], "x":0 , "y":3.5 , "w":1.75}, - {"label":"A" , "matrix": [3, 5], "x":1.75 , "y":3.5}, - {"label":"S" , "matrix": [3, 6], "x":2.75 , "y":3.5}, - {"label":"D" , "matrix": [3, 7], "x":3.75 , "y":3.5}, - {"label":"F" , "matrix": [3, 8], "x":4.75 , "y":3.5}, - {"label":"G" , "matrix": [3, 9], "x":5.75 , "y":3.5}, - {"label":"H" , "matrix": [10, 0], "x":9.5 , "y":3.5}, - {"label":"J" , "matrix": [9, 1], "x":10.5 , "y":3.5}, - {"label":"K" , "matrix": [9, 2], "x":11.5 , "y":3.5}, - {"label":"L" , "matrix": [9, 3], "x":12.5 , "y":3.5}, - {"label":":" , "matrix": [9, 4], "x":13.5 , "y":3.5}, - {"label":"\"" , "matrix": [9, 5], "x":14.5 , "y":3.5}, - {"label":"Enter" , "matrix": [9, 6], "x":15.5 , "y":3.5 , "w":2.25}, - {"label":"Shift" , "matrix": [5, 4], "x":0 , "y":4.5 , "w":2.25}, - {"label":"Z" , "matrix": [4, 5], "x":2.25 , "y":4.5}, - {"label":"X" , "matrix": [4, 6], "x":3.25 , "y":4.5}, - {"label":"C" , "matrix": [4, 7], "x":4.25 , "y":4.5}, - {"label":"V" , "matrix": [4, 8], "x":5.25 , "y":4.5}, - {"label":"B" , "matrix": [4, 9], "x":6.25 , "y":4.5}, - {"label":"N" , "matrix": [11, 0], "x":10 , "y":4.5}, - {"label":"M" , "matrix": [10, 1], "x":11 , "y":4.5}, - {"label":"<" , "matrix": [10, 2], "x":12 , "y":4.5}, - {"label":">" , "matrix": [10, 3], "x":13 , "y":4.5}, - {"label":"?" , "matrix": [10, 4], "x":14 , "y":4.5}, - {"label":"Shift" , "matrix": [10, 6], "x":15 , "y":4.5 , "w":2.75}, - {"label":"\u2191" , "matrix": [10, 8], "x":19 , "y":4.5}, - {"label":"Ctrl" , "matrix": [5, 5], "x":0 , "y":5.5 , "w":1.25}, - {"label":"Fn" , "matrix": [5, 6], "x":1.25 , "y":5.5 , "w":1.25}, - {"label":"Win" , "matrix": [5, 7], "x":2.5 , "y":5.5 , "w":1.25}, - {"label":"Alt" , "matrix": [5, 8], "x":3.75 , "y":5.5 , "w":1.25}, - {"label":"Space" , "matrix": [5, 9], "x":5 , "y":5.5 , "w":2.25}, - {"label":"Space" , "matrix": [11, 1], "x":10 , "y":5.5 , "w":2.75}, - {"label":"Alt" , "matrix": [11, 3], "x":12.75 , "y":5.5 , "w":1.25}, - {"label":"Win" , "matrix": [11, 4], "x":14 , "y":5.5 , "w":1.25}, - {"label":"Menu" , "matrix": [11, 5], "x":15.25 , "y":5.5 , "w":1.25}, - {"label":"Ctrl" , "matrix": [11, 6], "x":16.5 , "y":5.5 , "w":1.25}, - {"label":"\u2190" , "matrix": [11, 7], "x":18 , "y":5.5}, - {"label":"\u2193" , "matrix": [11, 8], "x":19 , "y":5.5}, - {"label":"\u2192" , "matrix": [11, 9], "x":20 , "y":5.5} + {"label":"Esc", "matrix": [0, 4], "x":0, "y":0}, + {"label":"F1", "matrix": [0, 5], "x":2, "y":0}, + {"label":"F2", "matrix": [0, 6], "x":3, "y":0}, + {"label":"F3", "matrix": [0, 7], "x":4, "y":0}, + {"label":"F4", "matrix": [0, 8], "x":5, "y":0}, + {"label":"F5", "matrix": [0, 9], "x":6, "y":0}, + {"label":"F6", "matrix": [6, 0], "x":10.25, "y":0}, + {"label":"F7", "matrix": [6, 1], "x":11.25, "y":0}, + {"label":"F8", "matrix": [6, 2], "x":12.25, "y":0}, + {"label":"F9", "matrix": [6, 3], "x":13.75, "y":0}, + {"label":"F10", "matrix": [6, 4], "x":14.75, "y":0}, + {"label":"F11", "matrix": [6, 5], "x":15.75, "y":0}, + {"label":"F12", "matrix": [6, 6], "x":16.75, "y":0}, + {"label":"PrtSc", "matrix": [6, 7], "x":18, "y":0}, + {"label":"Scroll Lock", "matrix": [6, 8], "x":19, "y":0}, + {"label":"Pause", "matrix": [6, 9], "x":20, "y":0}, + {"label":"~", "matrix": [2, 4], "x":0, "y":1.5}, + {"label":"1!", "matrix": [1, 4], "x":1, "y":1.5}, + {"label":"2@", "matrix": [1, 5], "x":2, "y":1.5}, + {"label":"3#", "matrix": [1, 6], "x":3, "y":1.5}, + {"label":"4$", "matrix": [1, 7], "x":4, "y":1.5}, + {"label":"5%", "matrix": [1, 8], "x":5, "y":1.5}, + {"label":"6^", "matrix": [1, 9], "x":6, "y":1.5}, + {"label":"7&", "matrix": [7, 0], "x":9.75, "y":1.5}, + {"label":"8*", "matrix": [7, 1], "x":10.75, "y":1.5}, + {"label":"9(", "matrix": [7, 2], "x":11.75, "y":1.5}, + {"label":"0)", "matrix": [7, 3], "x":12.75, "y":1.5}, + {"label":"-_", "matrix": [7, 4], "x":13.75, "y":1.5}, + {"label":"=+", "matrix": [7, 5], "x":14.75, "y":1.5}, + {"label":"Backspace", "matrix": [7, 6], "x":15.75, "y":1.5, "w":2}, + {"label":"Insert", "matrix": [7, 7], "x":18, "y":1.5}, + {"label":"Home", "matrix": [7, 8], "x":19, "y":1.5}, + {"label":"PgUp", "matrix": [7, 9], "x":20, "y":1.5}, + {"label":"Tab", "matrix": [3, 4], "x":0, "y":2.5, "w":1.5}, + {"label":"Q", "matrix": [2, 5], "x":1.5, "y":2.5}, + {"label":"W", "matrix": [2, 6], "x":2.5, "y":2.5}, + {"label":"E", "matrix": [2, 7], "x":3.5, "y":2.5}, + {"label":"R", "matrix": [2, 8], "x":4.5, "y":2.5}, + {"label":"T", "matrix": [2, 9], "x":5.5, "y":2.5}, + {"label":"Y", "matrix": [9, 0], "x":9.25, "y":2.5}, + {"label":"U", "matrix": [8, 0], "x":10.25, "y":2.5}, + {"label":"I", "matrix": [8, 1], "x":11.25, "y":2.5}, + {"label":"O", "matrix": [8, 2], "x":12.25, "y":2.5}, + {"label":"P", "matrix": [8, 3], "x":13.25, "y":2.5}, + {"label":"{", "matrix": [8, 4], "x":14.25, "y":2.5}, + {"label":"}", "matrix": [8, 5], "x":15.25, "y":2.5}, + {"label":"|", "matrix": [8, 6], "x":16.25, "y":2.5, "w":1.5}, + {"label":"Delete", "matrix": [8, 7], "x":18, "y":2.5}, + {"label":"End", "matrix": [8, 8], "x":19, "y":2.5}, + {"label":"PgDn", "matrix": [8, 9], "x":20, "y":2.5}, + {"label":"Caps Lock", "matrix": [4, 4], "x":0, "y":3.5, "w":1.75}, + {"label":"A", "matrix": [3, 5], "x":1.75, "y":3.5}, + {"label":"S", "matrix": [3, 6], "x":2.75, "y":3.5}, + {"label":"D", "matrix": [3, 7], "x":3.75, "y":3.5}, + {"label":"F", "matrix": [3, 8], "x":4.75, "y":3.5}, + {"label":"G", "matrix": [3, 9], "x":5.75, "y":3.5}, + {"label":"H", "matrix": [10, 0], "x":9.5, "y":3.5}, + {"label":"J", "matrix": [9, 1], "x":10.5, "y":3.5}, + {"label":"K", "matrix": [9, 2], "x":11.5, "y":3.5}, + {"label":"L", "matrix": [9, 3], "x":12.5, "y":3.5}, + {"label":":", "matrix": [9, 4], "x":13.5, "y":3.5}, + {"label":"\"", "matrix": [9, 5], "x":14.5, "y":3.5}, + {"label":"Enter", "matrix": [9, 6], "x":15.5, "y":3.5, "w":2.25}, + {"label":"Shift", "matrix": [5, 4], "x":0, "y":4.5, "w":2.25}, + {"label":"Z", "matrix": [4, 5], "x":2.25, "y":4.5}, + {"label":"X", "matrix": [4, 6], "x":3.25, "y":4.5}, + {"label":"C", "matrix": [4, 7], "x":4.25, "y":4.5}, + {"label":"V", "matrix": [4, 8], "x":5.25, "y":4.5}, + {"label":"B", "matrix": [4, 9], "x":6.25, "y":4.5}, + {"label":"N", "matrix": [11, 0], "x":10, "y":4.5}, + {"label":"M", "matrix": [10, 1], "x":11, "y":4.5}, + {"label":"<", "matrix": [10, 2], "x":12, "y":4.5}, + {"label":">", "matrix": [10, 3], "x":13, "y":4.5}, + {"label":"?", "matrix": [10, 4], "x":14, "y":4.5}, + {"label":"Shift", "matrix": [10, 6], "x":15, "y":4.5, "w":2.75}, + {"label":"\u2191", "matrix": [10, 8], "x":19, "y":4.5}, + {"label":"Ctrl", "matrix": [5, 5], "x":0, "y":5.5, "w":1.25}, + {"label":"Fn", "matrix": [5, 6], "x":1.25, "y":5.5, "w":1.25}, + {"label":"Win", "matrix": [5, 7], "x":2.5, "y":5.5, "w":1.25}, + {"label":"Alt", "matrix": [5, 8], "x":3.75, "y":5.5, "w":1.25}, + {"label":"Space", "matrix": [5, 9], "x":5, "y":5.5, "w":2.25}, + {"label":"Space", "matrix": [11, 1], "x":10, "y":5.5, "w":2.75}, + {"label":"Alt", "matrix": [11, 3], "x":12.75, "y":5.5, "w":1.25}, + {"label":"Win", "matrix": [11, 4], "x":14, "y":5.5, "w":1.25}, + {"label":"Menu", "matrix": [11, 5], "x":15.25, "y":5.5, "w":1.25}, + {"label":"Ctrl", "matrix": [11, 6], "x":16.5, "y":5.5, "w":1.25}, + {"label":"\u2190", "matrix": [11, 7], "x":18, "y":5.5}, + {"label":"\u2193", "matrix": [11, 8], "x":19, "y":5.5}, + {"label":"\u2192", "matrix": [11, 9], "x":20, "y":5.5} ] } } diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json index 5137e62c22..01ab1df856 100644 --- a/keyboards/handwired/swiftrax/astro65/info.json +++ b/keyboards/handwired/swiftrax/astro65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Astro65", + "keyboard_name": "Astro65", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAEF", diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json index 3de3e79553..b833dfbdf6 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Bebol", + "keyboard_name": "Bebol", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAC4", diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json index a8aecb81b4..e35d1f36e7 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Beegboy", + "keyboard_name": "Beegboy", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAC5", diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index f5fe3747c4..9a46cb9849 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "BumbleBee", + "keyboard_name": "BumbleBee", "manufacturer": "Swiftrax", - "url": "https://www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE881", @@ -89,4 +89,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json index 5049e12358..8aea3b0c1b 100644 --- a/keyboards/handwired/swiftrax/cowfish/info.json +++ b/keyboards/handwired/swiftrax/cowfish/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "CowFish", + "keyboard_name": "CowFish", "manufacturer": "Swiftrax", - "url": "", - "maintainer": "swiftrax", + "url": "", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEB53", diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json index be40a46eeb..3aed06628f 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Glacier", + "keyboard_name": "Glacier", "manufacturer": "Digital Carpentry", - "url": "https://www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE890", diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json index 9506e088f9..e55940cf0c 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Joypad", + "keyboard_name": "Joypad", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA68", diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/info.json index c055d2622a..e049002036 100644 --- a/keyboards/handwired/swiftrax/koalafications/info.json +++ b/keyboards/handwired/swiftrax/koalafications/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Koalafications", + "keyboard_name": "Koalafications", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA44", diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/info.json index ad088985a1..9deacb8238 100644 --- a/keyboards/handwired/swiftrax/nodu/info.json +++ b/keyboards/handwired/swiftrax/nodu/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Nodu", + "keyboard_name": "Nodu", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA6E", diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json index 7e9e15d474..b12fc5c31f 100644 --- a/keyboards/handwired/swiftrax/the_galleon/info.json +++ b/keyboards/handwired/swiftrax/the_galleon/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "The Galleon", + "keyboard_name": "The Galleon", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "swiftrax", + "url": "github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA2D", diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json index b651d29835..545e0b66e5 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "UnSplit", + "keyboard_name": "UnSplit", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "swiftrax", + "url": "github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAB1", diff --git a/keyboards/handwired/symmetric70_proto/info.json b/keyboards/handwired/symmetric70_proto/info.json index 9be776f41c..ecd0d38c24 100644 --- a/keyboards/handwired/symmetric70_proto/info.json +++ b/keyboards/handwired/symmetric70_proto/info.json @@ -3,9 +3,9 @@ "url": "", "maintainer": "mtei", "usb": { - "vid": "0xFEED", - "pid": "0x2BE5", - "device_version": "0.0.1" + "vid": "0xFEED", + "pid": "0x2BE5", + "device_version": "0.0.1" }, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json index d3bc56857a..f4ecf44eab 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "T111", + "keyboard_name": "T111", "manufacturer": "FUJITSU", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0xFEED", "pid": "0x6FAA", diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index da74d9b80a..a48d64f730 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Tennie", "manufacturer": "Jsck", "url": "https://github.com/StoutIEEE/macropad-workshop", - "maintainer": "UW Stout IEEE, Jack Hildebrandt (onemorebyte)", + "maintainer": "UW Stout IEEE, Jack Hildebrandt (onemorebyte)", "usb": { "vid": "0x1EEE", "pid": "0x1313", diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/info.json index 032b2c10f7..edd94e7f25 100644 --- a/keyboards/handwired/tkk/info.json +++ b/keyboards/handwired/tkk/info.json @@ -13,8 +13,8 @@ }, "matrix_pins": { "direct": [ - ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"] - ] + ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"] + ] }, "processor": "atmega32u4", "url": "", diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index e6c9010bfd..8f56d90947 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -58,7 +58,7 @@ {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} ] }, - "LAYOUT_nontra_6x4": { + "LAYOUT_nontra_6x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/handwired/wabi/info.json b/keyboards/handwired/wabi/info.json index 1baea8b6ac..8c833feeb4 100644 --- a/keyboards/handwired/wabi/info.json +++ b/keyboards/handwired/wabi/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Wabi", + "keyboard_name": "Wabi", "manufacturer": "Montsinger", - "url": "www.montsinger.net", - "maintainer": "Montsinger", + "url": "www.montsinger.net", + "maintainer": "Montsinger", "usb": { "vid": "0xFEED", "pid": "0xB07D", diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json index 373c80ac7f..f027c7da1f 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z150", + "keyboard_name": "Z150", "manufacturer": "ALPS", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json index 460428388b..56b1b8f0cd 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "zErgo", + "keyboard_name": "zErgo", "manufacturer": "GreenJack", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", - "maintainer": "greenjack", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", + "maintainer": "greenjack", "usb": { "vid": "0xFEED", "pid": "0xB92B", diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json index 8d11f6cd76..9855630a4b 100644 --- a/keyboards/hardwareabstraction/handwire/info.json +++ b/keyboards/hardwareabstraction/handwire/info.json @@ -12,12 +12,10 @@ "mousekey": true, "nkro": true }, - "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B7", "D5", "D3", "D2"] }, - "processor": "atmega32u4", "url": "https://github.com/cgmandy", "usb": { @@ -25,7 +23,6 @@ "vid": "0xAF01", "pid": "0x0001" }, - "layouts": { "LAYOUT_60_arrows": { "layout": [ diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json index f57889bc2d..4546c49663 100644 --- a/keyboards/hazel/bad_wings/info.json +++ b/keyboards/hazel/bad_wings/info.json @@ -9,18 +9,18 @@ "device_version": "1.0.0" }, "processor": "RP2040", - "bootloader": "rp2040", + "bootloader": "rp2040", "matrix_size": { "cols": 8, "rows": 5 - }, + }, "diode_direction": "COL2ROW", "features": { "bootmagic": true, "deferred_exec": true, "nkro": false }, - "community_layouts": [ "split_3x5_3" ], + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ @@ -60,7 +60,7 @@ { "label": "K47", "matrix": [4, 7], "w": 1, "x": 7, "y": 3.47 }, { "label": "K37", "matrix": [3, 7], "w": 1, "x": 8, "y": 3.36 }, { "label": "K27", "matrix": [2, 7], "w": 1, "x": 9, "y": 3.25 } - ] + ] } - } -} \ No newline at end of file + } +} diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/info.json index 88998edd65..69176327e1 100644 --- a/keyboards/heliotrope/info.json +++ b/keyboards/heliotrope/info.json @@ -30,64 +30,64 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 0] , "x": 7 , "y": 5 } , - { "flags": 4, "matrix": [0, 1] , "x": 22 , "y": 5 } , - { "flags": 4, "matrix": [0, 2] , "x": 37 , "y": 5 } , - { "flags": 4, "matrix": [0, 3] , "x": 52 , "y": 5 } , - { "flags": 4, "matrix": [0, 4] , "x": 67 , "y": 5 } , - { "flags": 4, "matrix": [0, 5] , "x": 82 , "y": 5 } , - { "flags": 4, "matrix": [0, 6] , "x": 97 , "y": 5 } , - { "flags": 4, "matrix": [0, 7] , "x": 112, "y": 5 } , - { "flags": 4, "matrix": [0, 8] , "x": 127, "y": 5 } , - { "flags": 4, "matrix": [0, 9] , "x": 142, "y": 5 } , - { "flags": 4, "matrix": [0, 10], "x": 157, "y": 5 } , - { "flags": 4, "matrix": [0, 11], "x": 172, "y": 5 } , - { "flags": 4, "matrix": [0, 12], "x": 187, "y": 5 } , - { "flags": 4, "matrix": [0, 13], "x": 209, "y": 5 } , + { "flags": 4, "matrix": [0, 0], "x": 7, "y": 5 }, + { "flags": 4, "matrix": [0, 1], "x": 22, "y": 5 }, + { "flags": 4, "matrix": [0, 2], "x": 37, "y": 5 }, + { "flags": 4, "matrix": [0, 3], "x": 52, "y": 5 }, + { "flags": 4, "matrix": [0, 4], "x": 67, "y": 5 }, + { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 }, + { "flags": 4, "matrix": [0, 6], "x": 97, "y": 5 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 5 }, + { "flags": 4, "matrix": [0, 8], "x": 127, "y": 5 }, + { "flags": 4, "matrix": [0, 9], "x": 142, "y": 5 }, + { "flags": 4, "matrix": [0, 10], "x": 157, "y": 5 }, + { "flags": 4, "matrix": [0, 11], "x": 172, "y": 5 }, + { "flags": 4, "matrix": [0, 12], "x": 187, "y": 5 }, + { "flags": 4, "matrix": [0, 13], "x": 209, "y": 5 }, { "flags": 4, "matrix": [1, 13], "x": 213, "y": 17 }, { "flags": 4, "matrix": [1, 12], "x": 194, "y": 17 }, { "flags": 4, "matrix": [1, 11], "x": 179, "y": 17 }, { "flags": 4, "matrix": [1, 10], "x": 164, "y": 17 }, - { "flags": 4, "matrix": [1, 9] , "x": 149, "y": 17 }, - { "flags": 4, "matrix": [1, 8] , "x": 134, "y": 17 }, - { "flags": 4, "matrix": [1, 7] , "x": 119, "y": 17 }, - { "flags": 4, "matrix": [1, 6] , "x": 104, "y": 17 }, - { "flags": 4, "matrix": [1, 5] , "x": 90 , "y": 17 }, - { "flags": 4, "matrix": [1, 4] , "x": 75 , "y": 17 }, - { "flags": 4, "matrix": [1, 3] , "x": 60 , "y": 17 }, - { "flags": 4, "matrix": [1, 2] , "x": 45 , "y": 17 }, - { "flags": 4, "matrix": [1, 1] , "x": 30 , "y": 17 }, - { "flags": 4, "matrix": [1, 0] , "x": 11 , "y": 17 }, - { "flags": 4, "matrix": [2, 0] , "x": 13 , "y": 29 }, - { "flags": 4, "matrix": [2, 1] , "x": 34 , "y": 29 }, - { "flags": 4, "matrix": [2, 2] , "x": 49 , "y": 29 }, - { "flags": 4, "matrix": [2, 3] , "x": 63 , "y": 29 }, - { "flags": 4, "matrix": [2, 4] , "x": 78 , "y": 29 }, - { "flags": 4, "matrix": [2, 5] , "x": 93 , "y": 29 }, - { "flags": 4, "matrix": [2, 6] , "x": 108, "y": 29 }, - { "flags": 4, "matrix": [2, 7] , "x": 123, "y": 29 }, - { "flags": 4, "matrix": [2, 8] , "x": 138, "y": 29 }, - { "flags": 4, "matrix": [2, 9] , "x": 153, "y": 29 }, + { "flags": 4, "matrix": [1, 9], "x": 149, "y": 17 }, + { "flags": 4, "matrix": [1, 8], "x": 134, "y": 17 }, + { "flags": 4, "matrix": [1, 7], "x": 119, "y": 17 }, + { "flags": 4, "matrix": [1, 6], "x": 104, "y": 17 }, + { "flags": 4, "matrix": [1, 5], "x": 90, "y": 17 }, + { "flags": 4, "matrix": [1, 4], "x": 75, "y": 17 }, + { "flags": 4, "matrix": [1, 3], "x": 60, "y": 17 }, + { "flags": 4, "matrix": [1, 2], "x": 45, "y": 17 }, + { "flags": 4, "matrix": [1, 1], "x": 30, "y": 17 }, + { "flags": 4, "matrix": [1, 0], "x": 11, "y": 17 }, + { "flags": 4, "matrix": [2, 0], "x": 13, "y": 29 }, + { "flags": 4, "matrix": [2, 1], "x": 34, "y": 29 }, + { "flags": 4, "matrix": [2, 2], "x": 49, "y": 29 }, + { "flags": 4, "matrix": [2, 3], "x": 63, "y": 29 }, + { "flags": 4, "matrix": [2, 4], "x": 78, "y": 29 }, + { "flags": 4, "matrix": [2, 5], "x": 93, "y": 29 }, + { "flags": 4, "matrix": [2, 6], "x": 108, "y": 29 }, + { "flags": 4, "matrix": [2, 7], "x": 123, "y": 29 }, + { "flags": 4, "matrix": [2, 8], "x": 138, "y": 29 }, + { "flags": 4, "matrix": [2, 9], "x": 153, "y": 29 }, { "flags": 4, "matrix": [2, 10], "x": 168, "y": 29 }, { "flags": 4, "matrix": [2, 11], "x": 183, "y": 29 }, - { "flags": 4, "matrix": [2, 13], "x": 207, "y": 29 }, + { "flags": 4, "matrix": [2, 13], "x": 207, "y": 29 }, { "flags": 4, "matrix": [3, 13], "x": 203, "y": 41 }, - { "flags": 4, "matrix": [3, 10], "x": 175, "y": 41 }, - { "flags": 4, "matrix": [3, 9] , "x": 161, "y": 41 }, - { "flags": 4, "matrix": [3, 8] , "x": 146, "y": 41 }, - { "flags": 4, "matrix": [3, 7] , "x": 131, "y": 41 }, - { "flags": 4, "matrix": [3, 6] , "x": 116, "y": 41 }, - { "flags": 4, "matrix": [3, 5] , "x": 101, "y": 41 }, - { "flags": 4, "matrix": [3, 4] , "x": 86 , "y": 41 }, - { "flags": 4, "matrix": [3, 3] , "x": 71 , "y": 41 }, - { "flags": 4, "matrix": [3, 2] , "x": 56 , "y": 41 }, - { "flags": 4, "matrix": [3, 1] , "x": 41 , "y": 41 }, - { "flags": 4, "matrix": [3, 0] , "x": 17 , "y": 41 }, - { "flags": 4, "matrix": [4, 0] , "x": 9 , "y": 54 }, - { "flags": 4, "matrix": [4, 1] , "x": 28 , "y": 54 }, - { "flags": 4, "matrix": [4, 2] , "x": 47 , "y": 54 }, - { "flags": 4, "matrix": [4, 5] , "x": 103, "y": 54 }, - { "flags": 4, "matrix": [4, 9] , "x": 159, "y": 54 }, + { "flags": 4, "matrix": [3, 10], "x": 175, "y": 41 }, + { "flags": 4, "matrix": [3, 9], "x": 161, "y": 41 }, + { "flags": 4, "matrix": [3, 8], "x": 146, "y": 41 }, + { "flags": 4, "matrix": [3, 7], "x": 131, "y": 41 }, + { "flags": 4, "matrix": [3, 6], "x": 116, "y": 41 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 41 }, + { "flags": 4, "matrix": [3, 4], "x": 86, "y": 41 }, + { "flags": 4, "matrix": [3, 3], "x": 71, "y": 41 }, + { "flags": 4, "matrix": [3, 2], "x": 56, "y": 41 }, + { "flags": 4, "matrix": [3, 1], "x": 41, "y": 41 }, + { "flags": 4, "matrix": [3, 0], "x": 17, "y": 41 }, + { "flags": 4, "matrix": [4, 0], "x": 9, "y": 54 }, + { "flags": 4, "matrix": [4, 1], "x": 28, "y": 54 }, + { "flags": 4, "matrix": [4, 2], "x": 47, "y": 54 }, + { "flags": 4, "matrix": [4, 5], "x": 103, "y": 54 }, + { "flags": 4, "matrix": [4, 9], "x": 159, "y": 54 }, { "flags": 4, "matrix": [4, 10], "x": 177, "y": 54 }, { "flags": 4, "matrix": [4, 11], "x": 196, "y": 54 }, { "flags": 4, "matrix": [4, 13], "x": 215, "y": 54 } @@ -96,69 +96,68 @@ "layouts": { "LAYOUT_60_ansi": { "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, 13], "w": 2.25 , "x": 12.75, "y": 2 }, - { "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, 13], "w": 2.75 , "x": 12.25, "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] , "w": 1.25 , "x": 10 , "y": 4 }, - { "matrix": [4, 10], "w": 1.25 , "x": 11.25, "y": 4 }, - { "matrix": [4, 11], "w": 1.25 , "x": 12.5 , "y": 4 }, - { "matrix": [4, 13], "w": 1.25 , "x": 13.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": [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, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "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, 13], "w": 2.75, "x": 12.25, "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], "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 } ] } } } - diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 0fc817ffdc..559fa3d790 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -14,7 +14,7 @@ "processor": "WB32FQ95", "bootloader": "wb32-dfu", "matrix_pins": { - "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index 549bff42a6..8b5fa112f7 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -1,13 +1,11 @@ { "processor": "atmega32u4", "bootloader": "atmel-dfu", - "matrix_pins": { "rows": ["C6", "D7", "E6", "B5"], "cols": ["F6", "F7", "B1", "B3", "B2", "B6"] }, "diode_direction": "COL2ROW", - "usb": { "vid": "0x4D4D", "pid": "0x4846", @@ -18,7 +16,6 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, - "features": { "encoder": true, "extrakey": true, @@ -34,7 +31,6 @@ } } }, - "rgblight": { "led_count": 4, "split": true, diff --git a/keyboards/hillside/46/info.json b/keyboards/hillside/46/info.json index 67090583a9..10d2d5c7e1 100644 --- a/keyboards/hillside/46/info.json +++ b/keyboards/hillside/46/info.json @@ -1,9 +1,7 @@ { "manufacturer": "mmccoyd", "maintainer": "mmccoyd", - "keyboard_name": "Hillside 46", "url": "http://github.com/mmccoyd/hillside/", - - "tags": ["split", "column stagger", "choc v1", "choc spaced" ] + "tags": ["split", "column stagger", "choc v1", "choc spaced"] } diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index 6f256f73dc..19e38259d3 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -1,13 +1,11 @@ { "processor": "atmega32u4", "bootloader": "atmel-dfu", - "matrix_pins": { "rows": ["D7", "E6", "B4", "B5"], "cols": ["F6", "F7", "B1", "B3", "B2", "B6"] - }, + }, "diode_direction": "COL2ROW", - "usb": { "vid": "0xFEED", "pid": "0x67C0", @@ -18,7 +16,6 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, - "features": { "encoder": true, "extrakey": true, @@ -35,7 +32,6 @@ } } }, - "rgblight": { "led_count": 5, "split": true, diff --git a/keyboards/hillside/48/info.json b/keyboards/hillside/48/info.json index 1735e6a4c6..774f849315 100644 --- a/keyboards/hillside/48/info.json +++ b/keyboards/hillside/48/info.json @@ -1,9 +1,7 @@ { "manufacturer": "mmccoyd", "maintainer": "mmccoyd", - "keyboard_name": "Hillside48", "url": "http://github.com/mmccoyd/hillside/", - - "tags": ["split", "column stagger", "choc v1", "choc spaced" ] + "tags": ["split", "column stagger", "choc v1", "choc spaced"] } diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index 46ab70bb9b..8584ee1512 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -1,13 +1,11 @@ { "processor": "atmega32u4", "bootloader": "atmel-dfu", - "matrix_pins": { "rows": ["C6", "D7", "E6", "B4", "B5"], "cols": ["F6", "F7", "B1", "B3", "B2", "B6"] - }, + }, "diode_direction": "COL2ROW", - "usb": { "vid": "0x4D4D", "pid": "0x4852", @@ -18,7 +16,6 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, - "features": { "encoder": true, "extrakey": true, @@ -34,7 +31,6 @@ } } }, - "rgblight": { "led_count": 5, "split": true, diff --git a/keyboards/hillside/52/info.json b/keyboards/hillside/52/info.json index 3f236e4c76..8cafb29a6b 100644 --- a/keyboards/hillside/52/info.json +++ b/keyboards/hillside/52/info.json @@ -1,9 +1,7 @@ { "manufacturer": "mmccoyd", "maintainer": "mmccoyd", - "keyboard_name": "Hillside 52", "url": "http://github.com/mmccoyd/hillside/", - - "tags": ["split", "column stagger", "choc v1", "choc spaced" ] + "tags": ["split", "column stagger", "choc v1", "choc spaced"] } diff --git a/keyboards/hineybush/hineyg80/info.json b/keyboards/hineybush/hineyg80/info.json index 85e4ca0e36..1d7b00d4db 100644 --- a/keyboards/hineybush/hineyg80/info.json +++ b/keyboards/hineybush/hineyg80/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "hineyG80", + "keyboard_name": "hineyG80", "manufacturer": "hineybush", - "url": "", - "maintainer": "hineybush", + "url": "", + "maintainer": "hineybush", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/info.json index 6fc2861e46..1cb13cae05 100644 --- a/keyboards/hotdox76v2/info.json +++ b/keyboards/hotdox76v2/info.json @@ -220,8 +220,8 @@ { "label": "R54", "matrix": [6, 4], "x": 9, "y": 6 }, - { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6,"h": 2 }, - { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6,"h": 2 }, + { "label": "L53", "matrix": [0, 3], "x": 5, "y": 6, "h": 2 }, + { "label": "L52", "matrix": [0, 2], "x": 6, "y": 6, "h": 2 }, { "label": "L51", "matrix": [0, 1], "x": 7, "y": 7 }, { "label": "R51", "matrix": [6, 1], "x": 9, "y": 7 }, diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json index 3d06f3c9f7..20f6111a0b 100644 --- a/keyboards/hubble/info.json +++ b/keyboards/hubble/info.json @@ -53,7 +53,7 @@ { "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": [2, 7], "x": 7.25, "y": 1 }, + { "matrix": [2, 7], "x": 7.25, "y": 1 }, { "matrix": [3, 7], "x": 8.25, "y": 1 }, { "matrix": [3, 6], "x": 9.25, "y": 1 }, { "matrix": [3, 5], "x": 10.25, "y": 1 }, @@ -75,19 +75,18 @@ { "matrix": [5, 4], "x": 11.75, "y": 2, "w": 1.25 }, { "matrix": [5, 3], "x": 13, "y": 2 }, { "matrix": [5, 1], "x": 14.25, "y": 2 }, - { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 }, + { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 }, { "matrix": [6, 1], "x": 1.25, "y": 3, "w": 1.25}, { "matrix": [6, 2], "x": 2.5, "y": 3, "w": 1.25 }, { "matrix": [6, 3], "x": 3.75, "y": 3, "w": 2.25 }, { "matrix": [6, 5], "x": 6, "y": 3, "w": 1.25 }, { "matrix": [6, 7], "x": 7.25, "y": 3, "w": 2.75 }, - { "matrix": [7, 6], "x": 10, "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, 2], "x": 13.25, "y": 3 }, { "matrix": [7, 1], "x": 14.25, "y": 3 }, { "matrix": [7, 0], "x": 15.25, "y": 3 } - ] } } diff --git a/keyboards/ianklug/grooveboard/info.json b/keyboards/ianklug/grooveboard/info.json index bf4cadae84..a38e793544 100644 --- a/keyboards/ianklug/grooveboard/info.json +++ b/keyboards/ianklug/grooveboard/info.json @@ -22,7 +22,7 @@ {"x": 1, "y": 0, "matrix": [0, 1]}, {"x": 4, "y": 0, "matrix": [0, 2]}, {"x": 5, "y": 0, "matrix": [0, 3]} - ] + ] } } } diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index 74015bf03e..37fddaaf8f 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -1,8 +1,8 @@ { "keyboard_name": "IBM Model M (4th generation)", "manufacturer": "IBM/Purdea Andrei", - "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", - "maintainer": "purdeaandrei", + "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", + "maintainer": "purdeaandrei", "usb": { "vid": "0x16C0", "pid": "0x27DB", diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json index 0e19a2b10b..3fd59d1dd4 100644 --- a/keyboards/idobao/id80/v2/ansi/info.json +++ b/keyboards/idobao/id80/v2/ansi/info.json @@ -66,9 +66,9 @@ {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25}, {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25}, {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25}, - {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25 , "w":2.25}, + {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25, "w":2.25}, - {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25 , "w":2.25}, + {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":2.25}, {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25}, {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25}, {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25}, @@ -79,15 +79,15 @@ {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25}, {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25}, {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25}, - {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25 , "w":1.75}, + {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "matrix":[3, 6], "x":14.25, "y":4.5}, - {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25 , "w":1.25}, - {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25 , "w":1.25}, - {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25 , "w":1.25}, - {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25 , "w":6.25}, - {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25 , "w":1.5}, - {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25 , "w":1.5}, + {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25}, + {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25}, + {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25}, + {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25}, + {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5}, + {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5}, {"label":"\u2190", "matrix":[5, 0], "x":13.25, "y":5.5}, {"label":"\u2193", "matrix":[4, 0], "x":14.25, "y":5.5}, {"label":"\u2192", "matrix":[3, 0], "x":15.25, "y":5.5} diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index 2a7b4a9bf9..1deaf6b270 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ID87", + "keyboard_name": "ID87", "manufacturer": "IDOBAO", - "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", - "maintainer": "qmk", + "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", + "maintainer": "qmk", "usb": { "vid": "0x6964", "pid": "0x0087", diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json index dcac3b712b..fb45bcb0d0 100644 --- a/keyboards/idyllic/tinny50_rgb/info.json +++ b/keyboards/idyllic/tinny50_rgb/info.json @@ -91,4 +91,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/igloo/info.json b/keyboards/igloo/info.json index 9ff5a23b0f..6e26d0f062 100644 --- a/keyboards/igloo/info.json +++ b/keyboards/igloo/info.json @@ -13,8 +13,8 @@ "nkro": true }, "matrix_pins": { - "cols": ["F7", "F6", "F5", "F4", "F1", "F0", - "B0", "B1", "B2", "B4", "B5", "B6", + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", + "B0", "B1", "B2", "B4", "B5", "B6", "C6", "C7", "D5", "D6", "D4"], "rows": ["B7", "D0", "D1", "D2", "D3"] }, @@ -78,12 +78,11 @@ { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "x": 12.75, "y": 2 }, - { "matrix": [2, 15], "x": 13, "y": 0 }, - + { "matrix": [2, 14], "x": 12.75, "y": 2 }, + { "matrix": [2, 15], "x": 13, "y": 0 }, { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1.25, "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 }, @@ -91,12 +90,12 @@ { "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, 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, 14], "x": 13.25, "y": 3 }, - { "matrix": [3, 15], "x": 16.25, "y": 3 }, + { "matrix": [3, 15], "x": 16.25, "y": 3 }, { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, @@ -107,7 +106,7 @@ { "matrix": [4, 6], "w": 2.25, "x": 7.25, "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], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, { "matrix": [4, 12], "w": 1.25, "x": 13.75, "y": 4 }, { "matrix": [4, 13], "w": 1.25, "x": 15, "y": 4 }, { "matrix": [4, 14], "x": 15.25, "y": 4 }, @@ -116,4 +115,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/illuminati/is0/info.json b/keyboards/illuminati/is0/info.json index 061f2e1049..b5a534e142 100644 --- a/keyboards/illuminati/is0/info.json +++ b/keyboards/illuminati/is0/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "iS0", + "keyboard_name": "iS0", "manufacturer": "Illuminati Works", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0012", diff --git a/keyboards/illusion/rosa/info.json b/keyboards/illusion/rosa/info.json index 1c0da2e9ed..3b48442566 100644 --- a/keyboards/illusion/rosa/info.json +++ b/keyboards/illusion/rosa/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Rosa", + "keyboard_name": "Rosa", "manufacturer": "illusion keyboards", - "url": "", - "maintainer": "illusion", + "url": "", + "maintainer": "illusion", "usb": { "vid": "0x694B", "pid": "0x6952", diff --git a/keyboards/ilumkb/primus75/info.json b/keyboards/ilumkb/primus75/info.json index 31963c6572..d65bb31e2d 100644 --- a/keyboards/ilumkb/primus75/info.json +++ b/keyboards/ilumkb/primus75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Primus75", + "keyboard_name": "Primus75", "manufacturer": "moyi4681", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x445A", "pid": "0x1014", @@ -124,5 +124,4 @@ ] } } - } diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json index 53e00d8027..4b3a067522 100644 --- a/keyboards/ilumkb/simpler61/info.json +++ b/keyboards/ilumkb/simpler61/info.json @@ -90,5 +90,4 @@ ] } } - } diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json index 575b1681e4..0db9d79c22 100644 --- a/keyboards/ilumkb/simpler64/info.json +++ b/keyboards/ilumkb/simpler64/info.json @@ -93,4 +93,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ilumkb/volcano660/info.json b/keyboards/ilumkb/volcano660/info.json index 3ee1e7aa67..5dba9e1020 100644 --- a/keyboards/ilumkb/volcano660/info.json +++ b/keyboards/ilumkb/volcano660/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Volcano660", + "keyboard_name": "Volcano660", "manufacturer": "DZTech", - "url": "", - "maintainer": "dztech", + "url": "", + "maintainer": "dztech", "usb": { "vid": "0x445A", "pid": "0x0002", diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json index 6af9cc38af..57d7ee7bb3 100644 --- a/keyboards/jae/j01/info.json +++ b/keyboards/jae/j01/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "J-01", + "keyboard_name": "J-01", "manufacturer": "Evyd13", - "url": "", - "maintainer": "MechMerlin", + "url": "", + "maintainer": "MechMerlin", "usb": { "vid": "0x4705", "pid": "0x0143", diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json index 5d9e6bd54b..b14eb858d8 100644 --- a/keyboards/jels/boaty/info.json +++ b/keyboards/jels/boaty/info.json @@ -21,7 +21,7 @@ "backlight": false }, "matrix_pins": { - "cols": [ "B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5" ], + "cols": ["B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5"], "rows": ["D6", "B0", "D7", "B5", "B3", "B4", "B2"] }, "diode_direction": "COL2ROW", @@ -29,7 +29,7 @@ "LAYOUT_all": { "layout": [ { "label": "Num Lock", "matrix": [2, 10], "x":6.75, "y": 0 }, - { "label": "-", "matrix": [1, 10], "x":6.75, "y": 1 }, + { "label": "-", "matrix": [1, 10], "x":6.75, "y": 1 }, { "label": "*", "matrix": [1, 9], "x":7.75, "y": 1 }, { "label": "7", "matrix": [0, 8], "x":6.75, "y": 2 }, { "label": "8", "matrix": [0, 9], "x":7.75, "y": 2 }, diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index 143eaaa557..0332657ffc 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Jiran", + "keyboard_name": "Jiran", "manufacturer": "Ladniy", - "url": "t.me/s/ladniys", - "maintainer": "Ladniy", + "url": "t.me/s/ladniys", + "maintainer": "Ladniy", "usb": { "vid": "0x1209", "pid": "0x3735", diff --git a/keyboards/jkeys_design/gentleman65/info.json b/keyboards/jkeys_design/gentleman65/info.json index 7858dcc3e4..e269f48dea 100644 --- a/keyboards/jkeys_design/gentleman65/info.json +++ b/keyboards/jkeys_design/gentleman65/info.json @@ -1,8 +1,8 @@ { - "name": "Gentleman 65", + "name": "Gentleman 65", "manufacturer": "JJ48_24 & Omar Afzal", - "url": "https://jkeys.design/products/gentleman-65", - "maintainer": "0marA", + "url": "https://jkeys.design/products/gentleman-65", + "maintainer": "0marA", "usb": { "vid": "0x00FA", "pid": "0x2020", @@ -104,4 +104,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index 8309acbd32..9256cad38f 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Gentleman 65", + "keyboard_name": "Gentleman 65", "manufacturer": "JJ48_24 & Omar Afzal", - "url": "https://jkeys.design/products/gentleman-65-suited-edition", - "maintainer": "OmarA", + "url": "https://jkeys.design/products/gentleman-65-suited-edition", + "maintainer": "OmarA", "usb": { "vid": "0x00FA", "pid": "0x2322", diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index c3a0ba00c6..f07f99e4a6 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -78,4 +78,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json index 97d8d9b763..525a6e8dcd 100644 --- a/keyboards/k34/info.json +++ b/keyboards/k34/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "k34", + "keyboard_name": "k34", "manufacturer": "jp_smasher", - "url": "https://github.com/wongjingping/k34", - "maintainer": "qmk", + "url": "https://github.com/wongjingping/k34", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", @@ -62,4 +62,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json index 345fdba511..8ec6b52705 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/info.json @@ -1,15 +1,15 @@ { - "keyboard_name": "78S", + "keyboard_name": "78S", "manufacturer": "Kabe_Don", - "url": "", - "maintainer": "370490639", + "url": "", + "maintainer": "370490639", "usb": { - "vid": "0x4B44", - "pid": "0x3738", - "device_version": "0.0.1" + "vid": "0x4B44", + "pid": "0x3738", + "device_version": "0.0.1" }, "ws2812": { - "pin": "B7" + "pin": "B7" }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0", "C7", "D7", "B5", "B2", "E6"], diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json index 85edf331b9..95781f0581 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/info.json @@ -1,15 +1,15 @@ { - "keyboard_name": "980", + "keyboard_name": "980", "manufacturer": "Kabe_Don", - "url": "https://kabedon.taobao.com", - "maintainer": "370490639", + "url": "https://kabedon.taobao.com", + "maintainer": "370490639", "usb": { - "vid": "0x4B44", - "pid": "0x3938", - "device_version": "0.0.1" + "vid": "0x4B44", + "pid": "0x3938", + "device_version": "0.0.1" }, "ws2812": { - "pin": "B7" + "pin": "B7" }, "matrix_pins": { "cols": ["F5", "F4", "F6", "C6", "B6", "B4", "D3", "D1", "D4", "F1", "B3", "D5", "F0"], diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json index 45c6138f2c..790db40f6d 100644 --- a/keyboards/kagizaraya/halberd/info.json +++ b/keyboards/kagizaraya/halberd/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Halberd", + "keyboard_name": "Halberd", "manufacturer": "Kagizaraya", - "url": "", - "maintainer": "ka2hiro", + "url": "", + "maintainer": "ka2hiro", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index bacca0ef6d..8198cd0017 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Scythe", + "keyboard_name": "Scythe", "manufacturer": "Kagizaraya", - "url": "", - "maintainer": "ka2hiro", + "url": "", + "maintainer": "ka2hiro", "usb": { "vid": "0xFEED", "pid": "0x3941", diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json index d1fe26f5dd..e7346974b0 100644 --- a/keyboards/kalakos/bahrnob/info.json +++ b/keyboards/kalakos/bahrnob/info.json @@ -105,4 +105,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kamigakushi/info.json b/keyboards/kamigakushi/info.json index dc7b54ad54..ec2726cae3 100644 --- a/keyboards/kamigakushi/info.json +++ b/keyboards/kamigakushi/info.json @@ -41,7 +41,7 @@ "driver": "vendor" }, "matrix_pins": { - "cols": ["GP28", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7" ], + "cols": ["GP28", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7"], "rows": ["GP24", "GP29", "GP6", "GP15", "GP16"] }, "processor": "RP2040", @@ -123,4 +123,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json index 0bfc8cec3f..0125b834fb 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Arya", + "keyboard_name": "Arya", "manufacturer": "KapCave", - "url": "https://kapcave.com/products/arya", - "maintainer": "nachie", + "url": "https://kapcave.com/products/arya", + "maintainer": "nachie", "usb": { "vid": "0x4B43", "pid": "0x4152", diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index 245ef7066a..da14ebbd01 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PaladinPad", + "keyboard_name": "PaladinPad", "manufacturer": "KapCave", - "url": "https://kapcave.com/products/paladinpad-pcb", - "maintainer": "nachie", + "url": "https://kapcave.com/products/paladinpad-pcb", + "maintainer": "nachie", "usb": { "vid": "0x4B43", "pid": "0x5050" diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json index 9ca2831a11..655ba8a866 100644 --- a/keyboards/kb_elmo/67mk_e/info.json +++ b/keyboards/kb_elmo/67mk_e/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "67mk_E", + "keyboard_name": "67mk_E", "manufacturer": "kb_elmo", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0xA68C", "pid": "0xD03E", diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json index 4e5a13f870..693f452f20 100644 --- a/keyboards/kb_elmo/aek2_usb/info.json +++ b/keyboards/kb_elmo/aek2_usb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "AEK II USB", + "keyboard_name": "AEK II USB", "manufacturer": "kb-elmo", - "url": "https://github.com/kb-elmo/aek2_usb", - "maintainer": "kb-elmo", + "url": "https://github.com/kb-elmo/aek2_usb", + "maintainer": "kb-elmo", "usb": { "vid": "0xA68C", "pid": "0xDB52", diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index 4c37db13ea..419efe5be3 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M0110A USB", + "keyboard_name": "M0110A USB", "manufacturer": "kb-elmo", - "url": "https://github.com/kb-elmo/m0110a_usb", - "maintainer": "kb-elmo", + "url": "https://github.com/kb-elmo/m0110a_usb", + "maintainer": "kb-elmo", "usb": { "vid": "0xA68C", "pid": "0xDB4B", diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json index e8accd8448..436d42a973 100644 --- a/keyboards/kb_elmo/m0116_usb/info.json +++ b/keyboards/kb_elmo/m0116_usb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M0116 USB", + "keyboard_name": "M0116 USB", "manufacturer": "kb-elmo", - "url": "https://github.com/kb-elmo/m0116_usb", - "maintainer": "kb-elmo", + "url": "https://github.com/kb-elmo/m0116_usb", + "maintainer": "kb-elmo", "usb": { "vid": "0xA68C", "pid": "0x8F7E", diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index 94e94ab874..95091845e3 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Twelvekey", + "keyboard_name": "Twelvekey", "manufacturer": "kb-elmo", - "url": "https://github.com/kb-elmo/twelvekey", - "maintainer": "kb-elmo", + "url": "https://github.com/kb-elmo/twelvekey", + "maintainer": "kb-elmo", "usb": { "vid": "0xA68C", "pid": "0x9879", diff --git a/keyboards/kbdclack/kaishi65/info.json b/keyboards/kbdclack/kaishi65/info.json index 69c440f0be..fbae47d0f5 100644 --- a/keyboards/kbdclack/kaishi65/info.json +++ b/keyboards/kbdclack/kaishi65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "kaishi65", + "keyboard_name": "kaishi65", "manufacturer": "KBDClack", - "url": "https://github.com/powerlemming/KBDClack", - "maintainer": "KBDClack", + "url": "https://github.com/powerlemming/KBDClack", + "maintainer": "KBDClack", "usb": { "vid": "0xFEED", "pid": "0x1A81", diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index aca8cb7d34..73354b22a8 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Adam64", "manufacturer": "KBDCRAFT", "url": "https://kbdcraft.store/products/adam", @@ -210,4 +209,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json index 64ec94448d..ba39628688 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Bella RGB ANSI", + "keyboard_name": "Bella RGB ANSI", "manufacturer": "KBDfans", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42", "pid": "0x0008", diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json index 95b8885369..ffdf11155a 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Bella RGB ISO", + "keyboard_name": "Bella RGB ISO", "manufacturer": "KBDfans", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42", "pid": "0x0009", diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json index db7c70a981..8f9028305e 100644 --- a/keyboards/kbdfans/boop65/rgb/info.json +++ b/keyboards/kbdfans/boop65/rgb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Boop65 RGB", + "keyboard_name": "Boop65 RGB", "manufacturer": "KBDfans", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42", "pid": "0x1000", @@ -95,4 +95,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index b8dfc79c2e..bac73f0883 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Bounce75 Hotswap", + "keyboard_name": "Bounce75 Hotswap", "manufacturer": "KBDfans", - "maintainer": "moyi4681", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42", "pid": "0x7001", @@ -123,4 +123,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json index e75747f2ea..34ae9489ac 100644 --- a/keyboards/kbdfans/bounce/pad/info.json +++ b/keyboards/kbdfans/bounce/pad/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Bounce Pad", + "keyboard_name": "Bounce Pad", "manufacturer": "KBDfans", - "maintainer": "moyi4681", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42", "pid": "0x7002", diff --git a/keyboards/kbdfans/d45/v2/info.json b/keyboards/kbdfans/d45/v2/info.json index e6b0f903b8..71bbc1cfa0 100644 --- a/keyboards/kbdfans/d45/v2/info.json +++ b/keyboards/kbdfans/d45/v2/info.json @@ -1,7 +1,7 @@ { "manufacturer": "kbdfans", "maintainer": "moyi4681", - "keyboard_name": "D45V2", + "keyboard_name": "D45V2", "bootloader": "rp2040", "diode_direction": "COL2ROW", "features": { diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index 6ab178520e..edbbf6638e 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KBD67 Hotswap", + "keyboard_name": "KBD67 Hotswap", "manufacturer": "KBDFans", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4B42", "pid": "0x6065", diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/info.json b/keyboards/kbdfans/kbd67/mkii_soldered/info.json index 46f55727f8..44d5498371 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/info.json +++ b/keyboards/kbdfans/kbd67/mkii_soldered/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KBD67-MKII Soldered", + "keyboard_name": "KBD67-MKII Soldered", "manufacturer": "KBDfans", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xA103", "pid": "0x0013", diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json index 896f0385d1..023c6ff5db 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json @@ -1,7 +1,7 @@ { "manufacturer": "KBDfans", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x4B42" }, diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 2161ecdd8b..782da6bc64 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KBD6X", + "keyboard_name": "KBD6X", "manufacturer": "KBDfans", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4B42", "pid": "0x3658", diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index b84f63a967..fef9c5a8c2 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "KBD75 Hotswap", + "keyboard_name": "KBD75 Hotswap", "manufacturer": "KBDfans", - "maintainer": "DZTECH", + "maintainer": "DZTECH", "usb": { "vid": "0x4B42", "pid": "0x6062", @@ -117,4 +117,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 2f284ea937..f8f506c169 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KBD8X-MKII", + "keyboard_name": "KBD8X-MKII", "manufacturer": "KBDfans", - "url": "https://kb.ai03.me/projects/kbd8x-mkii.html", - "maintainer": "ai03", + "url": "https://kb.ai03.me/projects/kbd8x-mkii.html", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0005", diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json index a97ad09cec..533f52f012 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "KBDMINI", + "keyboard_name": "KBDMINI", "manufacturer": "DZTECH", "url": "", "maintainer": "KBDFans", diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 8279ac4e81..dc47064fee 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "KBDPAD-MKII", + "keyboard_name": "KBDPAD-MKII", "manufacturer": "KBDfans", - "url": "https://kb.ai03.me/projects/kbdpad-mkii.html", - "maintainer": "ai03", + "url": "https://kb.ai03.me/projects/kbdpad-mkii.html", + "maintainer": "ai03", "usb": { - "vid": "0xA103", - "pid": "0x0006", - "device_version": "0.0.1" + "vid": "0xA103", + "pid": "0x0006", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["C4", "C5", "B3", "B2"], @@ -14,16 +14,16 @@ }, "diode_direction": "COL2ROW", "backlight": { - "pin": "B7", - "levels": 5, - "breathing": true + "pin": "B7", + "levels": 5, + "breathing": true }, "ws2812": { "pin": "B5" }, "indicators": { - "num_lock": "B4", - "on_state": 0 + "num_lock": "B4", + "on_state": 0 }, "processor": "atmega32u2", "bootloader": "atmel-dfu", diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json index f0a1674345..1c6eeaea81 100644 --- a/keyboards/kbdfans/kbdpad/mk3/info.json +++ b/keyboards/kbdfans/kbdpad/mk3/info.json @@ -85,4 +85,3 @@ } } } - diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index f41f1105b2..4ba2f38516 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -82,7 +82,6 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] }, - "LAYOUT_planck_mit": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json index d5a2e7ce76..ac6200a248 100644 --- a/keyboards/kbdfans/odinmini/info.json +++ b/keyboards/kbdfans/odinmini/info.json @@ -35,7 +35,6 @@ "snake": true, "static_gradient": true, "twinkle": true - }, "brightness_steps": 8, "hue_steps": 8, @@ -143,4 +142,3 @@ } } } - diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 1f23e0860e..5e36f9471f 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -51,193 +51,192 @@ "usb": { "device_version": "0.0.1", "pid": "0x0011", - "vid": "0x4B42" + "vid": "0x4B42" }, "community_layouts": ["tkl_f13_ansi_tsangan", "tkl_f13_iso_tsangan"], "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ - { "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": "F13", "matrix": [0, 13], "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [3, 15], "x": 17.25, "y": 0 }, - { "label": "`~", "matrix": [1, 0], "x": 0, "y": 1.5 }, - { "label": "1!", "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "label": "2@", "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "label": "3#", "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "label": "4$", "matrix": [1, 4], "x": 4, "y": 1.5 }, - { "label": "5%", "matrix": [1, 5], "x": 5, "y": 1.5 }, - { "label": "6^", "matrix": [1, 6], "x": 6, "y": 1.5 }, - { "label": "7", "matrix": [1, 7], "x": 7, "y": 1.5 }, - { "label": "8*", "matrix": [1, 8], "x": 8, "y": 1.5 }, - { "label": "9(", "matrix": [1, 9], "x": 9, "y": 1.5 }, - { "label": "0)", "matrix": [1, 10], "x": 10, "y": 1.5 }, - { "label": "-_", "matrix": [1, 11], "x": 11, "y": 1.5 }, - { "label": "=+", "matrix": [1, 12], "x": 12, "y": 1.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": "F13", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [3, 15], "x": 17.25, "y": 0 }, + { "label": "`~", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "1!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "2@", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "3#", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "4$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "5%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "6^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "7", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "8*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "9(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": "0)", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "-_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "=+", "matrix": [1, 12], "x": 12, "y": 1.5 }, { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, - { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "matrix": [3, 14], "x": 17.25, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [3, 14], "x": 17.25, "y": 1.5 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, - { "label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, - { "label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, { "label": "\\|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, - { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, - { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "matrix": [4, 14], "x": 17.25, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [4, 14], "x": 17.25, "y": 2.5 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, - { "label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, - { "label": "'\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "'\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.5 }, { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 }, - { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, - { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, - { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, - { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, - { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, - { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, - { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, - { "label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, - { "label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, - { "label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, + { "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5 }, - { "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.5 }, + { "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.5 }, { "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5 }, { "label": "Space", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.5 }, { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.5 }, - { "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.5 }, + { "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.5 }, { "label": "Ctrl", "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 }, - { "label": "\u2190", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, - { "label": "\u2193", "matrix": [5, 14], "x": 16.25, "y": 5.5 }, - { "label": "\u2192", "matrix": [5, 15], "x": 17.25, "y": 5.5 } + { "label": "\u2190", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "\u2193", "matrix": [5, 14], "x": 16.25, "y": 5.5 }, + { "label": "\u2192", "matrix": [5, 15], "x": 17.25, "y": 5.5 } ] }, "LAYOUT_tkl_f13_iso_tsangan": { "layout": [ - { "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": "K0F", "matrix": [0, 15], "x": 15, "y": 0 }, - { "label": "K3F", "matrix": [3, 15], "x": 16, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "x": 17, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "x": 18, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "x": 19, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "x": 20, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "x": 21, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "x": 22, "y": 0 }, - { "label": "K16", "matrix": [1, 6], "x": 23, "y": 0 }, - { "label": "K17", "matrix": [1, 7], "x": 24, "y": 0 }, - { "label": "K18", "matrix": [1, 8], "x": 25, "y": 0 }, - { "label": "K19", "matrix": [1, 9], "x": 26, "y": 0 }, - { "label": "K1A", "matrix": [1, 10], "x": 27, "y": 0 }, - { "label": "K1B", "matrix": [1, 11], "x": 28, "y": 0 }, - { "label": "K1C", "matrix": [1, 12], "x": 29, "y": 0 }, - { "label": "K1D", "matrix": [1, 13], "x": 30, "y": 0 }, - { "label": "K1E", "matrix": [1, 14], "x": 31, "y": 0 }, - { "label": "K1F", "matrix": [1, 15], "x": 32, "y": 0 }, - { "label": "K3E", "matrix": [3, 14], "x": 33, "y": 0 }, - { "label": "K20", "matrix": [2, 0], "x": 34, "y": 0 }, - { "label": "K21", "matrix": [2, 1], "x": 35, "y": 0 }, - { "label": "K22", "matrix": [2, 2], "x": 36, "y": 0 }, - { "label": "K23", "matrix": [2, 3], "x": 37, "y": 0 }, - { "label": "K24", "matrix": [2, 4], "x": 38, "y": 0 }, - { "label": "K25", "matrix": [2, 5], "x": 39, "y": 0 }, - { "label": "K26", "matrix": [2, 6], "x": 40, "y": 0 }, - { "label": "K27", "matrix": [2, 7], "x": 41, "y": 0 }, - { "label": "K28", "matrix": [2, 8], "x": 42, "y": 0 }, - { "label": "K29", "matrix": [2, 9], "x": 43, "y": 0 }, - { "label": "K2A", "matrix": [2, 10], "x": 44, "y": 0 }, - { "label": "K2B", "matrix": [2, 11], "x": 45, "y": 0 }, - { "label": "K2C", "matrix": [2, 12], "x": 46, "y": 0 }, - { "label": "K2D", "matrix": [2, 13], "x": 47, "y": 0 }, - { "label": "K2E", "matrix": [2, 14], "x": 48, "y": 0 }, - { "label": "K2F", "matrix": [2, 15], "x": 49, "y": 0 }, - { "label": "K4E", "matrix": [4, 14], "x": 50, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "x": 51, "y": 0 }, - { "label": "K31", "matrix": [3, 1], "x": 52, "y": 0 }, - { "label": "K32", "matrix": [3, 2], "x": 53, "y": 0 }, - { "label": "K33", "matrix": [3, 3], "x": 54, "y": 0 }, - { "label": "K34", "matrix": [3, 4], "x": 55, "y": 0 }, - { "label": "K35", "matrix": [3, 5], "x": 56, "y": 0 }, - { "label": "K36", "matrix": [3, 6], "x": 57, "y": 0 }, - { "label": "K37", "matrix": [3, 7], "x": 58, "y": 0 }, - { "label": "K38", "matrix": [3, 8], "x": 59, "y": 0 }, - { "label": "K39", "matrix": [3, 9], "x": 60, "y": 0 }, - { "label": "K3A", "matrix": [3, 10], "x": 61, "y": 0 }, - { "label": "K3B", "matrix": [3, 11], "x": 62, "y": 0 }, - { "label": "K3D", "matrix": [3, 13], "x": 63, "y": 0 }, - { "label": "K40", "matrix": [4, 0], "x": 64, "y": 0 }, - { "label": "K41", "matrix": [4, 1], "x": 65, "y": 0 }, - { "label": "K42", "matrix": [4, 2], "x": 66, "y": 0 }, - { "label": "K43", "matrix": [4, 3], "x": 67, "y": 0 }, - { "label": "K44", "matrix": [4, 4], "x": 68, "y": 0 }, - { "label": "K45", "matrix": [4, 5], "x": 69, "y": 0 }, - { "label": "K46", "matrix": [4, 6], "x": 70, "y": 0 }, - { "label": "K47", "matrix": [4, 7], "x": 71, "y": 0 }, - { "label": "K48", "matrix": [4, 8], "x": 72, "y": 0 }, - { "label": "K49", "matrix": [4, 9], "x": 73, "y": 0 }, - { "label": "K4A", "matrix": [4, 10], "x": 74, "y": 0 }, - { "label": "K4B", "matrix": [4, 11], "x": 75, "y": 0 }, - { "label": "K4D", "matrix": [4, 13], "x": 76, "y": 0 }, - { "label": "K4F", "matrix": [4, 15], "x": 77, "y": 0 }, - { "label": "K50", "matrix": [5, 0], "x": 78, "y": 0 }, - { "label": "K51", "matrix": [5, 1], "x": 79, "y": 0 }, - { "label": "K52", "matrix": [5, 2], "x": 80, "y": 0 }, - { "label": "K56", "matrix": [5, 6], "x": 81, "y": 0 }, - { "label": "K5A", "matrix": [5, 10], "x": 82, "y": 0 }, - { "label": "K5B", "matrix": [5, 11], "x": 83, "y": 0 }, - { "label": "K5C", "matrix": [5, 12], "x": 84, "y": 0 }, - { "label": "K5D", "matrix": [5, 13], "x": 85, "y": 0 }, - { "label": "K5E", "matrix": [5, 14], "x": 86, "y": 0 }, - { "label": "K5F", "matrix": [5, 15], "x": 87, "y": 0 } + { "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": "K0F", "matrix": [0, 15], "x": 15, "y": 0 }, + { "label": "K3F", "matrix": [3, 15], "x": 16, "y": 0 }, + { "label": "K10", "matrix": [1, 0], "x": 17, "y": 0 }, + { "label": "K11", "matrix": [1, 1], "x": 18, "y": 0 }, + { "label": "K12", "matrix": [1, 2], "x": 19, "y": 0 }, + { "label": "K13", "matrix": [1, 3], "x": 20, "y": 0 }, + { "label": "K14", "matrix": [1, 4], "x": 21, "y": 0 }, + { "label": "K15", "matrix": [1, 5], "x": 22, "y": 0 }, + { "label": "K16", "matrix": [1, 6], "x": 23, "y": 0 }, + { "label": "K17", "matrix": [1, 7], "x": 24, "y": 0 }, + { "label": "K18", "matrix": [1, 8], "x": 25, "y": 0 }, + { "label": "K19", "matrix": [1, 9], "x": 26, "y": 0 }, + { "label": "K1A", "matrix": [1, 10], "x": 27, "y": 0 }, + { "label": "K1B", "matrix": [1, 11], "x": 28, "y": 0 }, + { "label": "K1C", "matrix": [1, 12], "x": 29, "y": 0 }, + { "label": "K1D", "matrix": [1, 13], "x": 30, "y": 0 }, + { "label": "K1E", "matrix": [1, 14], "x": 31, "y": 0 }, + { "label": "K1F", "matrix": [1, 15], "x": 32, "y": 0 }, + { "label": "K3E", "matrix": [3, 14], "x": 33, "y": 0 }, + { "label": "K20", "matrix": [2, 0], "x": 34, "y": 0 }, + { "label": "K21", "matrix": [2, 1], "x": 35, "y": 0 }, + { "label": "K22", "matrix": [2, 2], "x": 36, "y": 0 }, + { "label": "K23", "matrix": [2, 3], "x": 37, "y": 0 }, + { "label": "K24", "matrix": [2, 4], "x": 38, "y": 0 }, + { "label": "K25", "matrix": [2, 5], "x": 39, "y": 0 }, + { "label": "K26", "matrix": [2, 6], "x": 40, "y": 0 }, + { "label": "K27", "matrix": [2, 7], "x": 41, "y": 0 }, + { "label": "K28", "matrix": [2, 8], "x": 42, "y": 0 }, + { "label": "K29", "matrix": [2, 9], "x": 43, "y": 0 }, + { "label": "K2A", "matrix": [2, 10], "x": 44, "y": 0 }, + { "label": "K2B", "matrix": [2, 11], "x": 45, "y": 0 }, + { "label": "K2C", "matrix": [2, 12], "x": 46, "y": 0 }, + { "label": "K2D", "matrix": [2, 13], "x": 47, "y": 0 }, + { "label": "K2E", "matrix": [2, 14], "x": 48, "y": 0 }, + { "label": "K2F", "matrix": [2, 15], "x": 49, "y": 0 }, + { "label": "K4E", "matrix": [4, 14], "x": 50, "y": 0 }, + { "label": "K30", "matrix": [3, 0], "x": 51, "y": 0 }, + { "label": "K31", "matrix": [3, 1], "x": 52, "y": 0 }, + { "label": "K32", "matrix": [3, 2], "x": 53, "y": 0 }, + { "label": "K33", "matrix": [3, 3], "x": 54, "y": 0 }, + { "label": "K34", "matrix": [3, 4], "x": 55, "y": 0 }, + { "label": "K35", "matrix": [3, 5], "x": 56, "y": 0 }, + { "label": "K36", "matrix": [3, 6], "x": 57, "y": 0 }, + { "label": "K37", "matrix": [3, 7], "x": 58, "y": 0 }, + { "label": "K38", "matrix": [3, 8], "x": 59, "y": 0 }, + { "label": "K39", "matrix": [3, 9], "x": 60, "y": 0 }, + { "label": "K3A", "matrix": [3, 10], "x": 61, "y": 0 }, + { "label": "K3B", "matrix": [3, 11], "x": 62, "y": 0 }, + { "label": "K3D", "matrix": [3, 13], "x": 63, "y": 0 }, + { "label": "K40", "matrix": [4, 0], "x": 64, "y": 0 }, + { "label": "K41", "matrix": [4, 1], "x": 65, "y": 0 }, + { "label": "K42", "matrix": [4, 2], "x": 66, "y": 0 }, + { "label": "K43", "matrix": [4, 3], "x": 67, "y": 0 }, + { "label": "K44", "matrix": [4, 4], "x": 68, "y": 0 }, + { "label": "K45", "matrix": [4, 5], "x": 69, "y": 0 }, + { "label": "K46", "matrix": [4, 6], "x": 70, "y": 0 }, + { "label": "K47", "matrix": [4, 7], "x": 71, "y": 0 }, + { "label": "K48", "matrix": [4, 8], "x": 72, "y": 0 }, + { "label": "K49", "matrix": [4, 9], "x": 73, "y": 0 }, + { "label": "K4A", "matrix": [4, 10], "x": 74, "y": 0 }, + { "label": "K4B", "matrix": [4, 11], "x": 75, "y": 0 }, + { "label": "K4D", "matrix": [4, 13], "x": 76, "y": 0 }, + { "label": "K4F", "matrix": [4, 15], "x": 77, "y": 0 }, + { "label": "K50", "matrix": [5, 0], "x": 78, "y": 0 }, + { "label": "K51", "matrix": [5, 1], "x": 79, "y": 0 }, + { "label": "K52", "matrix": [5, 2], "x": 80, "y": 0 }, + { "label": "K56", "matrix": [5, 6], "x": 81, "y": 0 }, + { "label": "K5A", "matrix": [5, 10], "x": 82, "y": 0 }, + { "label": "K5B", "matrix": [5, 11], "x": 83, "y": 0 }, + { "label": "K5C", "matrix": [5, 12], "x": 84, "y": 0 }, + { "label": "K5D", "matrix": [5, 13], "x": 85, "y": 0 }, + { "label": "K5E", "matrix": [5, 14], "x": 86, "y": 0 }, + { "label": "K5F", "matrix": [5, 15], "x": 87, "y": 0 } ] } } } - diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 74e8ce3e93..e44bcb83bb 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -3,13 +3,11 @@ "manufacturer": "keawade", "url": "https://github.com/keawade/keaboard", "maintainer": "keawade", - "usb": { "vid": "0xFEED", "pid": "0x9090", "device_version": "1.0.0" }, - "diode_direction": "COL2ROW", "matrix_pins": { "rows": ["D7", "E6", "B4", "B5"], @@ -17,7 +15,6 @@ }, "bootloader": "caterina", "processor": "atmega32u4", - "split": { "enabled": true, "soft_serial_pin": "D0" @@ -28,7 +25,6 @@ "unicode": true, "command": true }, - "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index 856549eb96..dfe8069463 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -42,7 +42,7 @@ {"x":2, "y":3, "matrix": [3, 2]}, {"x":3, "y":3, "h":2, "matrix": [3, 3]}, - {"x":0, "y":4,"w":2, "matrix": [4, 0]}, + {"x":0, "y":4, "w":2, "matrix": [4, 0]}, {"x":2, "y":4, "matrix": [4, 2]} ] }, diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json index 9280c76288..ff0d40df16 100644 --- a/keyboards/keebio/convolution/rev1/info.json +++ b/keyboards/keebio/convolution/rev1/info.json @@ -32,21 +32,21 @@ "driver": "WS2812", "layout": [ { "flags": 2, "x": 12, "y": 13 }, - { "flags": 2, "x": 40, "y": 13 }, - { "flags": 2, "x": 77, "y": 13 }, - { "flags": 2, "x": 101, "y": 13 }, - { "flags": 2, "x": 126, "y": 13 }, - { "flags": 2, "x": 150, "y": 13 }, - { "flags": 2, "x": 181, "y": 13 }, - { "flags": 2, "x": 212, "y": 13 }, - { "flags": 2, "x": 212, "y": 51 }, - { "flags": 2, "x": 181, "y": 51 }, - { "flags": 2, "x": 149, "y": 51 }, - { "flags": 2, "x": 121, "y": 51 }, - { "flags": 2, "x": 101, "y": 51 }, - { "flags": 2, "x": 75, "y": 51 }, - { "flags": 2, "x": 43, "y": 51 }, - { "flags": 2, "x": 12, "y": 51 } + { "flags": 2, "x": 40, "y": 13 }, + { "flags": 2, "x": 77, "y": 13 }, + { "flags": 2, "x": 101, "y": 13 }, + { "flags": 2, "x": 126, "y": 13 }, + { "flags": 2, "x": 150, "y": 13 }, + { "flags": 2, "x": 181, "y": 13 }, + { "flags": 2, "x": 212, "y": 13 }, + { "flags": 2, "x": 212, "y": 51 }, + { "flags": 2, "x": 181, "y": 51 }, + { "flags": 2, "x": 149, "y": 51 }, + { "flags": 2, "x": 121, "y": 51 }, + { "flags": 2, "x": 101, "y": 51 }, + { "flags": 2, "x": 75, "y": 51 }, + { "flags": 2, "x": 43, "y": 51 }, + { "flags": 2, "x": 12, "y": 51 } ] }, "layouts": { diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 22c24e13c8..a9b37bda00 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Fourier", + "keyboard_name": "Fourier", "manufacturer": "Keebio", - "url": "https://keeb.io", - "maintainer": "nooges", + "url": "https://keeb.io", + "maintainer": "nooges", "usb": { "vid": "0xCB10", "pid": "0x1247", diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json index 325fd16b40..1899e88236 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Laplace", + "keyboard_name": "Laplace", "manufacturer": "Keebio", - "url": "https://keeb.io", - "maintainer": "nooges", + "url": "https://keeb.io", + "maintainer": "nooges", "usb": { "vid": "0xCB10", "pid": "0x1147", @@ -74,5 +74,4 @@ ] } } - } diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json index 37982e1a38..0e66d21aa3 100644 --- a/keyboards/keebio/sinc/rev3/info.json +++ b/keyboards/keebio/sinc/rev3/info.json @@ -47,68 +47,68 @@ "driver": "WS2812", "split_count": [56, 57], "layout": [ - { "flags": 4, "matrix": [5, 2], "x": 30, "y": 0 }, + { "flags": 4, "matrix": [5, 2], "x": 30, "y": 0 }, { "flags": 2, "x": 42, "y": 6 }, - { "flags": 4, "matrix": [5, 3], "x": 45, "y": 0 }, - { "flags": 4, "matrix": [5, 4], "x": 58, "y": 0 }, - { "flags": 2, "x": 67, "y": 6 }, - { "flags": 4, "matrix": [5, 5], "x": 70, "y": 0 }, - { "flags": 4, "matrix": [5, 6], "x": 82, "y": 0 }, - { "flags": 4, "matrix": [5, 7], "x": 97, "y": 0 }, - { "flags": 2, "x": 103, "y": 6 }, + { "flags": 4, "matrix": [5, 3], "x": 45, "y": 0 }, + { "flags": 4, "matrix": [5, 4], "x": 58, "y": 0 }, + { "flags": 2, "x": 67, "y": 6 }, + { "flags": 4, "matrix": [5, 5], "x": 70, "y": 0 }, + { "flags": 4, "matrix": [5, 6], "x": 82, "y": 0 }, + { "flags": 4, "matrix": [5, 7], "x": 97, "y": 0 }, + { "flags": 2, "x": 103, "y": 6 }, { "flags": 4, "matrix": [5, 8], "x": 109, "y": 0 }, { "flags": 4, "matrix": [0, 8], "x": 103, "y": 15 }, - { "flags": 4, "matrix": [0, 7], "x": 91, "y": 15 }, - { "flags": 4, "matrix": [0, 6], "x": 79, "y": 15 }, - { "flags": 4, "matrix": [0, 5], "x": 67, "y": 15 }, - { "flags": 4, "matrix": [0, 4], "x": 54, "y": 15 }, - { "flags": 4, "matrix": [0, 3], "x": 42, "y": 15 }, - { "flags": 4, "matrix": [0, 2], "x": 30, "y": 15 }, - - { "flags": 4, "matrix": [1, 2], "x": 33, "y": 27 }, - { "flags": 4, "matrix": [1, 3], "x": 48, "y": 27 }, - { "flags": 4, "matrix": [1, 4], "x": 61, "y": 27 }, - { "flags": 4, "matrix": [1, 5], "x": 73, "y": 27 }, - { "flags": 4, "matrix": [1, 6], "x": 85, "y": 27 }, - { "flags": 4, "matrix": [1, 7], "x": 97, "y": 27 }, + { "flags": 4, "matrix": [0, 7], "x": 91, "y": 15 }, + { "flags": 4, "matrix": [0, 6], "x": 79, "y": 15 }, + { "flags": 4, "matrix": [0, 5], "x": 67, "y": 15 }, + { "flags": 4, "matrix": [0, 4], "x": 54, "y": 15 }, + { "flags": 4, "matrix": [0, 3], "x": 42, "y": 15 }, + { "flags": 4, "matrix": [0, 2], "x": 30, "y": 15 }, + + { "flags": 4, "matrix": [1, 2], "x": 33, "y": 27 }, + { "flags": 4, "matrix": [1, 3], "x": 48, "y": 27 }, + { "flags": 4, "matrix": [1, 4], "x": 61, "y": 27 }, + { "flags": 4, "matrix": [1, 5], "x": 73, "y": 27 }, + { "flags": 4, "matrix": [1, 6], "x": 85, "y": 27 }, + { "flags": 4, "matrix": [1, 7], "x": 97, "y": 27 }, { "flags": 4, "matrix": [2, 7], "x": 100, "y": 40 }, - { "flags": 4, "matrix": [2, 6], "x": 88, "y": 40 }, - { "flags": 4, "matrix": [2, 5], "x": 76, "y": 40 }, - { "flags": 4, "matrix": [2, 4], "x": 64, "y": 40 }, - { "flags": 4, "matrix": [2, 3], "x": 51, "y": 40 }, - { "flags": 4, "matrix": [2, 2], "x": 35, "y": 40 }, - - { "flags": 4, "matrix": [3, 2], "x": 38, "y": 52 }, - { "flags": 4, "matrix": [3, 4], "x": 58, "y": 52 }, - { "flags": 4, "matrix": [3, 5], "x": 70, "y": 52 }, - { "flags": 4, "matrix": [3, 6], "x": 82, "y": 52 }, - { "flags": 4, "matrix": [3, 7], "x": 94, "y": 52 }, + { "flags": 4, "matrix": [2, 6], "x": 88, "y": 40 }, + { "flags": 4, "matrix": [2, 5], "x": 76, "y": 40 }, + { "flags": 4, "matrix": [2, 4], "x": 64, "y": 40 }, + { "flags": 4, "matrix": [2, 3], "x": 51, "y": 40 }, + { "flags": 4, "matrix": [2, 2], "x": 35, "y": 40 }, + + { "flags": 4, "matrix": [3, 2], "x": 38, "y": 52 }, + { "flags": 4, "matrix": [3, 4], "x": 58, "y": 52 }, + { "flags": 4, "matrix": [3, 5], "x": 70, "y": 52 }, + { "flags": 4, "matrix": [3, 6], "x": 82, "y": 52 }, + { "flags": 4, "matrix": [3, 7], "x": 94, "y": 52 }, { "flags": 4, "matrix": [3, 8], "x": 106, "y": 52 }, { "flags": 2, "x": 106, "y": 64 }, - { "flags": 4, "matrix": [4, 7], "x": 98, "y": 64 }, - { "flags": 4, "matrix": [4, 5], "x": 77, "y": 64 }, + { "flags": 4, "matrix": [4, 7], "x": 98, "y": 64 }, + { "flags": 4, "matrix": [4, 5], "x": 77, "y": 64 }, { "flags": 2, "x": 67, "y": 64 }, - { "flags": 4, "matrix": [4, 4], "x": 62, "y": 64 }, - { "flags": 4, "matrix": [4, 3], "x": 47, "y": 64 }, + { "flags": 4, "matrix": [4, 4], "x": 62, "y": 64 }, + { "flags": 4, "matrix": [4, 3], "x": 47, "y": 64 }, { "flags": 2, "x": 39, "y": 64 }, - { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 }, + { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 }, - { "flags": 4, "matrix": [4, 1], "x": 12, "y": 64 }, + { "flags": 4, "matrix": [4, 1], "x": 12, "y": 64 }, { "flags": 2, "x": 6, "y": 64 }, - { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, - - { "flags": 4, "matrix": [3, 0], "x": 0, "y": 52 }, - { "flags": 4, "matrix": [3, 1], "x": 12, "y": 52 }, - { "flags": 4, "matrix": [2, 1], "x": 12, "y": 40 }, - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 40 }, - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 27 }, - { "flags": 4, "matrix": [1, 1], "x": 12, "y": 27 }, - { "flags": 4, "matrix": [0, 1], "x": 12, "y": 15 }, - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 15 }, - { "flags": 4, "matrix": [5, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, + + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 52 }, + { "flags": 4, "matrix": [3, 1], "x": 12, "y": 52 }, + { "flags": 4, "matrix": [2, 1], "x": 12, "y": 40 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 40 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 27 }, + { "flags": 4, "matrix": [1, 1], "x": 12, "y": 27 }, + { "flags": 4, "matrix": [0, 1], "x": 12, "y": 15 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 15 }, + { "flags": 4, "matrix": [5, 0], "x": 0, "y": 0 }, { "flags": 2, "x": 9, "y": 0 }, { "flags": 2, "x": 224, "y": 6 }, diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/info.json index 9088f2c0f3..1d02e00a7a 100644 --- a/keyboards/keebsforall/freebird75/info.json +++ b/keyboards/keebsforall/freebird75/info.json @@ -27,437 +27,436 @@ "LAYOUT": { "layout": [ { - "matrix": [0,0], + "matrix": [0, 0], "x": 0, "y": 0 }, { - "matrix": [0,1], + "matrix": [0, 1], "x": 1.25, "y": 0 }, { - "matrix": [0,2], + "matrix": [0, 2], "x": 2.25, "y": 0 }, { - "matrix": [0,3], + "matrix": [0, 3], "x": 3.25, "y": 0 }, { - "matrix": [0,4], + "matrix": [0, 4], "x": 4.25, "y": 0 }, { - "matrix": [0,5], + "matrix": [0, 5], "x": 5.5, "y": 0 }, { - "matrix": [0,6], + "matrix": [0, 6], "x": 6.5, "y": 0 }, { - "matrix": [0,7], + "matrix": [0, 7], "x": 7.5, "y": 0 }, { - "matrix": [0,8], + "matrix": [0, 8], "x": 8.5, "y": 0 }, { - "matrix": [0,9], + "matrix": [0, 9], "x": 9.75, "y": 0 }, { - "matrix": [0,10], + "matrix": [0, 10], "x": 10.75, "y": 0 }, { - "matrix": [0,11], + "matrix": [0, 11], "x": 11.75, "y": 0 }, { - "matrix": [0,12], + "matrix": [0, 12], "x": 12.75, "y": 0 }, { - "matrix": [0,13], + "matrix": [0, 13], "x": 14, "y": 0 }, { - "matrix": [0,14], + "matrix": [0, 14], "x": 15.25, "y": 0 }, { - "matrix": [1,0], + "matrix": [1, 0], "x": 0, "y": 1.25 }, { - "matrix": [1,1], + "matrix": [1, 1], "x": 1, "y": 1.25 }, { - "matrix": [1,2], + "matrix": [1, 2], "x": 2, "y": 1.25 }, { - "matrix": [1,3], + "matrix": [1, 3], "x": 3, "y": 1.25 }, { - "matrix": [1,4], + "matrix": [1, 4], "x": 4, "y": 1.25 }, { - "matrix": [1,5], + "matrix": [1, 5], "x": 5, "y": 1.25 }, { - "matrix": [1,6], + "matrix": [1, 6], "x": 6, "y": 1.25 }, { - "matrix": [1,7], + "matrix": [1, 7], "x": 7, "y": 1.25 }, { - "matrix": [1,8], + "matrix": [1, 8], "x": 8, "y": 1.25 }, { - "matrix": [1,9], + "matrix": [1, 9], "x": 9, "y": 1.25 }, { - "matrix": [1,10], + "matrix": [1, 10], "x": 10, "y": 1.25 }, { - "matrix": [1,11], + "matrix": [1, 11], "x": 11, "y": 1.25 }, { - "matrix": [1,12], + "matrix": [1, 12], "x": 12, "y": 1.25 }, { - "matrix": [1,13], + "matrix": [1, 13], "x": 13, "y": 1.25 }, { - "matrix": [4,14], + "matrix": [4, 14], "x": 14, "y": 1.25 }, { - "matrix": [1,14], + "matrix": [1, 14], "x": 15.25, "y": 1.25 }, { - "matrix": [2,0], + "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 }, { - "matrix": [2,1], + "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { - "matrix": [2,2], + "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { - "matrix": [2,3], + "matrix": [2, 3], "x": 3.5, "y": 2.25 }, { - "matrix": [2,4], + "matrix": [2, 4], "x": 4.5, "y": 2.25 }, { - "matrix": [2,5], + "matrix": [2, 5], "x": 5.5, "y": 2.25 }, { - "matrix": [2,6], + "matrix": [2, 6], "x": 6.5, "y": 2.25 }, { - "matrix": [2,7], + "matrix": [2, 7], "x": 7.5, "y": 2.25 }, { - "matrix": [2,8], + "matrix": [2, 8], "x": 8.5, "y": 2.25 }, { - "matrix": [2,9], + "matrix": [2, 9], "x": 9.5, "y": 2.25 }, { - "matrix": [2,10], + "matrix": [2, 10], "x": 10.5, "y": 2.25 }, { - "matrix": [2,11], + "matrix": [2, 11], "x": 11.5, "y": 2.25 }, { - "matrix": [2,12], + "matrix": [2, 12], "x": 12.5, "y": 2.25 }, { - "matrix": [2,13], + "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 }, { - "matrix": [2,14], + "matrix": [2, 14], "x": 15.25, "y": 2.25 }, { - "matrix": [3,0], + "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 }, { - "matrix": [3,1], + "matrix": [3, 1], "x": 1.75, "y": 3.25 }, { - "matrix": [3,2], + "matrix": [3, 2], "x": 2.75, "y": 3.25 }, { - "matrix": [3,3], + "matrix": [3, 3], "x": 3.75, "y": 3.25 }, { - "matrix": [3,4], + "matrix": [3, 4], "x": 4.75, "y": 3.25 }, { - "matrix": [3,5], + "matrix": [3, 5], "x": 5.75, "y": 3.25 }, { - "matrix": [3,6], + "matrix": [3, 6], "x": 6.75, "y": 3.25 }, { - "matrix": [3,7], + "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { - "matrix": [3,8], + "matrix": [3, 8], "x": 8.75, "y": 3.25 }, { - "matrix": [3,9], + "matrix": [3, 9], "x": 9.75, "y": 3.25 }, { - "matrix": [3,10], + "matrix": [3, 10], "x": 10.75, "y": 3.25 }, { - "matrix": [3,11], + "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { - "matrix": [3,13], + "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 }, { - "matrix": [3,14], + "matrix": [3, 14], "x": 15.25, "y": 3.25 }, { - "matrix": [4,0], + "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25 }, { - "matrix": [4,1], + "matrix": [4, 1], "x": 1.25, "y": 4.25 }, { - "matrix": [4,2], + "matrix": [4, 2], "x": 2.25, "y": 4.25 }, { - "matrix": [4,3], + "matrix": [4, 3], "x": 3.25, "y": 4.25 }, { - "matrix": [4,4], + "matrix": [4, 4], "x": 4.25, "y": 4.25 }, { - "matrix": [4,5], + "matrix": [4, 5], "x": 5.25, "y": 4.25 }, { - "matrix": [4,6], + "matrix": [4, 6], "x": 6.25, "y": 4.25 }, { - "matrix": [4,7], + "matrix": [4, 7], "x": 7.25, "y": 4.25 }, { - "matrix": [4,8], + "matrix": [4, 8], "x": 8.25, "y": 4.25 }, { - "matrix": [4,9], + "matrix": [4, 9], "x": 9.25, "y": 4.25 }, { - "matrix": [4,10], + "matrix": [4, 10], "x": 10.25, "y": 4.25 }, { - "matrix": [4,11], + "matrix": [4, 11], "x": 11.25, "y": 4.25 }, { - "matrix": [4,12], + "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75 }, { - "matrix": [4,13], + "matrix": [4, 13], "x": 14.25, "y": 4.5 }, { - "matrix": [5,0], + "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 }, { - "matrix": [5,1], + "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 }, { - "matrix": [5,2], + "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 }, { - "matrix": [5,6], + "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25 }, { - "matrix": [5,9], + "matrix": [5, 9], "x": 10, "y": 5.25 }, { - "matrix": [5,10], + "matrix": [5, 10], "x": 11, "y": 5.25 }, { - "matrix": [5,11], + "matrix": [5, 11], "x": 12, "y": 5.25 }, { - "matrix": [5,12], + "matrix": [5, 12], "x": 13.25, "y": 5.5 }, { - "matrix": [5,13], + "matrix": [5, 13], "x": 14.25, "y": 5.5 }, { - "matrix": [5,14], + "matrix": [5, 14], "x": 15.25, "y": 5.5 } ] - } } } diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/info.json index 807095dbbc..fe541e634a 100644 --- a/keyboards/kepler_33/proto/info.json +++ b/keyboards/kepler_33/proto/info.json @@ -11,7 +11,6 @@ "mousekey": true, "nkro": true }, - "processor": "STM32F401", "board": "BLACKPILL_STM32_F401", "url": "https://github.com/seityaya/Kepler-33", @@ -23,7 +22,7 @@ "diode_direction": "ROW2COL", "matrix_pins": { "rows": ["B12", "B13", "B14", "B15"], - "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"] + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"] }, "layout_aliases": { "LAYOUT_proto": "LAYOUT" @@ -31,57 +30,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0], "label":"Esc", "x":0, "y":0}, - {"matrix": [0, 1], "label":"Q", "x":1, "y":0}, - {"matrix": [0, 2], "label":"W", "x":2, "y":0}, - {"matrix": [0, 3], "label":"E", "x":3, "y":0}, - {"matrix": [0, 4], "label":"R", "x":4, "y":0}, - {"matrix": [0, 5], "label":"T", "x":5, "y":0}, - {"matrix": [0, 6], "label":"Y", "x":6, "y":0}, - {"matrix": [0, 8], "label":"U", "x":7, "y":0}, - {"matrix": [0, 9], "label":"I", "x":8, "y":0}, - {"matrix": [0, 10], "label":"O", "x":9, "y":0}, - {"matrix": [0, 11], "label":"P", "x":10, "y":0}, - {"matrix": [0, 12], "label":"[{", "x":11, "y":0}, - {"matrix": [0, 13], "label":"]}", "x":12, "y":0}, - {"matrix": [0, 14], "label":"Del", "x":13, "y":0}, + {"matrix": [0, 0], "label":"Esc", "x":0, "y":0}, + {"matrix": [0, 1], "label":"Q", "x":1, "y":0}, + {"matrix": [0, 2], "label":"W", "x":2, "y":0}, + {"matrix": [0, 3], "label":"E", "x":3, "y":0}, + {"matrix": [0, 4], "label":"R", "x":4, "y":0}, + {"matrix": [0, 5], "label":"T", "x":5, "y":0}, + {"matrix": [0, 6], "label":"Y", "x":6, "y":0}, + {"matrix": [0, 8], "label":"U", "x":7, "y":0}, + {"matrix": [0, 9], "label":"I", "x":8, "y":0}, + {"matrix": [0, 10], "label":"O", "x":9, "y":0}, + {"matrix": [0, 11], "label":"P", "x":10, "y":0}, + {"matrix": [0, 12], "label":"[{", "x":11, "y":0}, + {"matrix": [0, 13], "label":"]}", "x":12, "y":0}, + {"matrix": [0, 14], "label":"Del", "x":13, "y":0}, + + {"matrix": [1, 0], "label":"Layer", "x":0.25, "y":1}, + {"matrix": [1, 1], "label":"A", "x":1.5, "y":1}, + {"matrix": [1, 2], "label":"S", "x":2.5, "y":1}, + {"matrix": [1, 3], "label":"D", "x":3.5, "y":1}, + {"matrix": [1, 4], "label":"F", "x":4.5, "y":1}, + {"matrix": [1, 5], "label":"G", "x":5.5, "y":1}, + {"matrix": [1, 7], "label":"H", "x":6.5, "y":1}, + {"matrix": [1, 9], "label":"J", "x":7.5, "y":1}, + {"matrix": [1, 10], "label":"K", "x":8.5, "y":1}, + {"matrix": [1, 11], "label":"L", "x":9.5, "y":1}, + {"matrix": [1, 12], "label":";:", "x":10.5, "y":1}, + {"matrix": [1, 13], "label":"'\"", "x":11.5, "y":1}, + {"matrix": [1, 14], "label":"Enter", "x":12.75, "y":1}, - {"matrix": [1, 0], "label":"Layer", "x":0.25, "y":1}, - {"matrix": [1, 1], "label":"A", "x":1.5, "y":1}, - {"matrix": [1, 2], "label":"S", "x":2.5, "y":1}, - {"matrix": [1, 3], "label":"D", "x":3.5, "y":1}, - {"matrix": [1, 4], "label":"F", "x":4.5, "y":1}, - {"matrix": [1, 5], "label":"G", "x":5.5, "y":1}, - {"matrix": [1, 7], "label":"H", "x":6.5, "y":1}, - {"matrix": [1, 9], "label":"J", "x":7.5, "y":1}, - {"matrix": [1, 10], "label":"K", "x":8.5, "y":1}, - {"matrix": [1, 11], "label":"L", "x":9.5, "y":1}, - {"matrix": [1, 12], "label":";:", "x":10.5, "y":1}, - {"matrix": [1, 13], "label":"'\"", "x":11.5, "y":1}, - {"matrix": [1, 14], "label":"Enter", "x":12.75, "y":1}, - - {"matrix": [2, 0], "label":"Shift_L", "x":0.5, "y":2}, - {"matrix": [2, 1], "label":"Z", "x":2, "y":2}, - {"matrix": [2, 2], "label":"X", "x":3, "y":2}, - {"matrix": [2, 3], "label":"C", "x":4, "y":2}, - {"matrix": [2, 4], "label":"V", "x":5, "y":2}, - {"matrix": [2, 6], "label":"B", "x":6, "y":2}, - {"matrix": [2, 8], "label":"N", "x":7, "y":2}, - {"matrix": [2, 10], "label":"M", "x":8, "y":2}, - {"matrix": [2, 11], "label":",<", "x":9, "y":2}, - {"matrix": [2, 12], "label":".>", "x":10, "y":2}, - {"matrix": [2, 13], "label":"/?", "x":11, "y":2}, - {"matrix": [2, 14], "label":"BackS", "x":12.5, "y":2}, + {"matrix": [2, 0], "label":"Shift_L", "x":0.5, "y":2}, + {"matrix": [2, 1], "label":"Z", "x":2, "y":2}, + {"matrix": [2, 2], "label":"X", "x":3, "y":2}, + {"matrix": [2, 3], "label":"C", "x":4, "y":2}, + {"matrix": [2, 4], "label":"V", "x":5, "y":2}, + {"matrix": [2, 6], "label":"B", "x":6, "y":2}, + {"matrix": [2, 8], "label":"N", "x":7, "y":2}, + {"matrix": [2, 10], "label":"M", "x":8, "y":2}, + {"matrix": [2, 11], "label":",<", "x":9, "y":2}, + {"matrix": [2, 12], "label":".>", "x":10, "y":2}, + {"matrix": [2, 13], "label":"/?", "x":11, "y":2}, + {"matrix": [2, 14], "label":"BackS", "x":12.5, "y":2}, - {"matrix": [3, 0], "label":"Ctrl_L", "x":0, "y":3}, - {"matrix": [3, 1], "label":"FN_L", "x":1.25, "y":3}, - {"matrix": [3, 2], "label":"Alt_L", "x":2.5, "y":3}, - {"matrix": [3, 4], "label":"Space", "x":5, "y":3}, - {"matrix": [3, 7], "label":"Space", "x":6.5, "y":3}, - {"matrix": [3, 10], "label":"Menu", "x":8, "y":3}, - {"matrix": [3, 12], "label":"Alt_R", "x":10.5, "y":3}, - {"matrix": [3, 13], "label":"FN_R", "x":11.75, "y":3}, - {"matrix": [3, 14], "label":"Ctrl_R", "x":13, "y":3} + {"matrix": [3, 0], "label":"Ctrl_L", "x":0, "y":3}, + {"matrix": [3, 1], "label":"FN_L", "x":1.25, "y":3}, + {"matrix": [3, 2], "label":"Alt_L", "x":2.5, "y":3}, + {"matrix": [3, 4], "label":"Space", "x":5, "y":3}, + {"matrix": [3, 7], "label":"Space", "x":6.5, "y":3}, + {"matrix": [3, 10], "label":"Menu", "x":8, "y":3}, + {"matrix": [3, 12], "label":"Alt_R", "x":10.5, "y":3}, + {"matrix": [3, 13], "label":"FN_R", "x":11.75, "y":3}, + {"matrix": [3, 14], "label":"Ctrl_R", "x":13, "y":3} ] } } diff --git a/keyboards/keybee/keybee65/info.json b/keyboards/keybee/keybee65/info.json index e279cd0668..92c8a6d59c 100644 --- a/keyboards/keybee/keybee65/info.json +++ b/keyboards/keybee/keybee65/info.json @@ -100,4 +100,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json index 688c9da92e..38ea8592aa 100644 --- a/keyboards/keychron/q0/rev_0130/info.json +++ b/keyboards/keychron/q0/rev_0130/info.json @@ -55,64 +55,63 @@ }, "center_point": [56, 16], "layout": [ - {"flags": 1,"matrix":[0,0], "x":0, "y":0}, - {"flags": 1,"matrix":[0,1], "x":37, "y":0}, - {"flags": 1,"matrix":[0,2], "x":75, "y":0}, - {"flags": 1,"matrix":[0,3], "x":112, "y":0}, + {"flags": 1, "matrix":[0, 0], "x":0, "y":0}, + {"flags": 1, "matrix":[0, 1], "x":37, "y":0}, + {"flags": 1, "matrix":[0, 2], "x":75, "y":0}, + {"flags": 1, "matrix":[0, 3], "x":112, "y":0}, + {"flags": 9, "matrix":[1, 0], "x":0, "y":6}, + {"flags": 4, "matrix":[1, 1], "x":37, "y":6}, + {"flags": 4, "matrix":[1, 2], "x":75, "y":6}, + {"flags": 4, "matrix":[1, 3], "x":112, "y":6}, - {"flags": 9,"matrix":[1,0], "x":0, "y":6}, - {"flags": 4,"matrix":[1,1], "x":37, "y":6}, - {"flags": 4,"matrix":[1,2], "x":75, "y":6}, - {"flags": 4,"matrix":[1,3], "x":112, "y":6}, + {"flags": 4, "matrix":[2, 0], "x":0, "y":13}, + {"flags": 4, "matrix":[2, 1], "x":37, "y":13}, + {"flags": 4, "matrix":[2, 2], "x":75, "y":13}, - {"flags": 4,"matrix":[2,0], "x":0, "y":13}, - {"flags": 4,"matrix":[2,1], "x":37, "y":13}, - {"flags": 4,"matrix":[2,2], "x":75, "y":13}, - - {"flags": 4,"matrix":[3,0], "x":0, "y":19}, - {"flags": 4,"matrix":[3,1], "x":37, "y":19}, - {"flags": 4,"matrix":[3,2], "x":75, "y":19}, - {"flags": 4,"matrix":[2,3], "x":112, "y":16}, + {"flags": 4, "matrix":[3, 0], "x":0, "y":19}, + {"flags": 4, "matrix":[3, 1], "x":37, "y":19}, + {"flags": 4, "matrix":[3, 2], "x":75, "y":19}, + {"flags": 4, "matrix":[2, 3], "x":112, "y":16}, - {"flags": 4,"matrix":[4,0], "x":0, "y":25}, - {"flags": 4,"matrix":[4,1], "x":37, "y":25}, - {"flags": 4,"matrix":[4,2], "x":75, "y":25}, + {"flags": 4, "matrix":[4, 0], "x":0, "y":25}, + {"flags": 4, "matrix":[4, 1], "x":37, "y":25}, + {"flags": 4, "matrix":[4, 2], "x":75, "y":25}, - {"flags": 4,"matrix":[5,0], "x":18, "y":32}, - {"flags": 4,"matrix":[5,2], "x":75, "y":32}, - {"flags": 1,"matrix":[4,3], "x":112, "y":29} + {"flags": 4, "matrix":[5, 0], "x":18, "y":32}, + {"flags": 4, "matrix":[5, 2], "x":75, "y":32}, + {"flags": 1, "matrix":[4, 3], "x":112, "y":29} ] }, "layouts": { "LAYOUT_numpad_6x4": { "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, 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":[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, 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}, - {"matrix":[2,3], "x":3, "y":2, "h":2}, + {"matrix":[3, 0], "x":0, "y":3}, + {"matrix":[3, 1], "x":1, "y":3}, + {"matrix":[3, 2], "x":2, "y":3}, + {"matrix":[2, 3], "x":3, "y":2, "h":2}, - {"matrix":[4,0], "x":0, "y":4}, - {"matrix":[4,1], "x":1, "y":4}, - {"matrix":[4,2], "x":2, "y":4}, + {"matrix":[4, 0], "x":0, "y":4}, + {"matrix":[4, 1], "x":1, "y":4}, + {"matrix":[4, 2], "x":2, "y":4}, - {"matrix":[5,0], "x":0, "y":5, "w":2}, - {"matrix":[5,2], "x":2, "y":5}, - {"matrix":[4,3], "x":3, "y":4, "h":2} + {"matrix":[5, 0], "x":0, "y":5, "w":2}, + {"matrix":[5, 2], "x":2, "y":5}, + {"matrix":[4, 3], "x":3, "y":4, "h":2} ] } } diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json index d25a2e6d9d..8736a937d5 100644 --- a/keyboards/keychron/q0/rev_0131/info.json +++ b/keyboards/keychron/q0/rev_0131/info.json @@ -63,74 +63,74 @@ "solid_splash": true }, "layout": [ - {"flags": 1, "matrix":[0,1], "x":56, "y":0}, - {"flags": 1, "matrix":[0,2], "x":112, "y":0}, - {"flags": 1, "matrix":[0,3], "x":168, "y":0}, - {"flags": 1, "matrix":[0,4], "x":224, "y":0}, + {"flags": 1, "matrix":[0, 1], "x":56, "y":0}, + {"flags": 1, "matrix":[0, 2], "x":112, "y":0}, + {"flags": 1, "matrix":[0, 3], "x":168, "y":0}, + {"flags": 1, "matrix":[0, 4], "x":224, "y":0}, - {"flags": 4, "matrix":[1,0], "x":0, "y":15}, - {"flags": 8, "matrix":[1,1], "x":56, "y":15}, - {"flags": 4, "matrix":[1,2], "x":112, "y":15}, - {"flags": 4, "matrix":[1,3], "x":168, "y":15}, - {"flags": 4, "matrix":[1,4], "x":224, "y":15}, + {"flags": 4, "matrix":[1, 0], "x":0, "y":15}, + {"flags": 8, "matrix":[1, 1], "x":56, "y":15}, + {"flags": 4, "matrix":[1, 2], "x":112, "y":15}, + {"flags": 4, "matrix":[1, 3], "x":168, "y":15}, + {"flags": 4, "matrix":[1, 4], "x":224, "y":15}, - {"flags": 4, "matrix":[2,0], "x":0, "y":27}, - {"flags": 4, "matrix":[2,1], "x":56, "y":27}, - {"flags": 4, "matrix":[2,2], "x":112, "y":27}, - {"flags": 4, "matrix":[2,3], "x":168, "y":27}, - {"flags": 4, "matrix":[2,4], "x":224, "y":34}, - - {"flags": 4, "matrix":[3,0], "x":0, "y":40}, - {"flags": 4, "matrix":[3,1], "x":56, "y":40}, - {"flags": 4, "matrix":[3,2], "x":112, "y":40}, - {"flags": 4, "matrix":[3,3], "x":168, "y":40}, + {"flags": 4, "matrix":[2, 0], "x":0, "y":27}, + {"flags": 4, "matrix":[2, 1], "x":56, "y":27}, + {"flags": 4, "matrix":[2, 2], "x":112, "y":27}, + {"flags": 4, "matrix":[2, 3], "x":168, "y":27}, + {"flags": 4, "matrix":[2, 4], "x":224, "y":34}, - {"flags": 4, "matrix":[4,0], "x":0, "y":52}, - {"flags": 4, "matrix":[4,1], "x":56, "y":52}, - {"flags": 4, "matrix":[4,2], "x":112, "y":52}, - {"flags": 4, "matrix":[4,3], "x":168, "y":52}, - {"flags": 4, "matrix":[4,4], "x":224, "y":58}, + {"flags": 4, "matrix":[3, 0], "x":0, "y":40}, + {"flags": 4, "matrix":[3, 1], "x":56, "y":40}, + {"flags": 4, "matrix":[3, 2], "x":112, "y":40}, + {"flags": 4, "matrix":[3, 3], "x":168, "y":40}, - {"flags": 4, "matrix":[5,0], "x":0, "y":64}, - {"flags": 4, "matrix":[5,1], "x":84, "y":64}, - {"flags": 1, "matrix":[5,3], "x":168, "y":64} + {"flags": 4, "matrix":[4, 0], "x":0, "y":52}, + {"flags": 4, "matrix":[4, 1], "x":56, "y":52}, + {"flags": 4, "matrix":[4, 2], "x":112, "y":52}, + {"flags": 4, "matrix":[4, 3], "x":168, "y":52}, + {"flags": 4, "matrix":[4, 4], "x":224, "y":58}, + + {"flags": 4, "matrix":[5, 0], "x":0, "y":64}, + {"flags": 4, "matrix":[5, 1], "x":84, "y":64}, + {"flags": 1, "matrix":[5, 3], "x":168, "y":64} ] }, "layouts": { "LAYOUT_numpad_6x5": { "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, 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":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1.25, "y":1.25}, - {"matrix":[1,2], "x":2.25, "y":1.25}, - {"matrix":[1,3], "x":3.25, "y":1.25}, - {"matrix":[1,4], "x":4.25, "y":1.25}, + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1.25, "y":1.25}, + {"matrix":[1, 2], "x":2.25, "y":1.25}, + {"matrix":[1, 3], "x":3.25, "y":1.25}, + {"matrix":[1, 4], "x":4.25, "y":1.25}, - {"matrix":[2,0], "x":0, "y":2.25}, - {"matrix":[2,1], "x":1.25, "y":2.25}, - {"matrix":[2,2], "x":2.25, "y":2.25}, - {"matrix":[2,3], "x":3.25, "y":2.25}, - {"matrix":[2,4], "x":4.25, "y":2.25, "h":2}, + {"matrix":[2, 0], "x":0, "y":2.25}, + {"matrix":[2, 1], "x":1.25, "y":2.25}, + {"matrix":[2, 2], "x":2.25, "y":2.25}, + {"matrix":[2, 3], "x":3.25, "y":2.25}, + {"matrix":[2, 4], "x":4.25, "y":2.25, "h":2}, - {"matrix":[3,0], "x":0, "y":3.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, 0], "x":0, "y":3.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":[4,0], "x":0, "y":4.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, "h":2}, + {"matrix":[4, 0], "x":0, "y":4.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, "h":2}, - {"matrix":[5,0], "x":0, "y":5.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":2}, - {"matrix":[5,3], "x":3.25, "y":5.25} + {"matrix":[5, 0], "x":0, "y":5.25}, + {"matrix":[5, 1], "x":1.25, "y":5.25, "w":2}, + {"matrix":[5, 3], "x":3.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json index e4fbf055f2..e41ab1086a 100644 --- a/keyboards/keychron/q1/ansi/info.json +++ b/keyboards/keychron/q1/ansi/info.json @@ -4,9 +4,9 @@ "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", - "pid": "0x0100", - "device_version": "1.0.0", + "vid": "0x3434", + "pid": "0x0100", + "device_version": "1.0.0", "force_nkro": true }, "rgb_matrix": { @@ -31,12 +31,12 @@ {"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,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "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, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -48,11 +48,11 @@ {"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":15.25, "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":15.25, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -64,11 +64,11 @@ {"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":15.25, "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":15.25, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -80,10 +80,10 @@ {"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,14], "x":15.25, "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, 14], "x":15.25, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -94,21 +94,21 @@ {"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":[3,12], "x":14.25, "y":4.25}, + {"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":[3, 12], "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}, - {"matrix":[5,11], "x":11, "y":5}, - {"matrix":[5,12], "x":12, "y":5}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[4,12], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25} + {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, + {"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.25, "y":5.25}, + {"matrix":[4, 12], "x":14.25, "y":5.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json index d9e2fdff60..3946625f3c 100644 --- a/keyboards/keychron/q1/ansi_encoder/info.json +++ b/keyboards/keychron/q1/ansi_encoder/info.json @@ -36,12 +36,12 @@ {"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,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "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, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -53,11 +53,11 @@ {"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":15.25, "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":15.25, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -69,11 +69,11 @@ {"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":15.25, "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":15.25, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -85,10 +85,10 @@ {"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,14], "x":15.25, "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, 14], "x":15.25, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -99,21 +99,21 @@ {"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":[3,12], "x":14.25, "y":4.25}, + {"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":[3, 12], "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}, - {"matrix":[5,11], "x":11, "y":5}, - {"matrix":[5,12], "x":12, "y":5}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[4,12], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25} + {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, + {"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.25, "y":5.25}, + {"matrix":[4, 12], "x":14.25, "y":5.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json index a99ef16ba9..28a3e38c77 100644 --- a/keyboards/keychron/q1/iso/info.json +++ b/keyboards/keychron/q1/iso/info.json @@ -31,12 +31,12 @@ {"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,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "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, 14], "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}, @@ -48,11 +48,11 @@ {"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, 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}, @@ -64,10 +64,10 @@ {"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,14], "x":15.25, "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, 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}, @@ -79,11 +79,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, @@ -95,21 +95,21 @@ {"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":[3,12], "x":14.25, "y":4.5}, + {"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":[3, 12], "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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[4,12], "x":14.25, "y":5.5}, - {"matrix":[5,14], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[4, 12], "x":14.25, "y":5.5}, + {"matrix":[5, 14], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json index 38a5da1994..d8e1751de3 100644 --- a/keyboards/keychron/q1/iso_encoder/info.json +++ b/keyboards/keychron/q1/iso_encoder/info.json @@ -36,12 +36,12 @@ {"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,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "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, 14], "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}, @@ -53,11 +53,11 @@ {"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, 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}, @@ -69,10 +69,10 @@ {"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,14], "x":15.25, "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, 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}, @@ -84,11 +84,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, @@ -100,21 +100,21 @@ {"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":[3,12], "x":14.25, "y":4.5}, + {"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":[3, 12], "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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[4,12], "x":14.25, "y":5.5}, - {"matrix":[5,14], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[4, 12], "x":14.25, "y":5.5}, + {"matrix":[5, 14], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json index e90d961165..5a14a6fb2b 100644 --- a/keyboards/keychron/q10/ansi_encoder/info.json +++ b/keyboards/keychron/q10/ansi_encoder/info.json @@ -34,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -51,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "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}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "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}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -68,12 +68,12 @@ {"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.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,14], "x":17.25, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -84,12 +84,12 @@ {"matrix":[3, 6], "x":7.5, "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.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":19.5, "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.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25}, @@ -100,12 +100,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"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,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -115,9 +115,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json index 2ff2931e20..19fd30e0f3 100644 --- a/keyboards/keychron/q10/iso_encoder/info.json +++ b/keyboards/keychron/q10/iso_encoder/info.json @@ -34,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -51,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "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}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "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}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -68,11 +68,11 @@ {"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.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -83,13 +83,13 @@ {"matrix":[3, 6], "x":7.5, "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.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25}, - {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":19.5, "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.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25}, + {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25}, @@ -101,12 +101,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"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,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -116,9 +116,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/info.json index 50d1260a09..d602ed5786 100755 --- a/keyboards/keychron/q11/ansi_encoder/info.json +++ b/keyboards/keychron/q11/ansi_encoder/info.json @@ -64,102 +64,102 @@ "layouts": { "LAYOUT_ansi_91": { "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":[6,0], "x":8.25, "y":0}, - {"matrix":[6,1], "x":9.25, "y":0}, - {"matrix":[6,2], "x":10.25, "y":0}, - {"matrix":[6,3], "x":11.25, "y":0}, - {"matrix":[6,4], "x":12.25, "y":0}, - {"matrix":[6,5], "x":13.25, "y":0}, - {"matrix":[6,6], "x":14.25, "y":0}, - {"matrix":[6,7], "x":15.25, "y":0}, - {"matrix":[6,8], "x":16.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.25, "y":0}, + {"matrix":[6, 0], "x":8.25, "y":0}, + {"matrix":[6, 1], "x":9.25, "y":0}, + {"matrix":[6, 2], "x":10.25, "y":0}, + {"matrix":[6, 3], "x":11.25, "y":0}, + {"matrix":[6, 4], "x":12.25, "y":0}, + {"matrix":[6, 5], "x":13.25, "y":0}, + {"matrix":[6, 6], "x":14.25, "y":0}, + {"matrix":[6, 7], "x":15.25, "y":0}, + {"matrix":[6, 8], "x":16.5, "y":0}, - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1.25, "y":1.25}, - {"matrix":[1,2], "x":2.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}, - {"matrix":[1,7], "x":7.25, "y":1.25}, - {"matrix":[7,0], "x":8.25, "y":1.25}, - {"matrix":[7,1], "x":9.25, "y":1.25}, - {"matrix":[7,2], "x":10.25, "y":1.25}, - {"matrix":[7,3], "x":11.25, "y":1.25}, - {"matrix":[7,4], "x":12.25, "y":1.25}, - {"matrix":[7,5], "x":13.25, "y":1.25}, - {"matrix":[7,6], "x":14.25, "y":1.25, "w":2}, - {"matrix":[7,8], "x":16.5, "y":1.25}, + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1.25, "y":1.25}, + {"matrix":[1, 2], "x":2.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}, + {"matrix":[1, 7], "x":7.25, "y":1.25}, + {"matrix":[7, 0], "x":8.25, "y":1.25}, + {"matrix":[7, 1], "x":9.25, "y":1.25}, + {"matrix":[7, 2], "x":10.25, "y":1.25}, + {"matrix":[7, 3], "x":11.25, "y":1.25}, + {"matrix":[7, 4], "x":12.25, "y":1.25}, + {"matrix":[7, 5], "x":13.25, "y":1.25}, + {"matrix":[7, 6], "x":14.25, "y":1.25, "w":2}, + {"matrix":[7, 8], "x":16.5, "y":1.25}, - {"matrix":[2,0], "x":0, "y":2.25}, - {"matrix":[2,1], "x":1.25, "y":2.25, "w":1.5}, - {"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,6], "x":5.75, "y":2.25}, - {"matrix":[2,7], "x":6.75, "y":2.25}, - {"matrix":[8,0], "x":7.75, "y":2.25}, - {"matrix":[8,1], "x":8.75, "y":2.25}, - {"matrix":[8,2], "x":9.75, "y":2.25}, - {"matrix":[8,3], "x":10.75, "y":2.25}, - {"matrix":[8,4], "x":11.75, "y":2.25}, - {"matrix":[8,5], "x":12.75, "y":2.25}, - {"matrix":[8,6], "x":13.75, "y":2.25}, - {"matrix":[8,7], "x":14.75, "y":2.25, "w":1.5}, - {"matrix":[8,8], "x":16.5, "y":2.25}, + {"matrix":[2, 0], "x":0, "y":2.25}, + {"matrix":[2, 1], "x":1.25, "y":2.25, "w":1.5}, + {"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, 6], "x":5.75, "y":2.25}, + {"matrix":[2, 7], "x":6.75, "y":2.25}, + {"matrix":[8, 0], "x":7.75, "y":2.25}, + {"matrix":[8, 1], "x":8.75, "y":2.25}, + {"matrix":[8, 2], "x":9.75, "y":2.25}, + {"matrix":[8, 3], "x":10.75, "y":2.25}, + {"matrix":[8, 4], "x":11.75, "y":2.25}, + {"matrix":[8, 5], "x":12.75, "y":2.25}, + {"matrix":[8, 6], "x":13.75, "y":2.25}, + {"matrix":[8, 7], "x":14.75, "y":2.25, "w":1.5}, + {"matrix":[8, 8], "x":16.5, "y":2.25}, - {"matrix":[3,0], "x":0, "y":3.25}, - {"matrix":[3,1], "x":1.25, "y":3.25, "w":1.75}, - {"matrix":[3,2], "x":3, "y":3.25}, - {"matrix":[3,3], "x":4, "y":3.25}, - {"matrix":[3,4], "x":5, "y":3.25}, - {"matrix":[3,5], "x":6, "y":3.25}, - {"matrix":[3,6], "x":7, "y":3.25}, - {"matrix":[9,0], "x":8, "y":3.25}, - {"matrix":[9,1], "x":9, "y":3.25}, - {"matrix":[9,2], "x":10, "y":3.25}, - {"matrix":[9,3], "x":11, "y":3.25}, - {"matrix":[9,4], "x":12, "y":3.25}, - {"matrix":[9,5], "x":13, "y":3.25}, - {"matrix":[9,7], "x":14, "y":3.25, "w":2.25}, - {"matrix":[9,8], "x":16.5, "y":3.25}, + {"matrix":[3, 0], "x":0, "y":3.25}, + {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.75}, + {"matrix":[3, 2], "x":3, "y":3.25}, + {"matrix":[3, 3], "x":4, "y":3.25}, + {"matrix":[3, 4], "x":5, "y":3.25}, + {"matrix":[3, 5], "x":6, "y":3.25}, + {"matrix":[3, 6], "x":7, "y":3.25}, + {"matrix":[9, 0], "x":8, "y":3.25}, + {"matrix":[9, 1], "x":9, "y":3.25}, + {"matrix":[9, 2], "x":10, "y":3.25}, + {"matrix":[9, 3], "x":11, "y":3.25}, + {"matrix":[9, 4], "x":12, "y":3.25}, + {"matrix":[9, 5], "x":13, "y":3.25}, + {"matrix":[9, 7], "x":14, "y":3.25, "w":2.25}, + {"matrix":[9, 8], "x":16.5, "y":3.25}, - {"matrix":[4,0], "x":0, "y":4.25}, - {"matrix":[4,2], "x":1.25, "y":4.25, "w":2.25}, - {"matrix":[4,3], "x":3.5, "y":4.25}, - {"matrix":[4,4], "x":4.5, "y":4.25}, - {"matrix":[4,5], "x":5.5, "y":4.25}, - {"matrix":[4,6], "x":6.5, "y":4.25}, - {"matrix":[4,7], "x":7.5, "y":4.25}, - {"matrix":[10,0], "x":8.5, "y":4.25}, - {"matrix":[10,1], "x":9.5, "y":4.25}, - {"matrix":[10,2], "x":10.5, "y":4.25}, - {"matrix":[10,3], "x":11.5, "y":4.25}, - {"matrix":[10,4], "x":12.5, "y":4.25}, - {"matrix":[10,5], "x":13.5, "y":4.25, "w":1.75}, - {"matrix":[10,7], "x":15.5, "y":4.25}, + {"matrix":[4, 0], "x":0, "y":4.25}, + {"matrix":[4, 2], "x":1.25, "y":4.25, "w":2.25}, + {"matrix":[4, 3], "x":3.5, "y":4.25}, + {"matrix":[4, 4], "x":4.5, "y":4.25}, + {"matrix":[4, 5], "x":5.5, "y":4.25}, + {"matrix":[4, 6], "x":6.5, "y":4.25}, + {"matrix":[4, 7], "x":7.5, "y":4.25}, + {"matrix":[10, 0], "x":8.5, "y":4.25}, + {"matrix":[10, 1], "x":9.5, "y":4.25}, + {"matrix":[10, 2], "x":10.5, "y":4.25}, + {"matrix":[10, 3], "x":11.5, "y":4.25}, + {"matrix":[10, 4], "x":12.5, "y":4.25}, + {"matrix":[10, 5], "x":13.5, "y":4.25, "w":1.75}, + {"matrix":[10, 7], "x":15.5, "y":4.25}, - {"matrix":[5,0], "x":0, "y":5.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":1.25}, - {"matrix":[5,4], "x":5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":6.25, "y":5.25, "w":2.25}, - {"matrix":[11,1], "x":8.5, "y":5.25, "w":2.75}, - {"matrix":[11,2], "x":11.25, "y":5.25}, - {"matrix":[11,3], "x":12.25, "y":5.25}, - {"matrix":[11,4], "x":13.25, "y":5.25}, - {"matrix":[11,6], "x":14.5, "y":5.25}, - {"matrix":[11,7], "x":15.5, "y":5.25}, - {"matrix":[11,8], "x":16.5, "y":5.25} + {"matrix":[5, 0], "x":0, "y":5.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":1.25}, + {"matrix":[5, 4], "x":5, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":6.25, "y":5.25, "w":2.25}, + {"matrix":[11, 1], "x":8.5, "y":5.25, "w":2.75}, + {"matrix":[11, 2], "x":11.25, "y":5.25}, + {"matrix":[11, 3], "x":12.25, "y":5.25}, + {"matrix":[11, 4], "x":13.25, "y":5.25}, + {"matrix":[11, 6], "x":14.5, "y":5.25}, + {"matrix":[11, 7], "x":15.5, "y":5.25}, + {"matrix":[11, 8], "x":16.5, "y":5.25} ] } } diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json index 2e15c38adc..0314c80224 100644 --- a/keyboards/keychron/q12/ansi_encoder/info.json +++ b/keyboards/keychron/q12/ansi_encoder/info.json @@ -21,114 +21,114 @@ "layouts": { "LAYOUT_ansi_103": { "layout": [ - {"matrix":[0,15], "x":0, "y":0}, - {"matrix":[0,16], "x":1, "y":0}, - {"matrix":[0,17], "x":2, "y":0}, - {"matrix":[5,16], "x":3, "y":0}, - {"matrix":[0,0], "x":4.25, "y":0}, - {"matrix":[0,1], "x":5.5, "y":0}, - {"matrix":[0,2], "x":6.5, "y":0}, - {"matrix":[0,3], "x":7.5, "y":0}, - {"matrix":[0,4], "x":8.5, "y":0}, - {"matrix":[0,5], "x":9.75, "y":0}, - {"matrix":[0,6], "x":10.75, "y":0}, - {"matrix":[0,7], "x":11.75, "y":0}, - {"matrix":[0,8], "x":12.75, "y":0}, - {"matrix":[0,9], "x":14, "y":0}, - {"matrix":[0,10], "x":15, "y":0}, - {"matrix":[0,11], "x":16, "y":0}, - {"matrix":[0,12], "x":17, "y":0}, - {"matrix":[0,13], "x":18.25, "y":0}, - {"matrix":[0,14], "x":19.5, "y":0}, + {"matrix":[0, 15], "x":0, "y":0}, + {"matrix":[0, 16], "x":1, "y":0}, + {"matrix":[0, 17], "x":2, "y":0}, + {"matrix":[5, 16], "x":3, "y":0}, + {"matrix":[0, 0], "x":4.25, "y":0}, + {"matrix":[0, 1], "x":5.5, "y":0}, + {"matrix":[0, 2], "x":6.5, "y":0}, + {"matrix":[0, 3], "x":7.5, "y":0}, + {"matrix":[0, 4], "x":8.5, "y":0}, + {"matrix":[0, 5], "x":9.75, "y":0}, + {"matrix":[0, 6], "x":10.75, "y":0}, + {"matrix":[0, 7], "x":11.75, "y":0}, + {"matrix":[0, 8], "x":12.75, "y":0}, + {"matrix":[0, 9], "x":14, "y":0}, + {"matrix":[0, 10], "x":15, "y":0}, + {"matrix":[0, 11], "x":16, "y":0}, + {"matrix":[0, 12], "x":17, "y":0}, + {"matrix":[0, 13], "x":18.25, "y":0}, + {"matrix":[0, 14], "x":19.5, "y":0}, - {"matrix":[1,15], "x":0, "y":1.25}, - {"matrix":[1,16], "x":1, "y":1.25}, - {"matrix":[1,17], "x":2, "y":1.25}, - {"matrix":[5,5], "x":3, "y":1.25}, - {"matrix":[1,0], "x":4.25, "y":1.25}, - {"matrix":[1,1], "x":5.25, "y":1.25}, - {"matrix":[1,2], "x":6.25, "y":1.25}, - {"matrix":[1,3], "x":7.25, "y":1.25}, - {"matrix":[1,4], "x":8.25, "y":1.25}, - {"matrix":[1,5], "x":9.25, "y":1.25}, - {"matrix":[1,6], "x":10.25, "y":1.25}, - {"matrix":[1,7], "x":11.25, "y":1.25}, - {"matrix":[1,8], "x":12.25, "y":1.25}, - {"matrix":[1,9], "x":13.25, "y":1.25}, - {"matrix":[1,10], "x":14.25, "y":1.25}, - {"matrix":[1,11], "x":15.25, "y":1.25}, - {"matrix":[1,12], "x":16.25, "y":1.25}, - {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, - {"matrix":[1,14], "x":19.5, "y":1.25}, + {"matrix":[1, 15], "x":0, "y":1.25}, + {"matrix":[1, 16], "x":1, "y":1.25}, + {"matrix":[1, 17], "x":2, "y":1.25}, + {"matrix":[5, 5], "x":3, "y":1.25}, + {"matrix":[1, 0], "x":4.25, "y":1.25}, + {"matrix":[1, 1], "x":5.25, "y":1.25}, + {"matrix":[1, 2], "x":6.25, "y":1.25}, + {"matrix":[1, 3], "x":7.25, "y":1.25}, + {"matrix":[1, 4], "x":8.25, "y":1.25}, + {"matrix":[1, 5], "x":9.25, "y":1.25}, + {"matrix":[1, 6], "x":10.25, "y":1.25}, + {"matrix":[1, 7], "x":11.25, "y":1.25}, + {"matrix":[1, 8], "x":12.25, "y":1.25}, + {"matrix":[1, 9], "x":13.25, "y":1.25}, + {"matrix":[1, 10], "x":14.25, "y":1.25}, + {"matrix":[1, 11], "x":15.25, "y":1.25}, + {"matrix":[1, 12], "x":16.25, "y":1.25}, + {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":19.5, "y":1.25}, - {"matrix":[2,15], "x":0, "y":2.25}, - {"matrix":[2,16], "x":1, "y":2.25}, - {"matrix":[2,17], "x":2, "y":2.25}, - {"matrix":[5,7], "x":3, "y":2.25, "h":2}, - {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":5.75, "y":2.25}, - {"matrix":[2,2], "x":6.75, "y":2.25}, - {"matrix":[2,3], "x":7.75, "y":2.25}, - {"matrix":[2,4], "x":8.75, "y":2.25}, - {"matrix":[2,5], "x":9.75, "y":2.25}, - {"matrix":[2,6], "x":10.75, "y":2.25}, - {"matrix":[2,7], "x":11.75, "y":2.25}, - {"matrix":[2,8], "x":12.75, "y":2.25}, - {"matrix":[2,9], "x":13.75, "y":2.25}, - {"matrix":[2,10], "x":14.75, "y":2.25}, - {"matrix":[2,11], "x":15.75, "y":2.25}, - {"matrix":[2,12], "x":16.75, "y":2.25}, - {"matrix":[2,13], "x":17.75, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":19.5, "y":2.25}, + {"matrix":[2, 15], "x":0, "y":2.25}, + {"matrix":[2, 16], "x":1, "y":2.25}, + {"matrix":[2, 17], "x":2, "y":2.25}, + {"matrix":[5, 7], "x":3, "y":2.25, "h":2}, + {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":5.75, "y":2.25}, + {"matrix":[2, 2], "x":6.75, "y":2.25}, + {"matrix":[2, 3], "x":7.75, "y":2.25}, + {"matrix":[2, 4], "x":8.75, "y":2.25}, + {"matrix":[2, 5], "x":9.75, "y":2.25}, + {"matrix":[2, 6], "x":10.75, "y":2.25}, + {"matrix":[2, 7], "x":11.75, "y":2.25}, + {"matrix":[2, 8], "x":12.75, "y":2.25}, + {"matrix":[2, 9], "x":13.75, "y":2.25}, + {"matrix":[2, 10], "x":14.75, "y":2.25}, + {"matrix":[2, 11], "x":15.75, "y":2.25}, + {"matrix":[2, 12], "x":16.75, "y":2.25}, + {"matrix":[2, 13], "x":17.75, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":19.5, "y":2.25}, - {"matrix":[3,15], "x":0, "y":3.25}, - {"matrix":[3,16], "x":1, "y":3.25}, - {"matrix":[3,17], "x":2, "y":3.25}, - {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":6, "y":3.25}, - {"matrix":[3,2], "x":7, "y":3.25}, - {"matrix":[3,3], "x":8, "y":3.25}, - {"matrix":[3,4], "x":9, "y":3.25}, - {"matrix":[3,5], "x":10, "y":3.25}, - {"matrix":[3,6], "x":11, "y":3.25}, - {"matrix":[3,7], "x":12, "y":3.25}, - {"matrix":[3,8], "x":13, "y":3.25}, - {"matrix":[3,9], "x":14, "y":3.25}, - {"matrix":[3,10], "x":15, "y":3.25}, - {"matrix":[3,11], "x":16, "y":3.25}, - {"matrix":[3,13], "x":17, "y":3.25, "w":2.25}, - {"matrix":[3,14], "x":19.5, "y":3.25}, + {"matrix":[3, 15], "x":0, "y":3.25}, + {"matrix":[3, 16], "x":1, "y":3.25}, + {"matrix":[3, 17], "x":2, "y":3.25}, + {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3, 1], "x":6, "y":3.25}, + {"matrix":[3, 2], "x":7, "y":3.25}, + {"matrix":[3, 3], "x":8, "y":3.25}, + {"matrix":[3, 4], "x":9, "y":3.25}, + {"matrix":[3, 5], "x":10, "y":3.25}, + {"matrix":[3, 6], "x":11, "y":3.25}, + {"matrix":[3, 7], "x":12, "y":3.25}, + {"matrix":[3, 8], "x":13, "y":3.25}, + {"matrix":[3, 9], "x":14, "y":3.25}, + {"matrix":[3, 10], "x":15, "y":3.25}, + {"matrix":[3, 11], "x":16, "y":3.25}, + {"matrix":[3, 13], "x":17, "y":3.25, "w":2.25}, + {"matrix":[3, 14], "x":19.5, "y":3.25}, - {"matrix":[4,15], "x":0, "y":4.25}, - {"matrix":[4,16], "x":1, "y":4.25}, - {"matrix":[4,17], "x":2, "y":4.25}, - {"matrix":[3,12], "x":3, "y":4.25, "h":2}, - {"matrix":[4,0], "x":4.25, "y":4.25, "w":2.25}, - {"matrix":[4,2], "x":6.5, "y":4.25}, - {"matrix":[4,3], "x":7.5, "y":4.25}, - {"matrix":[4,4], "x":8.5, "y":4.25}, - {"matrix":[4,5], "x":9.5, "y":4.25}, - {"matrix":[4,6], "x":10.5, "y":4.25}, - {"matrix":[4,7], "x":11.5, "y":4.25}, - {"matrix":[4,8], "x":12.5, "y":4.25}, - {"matrix":[4,9], "x":13.5, "y":4.25}, - {"matrix":[4,10], "x":14.5, "y":4.25}, - {"matrix":[4,11], "x":15.5, "y":4.25}, - {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":18.5, "y":4.5}, + {"matrix":[4, 15], "x":0, "y":4.25}, + {"matrix":[4, 16], "x":1, "y":4.25}, + {"matrix":[4, 17], "x":2, "y":4.25}, + {"matrix":[3, 12], "x":3, "y":4.25, "h":2}, + {"matrix":[4, 0], "x":4.25, "y":4.25, "w":2.25}, + {"matrix":[4, 2], "x":6.5, "y":4.25}, + {"matrix":[4, 3], "x":7.5, "y":4.25}, + {"matrix":[4, 4], "x":8.5, "y":4.25}, + {"matrix":[4, 5], "x":9.5, "y":4.25}, + {"matrix":[4, 6], "x":10.5, "y":4.25}, + {"matrix":[4, 7], "x":11.5, "y":4.25}, + {"matrix":[4, 8], "x":12.5, "y":4.25}, + {"matrix":[4, 9], "x":13.5, "y":4.25}, + {"matrix":[4, 10], "x":14.5, "y":4.25}, + {"matrix":[4, 11], "x":15.5, "y":4.25}, + {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":18.5, "y":4.5}, - {"matrix":[5,15], "x":0, "y":5.25, "w":2}, - {"matrix":[5,17], "x":2, "y":5.25}, - {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, - {"matrix":[5,9], "x":14.25, "y":5.25}, - {"matrix":[5,10], "x":15.25, "y":5.25}, - {"matrix":[5,11], "x":16.25, "y":5.25}, - {"matrix":[5,12], "x":17.5, "y":5.5}, - {"matrix":[5,13], "x":18.5, "y":5.5}, - {"matrix":[5,14], "x":19.5, "y":5.5} + {"matrix":[5, 15], "x":0, "y":5.25, "w":2}, + {"matrix":[5, 17], "x":2, "y":5.25}, + {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5, 9], "x":14.25, "y":5.25}, + {"matrix":[5, 10], "x":15.25, "y":5.25}, + {"matrix":[5, 11], "x":16.25, "y":5.25}, + {"matrix":[5, 12], "x":17.5, "y":5.5}, + {"matrix":[5, 13], "x":18.5, "y":5.5}, + {"matrix":[5, 14], "x":19.5, "y":5.5} ] } } diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json index 117d665dc3..1b1a687642 100644 --- a/keyboards/keychron/q12/iso_encoder/info.json +++ b/keyboards/keychron/q12/iso_encoder/info.json @@ -21,115 +21,115 @@ "layouts": { "LAYOUT_iso_104": { "layout": [ - {"matrix":[0,15], "x":0, "y":0}, - {"matrix":[0,16], "x":1, "y":0}, - {"matrix":[0,17], "x":2, "y":0}, - {"matrix":[5,16], "x":3, "y":0}, - {"matrix":[0,0], "x":4.25, "y":0}, - {"matrix":[0,1], "x":5.5, "y":0}, - {"matrix":[0,2], "x":6.5, "y":0}, - {"matrix":[0,3], "x":7.5, "y":0}, - {"matrix":[0,4], "x":8.5, "y":0}, - {"matrix":[0,5], "x":9.75, "y":0}, - {"matrix":[0,6], "x":10.75, "y":0}, - {"matrix":[0,7], "x":11.75, "y":0}, - {"matrix":[0,8], "x":12.75, "y":0}, - {"matrix":[0,9], "x":14, "y":0}, - {"matrix":[0,10], "x":15, "y":0}, - {"matrix":[0,11], "x":16, "y":0}, - {"matrix":[0,12], "x":17, "y":0}, - {"matrix":[0,13], "x":18.25, "y":0}, - {"matrix":[0,14], "x":19.5, "y":0}, + {"matrix":[0, 15], "x":0, "y":0}, + {"matrix":[0, 16], "x":1, "y":0}, + {"matrix":[0, 17], "x":2, "y":0}, + {"matrix":[5, 16], "x":3, "y":0}, + {"matrix":[0, 0], "x":4.25, "y":0}, + {"matrix":[0, 1], "x":5.5, "y":0}, + {"matrix":[0, 2], "x":6.5, "y":0}, + {"matrix":[0, 3], "x":7.5, "y":0}, + {"matrix":[0, 4], "x":8.5, "y":0}, + {"matrix":[0, 5], "x":9.75, "y":0}, + {"matrix":[0, 6], "x":10.75, "y":0}, + {"matrix":[0, 7], "x":11.75, "y":0}, + {"matrix":[0, 8], "x":12.75, "y":0}, + {"matrix":[0, 9], "x":14, "y":0}, + {"matrix":[0, 10], "x":15, "y":0}, + {"matrix":[0, 11], "x":16, "y":0}, + {"matrix":[0, 12], "x":17, "y":0}, + {"matrix":[0, 13], "x":18.25, "y":0}, + {"matrix":[0, 14], "x":19.5, "y":0}, - {"matrix":[1,15], "x":0, "y":1.25}, - {"matrix":[1,16], "x":1, "y":1.25}, - {"matrix":[1,17], "x":2, "y":1.25}, - {"matrix":[5,5], "x":3, "y":1.25}, - {"matrix":[1,0], "x":4.25, "y":1.25}, - {"matrix":[1,1], "x":5.25, "y":1.25}, - {"matrix":[1,2], "x":6.25, "y":1.25}, - {"matrix":[1,3], "x":7.25, "y":1.25}, - {"matrix":[1,4], "x":8.25, "y":1.25}, - {"matrix":[1,5], "x":9.25, "y":1.25}, - {"matrix":[1,6], "x":10.25, "y":1.25}, - {"matrix":[1,7], "x":11.25, "y":1.25}, - {"matrix":[1,8], "x":12.25, "y":1.25}, - {"matrix":[1,9], "x":13.25, "y":1.25}, - {"matrix":[1,10], "x":14.25, "y":1.25}, - {"matrix":[1,11], "x":15.25, "y":1.25}, - {"matrix":[1,12], "x":16.25, "y":1.25}, - {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, - {"matrix":[1,14], "x":19.5, "y":1.25}, + {"matrix":[1, 15], "x":0, "y":1.25}, + {"matrix":[1, 16], "x":1, "y":1.25}, + {"matrix":[1, 17], "x":2, "y":1.25}, + {"matrix":[5, 5], "x":3, "y":1.25}, + {"matrix":[1, 0], "x":4.25, "y":1.25}, + {"matrix":[1, 1], "x":5.25, "y":1.25}, + {"matrix":[1, 2], "x":6.25, "y":1.25}, + {"matrix":[1, 3], "x":7.25, "y":1.25}, + {"matrix":[1, 4], "x":8.25, "y":1.25}, + {"matrix":[1, 5], "x":9.25, "y":1.25}, + {"matrix":[1, 6], "x":10.25, "y":1.25}, + {"matrix":[1, 7], "x":11.25, "y":1.25}, + {"matrix":[1, 8], "x":12.25, "y":1.25}, + {"matrix":[1, 9], "x":13.25, "y":1.25}, + {"matrix":[1, 10], "x":14.25, "y":1.25}, + {"matrix":[1, 11], "x":15.25, "y":1.25}, + {"matrix":[1, 12], "x":16.25, "y":1.25}, + {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":19.5, "y":1.25}, - {"matrix":[2,15], "x":0, "y":2.25}, - {"matrix":[2,16], "x":1, "y":2.25}, - {"matrix":[2,17], "x":2, "y":2.25}, - {"matrix":[5,7], "x":3, "y":2.25, "h":2}, - {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":5.75, "y":2.25}, - {"matrix":[2,2], "x":6.75, "y":2.25}, - {"matrix":[2,3], "x":7.75, "y":2.25}, - {"matrix":[2,4], "x":8.75, "y":2.25}, - {"matrix":[2,5], "x":9.75, "y":2.25}, - {"matrix":[2,6], "x":10.75, "y":2.25}, - {"matrix":[2,7], "x":11.75, "y":2.25}, - {"matrix":[2,8], "x":12.75, "y":2.25}, - {"matrix":[2,9], "x":13.75, "y":2.25}, - {"matrix":[2,10], "x":14.75, "y":2.25}, - {"matrix":[2,11], "x":15.75, "y":2.25}, - {"matrix":[2,12], "x":16.75, "y":2.25}, - {"matrix":[2,14], "x":19.5, "y":2.25}, + {"matrix":[2, 15], "x":0, "y":2.25}, + {"matrix":[2, 16], "x":1, "y":2.25}, + {"matrix":[2, 17], "x":2, "y":2.25}, + {"matrix":[5, 7], "x":3, "y":2.25, "h":2}, + {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":5.75, "y":2.25}, + {"matrix":[2, 2], "x":6.75, "y":2.25}, + {"matrix":[2, 3], "x":7.75, "y":2.25}, + {"matrix":[2, 4], "x":8.75, "y":2.25}, + {"matrix":[2, 5], "x":9.75, "y":2.25}, + {"matrix":[2, 6], "x":10.75, "y":2.25}, + {"matrix":[2, 7], "x":11.75, "y":2.25}, + {"matrix":[2, 8], "x":12.75, "y":2.25}, + {"matrix":[2, 9], "x":13.75, "y":2.25}, + {"matrix":[2, 10], "x":14.75, "y":2.25}, + {"matrix":[2, 11], "x":15.75, "y":2.25}, + {"matrix":[2, 12], "x":16.75, "y":2.25}, + {"matrix":[2, 14], "x":19.5, "y":2.25}, - {"matrix":[3,15], "x":0, "y":3.25}, - {"matrix":[3,16], "x":1, "y":3.25}, - {"matrix":[3,17], "x":2, "y":3.25}, - {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":6, "y":3.25}, - {"matrix":[3,2], "x":7, "y":3.25}, - {"matrix":[3,3], "x":8, "y":3.25}, - {"matrix":[3,4], "x":9, "y":3.25}, - {"matrix":[3,5], "x":10, "y":3.25}, - {"matrix":[3,6], "x":11, "y":3.25}, - {"matrix":[3,7], "x":12, "y":3.25}, - {"matrix":[3,8], "x":13, "y":3.25}, - {"matrix":[3,9], "x":14, "y":3.25}, - {"matrix":[3,10], "x":15, "y":3.25}, - {"matrix":[3,11], "x":16, "y":3.25}, - {"matrix":[3,13], "x":17, "y":3.25}, - {"matrix":[2,13], "x":18, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":19.5, "y":3.25}, + {"matrix":[3, 15], "x":0, "y":3.25}, + {"matrix":[3, 16], "x":1, "y":3.25}, + {"matrix":[3, 17], "x":2, "y":3.25}, + {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3, 1], "x":6, "y":3.25}, + {"matrix":[3, 2], "x":7, "y":3.25}, + {"matrix":[3, 3], "x":8, "y":3.25}, + {"matrix":[3, 4], "x":9, "y":3.25}, + {"matrix":[3, 5], "x":10, "y":3.25}, + {"matrix":[3, 6], "x":11, "y":3.25}, + {"matrix":[3, 7], "x":12, "y":3.25}, + {"matrix":[3, 8], "x":13, "y":3.25}, + {"matrix":[3, 9], "x":14, "y":3.25}, + {"matrix":[3, 10], "x":15, "y":3.25}, + {"matrix":[3, 11], "x":16, "y":3.25}, + {"matrix":[3, 13], "x":17, "y":3.25}, + {"matrix":[2, 13], "x":18, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 14], "x":19.5, "y":3.25}, - {"matrix":[4,15], "x":0, "y":4.25}, - {"matrix":[4,16], "x":1, "y":4.25}, - {"matrix":[4,17], "x":2, "y":4.25}, - {"matrix":[3,12], "x":3, "y":4.25, "h":2}, - {"matrix":[4,0], "x":4.25, "y":4.25, "w":1.25}, - {"matrix":[4,1], "x":5.5, "y":4.25}, - {"matrix":[4,2], "x":6.5, "y":4.25}, - {"matrix":[4,3], "x":7.5, "y":4.25}, - {"matrix":[4,4], "x":8.5, "y":4.25}, - {"matrix":[4,5], "x":9.5, "y":4.25}, - {"matrix":[4,6], "x":10.5, "y":4.25}, - {"matrix":[4,7], "x":11.5, "y":4.25}, - {"matrix":[4,8], "x":12.5, "y":4.25}, - {"matrix":[4,9], "x":13.5, "y":4.25}, - {"matrix":[4,10], "x":14.5, "y":4.25}, - {"matrix":[4,11], "x":15.5, "y":4.25}, - {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":18.5, "y":4.5}, + {"matrix":[4, 15], "x":0, "y":4.25}, + {"matrix":[4, 16], "x":1, "y":4.25}, + {"matrix":[4, 17], "x":2, "y":4.25}, + {"matrix":[3, 12], "x":3, "y":4.25, "h":2}, + {"matrix":[4, 0], "x":4.25, "y":4.25, "w":1.25}, + {"matrix":[4, 1], "x":5.5, "y":4.25}, + {"matrix":[4, 2], "x":6.5, "y":4.25}, + {"matrix":[4, 3], "x":7.5, "y":4.25}, + {"matrix":[4, 4], "x":8.5, "y":4.25}, + {"matrix":[4, 5], "x":9.5, "y":4.25}, + {"matrix":[4, 6], "x":10.5, "y":4.25}, + {"matrix":[4, 7], "x":11.5, "y":4.25}, + {"matrix":[4, 8], "x":12.5, "y":4.25}, + {"matrix":[4, 9], "x":13.5, "y":4.25}, + {"matrix":[4, 10], "x":14.5, "y":4.25}, + {"matrix":[4, 11], "x":15.5, "y":4.25}, + {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":18.5, "y":4.5}, - {"matrix":[5,15], "x":0, "y":5.25, "w":2}, - {"matrix":[5,17], "x":2, "y":5.25}, - {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, - {"matrix":[5,9], "x":14.25, "y":5.25}, - {"matrix":[5,10], "x":15.25, "y":5.25}, - {"matrix":[5,11], "x":16.25, "y":5.25}, - {"matrix":[5,12], "x":17.5, "y":5.5}, - {"matrix":[5,13], "x":18.5, "y":5.5}, - {"matrix":[5,14], "x":19.5, "y":5.5} + {"matrix":[5, 15], "x":0, "y":5.25, "w":2}, + {"matrix":[5, 17], "x":2, "y":5.25}, + {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5, 9], "x":14.25, "y":5.25}, + {"matrix":[5, 10], "x":15.25, "y":5.25}, + {"matrix":[5, 11], "x":16.25, "y":5.25}, + {"matrix":[5, 12], "x":17.5, "y":5.5}, + {"matrix":[5, 13], "x":18.5, "y":5.5}, + {"matrix":[5, 14], "x":19.5, "y":5.5} ] } } diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json index 10d665e02f..f6e367d2c9 100644 --- a/keyboards/keychron/q2/ansi/info.json +++ b/keyboards/keychron/q2/ansi/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -47,11 +47,11 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -63,10 +63,10 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -77,21 +77,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json index abb5031073..7278109b7c 100644 --- a/keyboards/keychron/q2/ansi_encoder/info.json +++ b/keyboards/keychron/q2/ansi_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -52,11 +52,11 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -68,10 +68,10 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -82,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json index a29db71cca..f77a07c463 100644 --- a/keyboards/keychron/q2/iso/info.json +++ b/keyboards/keychron/q2/iso/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -47,10 +47,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -62,11 +62,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -78,21 +78,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json index 6c77c3ad5a..c783a990e7 100644 --- a/keyboards/keychron/q2/iso_encoder/info.json +++ b/keyboards/keychron/q2/iso_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -52,10 +52,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -67,11 +67,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -83,21 +83,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json index b43e1bd979..6c9cb2d634 100644 --- a/keyboards/keychron/q2/jis/info.json +++ b/keyboards/keychron/q2/jis/info.json @@ -31,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -48,10 +48,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -63,11 +63,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -78,11 +78,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"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":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"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":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -90,12 +90,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json index 09b4ec66a3..9f3d73d3ef 100644 --- a/keyboards/keychron/q2/jis_encoder/info.json +++ b/keyboards/keychron/q2/jis_encoder/info.json @@ -36,12 +36,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -53,10 +53,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -68,11 +68,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -83,11 +83,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"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":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"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":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -95,12 +95,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json index c0819fa24c..5e22787974 100644 --- a/keyboards/keychron/q3/ansi/info.json +++ b/keyboards/keychron/q3/ansi/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,13 +43,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -61,13 +61,13 @@ {"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":[3,12], "x":17.25, "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":[3, 12], "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}, @@ -79,9 +79,9 @@ {"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, 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}, @@ -92,22 +92,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json index 78d9c50832..f1e293824d 100644 --- a/keyboards/keychron/q3/ansi_encoder/info.json +++ b/keyboards/keychron/q3/ansi_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,13 +49,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -67,13 +67,13 @@ {"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":[3,12], "x":17.25, "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":[3, 12], "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}, @@ -85,9 +85,9 @@ {"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, 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}, @@ -98,22 +98,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json index b9c6b22df1..f9f04430c9 100644 --- a/keyboards/keychron/q3/iso/info.json +++ b/keyboards/keychron/q3/iso/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,13 +43,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -61,12 +61,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -78,10 +78,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -93,22 +93,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json index 4c264bf33f..79938eccc4 100644 --- a/keyboards/keychron/q3/iso_encoder/info.json +++ b/keyboards/keychron/q3/iso_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,13 +49,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -67,12 +67,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -84,10 +84,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -99,22 +99,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json index 55edbe16f2..b9cfdc5346 100644 --- a/keyboards/keychron/q3/jis/info.json +++ b/keyboards/keychron/q3/jis/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,14 +43,14 @@ {"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":[0,13], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "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":[0, 13], "x":14, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,12 +62,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -79,10 +79,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -93,11 +93,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.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}, @@ -105,13 +105,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"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":12.75, "y":5.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":[4,14], "x":17.25, "y":5.25} + {"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":12.75, "y":5.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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json index eb0ad6420a..f379df430e 100644 --- a/keyboards/keychron/q3/jis_encoder/info.json +++ b/keyboards/keychron/q3/jis_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,14 +49,14 @@ {"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, 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, 5], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,12 +68,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -85,10 +85,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -99,11 +99,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.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}, @@ -111,13 +111,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"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":12.75, "y":5.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":[4,14], "x":17.25, "y":5.25} + {"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":12.75, "y":5.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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json index 5686e96511..2db65a4690 100644 --- a/keyboards/keychron/q4/iso/info.json +++ b/keyboards/keychron/q4/iso/info.json @@ -35,7 +35,7 @@ {"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}, @@ -62,7 +62,7 @@ {"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 }, + {"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}, diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json index 8f3396500f..555034fb80 100644 --- a/keyboards/keychron/q5/ansi/info.json +++ b/keyboards/keychron/q5/ansi/info.json @@ -16,16 +16,16 @@ "layouts": { "LAYOUT_ansi_100": { "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, 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}, @@ -46,14 +46,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,13 +65,13 @@ {"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":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -83,13 +83,13 @@ {"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,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -100,26 +100,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json index 86c3b2d39b..2c828726c7 100644 --- a/keyboards/keychron/q5/ansi_encoder/info.json +++ b/keyboards/keychron/q5/ansi_encoder/info.json @@ -21,14 +21,14 @@ "layouts": { "LAYOUT_ansi_98": { "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, 7], "x":6.5, "y":0}, - {"matrix":[0, 8], "x":7.5, "y":0}, - {"matrix":[0, 9], "x":8.5, "y":0}, + {"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}, @@ -49,14 +49,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,13 +68,13 @@ {"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":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -86,13 +86,13 @@ {"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,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -103,26 +103,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json index dc7a2f5f2b..125cc33736 100644 --- a/keyboards/keychron/q5/iso/info.json +++ b/keyboards/keychron/q5/iso/info.json @@ -16,16 +16,16 @@ "layouts": { "LAYOUT_iso_101": { "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, 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}, @@ -46,14 +46,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +65,12 @@ {"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,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,14 +82,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -101,26 +101,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json index 26e27edd5e..4a5e1521cf 100644 --- a/keyboards/keychron/q5/iso_encoder/info.json +++ b/keyboards/keychron/q5/iso_encoder/info.json @@ -21,14 +21,14 @@ "layouts": { "LAYOUT_iso_99": { "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, 7], "x":6.5, "y":0}, - {"matrix":[0, 8], "x":7.5, "y":0}, - {"matrix":[0, 9], "x":8.5, "y":0}, + {"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}, @@ -49,14 +49,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,12 +68,12 @@ {"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,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -85,14 +85,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -104,26 +104,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json index 9e0b6106e2..6c343b03f1 100644 --- a/keyboards/keychron/q6/ansi/info.json +++ b/keyboards/keychron/q6/ansi/info.json @@ -26,16 +26,16 @@ {"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":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,17 +47,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -69,16 +69,16 @@ {"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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -90,13 +90,13 @@ {"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,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -107,28 +107,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json index 147dfa5e44..e0ce1f4713 100644 --- a/keyboards/keychron/q6/ansi_encoder/info.json +++ b/keyboards/keychron/q6/ansi_encoder/info.json @@ -31,17 +31,17 @@ {"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":[4,19], "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,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[4, 19], "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, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -53,17 +53,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -75,16 +75,16 @@ {"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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -96,13 +96,13 @@ {"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,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -113,28 +113,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json index f502f42f61..4441a4bf8e 100644 --- a/keyboards/keychron/q6/iso/info.json +++ b/keyboards/keychron/q6/iso/info.json @@ -26,16 +26,16 @@ {"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":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,17 +47,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -69,15 +69,15 @@ {"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,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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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, 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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -89,14 +89,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -108,28 +108,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json index 75aea3acbf..0adcec7892 100644 --- a/keyboards/keychron/q6/iso_encoder/info.json +++ b/keyboards/keychron/q6/iso_encoder/info.json @@ -31,17 +31,17 @@ {"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":[4,19], "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,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[4, 19], "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, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -53,17 +53,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -75,15 +75,15 @@ {"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,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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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, 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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -95,14 +95,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -114,28 +114,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json index 02b3d807fd..4756fe0e99 100644 --- a/keyboards/keychron/q60/ansi/info.json +++ b/keyboards/keychron/q60/ansi/info.json @@ -31,11 +31,11 @@ {"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,12], "x":14, "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, 12], "x":14, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -47,10 +47,10 @@ {"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, 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}, @@ -62,9 +62,9 @@ {"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, 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}, @@ -75,16 +75,16 @@ {"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, 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":1.5, "y":4}, {"matrix":[4, 1], "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, 10], "x":11, "y":4, "w":1.5}, + {"matrix":[4, 11], "x":12.5, "y":4} ] } } diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json index ec187ee615..fec4341d54 100644 --- a/keyboards/keychron/q65/ansi_encoder/info.json +++ b/keyboards/keychron/q65/ansi_encoder/info.json @@ -34,12 +34,12 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25}, - {"matrix":[0,14], "x":14.5, "y":0.25, "w":2}, - {"matrix":[0,15], "x":17, "y":0.25}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25}, + {"matrix":[0, 14], "x":14.5, "y":0.25, "w":2}, + {"matrix":[0, 15], "x":17, "y":0.25}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1.5, "y":1.25, "w":1.5}, @@ -51,12 +51,12 @@ {"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":[1,14], "x":15, "y":1.25, "w":1.5}, - {"matrix":[1,15], "x":17, "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":[1, 14], "x":15, "y":1.25, "w":1.5}, + {"matrix":[1, 15], "x":17, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25}, {"matrix":[2, 1], "x":1.5, "y":2.25, "w":1.75}, @@ -68,11 +68,11 @@ {"matrix":[2, 7], "x":8.25, "y":2.25}, {"matrix":[2, 8], "x":9.25, "y":2.25}, {"matrix":[2, 9], "x":10.25, "y":2.25}, - {"matrix":[2,10], "x":11.25, "y":2.25}, - {"matrix":[2,11], "x":12.25, "y":2.25}, - {"matrix":[2,12], "x":13.25, "y":2.25}, - {"matrix":[2,14], "x":14.25, "y":2.25, "w":2.25}, - {"matrix":[2,15], "x":17, "y":2.25}, + {"matrix":[2, 10], "x":11.25, "y":2.25}, + {"matrix":[2, 11], "x":12.25, "y":2.25}, + {"matrix":[2, 12], "x":13.25, "y":2.25}, + {"matrix":[2, 14], "x":14.25, "y":2.25, "w":2.25}, + {"matrix":[2, 15], "x":17, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":2.25}, @@ -83,24 +83,24 @@ {"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.75}, - {"matrix":[3,14], "x":17, "y":3.25}, - {"matrix":[3,15], "x":15.75, "y":3.5}, + {"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.75}, + {"matrix":[3, 14], "x":17, "y":3.25}, + {"matrix":[3, 15], "x":15.75, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.75, "y":4.25, "w":1.25}, {"matrix":[4, 3], "x":4, "y":4.25, "w":1.25}, {"matrix":[4, 7], "x":5.25, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":14.75, "y":4.5}, - {"matrix":[4,14], "x":15.75, "y":4.5}, - {"matrix":[4,15], "x":16.75, "y":4.5} + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":14.75, "y":4.5}, + {"matrix":[4, 14], "x":15.75, "y":4.5}, + {"matrix":[4, 15], "x":16.75, "y":4.5} ] } } diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json index b06285ebd8..5d665c2653 100644 --- a/keyboards/keychron/q7/ansi/info.json +++ b/keyboards/keychron/q7/ansi/info.json @@ -31,12 +31,12 @@ {"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":[0,15], "x":16, "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":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -48,12 +48,12 @@ {"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":[1,15], "x":16, "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":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -65,11 +65,11 @@ {"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":[2,15], "x":16, "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":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -80,23 +80,23 @@ {"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":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "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":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "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}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "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}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json index 1d78fbab7e..efa3abdbc9 100644 --- a/keyboards/keychron/q7/iso/info.json +++ b/keyboards/keychron/q7/iso/info.json @@ -31,12 +31,12 @@ {"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":[0,15], "x":16, "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":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -48,11 +48,11 @@ {"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":[1,15], "x":16, "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":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -64,12 +64,12 @@ {"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}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "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}, + {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3}, @@ -81,23 +81,23 @@ {"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":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "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":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "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}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "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}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json index 194b7ee983..7ec38683c5 100644 --- a/keyboards/keychron/q8/ansi/info.json +++ b/keyboards/keychron/q8/ansi/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -47,11 +47,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -62,11 +62,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -77,11 +77,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -91,9 +91,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json index 09d3c183e2..c506224a32 100644 --- a/keyboards/keychron/q8/ansi_encoder/info.json +++ b/keyboards/keychron/q8/ansi_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -52,11 +52,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -67,11 +67,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -82,11 +82,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -96,9 +96,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json index 3502848441..60b4006150 100644 --- a/keyboards/keychron/q8/iso/info.json +++ b/keyboards/keychron/q8/iso/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -47,10 +47,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -61,12 +61,12 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.5, "y":2.25}, - {"matrix":[2,12], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.5, "y":2.25}, + {"matrix":[2, 12], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -78,11 +78,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -92,9 +92,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json index 721ab371f0..ebcf8a8ee0 100644 --- a/keyboards/keychron/q8/iso_encoder/info.json +++ b/keyboards/keychron/q8/iso_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -52,10 +52,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -66,12 +66,12 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.5, "y":2.25}, - {"matrix":[2,12], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.5, "y":2.25}, + {"matrix":[2, 12], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -83,11 +83,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -97,9 +97,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json index 6198156d4b..28ed46e56d 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25, "w":1.5}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1.25}, @@ -47,10 +47,10 @@ {"matrix":[1, 7], "x":7.75, "y":1.25}, {"matrix":[1, 8], "x":8.75, "y":1.25}, {"matrix":[1, 9], "x":9.75, "y":1.25}, - {"matrix":[1,10], "x":10.75, "y":1.25}, - {"matrix":[1,11], "x":11.75, "y":1.25}, - {"matrix":[1,13], "x":12.75, "y":1.25, "w":2.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1.25}, + {"matrix":[1, 11], "x":11.75, "y":1.25}, + {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25}, {"matrix":[2, 2], "x":2.25, "y":2.25}, @@ -61,21 +61,21 @@ {"matrix":[2, 7], "x":7.25, "y":2.25}, {"matrix":[2, 8], "x":8.25, "y":2.25}, {"matrix":[2, 9], "x":9.25, "y":2.25}, - {"matrix":[2,10], "x":10.25, "y":2.25}, - {"matrix":[2,11], "x":11.25, "y":2.25}, - {"matrix":[2,13], "x":12.25, "y":2.25, "w":1.75}, - {"matrix":[2,14], "x":14.25, "y":2.5}, + {"matrix":[2, 10], "x":10.25, "y":2.25}, + {"matrix":[2, 11], "x":11.25, "y":2.25}, + {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75}, + {"matrix":[2, 14], "x":14.25, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3.25}, - {"matrix":[3,11], "x":11, "y":3.25}, - {"matrix":[3,12], "x":12, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.5}, - {"matrix":[3,14], "x":14.25, "y":3.5}, - {"matrix":[1,12], "x":15.25, "y":3.5} + {"matrix":[3, 10], "x":10, "y":3.25}, + {"matrix":[3, 11], "x":11, "y":3.25}, + {"matrix":[3, 12], "x":12, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.5}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, + {"matrix":[1, 12], "x":15.25, "y":3.5} ] } } diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json index 0fa8e952d3..e00278143f 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25, "w":1.5}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1.25}, @@ -52,10 +52,10 @@ {"matrix":[1, 7], "x":7.75, "y":1.25}, {"matrix":[1, 8], "x":8.75, "y":1.25}, {"matrix":[1, 9], "x":9.75, "y":1.25}, - {"matrix":[1,10], "x":10.75, "y":1.25}, - {"matrix":[1,11], "x":11.75, "y":1.25}, - {"matrix":[1,13], "x":12.75, "y":1.25, "w":2.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1.25}, + {"matrix":[1, 11], "x":11.75, "y":1.25}, + {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25}, {"matrix":[2, 2], "x":2.25, "y":2.25}, @@ -66,21 +66,21 @@ {"matrix":[2, 7], "x":7.25, "y":2.25}, {"matrix":[2, 8], "x":8.25, "y":2.25}, {"matrix":[2, 9], "x":9.25, "y":2.25}, - {"matrix":[2,10], "x":10.25, "y":2.25}, - {"matrix":[2,11], "x":11.25, "y":2.25}, - {"matrix":[2,13], "x":12.25, "y":2.25, "w":1.75}, - {"matrix":[2,14], "x":14.25, "y":2.5}, + {"matrix":[2, 10], "x":10.25, "y":2.25}, + {"matrix":[2, 11], "x":11.25, "y":2.25}, + {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75}, + {"matrix":[2, 14], "x":14.25, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3.25}, - {"matrix":[3,11], "x":11, "y":3.25}, - {"matrix":[3,12], "x":12, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.5}, - {"matrix":[3,14], "x":14.25, "y":3.5}, - {"matrix":[1,12], "x":15.25, "y":3.5} + {"matrix":[3, 10], "x":10, "y":3.25}, + {"matrix":[3, 11], "x":11, "y":3.25}, + {"matrix":[3, 12], "x":12, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.5}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, + {"matrix":[1, 12], "x":15.25, "y":3.5} ] } } diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json index e581982475..eb34386ecb 100644 --- a/keyboards/keychron/q9/iso/info.json +++ b/keyboards/keychron/q9/iso/info.json @@ -31,10 +31,10 @@ {"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,14], "x":15.25, "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, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1}, @@ -46,11 +46,11 @@ {"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,13], "x":12.75, "y":1}, - {"matrix":[0,13], "x":13.75, "y":0, "w":1.25, "h":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1}, + {"matrix":[1, 11], "x":11.75, "y":1}, + {"matrix":[1, 13], "x":12.75, "y":1}, + {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2, "w":1.25}, {"matrix":[2, 1], "x":1.25, "y":2}, @@ -62,21 +62,21 @@ {"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":1.75}, - {"matrix":[2,14], "x":14, "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":1.75}, + {"matrix":[2, 14], "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, 6], "x":3.75, "y":3, "w":6.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":[1,12], "x":15, "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":[1, 12], "x":15, "y":3} ] } } diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json index 2ae65f6092..b6d24d46de 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/info.json @@ -36,10 +36,10 @@ {"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,14], "x":15.25, "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, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1}, @@ -51,11 +51,11 @@ {"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,13], "x":12.75, "y":1}, - {"matrix":[0,13], "x":13.75, "y":0, "w":1.25, "h":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1}, + {"matrix":[1, 11], "x":11.75, "y":1}, + {"matrix":[1, 13], "x":12.75, "y":1}, + {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2, "w":1.25}, {"matrix":[2, 1], "x":1.25, "y":2}, @@ -67,21 +67,21 @@ {"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":1.75}, - {"matrix":[2,14], "x":14, "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":1.75}, + {"matrix":[2, 14], "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, 6], "x":3.75, "y":3, "w":6.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":[1,12], "x":15, "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":[1, 12], "x":15, "y":3} ] } } diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json index 0f490f8e81..82ec24e3fb 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/info.json @@ -35,12 +35,12 @@ {"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":[3,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15, "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":[3, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -52,11 +52,11 @@ {"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":15, "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":15, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -68,11 +68,11 @@ {"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":15, "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":15, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -84,10 +84,10 @@ {"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,14], "x":15, "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, 14], "x":15, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -98,22 +98,22 @@ {"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":[4,14], "x":15, "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":[4, 14], "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, 2], "x":2.5, "y":5, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, {"matrix":[5, 9], "x":10, "y":5}, - {"matrix":[5,10], "x":11, "y":5}, - {"matrix":[5,11], "x":12, "y":5}, - {"matrix":[5,12], "x":13, "y":5}, - {"matrix":[5,13], "x":14, "y":5}, - {"matrix":[5,14], "x":15, "y":5} + {"matrix":[5, 10], "x":11, "y":5}, + {"matrix":[5, 11], "x":12, "y":5}, + {"matrix":[5, 12], "x":13, "y":5}, + {"matrix":[5, 13], "x":14, "y":5}, + {"matrix":[5, 14], "x":15, "y":5} ] } } diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json index 667da15235..04580e30b4 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/info.json @@ -35,12 +35,12 @@ {"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":[3,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15, "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":[3, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -52,11 +52,11 @@ {"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":15, "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":15, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -68,11 +68,11 @@ {"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":15, "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":15, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -84,10 +84,10 @@ {"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,14], "x":15, "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, 14], "x":15, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -98,22 +98,22 @@ {"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":[4,14], "x":15, "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":[4, 14], "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, 2], "x":2.5, "y":5, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, {"matrix":[5, 9], "x":10, "y":5}, - {"matrix":[5,10], "x":11, "y":5}, - {"matrix":[5,11], "x":12, "y":5}, - {"matrix":[5,12], "x":13, "y":5}, - {"matrix":[5,13], "x":14, "y":5}, - {"matrix":[5,14], "x":15, "y":5} + {"matrix":[5, 10], "x":11, "y":5}, + {"matrix":[5, 11], "x":12, "y":5}, + {"matrix":[5, 12], "x":13, "y":5}, + {"matrix":[5, 13], "x":14, "y":5}, + {"matrix":[5, 14], "x":15, "y":5} ] } } diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json index 8f0e43bc76..e6326a9538 100644 --- a/keyboards/keychron/v1/ansi/info.json +++ b/keyboards/keychron/v1/ansi/info.json @@ -26,11 +26,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -42,11 +42,11 @@ {"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, 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":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,11 +58,11 @@ {"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, 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}, @@ -74,10 +74,10 @@ {"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,15], "x":15.25, "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, 15], "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}, @@ -88,21 +88,21 @@ {"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":[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":[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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json index 1546de3fef..303f1e6475 100644 --- a/keyboards/keychron/v1/ansi_encoder/info.json +++ b/keyboards/keychron/v1/ansi_encoder/info.json @@ -31,11 +31,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,11 +47,11 @@ {"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, 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":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -63,11 +63,11 @@ {"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, 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}, @@ -79,10 +79,10 @@ {"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,15], "x":15.25, "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, 15], "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}, @@ -93,21 +93,21 @@ {"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":[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":[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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json index 8977c93a07..4ebb8607f3 100644 --- a/keyboards/keychron/v1/iso/info.json +++ b/keyboards/keychron/v1/iso/info.json @@ -26,11 +26,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -42,11 +42,11 @@ {"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, 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":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,10 +58,10 @@ {"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,15], "x":15.25, "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, 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}, @@ -73,11 +73,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, @@ -89,21 +89,21 @@ {"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":[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":[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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json index fa0ec5e6e2..fcd2dbb793 100644 --- a/keyboards/keychron/v1/iso_encoder/info.json +++ b/keyboards/keychron/v1/iso_encoder/info.json @@ -31,11 +31,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,11 +47,11 @@ {"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, 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":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -63,10 +63,10 @@ {"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,15], "x":15.25, "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, 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}, @@ -78,11 +78,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, @@ -94,21 +94,21 @@ {"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":[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":[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}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json index 585bb27e26..efdb9664f1 100644 --- a/keyboards/keychron/v1/jis/info.json +++ b/keyboards/keychron/v1/jis/info.json @@ -26,11 +26,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -42,12 +42,12 @@ {"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":[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}, @@ -59,10 +59,10 @@ {"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,15], "x":15.25, "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, 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}, @@ -74,11 +74,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "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}, @@ -89,11 +89,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "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}, @@ -101,12 +101,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.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} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.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/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json index 5e473c07b4..511d33f01e 100644 --- a/keyboards/keychron/v1/jis_encoder/info.json +++ b/keyboards/keychron/v1/jis_encoder/info.json @@ -31,11 +31,11 @@ {"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,15], "x":15.25, "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, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,12 +47,12 @@ {"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":[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}, @@ -64,10 +64,10 @@ {"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,15], "x":15.25, "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, 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}, @@ -79,11 +79,11 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "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}, @@ -94,11 +94,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "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}, @@ -106,12 +106,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.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} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.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/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json index b314bcbbd2..3df1d8212a 100644 --- a/keyboards/keychron/v10/ansi_encoder/info.json +++ b/keyboards/keychron/v10/ansi_encoder/info.json @@ -34,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -51,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "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}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "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}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -68,12 +68,12 @@ {"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.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,14], "x":17.25, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -84,12 +84,12 @@ {"matrix":[3, 6], "x":7.5, "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.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":19.5, "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.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25}, @@ -100,12 +100,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"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,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -115,9 +115,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json index d5ad3a0c3e..5e4bb8c32f 100644 --- a/keyboards/keychron/v10/iso_encoder/info.json +++ b/keyboards/keychron/v10/iso_encoder/info.json @@ -34,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -51,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "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}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "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}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -68,11 +68,11 @@ {"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.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -83,13 +83,13 @@ {"matrix":[3, 6], "x":7.5, "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.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25}, - {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":19.5, "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.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25}, + {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25}, @@ -101,12 +101,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"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,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -116,9 +116,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json index 8b60fd9710..969eae09a2 100644 --- a/keyboards/keychron/v2/ansi/info.json +++ b/keyboards/keychron/v2/ansi/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -47,11 +47,11 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -63,10 +63,10 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -77,21 +77,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json index d59e469213..9676278be1 100644 --- a/keyboards/keychron/v2/ansi_encoder/info.json +++ b/keyboards/keychron/v2/ansi_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -52,11 +52,11 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -68,10 +68,10 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -82,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json index 3343ef10b8..8afe06f047 100644 --- a/keyboards/keychron/v2/iso/info.json +++ b/keyboards/keychron/v2/iso/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -47,10 +47,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -62,11 +62,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -78,21 +78,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json index c7492afdba..4aef5b79b2 100644 --- a/keyboards/keychron/v2/iso_encoder/info.json +++ b/keyboards/keychron/v2/iso_encoder/info.json @@ -35,11 +35,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -51,10 +51,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -66,11 +66,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -82,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.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, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json index 6ef7e94a37..91283ef4f7 100644 --- a/keyboards/keychron/v2/jis/info.json +++ b/keyboards/keychron/v2/jis/info.json @@ -31,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -48,10 +48,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -63,11 +63,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -78,11 +78,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"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":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"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":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -90,12 +90,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json index c24569847b..8e2683342d 100644 --- a/keyboards/keychron/v2/jis_encoder/info.json +++ b/keyboards/keychron/v2/jis_encoder/info.json @@ -36,12 +36,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -53,10 +53,10 @@ {"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}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -68,11 +68,11 @@ {"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}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -83,11 +83,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"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":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"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":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -95,12 +95,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.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}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json index 513838db8c..ccb9166cf0 100644 --- a/keyboards/keychron/v3/ansi/info.json +++ b/keyboards/keychron/v3/ansi/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,13 +43,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -61,13 +61,13 @@ {"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":[3,12], "x":17.25, "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":[3, 12], "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}, @@ -79,9 +79,9 @@ {"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, 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}, @@ -92,22 +92,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json index 1f0e263e24..7760b1107b 100644 --- a/keyboards/keychron/v3/ansi_encoder/info.json +++ b/keyboards/keychron/v3/ansi_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,13 +49,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -67,13 +67,13 @@ {"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":[3,12], "x":17.25, "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":[3, 12], "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}, @@ -85,9 +85,9 @@ {"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, 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}, @@ -98,22 +98,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json index c7163fcbc7..0ebb41d417 100644 --- a/keyboards/keychron/v3/iso/info.json +++ b/keyboards/keychron/v3/iso/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,13 +43,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -61,12 +61,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -78,10 +78,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -93,22 +93,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json index 915d3c6db1..0b6a7c1019 100644 --- a/keyboards/keychron/v3/iso_encoder/info.json +++ b/keyboards/keychron/v3/iso_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,13 +49,13 @@ {"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":[3,15], "x":17.25, "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":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -67,12 +67,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -84,10 +84,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -99,22 +99,22 @@ {"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":[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,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":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":[4,14], "x":17.25, "y":5.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":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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json index f212f3d86f..43ee08e448 100644 --- a/keyboards/keychron/v3/jis/info.json +++ b/keyboards/keychron/v3/jis/info.json @@ -26,12 +26,12 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,14 +43,14 @@ {"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":[0,13], "x":13, "y":1.25}, - {"matrix":[1,13], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "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":[0, 13], "x":13, "y":1.25}, + {"matrix":[1, 13], "x":14, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,12 +62,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -79,10 +79,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -93,11 +93,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.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}, @@ -105,13 +105,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"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":12.75, "y":5.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":[4,14], "x":17.25, "y":5.25} + {"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":12.75, "y":5.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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json index 0e9df3bfb8..85184c0a3d 100644 --- a/keyboards/keychron/v3/jis_encoder/info.json +++ b/keyboards/keychron/v3/jis_encoder/info.json @@ -31,13 +31,13 @@ {"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":[3,14], "x":17.25, "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":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,14 +49,14 @@ {"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, 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, 5], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,12 +68,12 @@ {"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,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "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, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "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}, @@ -85,10 +85,10 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -99,11 +99,11 @@ {"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}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.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}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.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}, @@ -111,13 +111,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"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":12.75, "y":5.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":[4,14], "x":17.25, "y":5.25} + {"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":12.75, "y":5.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":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json index d1c6d60cec..11d246a121 100644 --- a/keyboards/keychron/v4/ansi/info.json +++ b/keyboards/keychron/v4/ansi/info.json @@ -31,10 +31,10 @@ {"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, 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}, @@ -46,10 +46,10 @@ {"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, 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}, @@ -61,9 +61,9 @@ {"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, 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}, @@ -74,18 +74,18 @@ {"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":2.75}, + {"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":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, 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} + {"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/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json index 8ffc13cd85..362875903f 100644 --- a/keyboards/keychron/v4/iso/info.json +++ b/keyboards/keychron/v4/iso/info.json @@ -31,10 +31,10 @@ {"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, 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}, @@ -46,9 +46,9 @@ {"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, 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, 1], "x":1.75, "y":2}, @@ -60,10 +60,10 @@ {"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}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":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}, + {"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.25}, @@ -75,18 +75,18 @@ {"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":2.75}, + {"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":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, 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} + {"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/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json index 6e4f7e2dae..62d6a5332c 100644 --- a/keyboards/keychron/v5/ansi/info.json +++ b/keyboards/keychron/v5/ansi/info.json @@ -26,15 +26,15 @@ {"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.5, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[3,12], "x":18.5, "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.5, "y":0}, + {"matrix":[0, 16], "x":16.5, "y":0}, + {"matrix":[0, 17], "x":17.5, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +46,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,13 +65,13 @@ {"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":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -83,13 +83,13 @@ {"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,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -100,26 +100,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json index baa754f4a6..2b16b37c37 100644 --- a/keyboards/keychron/v5/ansi_encoder/info.json +++ b/keyboards/keychron/v5/ansi_encoder/info.json @@ -29,15 +29,15 @@ {"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":[3,12], "x":18.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":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,14 +49,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,13 +68,13 @@ {"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":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -86,13 +86,13 @@ {"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,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -103,26 +103,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json index c4a10480e5..ab7765ea58 100644 --- a/keyboards/keychron/v5/iso/info.json +++ b/keyboards/keychron/v5/iso/info.json @@ -26,15 +26,15 @@ {"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.5, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[3,12], "x":18.5, "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.5, "y":0}, + {"matrix":[0, 16], "x":16.5, "y":0}, + {"matrix":[0, 17], "x":17.5, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +46,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +65,12 @@ {"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,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,14 +82,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -101,26 +101,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json index 16d228d413..e15360af0f 100644 --- a/keyboards/keychron/v5/iso_encoder/info.json +++ b/keyboards/keychron/v5/iso_encoder/info.json @@ -29,15 +29,15 @@ {"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":[3,12], "x":18.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":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -49,14 +49,14 @@ {"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":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "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":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -68,12 +68,12 @@ {"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,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.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, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -85,14 +85,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -104,26 +104,26 @@ {"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":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "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":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.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,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "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}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "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}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json index c9fb812f32..436cd30a78 100644 --- a/keyboards/keychron/v6/ansi/info.json +++ b/keyboards/keychron/v6/ansi/info.json @@ -26,16 +26,16 @@ {"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":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,17 +47,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -69,16 +69,16 @@ {"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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -90,13 +90,13 @@ {"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,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -107,28 +107,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json index 9bfec3341d..a2cf5bdd76 100644 --- a/keyboards/keychron/v6/ansi_encoder/info.json +++ b/keyboards/keychron/v6/ansi_encoder/info.json @@ -31,17 +31,17 @@ {"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":[4,19], "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,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[4, 19], "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, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -53,17 +53,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -75,16 +75,16 @@ {"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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -96,13 +96,13 @@ {"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,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -113,28 +113,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json index 9024029d26..381754c706 100644 --- a/keyboards/keychron/v6/iso/info.json +++ b/keyboards/keychron/v6/iso/info.json @@ -26,16 +26,16 @@ {"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":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -47,17 +47,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -69,15 +69,15 @@ {"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,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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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, 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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -89,14 +89,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -108,28 +108,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json index 7111146ca8..f5048e25ad 100644 --- a/keyboards/keychron/v6/iso_encoder/info.json +++ b/keyboards/keychron/v6/iso_encoder/info.json @@ -31,17 +31,17 @@ {"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":[4,19], "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,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "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":[4, 19], "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, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -53,17 +53,17 @@ {"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":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "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":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -75,15 +75,15 @@ {"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,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":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.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, 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":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -95,14 +95,14 @@ {"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}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"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}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -114,28 +114,28 @@ {"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":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "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":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.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,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":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}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"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":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}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json index 4fb4147e45..ba799b0ed8 100644 --- a/keyboards/keychron/v7/ansi/info.json +++ b/keyboards/keychron/v7/ansi/info.json @@ -31,12 +31,12 @@ {"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":[0,15], "x":16, "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":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -48,12 +48,12 @@ {"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":[1,15], "x":16, "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":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -65,11 +65,11 @@ {"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":[2,15], "x":16, "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":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -80,23 +80,23 @@ {"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":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "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":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "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}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "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}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json index 26a85b57cd..99883b225c 100644 --- a/keyboards/keychron/v7/iso/info.json +++ b/keyboards/keychron/v7/iso/info.json @@ -31,12 +31,12 @@ {"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":[0,15], "x":16, "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":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -48,11 +48,11 @@ {"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":[1,15], "x":16, "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":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -64,12 +64,12 @@ {"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}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "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}, + {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3}, @@ -81,23 +81,23 @@ {"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":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "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":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "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}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "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}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json index 08864a29cf..3c2538aad9 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -47,11 +47,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -62,11 +62,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -77,11 +77,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -91,9 +91,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index cce4165ec9..7104a56169 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -52,11 +52,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -67,11 +67,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -82,11 +82,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -96,9 +96,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json index 2fc2f5292a..2a41cb64fb 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/info.json @@ -31,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -47,10 +47,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -62,11 +62,11 @@ {"matrix":[2, 7], "x":10.25, "y":2.25}, {"matrix":[2, 8], "x":11.25, "y":2.25}, {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":13.5, "y":2.25}, + {"matrix":[2, 11], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -78,11 +78,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -92,9 +92,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index e5f322851e..faede3c5f7 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -36,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -52,10 +52,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -67,11 +67,11 @@ {"matrix":[2, 7], "x":10.25, "y":2.25}, {"matrix":[2, 8], "x":11.25, "y":2.25}, {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":13.5, "y":2.25}, + {"matrix":[2, 11], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -83,11 +83,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.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}, @@ -97,9 +97,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keyhive/maypad/info.json b/keyboards/keyhive/maypad/info.json index ea0ffb80ae..6f61b99df3 100644 --- a/keyboards/keyhive/maypad/info.json +++ b/keyboards/keyhive/maypad/info.json @@ -96,6 +96,5 @@ {"matrix": [4, 3], "x": 3, "y": 4} ] } - } } diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json index d370601b62..e5df0c68e1 100644 --- a/keyboards/keyhive/navi10/info.json +++ b/keyboards/keyhive/navi10/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Navi10", + "keyboard_name": "Navi10", "manufacturer": "emdarcher", - "url": "", - "maintainer": "emdarcher", + "url": "", + "maintainer": "emdarcher", "usb": { "vid": "0xFEED", "pid": "0x0000" diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json index a5ebe8c588..afe95e7aa7 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "smAllice", + "keyboard_name": "smAllice", "manufacturer": "quark", - "url": "https://keyhive.xyz/shop/smallice", - "maintainer": "https://github.com/Armastardo", + "url": "https://keyhive.xyz/shop/smallice", + "maintainer": "https://github.com/Armastardo", "usb": { "vid": "0x514B", "pid": "0x5341", diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json index 7681489520..105cc0446a 100644 --- a/keyboards/keyprez/rhino/info.json +++ b/keyboards/keyprez/rhino/info.json @@ -83,7 +83,6 @@ {"matrix": [7, 5], "x": 12.5, "y": 4} ] }, - "LAYOUT_ergo_2x2u": { "layout": [ {"matrix": [7, 6], "x": 12.5, "y": 0}, @@ -143,7 +142,6 @@ {"matrix": [7, 5], "x": 12.5, "y": 4} ] }, - "LAYOUT_ortho_7u": { "layout": [ {"matrix": [7, 6], "x": 12.5, "y": 0}, diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json index 4528484069..884bc706e4 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/info.json @@ -237,4 +237,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index 011ce2332e..1a97779711 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -1,9 +1,9 @@ { "keyboard_name": "kt3700", - "manufacturer": "keyten", - "url": "", + "manufacturer": "keyten", + "url": "", "maintainer": "key10iq", - "usb": { + "usb": { "vid": "0xEB69", "pid": "0x3700", "device_version": "0.0.1" @@ -14,13 +14,13 @@ }, "diode_direction": "COL2ROW", "indicators": { - "num_lock": "B6" + "num_lock": "B6" }, "processor": "STM32F401", "bootloader": "stm32-dfu", - "layout_aliases": { - "LAYOUT_all": "LAYOUT_ortho_6x4" - }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_ortho_6x4" + }, "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json index 0bcbd52b40..0ed2fb83a6 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Ellora65", + "keyboard_name": "Ellora65", "manufacturer": "Kikos Lab", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE88F", diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json index 4d059dae24..c925c02832 100644 --- a/keyboards/kikoslab/kl90/info.json +++ b/keyboards/kikoslab/kl90/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KL-90", + "keyboard_name": "KL-90", "manufacturer": "Kikos Lab", - "url": "www.kikoslab.com", - "maintainer": "swiftrax", + "url": "www.kikoslab.com", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA53", diff --git a/keyboards/kineticlabs/emu/hotswap/info.json b/keyboards/kineticlabs/emu/hotswap/info.json index fe920deb2b..8f9cb70fe0 100644 --- a/keyboards/kineticlabs/emu/hotswap/info.json +++ b/keyboards/kineticlabs/emu/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Emu Hotswap", + "keyboard_name": "Emu Hotswap", "manufacturer": "Kineticlabs", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0xE015", "pid": "0xC387", diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/info.json index dad20cc868..811a837f5a 100644 --- a/keyboards/kineticlabs/emu/soldered/info.json +++ b/keyboards/kineticlabs/emu/soldered/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Emu Soldered", + "keyboard_name": "Emu Soldered", "manufacturer": "Kineticlabs", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0xE015", "pid": "0xC386", diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json index 236cc335a2..a6a8a4b8eb 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/info.json @@ -17,7 +17,7 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, @@ -34,6 +34,6 @@ {"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 2], "x": 2, "y": 3} ] - } + } } } diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json index 96c097db5f..a5bb27e397 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/info.json @@ -25,7 +25,7 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, @@ -42,6 +42,6 @@ {"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 2], "x": 2, "y": 3} ] - } + } } } diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json index 2be8746471..48e4bdf85e 100644 --- a/keyboards/kira75/info.json +++ b/keyboards/kira75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Kira 75", + "keyboard_name": "Kira 75", "manufacturer": "thesiscamper", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/kira80/info.json b/keyboards/kira80/info.json index 3dd54ee7d3..0ec9e0b258 100644 --- a/keyboards/kira80/info.json +++ b/keyboards/kira80/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Kira80", + "keyboard_name": "Kira80", "manufacturer": "EVE", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x6986", "pid": "0xC583", diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 1cbffbd568..84b8afb982 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -32,7 +32,6 @@ {"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 3], "x": 3, "y": 0, "w": 2, "h": 2} - ] } } diff --git a/keyboards/kj_modify/rs40/info.json b/keyboards/kj_modify/rs40/info.json index dfedf672c3..719f0e14dd 100644 --- a/keyboards/kj_modify/rs40/info.json +++ b/keyboards/kj_modify/rs40/info.json @@ -26,50 +26,50 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 1, "matrix": [0, 0], "label": "ESC"}, - {"x": 1, "y": 0, "w": 1, "matrix": [0, 1], "label": "Q"}, - {"x": 2, "y": 0, "w": 1, "matrix": [0, 2], "label": "W"}, - {"x": 3, "y": 0, "w": 1, "matrix": [0, 3], "label": "E"}, - {"x": 4, "y": 0, "w": 1, "matrix": [0, 4], "label": "R"}, - {"x": 5, "y": 0, "w": 1, "matrix": [0, 5], "label": "T"}, - {"x": 6, "y": 0, "w": 1, "matrix": [0, 6], "label": "Y"}, - {"x": 7, "y": 0, "w": 1, "matrix": [0, 7], "label": "U"}, - {"x": 8, "y": 0, "w": 1, "matrix": [0, 8], "label": "I"}, - {"x": 9, "y": 0, "w": 1, "matrix": [0, 9], "label": "O"}, - {"x": 10, "y": 0, "w": 1, "matrix": [0, 10], "label": "P"}, - {"x": 11, "y": 0, "w": 1, "matrix": [0, 11], "label": "BACKSPACE"}, + {"x": 0, "y": 0, "w": 1, "matrix": [0, 0], "label": "ESC"}, + {"x": 1, "y": 0, "w": 1, "matrix": [0, 1], "label": "Q"}, + {"x": 2, "y": 0, "w": 1, "matrix": [0, 2], "label": "W"}, + {"x": 3, "y": 0, "w": 1, "matrix": [0, 3], "label": "E"}, + {"x": 4, "y": 0, "w": 1, "matrix": [0, 4], "label": "R"}, + {"x": 5, "y": 0, "w": 1, "matrix": [0, 5], "label": "T"}, + {"x": 6, "y": 0, "w": 1, "matrix": [0, 6], "label": "Y"}, + {"x": 7, "y": 0, "w": 1, "matrix": [0, 7], "label": "U"}, + {"x": 8, "y": 0, "w": 1, "matrix": [0, 8], "label": "I"}, + {"x": 9, "y": 0, "w": 1, "matrix": [0, 9], "label": "O"}, + {"x": 10, "y": 0, "w": 1, "matrix": [0, 10], "label": "P"}, + {"x": 11, "y": 0, "w": 1, "matrix": [0, 11], "label": "BACKSPACE"}, - {"x": 0, "y": 1, "w": 1.25, "matrix": [1, 0], "label": "CAPSLOCK"}, - {"x": 1.25, "y": 1, "w": 1, "matrix": [1, 1], "label": "A"}, - {"x": 2.25, "y": 1, "w": 1, "matrix": [1, 2], "label": "S"}, - {"x": 3.25, "y": 1, "w": 1, "matrix": [1, 3], "label": "D"}, - {"x": 4.25, "y": 1, "w": 1, "matrix": [1, 4], "label": "F"}, - {"x": 5.25, "y": 1, "w": 1, "matrix": [1, 5], "label": "G"}, - {"x": 6.25, "y": 1, "w": 1, "matrix": [1, 6], "label": "H"}, - {"x": 7.25, "y": 1, "w": 1, "matrix": [1, 7], "label": "J"}, - {"x": 8.25, "y": 1, "w": 1, "matrix": [1, 8], "label": "K"}, - {"x": 9.25, "y": 1, "w": 1, "matrix": [1, 9], "label": "L"}, + {"x": 0, "y": 1, "w": 1.25, "matrix": [1, 0], "label": "CAPSLOCK"}, + {"x": 1.25, "y": 1, "w": 1, "matrix": [1, 1], "label": "A"}, + {"x": 2.25, "y": 1, "w": 1, "matrix": [1, 2], "label": "S"}, + {"x": 3.25, "y": 1, "w": 1, "matrix": [1, 3], "label": "D"}, + {"x": 4.25, "y": 1, "w": 1, "matrix": [1, 4], "label": "F"}, + {"x": 5.25, "y": 1, "w": 1, "matrix": [1, 5], "label": "G"}, + {"x": 6.25, "y": 1, "w": 1, "matrix": [1, 6], "label": "H"}, + {"x": 7.25, "y": 1, "w": 1, "matrix": [1, 7], "label": "J"}, + {"x": 8.25, "y": 1, "w": 1, "matrix": [1, 8], "label": "K"}, + {"x": 9.25, "y": 1, "w": 1, "matrix": [1, 9], "label": "L"}, {"x": 10.25, "y": 1, "w": 1.75, "matrix": [1, 11], "label": "ENTER"}, - {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0], "label": "LSHIFT"}, - {"x": 1.75, "y": 2, "w": 1, "matrix": [2, 2], "label": "Z"}, - {"x": 2.75, "y": 2, "w": 1, "matrix": [2, 3], "label": "X"}, - {"x": 3.75, "y": 2, "w": 1, "matrix": [2, 4], "label": "C"}, - {"x": 4.75, "y": 2, "w": 1, "matrix": [2, 5], "label": "V"}, - {"x": 5.75, "y": 2, "w": 1, "matrix": [2, 6], "label": "B"}, - {"x": 6.75, "y": 2, "w": 1, "matrix": [2, 7], "label": "N"}, - {"x": 7.75, "y": 2, "w": 1, "matrix": [2, 8], "label": "M"}, - {"x": 8.75, "y": 2, "w": 1, "matrix": [2, 9], "label": "COMMA"}, - {"x": 9.75, "y": 2, "w": 1, "matrix": [2, 10], "label": "PERIOD"}, + {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0], "label": "LSHIFT"}, + {"x": 1.75, "y": 2, "w": 1, "matrix": [2, 2], "label": "Z"}, + {"x": 2.75, "y": 2, "w": 1, "matrix": [2, 3], "label": "X"}, + {"x": 3.75, "y": 2, "w": 1, "matrix": [2, 4], "label": "C"}, + {"x": 4.75, "y": 2, "w": 1, "matrix": [2, 5], "label": "V"}, + {"x": 5.75, "y": 2, "w": 1, "matrix": [2, 6], "label": "B"}, + {"x": 6.75, "y": 2, "w": 1, "matrix": [2, 7], "label": "N"}, + {"x": 7.75, "y": 2, "w": 1, "matrix": [2, 8], "label": "M"}, + {"x": 8.75, "y": 2, "w": 1, "matrix": [2, 9], "label": "COMMA"}, + {"x": 9.75, "y": 2, "w": 1, "matrix": [2, 10], "label": "PERIOD"}, {"x": 10.75, "y": 2, "w": 1.25, "matrix": [2, 11], "label": "RSHIFT"}, - {"x": 1, "y": 3, "w": 1.25, "matrix": [3, 0], "label": "LCTRL"}, - {"x": 1.25, "y": 3, "w": 1, "matrix": [3, 1], "label": "FN2"}, - {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2], "label": "WIN"}, - {"x": 3.5, "y": 3, "w": 2.25, "matrix": [3, 4], "label": "SPACE"}, - {"x": 5.75, "y": 3, "w": 2.75, "matrix": [3, 7], "label": "FN"}, - {"x": 8.5, "y": 3, "w": 1.25, "matrix": [3, 9], "label": "SLASH"}, - {"x": 9.75, "y": 3, "w": 1, "matrix": [3, 10], "label": "SEMICOLON"}, + {"x": 1, "y": 3, "w": 1.25, "matrix": [3, 0], "label": "LCTRL"}, + {"x": 1.25, "y": 3, "w": 1, "matrix": [3, 1], "label": "FN2"}, + {"x": 2.25, "y": 3, "w": 1.25, "matrix": [3, 2], "label": "WIN"}, + {"x": 3.5, "y": 3, "w": 2.25, "matrix": [3, 4], "label": "SPACE"}, + {"x": 5.75, "y": 3, "w": 2.75, "matrix": [3, 7], "label": "FN"}, + {"x": 8.5, "y": 3, "w": 1.25, "matrix": [3, 9], "label": "SLASH"}, + {"x": 9.75, "y": 3, "w": 1, "matrix": [3, 10], "label": "SEMICOLON"}, {"x": 10.75, "y": 3, "w": 1.25, "matrix": [3, 11], "label": "RCTRL"} ] } diff --git a/keyboards/kkatano/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/info.json index 3dae3252c4..3549a3e8c7 100644 --- a/keyboards/kkatano/bakeneko80/info.json +++ b/keyboards/kkatano/bakeneko80/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Bakeneko 80", + "keyboard_name": "Bakeneko 80", "manufacturer": "Koichi Katano", - "url": "https://github.com/kkatano/bakeneko-80-pcb", - "maintainer": "Koichi Katano", + "url": "https://github.com/kkatano/bakeneko-80-pcb", + "maintainer": "Koichi Katano", "usb": { "vid": "0xFEED", "pid": "0x8DEF", diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json index e3f2d93e15..bdf826777d 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/info.json @@ -57,5 +57,4 @@ ] } } - } diff --git a/keyboards/knops/mini/info.json b/keyboards/knops/mini/info.json index ed33aa4c9e..fc6e8053c3 100644 --- a/keyboards/knops/mini/info.json +++ b/keyboards/knops/mini/info.json @@ -1,31 +1,31 @@ { - "keyboard_name": "Knops Mini", - "manufacturer": "Alltrons IT", - "url": "http://www.knops.io/knopsmini.html", - "maintainer": "Pawnerd", - "usb": { - "vid": "0xFEFD", - "pid": "0x9460", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], - "rows": ["D0"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "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}, + "keyboard_name": "Knops Mini", + "manufacturer": "Alltrons IT", + "url": "http://www.knops.io/knopsmini.html", + "maintainer": "Pawnerd", + "usb": { + "vid": "0xFEFD", + "pid": "0x9460", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D0"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "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": 0, "y": 1}, - {"matrix": [0, 4], "x": 1, "y": 1}, - {"matrix": [0, 5], "x": 2, "y": 1} - ] - } - } + {"matrix": [0, 3], "x": 0, "y": 1}, + {"matrix": [0, 4], "x": 1, "y": 1}, + {"matrix": [0, 5], "x": 2, "y": 1} + ] + } + } } diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json index cb9700b609..05e2a72f1e 100644 --- a/keyboards/kopibeng/mnk65/info.json +++ b/keyboards/kopibeng/mnk65/info.json @@ -100,4 +100,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/info.json index 1afc16a4e8..5385d0cf4b 100644 --- a/keyboards/kopibeng/mnk65_stm32/info.json +++ b/keyboards/kopibeng/mnk65_stm32/info.json @@ -1,9 +1,9 @@ { "keyboard_name": "MNK65_STM32", - "manufacturer": "kopibeng", + "manufacturer": "kopibeng", "maintainer": "kopibeng", "url": "https://monokei.co/", - "usb": { + "usb": { "vid": "0x4B50", "pid": "0x0652", "device_version": "1.0.0" @@ -37,7 +37,7 @@ { "matrix": [1, 13], "x": 13, "y": 0 }, { "matrix": [0, 13], "x": 14, "y": 0 }, { "matrix": [0, 14], "x": 15, "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 }, @@ -53,7 +53,7 @@ { "matrix": [2, 12], "x": 12.5, "y": 1 }, { "matrix": [1, 12], "w": 1.5, "x": 13.5, "y": 1 }, { "matrix": [1, 14], "x": 15, "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 }, @@ -68,7 +68,7 @@ { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, { "matrix": [2, 14], "x": 15, "y": 2 }, - + { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, { "matrix": [3, 1], "x": 1.25, "y": 3 }, { "matrix": [3, 2], "x": 2.25, "y": 3 }, @@ -84,7 +84,7 @@ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, { "matrix": [3, 13], "x": 14, "y": 3 }, { "matrix": [3, 14], "x": 15, "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 }, diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json index f6ce5d4e67..33ec6ac680 100644 --- a/keyboards/kopibeng/typ65/info.json +++ b/keyboards/kopibeng/typ65/info.json @@ -109,4 +109,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json index 3d376d7d99..a7db807ba9 100644 --- a/keyboards/kopibeng/xt60/info.json +++ b/keyboards/kopibeng/xt60/info.json @@ -97,4 +97,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kopibeng/xt60_singa/info.json b/keyboards/kopibeng/xt60_singa/info.json index 39ad108832..f5e973d66e 100644 --- a/keyboards/kopibeng/xt60_singa/info.json +++ b/keyboards/kopibeng/xt60_singa/info.json @@ -97,4 +97,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kopibeng/xt8x/info.json b/keyboards/kopibeng/xt8x/info.json index 41267375dc..07401ab763 100644 --- a/keyboards/kopibeng/xt8x/info.json +++ b/keyboards/kopibeng/xt8x/info.json @@ -133,4 +133,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index e5dacd90da..2627ffbff9 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -83,7 +83,6 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] }, - "LAYOUT_ortho_4x12": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -139,7 +138,6 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] }, - "LAYOUT_planck_1x2uR": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/info.json index a864057a1c..8ce72a94fe 100644 --- a/keyboards/ktec/ergodone/info.json +++ b/keyboards/ktec/ergodone/info.json @@ -258,8 +258,8 @@ { "label": "R51", "matrix": [5, 8], "x": 10, "y": 5 }, { "label": "L54", "matrix": [5, 4], "x": 7, "y": 6 }, { "label": "R52", "matrix": [5, 9], "x": 9, "y": 6 }, - { "label": "L53", "matrix": [5, 3], "x": 5, "y": 6,"h": 2 }, - { "label": "L52", "matrix": [5, 2], "x": 6, "y": 6,"h": 2 }, + { "label": "L53", "matrix": [5, 3], "x": 5, "y": 6, "h": 2 }, + { "label": "L52", "matrix": [5, 2], "x": 6, "y": 6, "h": 2 }, { "label": "L51", "matrix": [5, 1], "x": 7, "y": 7 }, { "label": "R55", "matrix": [5, 12], "x": 9, "y": 7 }, { "label": "R54", "matrix": [5, 11], "x": 10, "y": 6, "h": 2 }, diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json index 041cd63cf9..f97bb69710 100644 --- a/keyboards/ktec/staryu/info.json +++ b/keyboards/ktec/staryu/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Staryu", + "keyboard_name": "Staryu", "manufacturer": "K.T.E.C.", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x1209", "pid": "0x2328", diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index d878152e9e..3217dec71f 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -34,158 +34,158 @@ "ws2812": { "pin": "E6" }, - "community_layouts": [ "65_iso" ], + "community_layouts": ["65_iso"], "layouts": { "LAYOUT_65_iso": { "layout": [ - { "matrix": [0, 0], "label":"Esc", "x": 0, "y": 0}, - { "matrix": [0, 1], "label":"1", "x": 1, "y": 0}, - { "matrix": [0, 2], "label":"2", "x": 2, "y": 0}, - { "matrix": [0, 3], "label":"3", "x": 3, "y": 0}, - { "matrix": [0, 4], "label":"4", "x": 4, "y": 0}, - { "matrix": [0, 5], "label":"5", "x": 5, "y": 0}, - { "matrix": [0, 6], "label":"6", "x": 6, "y": 0}, - { "matrix": [0, 7], "label":"7", "x": 7, "y": 0}, - { "matrix": [0, 8], "label":"8", "x": 8, "y": 0}, - { "matrix": [0, 9], "label":"9", "x": 9, "y": 0}, - { "matrix": [0, 10], "label":"0", "x": 10, "y": 0}, - { "matrix": [0, 11], "label":"?", "x": 11, "y": 0}, - { "matrix": [0, 12], "label":"`", "x": 12, "y": 0}, - { "matrix": [0, 14], "label":"Backspace", "x": 13, "y": 0, "w":2}, - { "matrix": [0, 15], "label":"Del", "x": 15, "y": 0}, + { "matrix": [0, 0], "label":"Esc", "x": 0, "y": 0}, + { "matrix": [0, 1], "label":"1", "x": 1, "y": 0}, + { "matrix": [0, 2], "label":"2", "x": 2, "y": 0}, + { "matrix": [0, 3], "label":"3", "x": 3, "y": 0}, + { "matrix": [0, 4], "label":"4", "x": 4, "y": 0}, + { "matrix": [0, 5], "label":"5", "x": 5, "y": 0}, + { "matrix": [0, 6], "label":"6", "x": 6, "y": 0}, + { "matrix": [0, 7], "label":"7", "x": 7, "y": 0}, + { "matrix": [0, 8], "label":"8", "x": 8, "y": 0}, + { "matrix": [0, 9], "label":"9", "x": 9, "y": 0}, + { "matrix": [0, 10], "label":"0", "x": 10, "y": 0}, + { "matrix": [0, 11], "label":"?", "x": 11, "y": 0}, + { "matrix": [0, 12], "label":"`", "x": 12, "y": 0}, + { "matrix": [0, 14], "label":"Backspace", "x": 13, "y": 0, "w":2}, + { "matrix": [0, 15], "label":"Del", "x": 15, "y": 0}, - { "matrix": [1, 0], "label":"Tab", "x": 0, "y": 1, "w":1.5}, - { "matrix": [1, 1], "label":"Q", "x": 1.5, "y": 1}, - { "matrix": [1, 2], "label":"W", "x": 2.5, "y": 1}, - { "matrix": [1, 3], "label":"E", "x": 3.5, "y": 1}, - { "matrix": [1, 4], "label":"R", "x": 4.5, "y": 1}, - { "matrix": [1, 5], "label":"T", "x": 5.5, "y": 1}, - { "matrix": [1, 6], "label":"Z", "x": 6.5, "y": 1}, - { "matrix": [1, 7], "label":"U", "x": 7.5, "y": 1}, - { "matrix": [1, 8], "label":"I", "x": 8.5, "y": 1}, - { "matrix": [1, 9], "label":"O", "x": 9.5, "y": 1}, - { "matrix": [1, 10], "label":"P", "x": 10.5, "y": 1}, - { "matrix": [1, 11], "label":"Ü", "x": 11.5, "y": 1}, - { "matrix": [1, 12], "label":"*", "x": 12.5, "y": 1}, - { "matrix": [1, 15], "label":"Page Up", "x": 15, "y": 1}, - - { "matrix": [2, 0], "label":"Caps Lock", "x": 0, "y": 2, "w":1.75}, - { "matrix": [2, 1], "label":"A", "x": 1.75, "y": 2}, - { "matrix": [2, 2], "label":"S", "x": 2.75, "y": 2}, - { "matrix": [2, 3], "label":"D", "x": 3.75, "y": 2}, - { "matrix": [2, 4], "label":"F", "x": 4.75, "y": 2}, - { "matrix": [2, 5], "label":"G", "x": 5.75, "y": 2}, - { "matrix": [2, 6], "label":"H", "x": 6.75, "y": 2}, - { "matrix": [2, 7], "label":"J", "x": 7.75, "y": 2}, - { "matrix": [2, 8], "label":"K", "x": 8.75, "y": 2}, - { "matrix": [2, 9], "label":"L", "x": 9.75, "y": 2}, - { "matrix": [2, 10], "label":"Ö", "x": 10.75, "y": 2}, - { "matrix": [2, 11], "label":"Ä", "x": 11.75, "y": 2}, - { "matrix": [2, 12], "label":"'", "x": 12.75, "y": 2}, - { "matrix": [2, 14], "label":"Enter", "x": 13.75, "y": 1, "w":1.25, "h":2}, - { "matrix": [2, 15], "label":"Page Down", "x": 15, "y": 2}, + { "matrix": [1, 0], "label":"Tab", "x": 0, "y": 1, "w":1.5}, + { "matrix": [1, 1], "label":"Q", "x": 1.5, "y": 1}, + { "matrix": [1, 2], "label":"W", "x": 2.5, "y": 1}, + { "matrix": [1, 3], "label":"E", "x": 3.5, "y": 1}, + { "matrix": [1, 4], "label":"R", "x": 4.5, "y": 1}, + { "matrix": [1, 5], "label":"T", "x": 5.5, "y": 1}, + { "matrix": [1, 6], "label":"Z", "x": 6.5, "y": 1}, + { "matrix": [1, 7], "label":"U", "x": 7.5, "y": 1}, + { "matrix": [1, 8], "label":"I", "x": 8.5, "y": 1}, + { "matrix": [1, 9], "label":"O", "x": 9.5, "y": 1}, + { "matrix": [1, 10], "label":"P", "x": 10.5, "y": 1}, + { "matrix": [1, 11], "label":"Ü", "x": 11.5, "y": 1}, + { "matrix": [1, 12], "label":"*", "x": 12.5, "y": 1}, + { "matrix": [1, 15], "label":"Page Up", "x": 15, "y": 1}, - { "matrix": [3, 0], "label":"LShift", "x": 0, "y": 3, "w":1.25}, - { "matrix": [3, 1], "label":"<", "x": 1.25, "y": 3}, - { "matrix": [3, 2], "label":"Y", "x": 2.25, "y": 3}, - { "matrix": [3, 3], "label":"X", "x": 3.25, "y": 3}, - { "matrix": [3, 4], "label":"C", "x": 4.25, "y": 3}, - { "matrix": [3, 5], "label":"V", "x": 5.25, "y": 3}, - { "matrix": [3, 6], "label":"B", "x": 6.25, "y": 3}, - { "matrix": [3, 7], "label":"N", "x": 7.25, "y": 3}, - { "matrix": [3, 8], "label":"M", "x": 8.25, "y": 3}, - { "matrix": [3, 9], "label":",", "x": 9.25, "y": 3}, - { "matrix": [3, 10], "label":".", "x": 10.25, "y": 3}, - { "matrix": [3, 11], "label":"-", "x": 11.25, "y": 3}, - { "matrix": [3, 12], "label":"RShift", "x": 12.25, "y": 3, "w":1.75}, - { "matrix": [3, 14], "label":"\u2191", "x": 14, "y": 3}, - { "matrix": [3, 15], "label":"Fn2", "x": 15, "y": 3}, + { "matrix": [2, 0], "label":"Caps Lock", "x": 0, "y": 2, "w":1.75}, + { "matrix": [2, 1], "label":"A", "x": 1.75, "y": 2}, + { "matrix": [2, 2], "label":"S", "x": 2.75, "y": 2}, + { "matrix": [2, 3], "label":"D", "x": 3.75, "y": 2}, + { "matrix": [2, 4], "label":"F", "x": 4.75, "y": 2}, + { "matrix": [2, 5], "label":"G", "x": 5.75, "y": 2}, + { "matrix": [2, 6], "label":"H", "x": 6.75, "y": 2}, + { "matrix": [2, 7], "label":"J", "x": 7.75, "y": 2}, + { "matrix": [2, 8], "label":"K", "x": 8.75, "y": 2}, + { "matrix": [2, 9], "label":"L", "x": 9.75, "y": 2}, + { "matrix": [2, 10], "label":"Ö", "x": 10.75, "y": 2}, + { "matrix": [2, 11], "label":"Ä", "x": 11.75, "y": 2}, + { "matrix": [2, 12], "label":"'", "x": 12.75, "y": 2}, + { "matrix": [2, 14], "label":"Enter", "x": 13.75, "y": 1, "w":1.25, "h":2}, + { "matrix": [2, 15], "label":"Page Down", "x": 15, "y": 2}, - { "matrix": [4, 0], "label":"LCtrl", "x": 0, "y": 4, "w":1.25}, - { "matrix": [4, 1], "label":"Win", "x": 1.25, "y": 4, "w":1.25}, - { "matrix": [4, 2], "label":"LAlt", "x": 2.5, "y": 4, "w":1.25}, - { "matrix": [4, 6], "label":"Space", "x": 3.75, "y": 4, "w":6.25}, - { "matrix": [4, 10], "label":"RAlt", "x": 10, "y": 4}, - { "matrix": [4, 11], "label":"Fn1", "x": 11, "y": 4}, - { "matrix": [4, 12], "label":"RCtrl", "x": 12, "y": 4}, - { "matrix": [4, 13], "label":"\u2190", "x": 13, "y": 4}, - { "matrix": [4, 14], "label":"\u2193", "x": 14, "y": 4}, - { "matrix": [4, 15], "label":"\u2192", "x": 15, "y": 4} + { "matrix": [3, 0], "label":"LShift", "x": 0, "y": 3, "w":1.25}, + { "matrix": [3, 1], "label":"<", "x": 1.25, "y": 3}, + { "matrix": [3, 2], "label":"Y", "x": 2.25, "y": 3}, + { "matrix": [3, 3], "label":"X", "x": 3.25, "y": 3}, + { "matrix": [3, 4], "label":"C", "x": 4.25, "y": 3}, + { "matrix": [3, 5], "label":"V", "x": 5.25, "y": 3}, + { "matrix": [3, 6], "label":"B", "x": 6.25, "y": 3}, + { "matrix": [3, 7], "label":"N", "x": 7.25, "y": 3}, + { "matrix": [3, 8], "label":"M", "x": 8.25, "y": 3}, + { "matrix": [3, 9], "label":",", "x": 9.25, "y": 3}, + { "matrix": [3, 10], "label":".", "x": 10.25, "y": 3}, + { "matrix": [3, 11], "label":"-", "x": 11.25, "y": 3}, + { "matrix": [3, 12], "label":"RShift", "x": 12.25, "y": 3, "w":1.75}, + { "matrix": [3, 14], "label":"\u2191", "x": 14, "y": 3}, + { "matrix": [3, 15], "label":"Fn2", "x": 15, "y": 3}, + + { "matrix": [4, 0], "label":"LCtrl", "x": 0, "y": 4, "w":1.25}, + { "matrix": [4, 1], "label":"Win", "x": 1.25, "y": 4, "w":1.25}, + { "matrix": [4, 2], "label":"LAlt", "x": 2.5, "y": 4, "w":1.25}, + { "matrix": [4, 6], "label":"Space", "x": 3.75, "y": 4, "w":6.25}, + { "matrix": [4, 10], "label":"RAlt", "x": 10, "y": 4}, + { "matrix": [4, 11], "label":"Fn1", "x": 11, "y": 4}, + { "matrix": [4, 12], "label":"RCtrl", "x": 12, "y": 4}, + { "matrix": [4, 13], "label":"\u2190", "x": 13, "y": 4}, + { "matrix": [4, 14], "label":"\u2193", "x": 14, "y": 4}, + { "matrix": [4, 15], "label":"\u2192", "x": 15, "y": 4} ] } }, "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64}, - { "flags": 1, "matrix": [4, 10], "x":150, "y": 64}, - { "flags": 1, "matrix": [4, 11], "x":165, "y": 64}, - { "flags": 1, "matrix": [4, 12], "x":180, "y": 64}, - { "flags": 4, "matrix": [4, 13], "x":195, "y": 64}, - { "flags": 4, "matrix": [4, 14], "x":210, "y": 64}, - { "flags": 4, "matrix": [4, 15], "x":224, "y": 64}, - { "flags": 4, "matrix": [3, 15], "x":224, "y": 48}, - { "flags": 4, "matrix": [3, 14], "x":210, "y": 48}, - { "flags": 1, "matrix": [3, 12], "x":189, "y": 48}, - { "flags": 4, "matrix": [3, 11], "x":169, "y": 48}, - { "flags": 4, "matrix": [3, 10], "x":154, "y": 48}, - { "flags": 4, "matrix": [3, 9], "x":139, "y": 48}, - { "flags": 4, "matrix": [3, 8], "x":124, "y": 48}, - { "flags": 4, "matrix": [3, 7], "x":109, "y": 48}, - { "flags": 4, "matrix": [3, 6], "x": 94, "y": 48}, - { "flags": 4, "matrix": [3, 5], "x": 79, "y": 48}, - { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48}, - { "flags": 4, "matrix": [3, 3], "x": 49, "y": 48}, - { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48}, - { "flags": 4, "matrix": [3, 1], "x": 19, "y": 48}, - { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64}, - { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64}, - { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64}, - { "flags": 1, "matrix": [3, 0], "x": 2, "y": 48}, - { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, - { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32}, - { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, - { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32}, - { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32}, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32}, - { "flags": 4, "matrix": [2, 6], "x":101, "y": 32}, - { "flags": 4, "matrix": [2, 7], "x":116, "y": 32}, - { "flags": 4, "matrix": [2, 8], "x":131, "y": 32}, - { "flags": 4, "matrix": [2, 9], "x":146, "y": 32}, - { "flags": 4, "matrix": [2, 10], "x":161, "y": 32}, - { "flags": 4, "matrix": [2, 11], "x":176, "y": 32}, - { "flags": 4, "matrix": [2, 12], "x":191, "y": 32}, - { "flags": 4, "matrix": [2, 14], "x":208, "y": 24}, - { "flags": 4, "matrix": [2, 15], "x":224, "y": 32}, - { "flags": 4, "matrix": [1, 15], "x":224, "y": 16}, - { "flags": 4, "matrix": [1, 12], "x":188, "y": 16}, - { "flags": 4, "matrix": [1, 11], "x":173, "y": 16}, - { "flags": 4, "matrix": [1, 10], "x":158, "y": 16}, - { "flags": 4, "matrix": [1, 9], "x":143, "y": 16}, - { "flags": 4, "matrix": [1, 8], "x":128, "y": 16}, - { "flags": 4, "matrix": [1, 7], "x":113, "y": 16}, - { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16}, - { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16}, - { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16}, - { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16}, - { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16}, - { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16}, - { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, - { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, - { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, - { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, - { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, - { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, - { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, - { "flags": 4, "matrix": [0, 7], "x":105, "y": 0}, - { "flags": 4, "matrix": [0, 8], "x":120, "y": 0}, - { "flags": 4, "matrix": [0, 9], "x":135, "y": 0}, - { "flags": 4, "matrix": [0, 10], "x":150, "y": 0}, - { "flags": 4, "matrix": [0, 11], "x":165, "y": 0}, - { "flags": 4, "matrix": [0, 12], "x":180, "y": 0}, - { "flags": 4, "matrix": [0, 14], "x":203, "y": 0}, - { "flags": 4, "matrix": [0, 15], "x":224, "y": 0} + { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64}, + { "flags": 1, "matrix": [4, 10], "x":150, "y": 64}, + { "flags": 1, "matrix": [4, 11], "x":165, "y": 64}, + { "flags": 1, "matrix": [4, 12], "x":180, "y": 64}, + { "flags": 4, "matrix": [4, 13], "x":195, "y": 64}, + { "flags": 4, "matrix": [4, 14], "x":210, "y": 64}, + { "flags": 4, "matrix": [4, 15], "x":224, "y": 64}, + { "flags": 4, "matrix": [3, 15], "x":224, "y": 48}, + { "flags": 4, "matrix": [3, 14], "x":210, "y": 48}, + { "flags": 1, "matrix": [3, 12], "x":189, "y": 48}, + { "flags": 4, "matrix": [3, 11], "x":169, "y": 48}, + { "flags": 4, "matrix": [3, 10], "x":154, "y": 48}, + { "flags": 4, "matrix": [3, 9], "x":139, "y": 48}, + { "flags": 4, "matrix": [3, 8], "x":124, "y": 48}, + { "flags": 4, "matrix": [3, 7], "x":109, "y": 48}, + { "flags": 4, "matrix": [3, 6], "x": 94, "y": 48}, + { "flags": 4, "matrix": [3, 5], "x": 79, "y": 48}, + { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48}, + { "flags": 4, "matrix": [3, 3], "x": 49, "y": 48}, + { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48}, + { "flags": 4, "matrix": [3, 1], "x": 19, "y": 48}, + { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64}, + { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64}, + { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64}, + { "flags": 1, "matrix": [3, 0], "x": 2, "y": 48}, + { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, + { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32}, + { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, + { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32}, + { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32}, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32}, + { "flags": 4, "matrix": [2, 6], "x":101, "y": 32}, + { "flags": 4, "matrix": [2, 7], "x":116, "y": 32}, + { "flags": 4, "matrix": [2, 8], "x":131, "y": 32}, + { "flags": 4, "matrix": [2, 9], "x":146, "y": 32}, + { "flags": 4, "matrix": [2, 10], "x":161, "y": 32}, + { "flags": 4, "matrix": [2, 11], "x":176, "y": 32}, + { "flags": 4, "matrix": [2, 12], "x":191, "y": 32}, + { "flags": 4, "matrix": [2, 14], "x":208, "y": 24}, + { "flags": 4, "matrix": [2, 15], "x":224, "y": 32}, + { "flags": 4, "matrix": [1, 15], "x":224, "y": 16}, + { "flags": 4, "matrix": [1, 12], "x":188, "y": 16}, + { "flags": 4, "matrix": [1, 11], "x":173, "y": 16}, + { "flags": 4, "matrix": [1, 10], "x":158, "y": 16}, + { "flags": 4, "matrix": [1, 9], "x":143, "y": 16}, + { "flags": 4, "matrix": [1, 8], "x":128, "y": 16}, + { "flags": 4, "matrix": [1, 7], "x":113, "y": 16}, + { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16}, + { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16}, + { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16}, + { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16}, + { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16}, + { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16}, + { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + { "flags": 4, "matrix": [0, 7], "x":105, "y": 0}, + { "flags": 4, "matrix": [0, 8], "x":120, "y": 0}, + { "flags": 4, "matrix": [0, 9], "x":135, "y": 0}, + { "flags": 4, "matrix": [0, 10], "x":150, "y": 0}, + { "flags": 4, "matrix": [0, 11], "x":165, "y": 0}, + { "flags": 4, "matrix": [0, 12], "x":180, "y": 0}, + { "flags": 4, "matrix": [0, 14], "x":203, "y": 0}, + { "flags": 4, "matrix": [0, 15], "x":224, "y": 0} ] } } diff --git a/keyboards/labbe/labbeminiv1/info.json b/keyboards/labbe/labbeminiv1/info.json index 80ff4d88c5..ff53873f2b 100644 --- a/keyboards/labbe/labbeminiv1/info.json +++ b/keyboards/labbe/labbeminiv1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Labbe Mini V1", + "keyboard_name": "Labbe Mini V1", "manufacturer": "Labbe", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xABBE", "pid": "0x4C4D", @@ -26,4 +26,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json index 3288c87ee5..797627865e 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "labyrinth75", + "keyboard_name": "labyrinth75", "manufacturer": "Livi", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4F53", "pid": "0x464B", diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json index 44aab18307..b9a9b7eb95 100644 --- a/keyboards/latincompass/latin47ble/info.json +++ b/keyboards/latincompass/latin47ble/info.json @@ -75,5 +75,4 @@ ] } } - } diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json index 6a7e0bd57f..3705550a60 100644 --- a/keyboards/latincompass/latinpad/info.json +++ b/keyboards/latincompass/latinpad/info.json @@ -28,7 +28,6 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT": { "layout": [ {"matrix": [4, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8}, diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index a5fc41c143..fc23ad45c5 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Dimple", + "keyboard_name": "Dimple", "manufacturer": "LazyDesigners", - "url": "http://lazydesigners.cn", - "maintainer": "Jacky@LAZYDESIGNERS", + "url": "http://lazydesigners.cn", + "maintainer": "Jacky@LAZYDESIGNERS", "usb": { "vid": "0x4C44", "pid": "0x0040", diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json index a9b5b8751a..1ffe78fc5c 100644 --- a/keyboards/lazydesigners/dimple/staggered/info.json +++ b/keyboards/lazydesigners/dimple/staggered/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Dimple", + "keyboard_name": "Dimple", "manufacturer": "LazyDesigners", - "url": "http://lazydesigners.cn", - "maintainer": "Erovia", + "url": "http://lazydesigners.cn", + "maintainer": "Erovia", "usb": { "vid": "0x4C44", "pid": "0x0040", diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json index f703059bd5..b1a3dbf19b 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json +++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json @@ -78,7 +78,7 @@ {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]}, {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]}, {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]}, - {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2, "matrix": [1, 11]}, + {"label":"Enter", "x":11.25, "y":0, "w":1.25, "h":2, "matrix": [1, 11]}, {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]}, {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]}, diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json index 4841a369d6..e7aab1bea3 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/info.json @@ -175,5 +175,4 @@ ] } } - } diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index a82f180e57..f29e8dfe0d 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "THE50", + "keyboard_name": "THE50", "manufacturer": "LazyDesigners", - "url": "http://lazydesigners.cn", - "maintainer": "qmk", + "url": "http://lazydesigners.cn", + "maintainer": "qmk", "usb": { "vid": "0x4C44", "pid": "0x0050", diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json index a5041a62a5..ebdc386450 100644 --- a/keyboards/lily58/r2g/info.json +++ b/keyboards/lily58/r2g/info.json @@ -42,49 +42,49 @@ "driver": "WS2812", "split_count": [37, 37], "layout": [ - {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06 - {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05 - {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04 - {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03 - {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02 - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01 - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07 - {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08 - {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09 - {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10 - {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11 - {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12 - {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18 - {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17 - {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16 - {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15 - {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14 - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13 - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20 - {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21 - {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22 - {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23 - {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24 - {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25 + {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06 + {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05 + {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04 + {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03 + {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02 + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01 + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07 + {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08 + {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09 + {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10 + {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11 + {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12 + {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18 + {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17 + {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16 + {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15 + {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14 + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13 + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20 + {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21 + {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22 + {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23 + {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24 + {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25 {"flags": 4, "matrix": [4, 5], "x": 87, "y": 41}, {"flags": 4, "matrix": [4, 4], "x": 87, "y": 64}, {"flags": 4, "matrix": [4, 3], "x": 65, "y": 64}, {"flags": 4, "matrix": [4, 2], "x": 51, "y": 62}, {"flags": 4, "matrix": [4, 1], "x": 36, "y": 62}, - {"flags": 2, "x": 96, "y": 64}, // L RGB1 - {"flags": 2, "x": 32, "y": 64}, // L RGB2 - {"flags": 2, "x": 0, "y": 64}, // L RGB3 - {"flags": 2, "x": 0, "y": 32}, // L RGB4 - {"flags": 2, "x": 16, "y": 0}, // L RGB5 - {"flags": 2, "x": 50, "y": 0}, // L RGB6 - {"flags": 2, "x": 80, "y": 0}, // L RGB7 - {"flags": 2, "x": 96, "y": 32}, // L RGB8 - {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06 - {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05 - {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04 - {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03 - {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02 - {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01 + {"flags": 2, "x": 96, "y": 64}, // L RGB1 + {"flags": 2, "x": 32, "y": 64}, // L RGB2 + {"flags": 2, "x": 0, "y": 64}, // L RGB3 + {"flags": 2, "x": 0, "y": 32}, // L RGB4 + {"flags": 2, "x": 16, "y": 0}, // L RGB5 + {"flags": 2, "x": 50, "y": 0}, // L RGB6 + {"flags": 2, "x": 80, "y": 0}, // L RGB7 + {"flags": 2, "x": 96, "y": 32}, // L RGB8 + {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06 + {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05 + {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04 + {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03 + {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02 + {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01 {"flags": 4, "matrix": [6, 0], "x": 224, "y": 23}, // R SW07 {"flags": 4, "matrix": [6, 1], "x": 210, "y": 21}, // R SW08 {"flags": 4, "matrix": [6, 2], "x": 195, "y": 17}, // R SW09 @@ -112,9 +112,9 @@ {"flags": 2, "x": 192, "y": 64}, // R RGB2 {"flags": 2, "x": 224, "y": 64}, // R RGB3 {"flags": 2, "x": 224, "y": 32}, // R RGB4 - {"flags": 2, "x": 206, "y": 0}, // R RGB5 - {"flags": 2, "x": 150, "y": 0}, // R RGB6 - {"flags": 2, "x": 140, "y": 0}, // R RGB7 + {"flags": 2, "x": 206, "y": 0}, // R RGB5 + {"flags": 2, "x": 150, "y": 0}, // R RGB6 + {"flags": 2, "x": 140, "y": 0}, // R RGB7 {"flags": 2, "x": 128, "y": 32} // R RGB8 ] } diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 5cb25cbcf1..a3e89ec3a7 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Lily58", + "keyboard_name": "Lily58", "manufacturer": "liliums", - "url": "", - "maintainer": "liliums", + "url": "", + "maintainer": "liliums", "usb": { "vid": "0x04D8", "pid": "0xEB2D", diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index c628200298..9b4af12305 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -350,4 +350,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json index f501b5e52c..7d750c0e3a 100644 --- a/keyboards/linworks/em8/info.json +++ b/keyboards/linworks/em8/info.json @@ -13,8 +13,8 @@ "nkro": true }, "matrix_pins": { - "cols": [ "B5", "B4", "D0", "D1", "D4", "D6", "D7", "F6", "F5", "F4", "F1", "B2", "B6", "C6", "C7" ], - "rows": [ "B7", "B0", "F0", "E6", "F7" ] + "cols": ["B5", "B4", "D0", "D1", "D4", "D6", "D7", "F6", "F5", "F4", "F1", "B2", "B6", "C6", "C7"], + "rows": ["B7", "B0", "F0", "E6", "F7"] }, "processor": "atmega32u4", "url": "https://klc-playground.com/", @@ -40,159 +40,158 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "matrix":[1,0] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[0,1] }, - {"x":3.25, "y":0, "matrix":[0,2] }, - {"x":4.25, "y":0, "matrix":[0,3] }, - {"x":5.25, "y":0, "matrix":[0,4] }, - {"x":6.25, "y":0, "matrix":[0,5] }, - {"x":7.25, "y":0, "matrix":[0,6] }, - {"x":10.25, "y":0, "matrix":[0,7] }, - {"x":11.25, "y":0, "matrix":[0,8] }, - {"x":12.25, "y":0, "matrix":[0,9] }, - {"x":13.25, "y":0, "matrix":[0,10] }, - {"x":14.25, "y":0, "matrix":[0,11] }, - {"x":15.25, "y":0, "matrix":[0,12] }, - {"x":16.25, "y":0, "w": 2, "matrix":[0,13] }, - {"x":18.5, "y":0, "matrix":[0,14] }, + {"x":0, "y":0, "matrix":[1, 0] }, + {"x":1.25, "y":0, "matrix":[0, 0] }, + {"x":2.25, "y":0, "matrix":[0, 1] }, + {"x":3.25, "y":0, "matrix":[0, 2] }, + {"x":4.25, "y":0, "matrix":[0, 3] }, + {"x":5.25, "y":0, "matrix":[0, 4] }, + {"x":6.25, "y":0, "matrix":[0, 5] }, + {"x":7.25, "y":0, "matrix":[0, 6] }, + {"x":10.25, "y":0, "matrix":[0, 7] }, + {"x":11.25, "y":0, "matrix":[0, 8] }, + {"x":12.25, "y":0, "matrix":[0, 9] }, + {"x":13.25, "y":0, "matrix":[0, 10] }, + {"x":14.25, "y":0, "matrix":[0, 11] }, + {"x":15.25, "y":0, "matrix":[0, 12] }, + {"x":16.25, "y":0, "w": 2, "matrix":[0, 13] }, + {"x":18.5, "y":0, "matrix":[0, 14] }, - {"x":0, "y":1, "matrix":[2,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":9.75, "y":1, "matrix":[1,7] }, - {"x":10.75, "y":1, "matrix":[1,8] }, - {"x":11.75, "y":1, "matrix":[1,9] }, - {"x":12.75, "y":1, "matrix":[1,10] }, - {"x":13.75, "y":1, "matrix":[1,11] }, - {"x":14.75, "y":1, "matrix":[1,12] }, - {"x":15.75, "y":1, "matrix":[1,13] }, - {"x":16.75, "y":1, "w":1.5, "matrix":[1,14] }, - {"x":18.5, "y":1, "matrix":[2,14] }, + {"x":0, "y":1, "matrix":[2, 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":9.75, "y":1, "matrix":[1, 7] }, + {"x":10.75, "y":1, "matrix":[1, 8] }, + {"x":11.75, "y":1, "matrix":[1, 9] }, + {"x":12.75, "y":1, "matrix":[1, 10] }, + {"x":13.75, "y":1, "matrix":[1, 11] }, + {"x":14.75, "y":1, "matrix":[1, 12] }, + {"x":15.75, "y":1, "matrix":[1, 13] }, + {"x":16.75, "y":1, "w":1.5, "matrix":[1, 14] }, + {"x":18.5, "y":1, "matrix":[2, 14] }, - {"x":0, "y":2, "matrix":[3,0] }, - {"x":1.25, "y":2, "w":1.75, "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, "y":2, "matrix":[2,6] }, - {"x":10, "y":2, "matrix":[2,7] }, - {"x":11, "y":2, "matrix":[2,8] }, - {"x":12, "y":2, "matrix":[2,9] }, - {"x":13, "y":2, "matrix":[2,10] }, - {"x":14, "y":2, "matrix":[2,11] }, - {"x":15, "y":2, "matrix":[2,12] }, - {"x":16, "y":2, "w":2.25, "matrix":[2,13] }, + {"x":0, "y":2, "matrix":[3, 0] }, + {"x":1.25, "y":2, "w":1.75, "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, "y":2, "matrix":[2, 6] }, + {"x":10, "y":2, "matrix":[2, 7] }, + {"x":11, "y":2, "matrix":[2, 8] }, + {"x":12, "y":2, "matrix":[2, 9] }, + {"x":13, "y":2, "matrix":[2, 10] }, + {"x":14, "y":2, "matrix":[2, 11] }, + {"x":15, "y":2, "matrix":[2, 12] }, + {"x":16, "y":2, "w":2.25, "matrix":[2, 13] }, - {"x":1.25, "y":3, "w":2.25, "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":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, "matrix":[3,10] }, - {"x":13.5, "y":3, "matrix":[3,11] }, - {"x":14.5, "y":3, "matrix":[3,12] }, - {"x":15.5, "y":3, "w":1.75, "matrix":[3,13] }, - {"x":17.5, "y":3.25, "matrix":[3,14] }, + {"x":1.25, "y":3, "w":2.25, "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":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, "matrix":[3, 10] }, + {"x":13.5, "y":3, "matrix":[3, 11] }, + {"x":14.5, "y":3, "matrix":[3, 12] }, + {"x":15.5, "y":3, "w":1.75, "matrix":[3, 13] }, + {"x":17.5, "y":3.25, "matrix":[3, 14] }, - {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] }, - {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] }, - {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] }, - {"x":8, "y":4, "matrix":[4,6] }, - {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] }, - {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] }, - {"x":16.5, "y":4.25, "matrix":[4,12] }, - {"x":17.5, "y":4.25, "matrix":[4,13] }, - {"x":18.5, "y":4.25, "matrix":[4,14] } + {"x":1.25, "y":4, "w":1.5, "matrix":[4, 1] }, + {"x":4.25, "y":4, "w":1.5, "matrix":[4, 3] }, + {"x":5.75, "y":4, "w":2.25, "matrix":[4, 5] }, + {"x":8, "y":4, "matrix":[4, 6] }, + {"x":9.5, "y":4, "w":2.75, "matrix":[4, 8] }, + {"x":12.25, "y":4, "w":1.5, "matrix":[4, 10] }, + {"x":16.5, "y":4.25, "matrix":[4, 12] }, + {"x":17.5, "y":4.25, "matrix":[4, 13] }, + {"x":18.5, "y":4.25, "matrix":[4, 14] } ] }, - "LAYOUT_split_bs": { "layout": [ - {"x":0, "y":0, "matrix":[1,0] }, - {"x":1.25, "y":0, "matrix":[0,0] }, - {"x":2.25, "y":0, "matrix":[0,1] }, - {"x":3.25, "y":0, "matrix":[0,2] }, - {"x":4.25, "y":0, "matrix":[0,3] }, - {"x":5.25, "y":0, "matrix":[0,4] }, - {"x":6.25, "y":0, "matrix":[0,5] }, - {"x":7.25, "y":0, "matrix":[0,6] }, - {"x":10.25, "y":0, "matrix":[0,7] }, - {"x":11.25, "y":0, "matrix":[0,8] }, - {"x":12.25, "y":0, "matrix":[0,9] }, - {"x":13.25, "y":0, "matrix":[0,10] }, - {"x":14.25, "y":0, "matrix":[0,11] }, - {"x":15.25, "y":0, "matrix":[0,12] }, - {"x":16.25, "y":0, "matrix":[0,13] }, - {"x":17.25, "y":0, "matrix":[4,11] }, - {"x":18.5, "y":0, "matrix":[0,14] }, + {"x":0, "y":0, "matrix":[1, 0] }, + {"x":1.25, "y":0, "matrix":[0, 0] }, + {"x":2.25, "y":0, "matrix":[0, 1] }, + {"x":3.25, "y":0, "matrix":[0, 2] }, + {"x":4.25, "y":0, "matrix":[0, 3] }, + {"x":5.25, "y":0, "matrix":[0, 4] }, + {"x":6.25, "y":0, "matrix":[0, 5] }, + {"x":7.25, "y":0, "matrix":[0, 6] }, + {"x":10.25, "y":0, "matrix":[0, 7] }, + {"x":11.25, "y":0, "matrix":[0, 8] }, + {"x":12.25, "y":0, "matrix":[0, 9] }, + {"x":13.25, "y":0, "matrix":[0, 10] }, + {"x":14.25, "y":0, "matrix":[0, 11] }, + {"x":15.25, "y":0, "matrix":[0, 12] }, + {"x":16.25, "y":0, "matrix":[0, 13] }, + {"x":17.25, "y":0, "matrix":[4, 11] }, + {"x":18.5, "y":0, "matrix":[0, 14] }, - {"x":0, "y":1, "matrix":[2,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":9.75, "y":1, "matrix":[1,7] }, - {"x":10.75, "y":1, "matrix":[1,8] }, - {"x":11.75, "y":1, "matrix":[1,9] }, - {"x":12.75, "y":1, "matrix":[1,10] }, - {"x":13.75, "y":1, "matrix":[1,11] }, - {"x":14.75, "y":1, "matrix":[1,12] }, - {"x":15.75, "y":1, "matrix":[1,13] }, - {"x":16.75, "y":1, "w":1.5, "matrix":[1,14] }, - {"x":18.5, "y":1, "matrix":[2,14] }, + {"x":0, "y":1, "matrix":[2, 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":9.75, "y":1, "matrix":[1, 7] }, + {"x":10.75, "y":1, "matrix":[1, 8] }, + {"x":11.75, "y":1, "matrix":[1, 9] }, + {"x":12.75, "y":1, "matrix":[1, 10] }, + {"x":13.75, "y":1, "matrix":[1, 11] }, + {"x":14.75, "y":1, "matrix":[1, 12] }, + {"x":15.75, "y":1, "matrix":[1, 13] }, + {"x":16.75, "y":1, "w":1.5, "matrix":[1, 14] }, + {"x":18.5, "y":1, "matrix":[2, 14] }, - {"x":0, "y":2, "matrix":[3,0] }, - {"x":1.25, "y":2, "w":1.75, "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, "y":2, "matrix":[2,6] }, - {"x":10, "y":2, "matrix":[2,7] }, - {"x":11, "y":2, "matrix":[2,8] }, - {"x":12, "y":2, "matrix":[2,9] }, - {"x":13, "y":2, "matrix":[2,10] }, - {"x":14, "y":2, "matrix":[2,11] }, - {"x":15, "y":2, "matrix":[2,12] }, - {"x":16, "y":2, "w":2.25, "matrix":[2,13] }, + {"x":0, "y":2, "matrix":[3, 0] }, + {"x":1.25, "y":2, "w":1.75, "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, "y":2, "matrix":[2, 6] }, + {"x":10, "y":2, "matrix":[2, 7] }, + {"x":11, "y":2, "matrix":[2, 8] }, + {"x":12, "y":2, "matrix":[2, 9] }, + {"x":13, "y":2, "matrix":[2, 10] }, + {"x":14, "y":2, "matrix":[2, 11] }, + {"x":15, "y":2, "matrix":[2, 12] }, + {"x":16, "y":2, "w":2.25, "matrix":[2, 13] }, - {"x":1.25, "y":3, "w":2.25, "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":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, "matrix":[3,10] }, - {"x":13.5, "y":3, "matrix":[3,11] }, - {"x":14.5, "y":3, "matrix":[3,12] }, - {"x":15.5, "y":3, "w":1.75, "matrix":[3,13] }, - {"x":17.5, "y":3.25, "matrix":[3,14] }, + {"x":1.25, "y":3, "w":2.25, "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":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, "matrix":[3, 10] }, + {"x":13.5, "y":3, "matrix":[3, 11] }, + {"x":14.5, "y":3, "matrix":[3, 12] }, + {"x":15.5, "y":3, "w":1.75, "matrix":[3, 13] }, + {"x":17.5, "y":3.25, "matrix":[3, 14] }, - {"x":1.25, "y":4, "w":1.5, "matrix":[4,1] }, - {"x":4.25, "y":4, "w":1.5, "matrix":[4,3] }, - {"x":5.75, "y":4, "w":2.25, "matrix":[4,5] }, - {"x":8, "y":4, "matrix":[4,6] }, - {"x":9.5, "y":4, "w":2.75, "matrix":[4,8] }, - {"x":12.25, "y":4, "w":1.5, "matrix":[4,10] }, - {"x":16.5, "y":4.25, "matrix":[4,12] }, - {"x":17.5, "y":4.25, "matrix":[4,13] }, - {"x":18.5, "y":4.25, "matrix":[4,14] } + {"x":1.25, "y":4, "w":1.5, "matrix":[4, 1] }, + {"x":4.25, "y":4, "w":1.5, "matrix":[4, 3] }, + {"x":5.75, "y":4, "w":2.25, "matrix":[4, 5] }, + {"x":8, "y":4, "matrix":[4, 6] }, + {"x":9.5, "y":4, "w":2.75, "matrix":[4, 8] }, + {"x":12.25, "y":4, "w":1.5, "matrix":[4, 10] }, + {"x":16.5, "y":4.25, "matrix":[4, 12] }, + {"x":17.5, "y":4.25, "matrix":[4, 13] }, + {"x":18.5, "y":4.25, "matrix":[4, 14] } ] } } -} \ No newline at end of file +} diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json index f7276d6e82..6208b749f9 100644 --- a/keyboards/ll3macorn/bongopad/info.json +++ b/keyboards/ll3macorn/bongopad/info.json @@ -1,48 +1,48 @@ { - "keyboard_name": "BongoPad", - "manufacturer": "Ll3macorn", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ll3macorn/bongopad", - "maintainer": "Ll3macorn", - "usb": { - "vid": "0x3728", - "pid": "0x2949", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["F4", "F5", "F6"], - "rows": ["F7", "D7", "C6", "D4"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "B1", "pin_b": "B3"} - ] - }, - "bootmagic": { - "matrix": [1, 0] - }, - "ws2812": { - "pin": "E6" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_default": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, + "keyboard_name": "BongoPad", + "manufacturer": "Ll3macorn", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ll3macorn/bongopad", + "maintainer": "Ll3macorn", + "usb": { + "vid": "0x3728", + "pid": "0x2949", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["F7", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B1", "pin_b": "B3"} + ] + }, + "bootmagic": { + "matrix": [1, 0] + }, + "ws2812": { + "pin": "E6" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_default": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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, 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": [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} - ] - } - } + {"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/lpad/info.json b/keyboards/lpad/info.json index 920352bf74..0278890610 100644 --- a/keyboards/lpad/info.json +++ b/keyboards/lpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "L-PAD", + "keyboard_name": "L-PAD", "manufacturer": "Laneware Peripherals", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4C50", "pid": "0x2222", @@ -22,12 +22,12 @@ }, "layouts":{ "LAYOUT": { - "layout":[{ "label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + "layout": [{ "label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "label": "Mute", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.5 }, { "label": "Next", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, { "label": "Prev", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, { "label": "Left", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, { "label": "Rght", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }] - }, + }, } } diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/info.json index 179d4484a1..909b454f70 100644 --- a/keyboards/lucid/velvet_hotswap/info.json +++ b/keyboards/lucid/velvet_hotswap/info.json @@ -43,7 +43,7 @@ {"matrix": [0, 14], "label":"PrtSc", "x":15.25, "y":0}, {"matrix": [0, 15], "label":"Scroll Lock", "x":16.25, "y":0}, {"matrix": [0, 16], "label":"Pause", "x":17.25, "y":0}, - + {"matrix": [1, 0], "label":"~", "x":0, "y":1.25}, {"matrix": [1, 1], "label":"!", "x":1, "y":1.25}, {"matrix": [1, 2], "label":"@", "x":2, "y":1.25}, @@ -62,7 +62,7 @@ {"matrix": [1, 14], "label":"Insert", "x":15.25, "y":1.25}, {"matrix": [1, 15], "label":"Home", "x":16.25, "y":1.25}, {"matrix": [1, 16], "label":"PgUp", "x":17.25, "y":1.25}, - + {"matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5}, {"matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25}, {"matrix": [2, 2], "label":"W", "x":2.5, "y":2.25}, @@ -80,7 +80,7 @@ {"matrix": [2, 14], "label":"Delete", "x":15.25, "y":2.25}, {"matrix": [2, 15], "label":"End", "x":16.25, "y":2.25}, {"matrix": [2, 16], "label":"PgDn", "x":17.25, "y":2.25}, - + {"matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"matrix": [3, 1], "label":"A", "x":1.75, "y":3.25}, {"matrix": [3, 2], "label":"S", "x":2.75, "y":3.25}, @@ -109,7 +109,7 @@ {"matrix": [4, 12], "label":"Right Shift", "x":12.25, "y":4.25, "w":1.75}, {"matrix": [4, 13], "label":"Right Shift", "x":12.25, "y":4.25}, {"matrix": [4, 15], "label":"\u2191", "x":16.25, "y":4.25}, - + {"matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25}, @@ -124,4 +124,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json index 7ee6d55f73..7f2bd1f7f5 100644 --- a/keyboards/lucid/velvet_solder/info.json +++ b/keyboards/lucid/velvet_solder/info.json @@ -43,7 +43,7 @@ {"matrix": [0, 14], "label":"PrtSc", "x":15.25, "y":0}, {"matrix": [0, 15], "label":"Scroll Lock", "x":16.25, "y":0}, {"matrix": [0, 16], "label":"Pause", "x":17.25, "y":0}, - + {"matrix": [1, 0], "label":"~", "x":0, "y":1.25}, {"matrix": [1, 1], "label":"!", "x":1, "y":1.25}, {"matrix": [1, 2], "label":"@", "x":2, "y":1.25}, @@ -62,7 +62,7 @@ {"matrix": [1, 14], "label":"Insert", "x":15.25, "y":1.25}, {"matrix": [1, 15], "label":"Home", "x":16.25, "y":1.25}, {"matrix": [1, 16], "label":"PgUp", "x":17.25, "y":1.25}, - + {"matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5}, {"matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25}, {"matrix": [2, 2], "label":"W", "x":2.5, "y":2.25}, @@ -80,7 +80,7 @@ {"matrix": [2, 14], "label":"Delete", "x":15.25, "y":2.25}, {"matrix": [2, 15], "label":"End", "x":16.25, "y":2.25}, {"matrix": [2, 16], "label":"PgDn", "x":17.25, "y":2.25}, - + {"matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"matrix": [3, 1], "label":"A", "x":1.75, "y":3.25}, {"matrix": [3, 2], "label":"S", "x":2.75, "y":3.25}, @@ -110,7 +110,7 @@ {"matrix": [4, 12], "label":"Right Shift", "x":12.25, "y":4.25, "w":1.75}, {"matrix": [4, 13], "label":"Right Shift", "x":12.25, "y":4.25}, {"matrix": [4, 15], "label":"\u2191", "x":16.25, "y":4.25}, - + {"matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25}, @@ -127,4 +127,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/lw67/info.json b/keyboards/lw67/info.json index 87722c409c..e9bba7c858 100644 --- a/keyboards/lw67/info.json +++ b/keyboards/lw67/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "LW-67", + "keyboard_name": "LW-67", "manufacturer": "Laneware Peripherals", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4C50", "pid": "0x9998", diff --git a/keyboards/lw75/info.json b/keyboards/lw75/info.json index 8eb4f219be..d236546c3b 100644 --- a/keyboards/lw75/info.json +++ b/keyboards/lw75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "LW-75", + "keyboard_name": "LW-75", "manufacturer": "Laneware Peripherals", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4C50", "pid": "0x1111", diff --git a/keyboards/lxxt/info.json b/keyboards/lxxt/info.json index abd0d7c84f..2fcc3c4921 100644 --- a/keyboards/lxxt/info.json +++ b/keyboards/lxxt/info.json @@ -1,20 +1,20 @@ { - "keyboard_name": "LXXT", + "keyboard_name": "LXXT", "manufacturer": "DeskDaily", - "url": "", - "maintainer": "DeskDaily", + "url": "", + "maintainer": "DeskDaily", "usb": { - "vid": "0x5003", - "pid": "0x0001", - "device_version": "0.0.1" + "vid": "0x5003", + "pid": "0x0001", + "device_version": "0.0.1" }, "encoder": { "rotary": [ {"pin_a": "GP27", "pin_b": "GP28"}, {"pin_a": "GP8", "pin_b": "GP9"} ] - }, - "processor": "RP2040", + }, + "processor": "RP2040", "bootloader": "rp2040", "matrix_pins": { "rows": ["GP29", "GP26", "GP22", "GP24", "GP17"], @@ -24,14 +24,14 @@ "pin": "GP21", "driver": "vendor" }, - "rgblight": { - "led_count": 16, - "hue_steps": 8, - "saturation_steps": 8, - "brightness_steps": 8, - "max_brightness": 255, - "sleep": true, - "animations": { + "rgblight": { + "led_count": 16, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8, + "max_brightness": 255, + "sleep": true, + "animations": { "alternating": true, "breathing": true, "christmas": true, @@ -57,80 +57,80 @@ "layouts": { "LAYOUT": { "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": [0, 13], "x": 13.25, "y": 0}, - {"matrix": [0, 14], "x": 14.25, "y": 0}, - {"matrix": [1, 14], "x": 15.25, "y": 0}, - {"matrix": [0, 15], "x": 16.5, "y": 0}, - {"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": 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.5, "y": 1}, - {"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": [2, 15], "x": 16.5, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, - {"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.5, "y": 3}, - {"matrix": [4, 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, 4], "x": 3.75, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "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": 13.75, "y": 4, "w": 1.25}, - {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25}, - {"matrix": [4, 15], "x": 16.5, "y": 4} - ] + {"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": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [1, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"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": 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.5, "y": 1}, + {"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": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"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.5, "y": 3}, + {"matrix": [4, 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, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "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": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25}, + {"matrix": [4, 15], "x": 16.5, "y": 4} + ] } } -} \ No newline at end of file +} diff --git a/keyboards/lyso1/lck75/info.json b/keyboards/lyso1/lck75/info.json index 9369fc54fe..aa2b1350bc 100644 --- a/keyboards/lyso1/lck75/info.json +++ b/keyboards/lyso1/lck75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "LCK75", + "keyboard_name": "LCK75", "manufacturer": "Lyso1", - "url": "https://github.com/lyso1/LCK75", - "maintainer": "Lyso1", + "url": "https://github.com/lyso1/LCK75", + "maintainer": "Lyso1", "usb": { "vid": "0x7856", "pid": "0x6163", @@ -739,4 +739,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/lyso1/lefishe/info.json b/keyboards/lyso1/lefishe/info.json index 580a6e0959..b6c3b21aca 100644 --- a/keyboards/lyso1/lefishe/info.json +++ b/keyboards/lyso1/lefishe/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Le_Fishe", + "keyboard_name": "Le_Fishe", "manufacturer": "Lyso1", - "url": "", - "maintainer": "Lyso1", + "url": "", + "maintainer": "Lyso1", "usb": { "vid": "0x7856", "pid": "0x6169", diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json index 83cdd13a8f..edb8793759 100644 --- a/keyboards/machkeyboards/mach3/info.json +++ b/keyboards/machkeyboards/mach3/info.json @@ -37,4 +37,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json index c23f85776b..dd22627031 100644 --- a/keyboards/macro1/info.json +++ b/keyboards/macro1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MACRO-1", + "keyboard_name": "MACRO-1", "manufacturer": "Laneware Peripherals", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4C50", "pid": "0x9999", @@ -115,4 +115,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json index 632f34617f..7e723954a6 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/info.json @@ -4,9 +4,9 @@ "url": "https://github.com/yossiyossy/maJIStic", "maintainer": "yossiyossy", "usb": { - "vid": "0xFEED", - "pid": "0x6E55", - "device_version": "0.0.1" + "vid": "0xFEED", + "pid": "0x6E55", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], @@ -14,7 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2", + "soft_serial_pin": "D2", "matrix_pins": { "right": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json index 8d5bc0ddcf..b5f3a96cb5 100644 --- a/keyboards/makenova/omega/omega4/info.json +++ b/keyboards/makenova/omega/omega4/info.json @@ -143,4 +143,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json index 4b673c575a..8a70fe365e 100755 --- a/keyboards/maple_computing/c39/info.json +++ b/keyboards/maple_computing/c39/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "C39", + "keyboard_name": "C39", "manufacturer": "Maple Computing", - "url": "", - "maintainer": "Space Cat", + "url": "", + "maintainer": "Space Cat", "usb": { "vid": "0xCA17", "pid": "0xCA39", diff --git a/keyboards/matthewdias/txuu/info.json b/keyboards/matthewdias/txuu/info.json index 5129444f49..bfad8a5e67 100644 --- a/keyboards/matthewdias/txuu/info.json +++ b/keyboards/matthewdias/txuu/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Txuu", + "keyboard_name": "Txuu", "manufacturer": "Matthew Dias", - "maintainer": "matthewdias", + "maintainer": "matthewdias", "usb": { "vid": "0x6D64", "pid": "0x2809", diff --git a/keyboards/mc_76k/info.json b/keyboards/mc_76k/info.json index 91da1b8a01..8fc43ab394 100644 --- a/keyboards/mc_76k/info.json +++ b/keyboards/mc_76k/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "MC-76K", + "keyboard_name": "MC-76K", "manufacturer": "Yiancar-Designs", "url": "www.yiancar-designs.com", "maintainer": "Yiancar", diff --git a/keyboards/mechbrewery/mb65h/info.json b/keyboards/mechbrewery/mb65h/info.json index ea5b2f48b8..be731e3b0a 100644 --- a/keyboards/mechbrewery/mb65h/info.json +++ b/keyboards/mechbrewery/mb65h/info.json @@ -17,7 +17,6 @@ "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker"], "layouts": { - "LAYOUT_65_ansi_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 7d7be45a03..7132ecb953 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Foundation FRL", + "keyboard_name": "Foundation FRL", "manufacturer": "Mechlovin Studio", - "url": "", - "maintainer": "Protozoa", + "url": "", + "maintainer": "Protozoa", "usb": { "vid": "0x4D4C", "pid": "0x0180", diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 8f902a7c77..49eb2af5c1 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Hannah910", + "keyboard_name": "Hannah910", "manufacturer": "Mechlovin", - "url": "", - "maintainer": "Mechlovin'", + "url": "", + "maintainer": "Mechlovin'", "usb": { "vid": "0x4D4C", "pid": "0x9101", diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index 25dc91a8f9..c2133902ce 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Zed65-MonoLED", + "keyboard_name": "Zed65-MonoLED", "manufacturer": "Mechlovin Studio", - "url": "", - "maintainer": "Mechlovin' Studio", + "url": "", + "maintainer": "Mechlovin' Studio", "usb": { "vid": "0x4D4C", "pid": "0x6503", @@ -250,4 +250,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json index 11fb617ac4..b7d873dcb0 100644 --- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/cor65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Cor65", + "keyboard_name": "Cor65", "manufacturer": "Mechlovin Studio", - "url": "", - "maintainer": "Mechlovin' Studio", + "url": "", + "maintainer": "Mechlovin' Studio", "usb": { "vid": "0x4D4C", "pid": "0x6504", @@ -264,4 +264,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json index 37a239bcf0..7919090563 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Retro66", + "keyboard_name": "Retro66", "manufacturer": "Mechlovin Studio", - "url": "", - "maintainer": "Mechlovin' Studio", + "url": "", + "maintainer": "Mechlovin' Studio", "usb": { "vid": "0x4D4C", "pid": "0x6601", @@ -177,4 +177,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json index b7ce16576f..264d20504c 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Wearhaus66", + "keyboard_name": "Wearhaus66", "manufacturer": "Mechlovin Studio", - "url": "", + "url": "", "maintainer": "mechlovin", "usb": { "vid": "0x4D4C", diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json index 1ac84c732a..cc1f5a425f 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Dawn", + "keyboard_name": "Dawn", "manufacturer": "Mech Studio", - "url": "https://mech.studio/projects/dawn/", - "maintainer": "dejaeghered", + "url": "https://mech.studio/projects/dawn/", + "maintainer": "dejaeghered", "usb": { "vid": "0x4D53", "pid": "0x0004", diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/info.json index 2b81a900db..fe38614965 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "UD_40 Ortholinear", + "keyboard_name": "UD_40 Ortholinear", "manufacturer": "Mech Studio", - "url": "https://mech.studio/projects/ud_40/", - "maintainer": "dejaeghered", + "url": "https://mech.studio/projects/ud_40/", + "maintainer": "dejaeghered", "usb": { "vid": "0x4D53", "pid": "0x0002", diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index 499a9d1537..39c23e2fff 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -62,4 +62,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json index a50d2abaa5..4b64ddeffd 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/info.json @@ -10,8 +10,8 @@ ] }, "matrix_pins": { - "rows":[ "C6", "D7", "B4", "D4", "E6", "B2" ], - "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5" ] + "rows": ["C6", "D7", "B4", "D4", "E6", "B2"], + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5"] }, "diode_direction": "COL2ROW", "rgblight": { diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json index 0cf78b35a6..c51e60c260 100644 --- a/keyboards/mechwild/bde/righty/info.json +++ b/keyboards/mechwild/bde/righty/info.json @@ -6,7 +6,7 @@ }, "matrix_pins": { "rows": ["D1", "D7", "D3"], - "cols": [ "B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] + "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] }, "diode_direction": "ROW2COL", "rgblight": { @@ -55,7 +55,7 @@ { "matrix": [1, 7], "label":"K", "x":7, "y":1 }, { "matrix": [1, 8], "label":"L", "x":8, "y":1 }, { "matrix": [1, 9], "label":"Esc", "x":9, "y":1 }, - { "matrix": [1, 10], "label":"Enter", "x":10, "y":1 , "h":2 }, + { "matrix": [1, 10], "label":"Enter", "x":10, "y":1, "h":2 }, { "matrix": [1, 11], "label":"4", "x":11, "y":1 }, { "matrix": [1, 12], "label":"5", "x":12, "y":1 }, { "matrix": [1, 13], "label":"6", "x":13, "y":1 }, diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json index 89083afeb2..6f5cc66dea 100644 --- a/keyboards/mechwild/clunker/info.json +++ b/keyboards/mechwild/clunker/info.json @@ -33,56 +33,56 @@ "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, 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, "w":1.5}, - { "matrix": [1, 1], "x":1.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, 6], "x":6.5, "y":1}, - { "matrix": [1, 7], "x":7.5, "y":1}, - { "matrix": [5, 7], "x":8.5, "y":1}, - { "matrix": [5, 6], "x":9.5, "y":1}, - { "matrix": [5, 5], "x":10.5, "y":1}, - { "matrix": [5, 4], "x":11.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": [5, 1], "x":8.75, "y":2}, - { "matrix": [5, 2], "x":9.75, "y":2}, - { "matrix": [5, 3], "x":10.75, "y":2, "w":1.75}, - { "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": [6, 7], "x":8.25, "y":3}, - { "matrix": [6, 6], "x":9.25, "y":3}, - { "matrix": [6, 5], "x":10.25, "y":3}, - { "matrix": [6, 4], "x":11.25, "y":3, "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": [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": [5, 7], "x":8.5, "y":1}, + { "matrix": [5, 6], "x":9.5, "y":1}, + { "matrix": [5, 5], "x":10.5, "y":1}, + { "matrix": [5, 4], "x":11.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": [5, 1], "x":8.75, "y":2}, + { "matrix": [5, 2], "x":9.75, "y":2}, + { "matrix": [5, 3], "x":10.75, "y":2, "w":1.75}, + { "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": [6, 7], "x":8.25, "y":3}, + { "matrix": [6, 6], "x":9.25, "y":3}, + { "matrix": [6, 5], "x":10.25, "y":3}, + { "matrix": [6, 4], "x":11.25, "y":3, "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, 3], "x":3.75, "y":4, "w":2.75}, - { "matrix": [4, 4], "x":6.5, "y":4, "w":2.25}, + { "matrix": [4, 4], "x":6.5, "y":4, "w":2.25}, { "matrix": [4, 5], "x":8.75, "y":4, "w":1.25}, - { "matrix": [4, 6], "x":10, "y":4, "w":1.25}, + { "matrix": [4, 6], "x":10, "y":4, "w":1.25}, { "matrix": [4, 7], "x":11.25, "y":4, "w":1.25} ] } diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/info.json index 9fd3bb8522..664105c89c 100644 --- a/keyboards/meletrix/zoom75/info.json +++ b/keyboards/meletrix/zoom75/info.json @@ -134,9 +134,9 @@ { "matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 }, { "matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 }, { "matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 5], "label": "Space","x": 3.75, "y": 5.25, "w": 2.25 }, - { "matrix": [5, 6], "label": "Space","x": 6, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 7], "label": "Space","x": 7.25, "y": 5.25, "w": 2.75 }, + { "matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25 }, + { "matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75 }, { "matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, { "matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 }, { "matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25 }, diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json index a9b0ba9ba9..cbc73a262a 100644 --- a/keyboards/melgeek/mj64/info.json +++ b/keyboards/melgeek/mj64/info.json @@ -87,5 +87,4 @@ ] } } - } diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json index c4fe0a33db..c5dcb5d410 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/info.json @@ -4,12 +4,12 @@ "url": "", "maintainer": "melgeek001365", "usb": { - "vid": "0xEDED", - "pid": "0x0068", - "device_version": "0.0.1" + "vid": "0xEDED", + "pid": "0x0068", + "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3741" + "driver": "IS31FL3741" }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json index d0b9810fcd..311c10b635 100644 --- a/keyboards/meow48/info.json +++ b/keyboards/meow48/info.json @@ -75,4 +75,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/millipad/info.json b/keyboards/millipad/info.json index 5ac2e32221..0734c9ae60 100644 --- a/keyboards/millipad/info.json +++ b/keyboards/millipad/info.json @@ -4,9 +4,9 @@ "url": "https://github.com/GLozares/millipad", "maintainer": "Jirou", "usb": { - "vid": "0xFEED", - "pid": "0x1A1B", - "device_version": "0.0.1", + "vid": "0xFEED", + "pid": "0x1A1B", + "device_version": "0.0.1", "force_nkro": true }, "matrix_pins": { diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json index 36cdb6a4d4..cef71403d0 100644 --- a/keyboards/mincedshon/ecila/info.json +++ b/keyboards/mincedshon/ecila/info.json @@ -22,8 +22,8 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": [ "B6", "F7", "F6", "F5", "F4", "F1", "F0", "D6", "B7", "D0", "D1", "D2", "D3", "D5", "D4" ], - "rows": [ "E6", "B3", "B5", "B4", "D7" ] + "cols": ["B6", "F7", "F6", "F5", "F4", "F1", "F0", "D6", "B7", "D0", "D1", "D2", "D3", "D5", "D4"], + "rows": ["E6", "B3", "B5", "B4", "D7"] }, "processor": "atmega32u4", "url": "", diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/info.json index 7134938252..396c27506c 100644 --- a/keyboards/mini_elixivy/info.json +++ b/keyboards/mini_elixivy/info.json @@ -23,7 +23,7 @@ "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_65_ansi": { - "layout":[ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, @@ -99,7 +99,7 @@ ] }, "LAYOUT_65_iso": { - "layout":[ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/mino_plus/soldered/info.json b/keyboards/mino_plus/soldered/info.json index fc75d06e13..5c6a3d77d8 100644 --- a/keyboards/mino_plus/soldered/info.json +++ b/keyboards/mino_plus/soldered/info.json @@ -126,4 +126,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json index 7a0aaa4ffd..0ad1476419 100644 --- a/keyboards/mk65/info.json +++ b/keyboards/mk65/info.json @@ -58,77 +58,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"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.25}, - {"matrix": [0, 4], "x": 4, "y": 0.25}, - {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"matrix": [0, 6], "x": 6, "y": 0.25}, - {"matrix": [0, 7], "x": 7, "y": 0.25}, - {"matrix": [0, 8], "x": 8, "y": 0.25}, - {"matrix": [0, 9], "x": 9, "y": 0.25}, - {"matrix": [0, 10], "x": 10, "y": 0.25}, - {"matrix": [0, 11], "x": 11, "y": 0.25}, - {"matrix": [0, 12], "x": 12, "y": 0.25}, - {"matrix": [0, 13], "x": 13, "y": 0.25}, - {"matrix": [0, 14], "x": 14, "y": 0.25}, - {"matrix": [0, 15], "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}, - {"matrix": [1, 12], "x": 12.5, "y": 1.25}, - {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5}, - {"matrix": [1, 15], "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}, - {"matrix": [2, 11], "x": 11.75, "y": 2.25}, - {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25}, - {"matrix": [2, 15], "x": 15.5, "y": 2.25}, - {"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, 6], "x": 6.25, "y": 3.25}, - {"matrix": [3, 7], "x": 7.25, "y": 3.25}, - {"matrix": [3, 8], "x": 8.25, "y": 3.25}, - {"matrix": [3, 9], "x": 9.25, "y": 3.25}, - {"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, "w": 1.75}, - {"matrix": [3, 15], "x": 15.5, "y": 3.25}, - {"matrix": [3, 14], "x": 14.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, 6], "x": 3.75, "y": 4.25, "w": 6.25}, - {"matrix": [4, 10], "x": 10, "y": 4.25}, - {"matrix": [4, 11], "x": 11, "y": 4.25}, - {"matrix": [4, 12], "x": 12, "y": 4.25}, - {"matrix": [4, 13], "x": 13.25, "y": 4.5}, - {"matrix": [4, 14], "x": 14.25, "y": 4.5}, - {"matrix": [4, 15], "x": 15.25, "y": 4.5} + {"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.25}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, + {"matrix": [0, 7], "x": 7, "y": 0.25}, + {"matrix": [0, 8], "x": 8, "y": 0.25}, + {"matrix": [0, 9], "x": 9, "y": 0.25}, + {"matrix": [0, 10], "x": 10, "y": 0.25}, + {"matrix": [0, 11], "x": 11, "y": 0.25}, + {"matrix": [0, 12], "x": 12, "y": 0.25}, + {"matrix": [0, 13], "x": 13, "y": 0.25}, + {"matrix": [0, 14], "x": 14, "y": 0.25}, + {"matrix": [0, 15], "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}, + {"matrix": [1, 12], "x": 12.5, "y": 1.25}, + {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 15], "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}, + {"matrix": [2, 11], "x": 11.75, "y": 2.25}, + {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25}, + {"matrix": [2, 15], "x": 15.5, "y": 2.25}, + {"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, 6], "x": 6.25, "y": 3.25}, + {"matrix": [3, 7], "x": 7.25, "y": 3.25}, + {"matrix": [3, 8], "x": 8.25, "y": 3.25}, + {"matrix": [3, 9], "x": 9.25, "y": 3.25}, + {"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, "w": 1.75}, + {"matrix": [3, 15], "x": 15.5, "y": 3.25}, + {"matrix": [3, 14], "x": 14.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, 6], "x": 3.75, "y": 4.25, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4.25}, + {"matrix": [4, 11], "x": 11, "y": 4.25}, + {"matrix": [4, 12], "x": 12, "y": 4.25}, + {"matrix": [4, 13], "x": 13.25, "y": 4.5}, + {"matrix": [4, 14], "x": 14.25, "y": 4.5}, + {"matrix": [4, 15], "x": 15.25, "y": 4.5} ] } } -} \ No newline at end of file +} diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/info.json index a2187ba9e4..980b0fc5da 100644 --- a/keyboards/mkh_studio/bully/info.json +++ b/keyboards/mkh_studio/bully/info.json @@ -71,5 +71,5 @@ { "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3 } ] } - } + } } diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index 07e477bf9f..be7338c6f8 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "Eighty", + "keyboard_name": "Eighty", "manufacturer": "Mode", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { - "vid": "0x00DE", - "pid": "0x0081", - "device_version": "0.7.2" + "vid": "0x00DE", + "pid": "0x0081", + "device_version": "0.7.2" }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], @@ -15,10 +15,10 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", - "community_layouts": [ "tkl_ansi" ], - "layout_aliases": { - "LAYOUT_eighty_m80h": "LAYOUT_tkl_ansi" - }, + "community_layouts": ["tkl_ansi"], + "layout_aliases": { + "LAYOUT_eighty_m80h": "LAYOUT_tkl_ansi" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index fbce0cd37e..3c141c4e08 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "Eighty", + "keyboard_name": "Eighty", "manufacturer": "Mode", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { - "vid": "0x00DE", - "pid": "0x0080", - "device_version": "0.8.3" + "vid": "0x00DE", + "pid": "0x0080", + "device_version": "0.8.3" }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 1ac0ee9d26..03a2d912bc 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "M80H V2", + "keyboard_name": "M80H V2", "manufacturer": "Mode", - "url": "https://shop.modedesigns.com/collections/eighty", - "maintainer": "Gondolindrim", + "url": "https://shop.modedesigns.com/collections/eighty", + "maintainer": "Gondolindrim", "usb": { - "vid": "0x00DE", - "pid": "0x0083", - "device_version": "0.0.2" + "vid": "0x00DE", + "pid": "0x0083", + "device_version": "0.0.2" }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], @@ -14,15 +14,15 @@ }, "diode_direction": "COL2ROW", "indicators": { - "caps_lock": "A0", - "on_state": 0 + "caps_lock": "A0", + "on_state": 0 }, "processor": "STM32F072", "bootloader": "stm32-dfu", - "community_layouts": [ "tkl_ansi" ], - "layout_aliases": { - "LAYOUT_m80v2h": "LAYOUT_tkl_ansi" - }, + "community_layouts": ["tkl_ansi"], + "layout_aliases": { + "LAYOUT_m80v2h": "LAYOUT_tkl_ansi" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index df7bd3ed50..829448f9ae 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "M80S V2", + "keyboard_name": "M80S V2", "manufacturer": "Mode", - "url": "https://shop.modedesigns.com/collections/eighty", - "maintainer": "Gondolindrim", + "url": "https://shop.modedesigns.com/collections/eighty", + "maintainer": "Gondolindrim", "usb": { - "vid": "0x00DE", - "pid": "0x0082", - "device_version": "0.0.2" + "vid": "0x00DE", + "pid": "0x0082", + "device_version": "0.0.2" }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], @@ -14,8 +14,8 @@ }, "diode_direction": "COL2ROW", "indicators": { - "caps_lock": "A0", - "on_state": 0 + "caps_lock": "A0", + "on_state": 0 }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/mokey/mokey63/info.json b/keyboards/mokey/mokey63/info.json index 1708e147d8..bf0b078789 100644 --- a/keyboards/mokey/mokey63/info.json +++ b/keyboards/mokey/mokey63/info.json @@ -162,4 +162,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/monstargear/xo87/rgb/info.json b/keyboards/monstargear/xo87/rgb/info.json index 1ae406ac32..18aa2dd8d6 100644 --- a/keyboards/monstargear/xo87/rgb/info.json +++ b/keyboards/monstargear/xo87/rgb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "XO87 RGB", + "keyboard_name": "XO87 RGB", "manufacturer": "Monstargear", - "url": "https://www.monstargears.com/", - "maintainer": "qmk", + "url": "https://www.monstargears.com/", + "maintainer": "qmk", "usb": { "vid": "0x4D47", "pid": "0x584F", diff --git a/keyboards/mountainblocks/mb17/info.json b/keyboards/mountainblocks/mb17/info.json index ea6840b365..411e23a420 100644 --- a/keyboards/mountainblocks/mb17/info.json +++ b/keyboards/mountainblocks/mb17/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MB17", + "keyboard_name": "MB17", "manufacturer": "Mountainblocks", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D42", "pid": "0x0017", diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json index 39782eea71..7afd13d96d 100644 --- a/keyboards/ms_sculpt/info.json +++ b/keyboards/ms_sculpt/info.json @@ -14,7 +14,7 @@ }, "matrix_pins": { "rows": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], - "cols": ["A2","B8","A0","C15","C14","A14","A13","B7","B6","B5","B4","B3","A15","A10","A8","B15","B14","B12"], + "cols": ["A2", "B8", "A0", "C15", "C14", "A14", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A10", "A8", "B15", "B14", "B12"], "ghost": true, "io_delay": 5 }, diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json index 5118f4ed37..8005f5e7f7 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/mschwingen/modelm/info.json @@ -140,5 +140,4 @@ ] } } - } diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index fa169a1d35..db328f8dad 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Blocked65", + "keyboard_name": "Blocked65", "manufacturer": "Dou", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5746", "pid": "0x0001", diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json index a482ce53b4..58ded7742c 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MT64RGB", + "keyboard_name": "MT64RGB", "manufacturer": "MT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D54", "pid": "0x0001", diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json index 0880102dd1..e7a7507d7e 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "MT84", + "keyboard_name": "MT84", "manufacturer": "MT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D54", "pid": "0x0002", diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json index dc57ef4a08..dc20f93dbc 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Split75", + "keyboard_name": "Split75", "manufacturer": "YMDK", - "url": "", - "maintainer": "Michael L. Walker", + "url": "", + "maintainer": "Michael L. Walker", "usb": { "vid": "0x594D", "pid": "0x0001", diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json index 3cf9f972fc..9d08b0277c 100644 --- a/keyboards/mwstudio/mw660/info.json +++ b/keyboards/mwstudio/mw660/info.json @@ -16,8 +16,8 @@ "pin": "B8" }, "matrix_pins": { - "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ], - "rows": ["A3", "A4", "A5", "A6", "A2" ] + "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7"], + "rows": ["A3", "A4", "A5", "A6", "A2"] }, "processor": "STM32F103", "bootloader": "stm32duino", @@ -31,7 +31,7 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0, "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/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/info.json index 616e44256d..7e17fa35ea 100644 --- a/keyboards/mwstudio/mw80/info.json +++ b/keyboards/mwstudio/mw80/info.json @@ -13,8 +13,8 @@ "encoder": true }, "matrix_pins": { - "cols": ["B3", "A15", "A10", "A9", "A8", "B15", "B14", "A7", "B0", "B1", "B10", "A6", "A5", "A4", "A3", "A2", "A1" ], - "rows": ["B4", "B5", "B6", "B13", "B12", "B11" ] + "cols": ["B3", "A15", "A10", "A9", "A8", "B15", "B14", "A7", "B0", "B1", "B10", "A6", "A5", "A4", "A3", "A2", "A1"], + "rows": ["B4", "B5", "B6", "B13", "B12", "B11"] }, "processor": "STM32F103", "bootloader": "stm32duino", diff --git a/keyboards/mysticworks/wyvern/info.json b/keyboards/mysticworks/wyvern/info.json index 406a9d3eba..01c16c41f9 100644 --- a/keyboards/mysticworks/wyvern/info.json +++ b/keyboards/mysticworks/wyvern/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Wyvern", + "keyboard_name": "Wyvern", "manufacturer": "Mystic Works", - "url": "https://mysticworks.xyz", - "maintainer": "mysticworks", + "url": "https://mysticworks.xyz", + "maintainer": "mysticworks", "usb": { "vid": "0x4D59", "pid": "0x0001", diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 920a2f946f..aa60255b0d 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -81,4 +81,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 8632bfabdf..94c812dd95 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -95,4 +95,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/navi60/info.json b/keyboards/navi60/info.json index f1b1d3c0de..dde3b09ff8 100644 --- a/keyboards/navi60/info.json +++ b/keyboards/navi60/info.json @@ -1,14 +1,14 @@ { - "keyboard_name": "Navi60", + "keyboard_name": "Navi60", "manufacturer": "Navi60", - "url": "", - "maintainer": "DeskDaily", + "url": "", + "maintainer": "DeskDaily", "usb": { - "vid": "0x5001", - "pid": "0x0001", - "device_version": "0.0.1" + "vid": "0x5001", + "pid": "0x0001", + "device_version": "0.0.1" }, - "processor": "atmega32u4", + "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { "rows": ["F4", "F1", "D5", "B6", "F6"], @@ -45,7 +45,7 @@ {"label": "-", "matrix": [0, 12], "x": 12, "y": 0}, {"label": "=", "matrix": [0, 13], "x": 13, "y": 0}, {"label": "Backspace", "matrix": [1, 13], "x": 14, "y": 0}, - + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, {"label": "W)", "matrix": [1, 2], "x": 2.5, "y": 1}, @@ -60,7 +60,7 @@ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, - + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, @@ -74,7 +74,7 @@ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3}, {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, @@ -89,7 +89,7 @@ {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, {"label": "Shift", "matrix": [3, 13], "x": 14, "y": 3}, - + {"label": "Control", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"label": "GUI", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25}, {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, @@ -98,7 +98,7 @@ {"label": "App", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, {"label": "GUI", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, {"label": "Control", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} - ] + ] } } -} \ No newline at end of file +} diff --git a/keyboards/nightingale_studios/hailey/info.json b/keyboards/nightingale_studios/hailey/info.json index 19816869da..588bb83210 100644 --- a/keyboards/nightingale_studios/hailey/info.json +++ b/keyboards/nightingale_studios/hailey/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Hailey", + "keyboard_name": "Hailey", "manufacturer": "Nightingale Studios", - "maintainer": "zvecr", + "maintainer": "zvecr", "usb": { "vid": "0xFEED", "pid": "0x4879", diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json index 5aca4e8a1d..81e21e9377 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0xD812", - "pid": "0x0010", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0010", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B7", "B3", "B2", "D0", "D1", "D2", "D3"], @@ -14,12 +14,12 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "C7", "pin_b": "C6"} - ] + "rotary": [ + {"pin_a": "C7", "pin_b": "C6"} + ] }, "ws2812": { - "pin": "D5" + "pin": "D5" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 0c33b1c769..e0ea3294e9 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0x0717", - "pid": "0x0002", - "device_version": "0.0.1" + "vid": "0x0717", + "pid": "0x0002", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B0", "B1", "B2", "B3"], @@ -14,12 +14,12 @@ }, "diode_direction": "COL2ROW", "indicators": { - "caps_lock": "D6", - "num_lock": "D7", - "scroll_lock": "B4" + "caps_lock": "D6", + "num_lock": "D7", + "scroll_lock": "B4" }, "ws2812": { - "pin": "F1" + "pin": "F1" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 9688c39ff0..e318151c8c 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "Conde60", + "keyboard_name": "Conde60", "manufacturer": "DeskDaily", - "url": "", - "maintainer": "DeskDaily", + "url": "", + "maintainer": "DeskDaily", "usb": { - "vid": "0xD812", - "pid": "0x0015", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0015", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["B0", "B3", "B7", "B6", "C6", "C7", "F7", "F6", "F5", "D4", "D6", "D7", "B4", "B5"], @@ -14,7 +14,7 @@ }, "diode_direction": "COL2ROW", "ws2812": { - "pin": "D5" + "pin": "D5" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", @@ -94,4 +94,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/info.json index f1551f3a3e..88da3fa0a1 100644 --- a/keyboards/nightly_boards/daily60/info.json +++ b/keyboards/nightly_boards/daily60/info.json @@ -1,11 +1,11 @@ { - "keyboard_name": "Daily60", + "keyboard_name": "Daily60", "manufacturer": "DeskDaily", "maintainer": "DeskDaily", "usb": { - "vid": "0xD812", - "pid": "0x0024", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0024", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["GP22", "GP0", "GP1", "GP2", "GP5", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15"], @@ -91,4 +91,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json index d155c918b5..4dca4dec60 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/info.json @@ -1,11 +1,11 @@ { - "keyboard_name": "Jisoo", + "keyboard_name": "Jisoo", "manufacturer": "DeskDaily", "maintainer": "DeskDaily", "usb": { - "vid": "0xD812", - "pid": "0x0025", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0025", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["GP25", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"], @@ -116,5 +116,4 @@ ] } } - -} \ No newline at end of file +} diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/info.json index f1401f5061..ec403fb647 100644 --- a/keyboards/nightly_boards/n40_o/info.json +++ b/keyboards/nightly_boards/n40_o/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0xD812", - "pid": "0x0009", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0009", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["B5", "C7", "D6", "D4", "B3", "B2", "B1", "B0", "D5", "D3", "D2", "D1", "D0"], @@ -14,11 +14,11 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "F6", "pin_b": "F7"}, - {"pin_a": "F4", "pin_b": "F5"}, - {"pin_a": "B6", "pin_b": "C6"} - ] + "rotary": [ + {"pin_a": "F6", "pin_b": "F7"}, + {"pin_a": "F4", "pin_b": "F5"}, + {"pin_a": "B6", "pin_b": "C6"} + ] }, "ws2812": { "pin": "B4" diff --git a/keyboards/nightly_boards/n60_s/info.json b/keyboards/nightly_boards/n60_s/info.json index 52d75d6a13..2e49134300 100644 --- a/keyboards/nightly_boards/n60_s/info.json +++ b/keyboards/nightly_boards/n60_s/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "[n]60-S", + "keyboard_name": "[n]60-S", "manufacturer": "Neil Brian Ramirez", - "url": "", - "maintainer": "Neil Brian Ramirez", + "url": "", + "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0xD812", - "pid": "0x0007", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0007", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"], @@ -14,12 +14,12 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "D3", "pin_b": "D5"} - ] + "rotary": [ + {"pin_a": "D3", "pin_b": "D5"} + ] }, "ws2812": { - "pin": "D1" + "pin": "D1" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/nightly_boards/n9/info.json b/keyboards/nightly_boards/n9/info.json index 6929804d0c..1dfd4f6fda 100644 --- a/keyboards/nightly_boards/n9/info.json +++ b/keyboards/nightly_boards/n9/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "[n]9", + "keyboard_name": "[n]9", "manufacturer": "Neil Brian Ramirez", - "url": "", - "maintainer": "Neil Brian Ramirez", + "url": "", + "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0xD812", - "pid": "0x0012", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0012", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F6", "F7", "D4"], diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json index 4fd95b4a8c..c78a58937d 100644 --- a/keyboards/nightly_boards/octopad/info.json +++ b/keyboards/nightly_boards/octopad/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "Neil Brian Ramirez", "usb": { - "vid": "0xD812", - "pid": "0x0004", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0004", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F1", "F0", "D0", "D1", "B1"], @@ -14,13 +14,13 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "C7", "pin_b": "C6"}, - {"pin_a": "F4", "pin_b": "F5"} - ] + "rotary": [ + {"pin_a": "C7", "pin_b": "C6"}, + {"pin_a": "F4", "pin_b": "F5"} + ] }, "ws2812": { - "pin": "F7" + "pin": "F7" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index 71556373dc..533cefc3c1 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -1,13 +1,13 @@ { - "keyboard_name": "Octopad+" , + "keyboard_name": "Octopad+", "manufacturer": "DeskDaily", "url": "", "maintainer": "DeskDaily", "usb": { - "vid": "0xD812", - "pid": "0x0014", - "device_version": "0.0.1" - }, + "vid": "0xD812", + "pid": "0x0014", + "device_version": "0.0.1" + }, "matrix_pins": { "cols": ["E6", "F5", "C7", "D7", "F4", "D2"], "rows": ["F6", "D3"] @@ -21,9 +21,9 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "rgblight": { + "rgblight": { "animations": { - "alternating": true, + "alternating": true, "breathing": true, "christmas": true, "knight": true, diff --git a/keyboards/nightly_boards/paraluman/info.json b/keyboards/nightly_boards/paraluman/info.json index 66583a9f01..10f8514275 100644 --- a/keyboards/nightly_boards/paraluman/info.json +++ b/keyboards/nightly_boards/paraluman/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "DeskDaily", "usb": { - "vid": "0xD812", - "pid": "0x0012", - "device_version": "0.0.1" + "vid": "0xD812", + "pid": "0x0012", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["B2", "F6", "F5", "F4", "F1", "F0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], @@ -158,4 +158,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json index 64f74e92f6..b72492a6aa 100755 --- a/keyboards/novelkeys/nk1/info.json +++ b/keyboards/novelkeys/nk1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "NK1", + "keyboard_name": "NK1", "manufacturer": "Yiancar-Designs", "url": "www.yiancar-designs.com", - "maintainer": "yiancar", + "maintainer": "yiancar", "usb": { "vid": "0x8968", "pid": "0x4E4D", diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json index e385ff3b61..59187f9ef8 100755 --- a/keyboards/novelkeys/nk65/info.json +++ b/keyboards/novelkeys/nk65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "NK65", + "keyboard_name": "NK65", "manufacturer": "Yiancar-Designs", - "url": "", - "maintainer": "yiancar", + "url": "", + "maintainer": "yiancar", "usb": { "vid": "0x8968", "pid": "0x4E4B", diff --git a/keyboards/noxary/220/info.json b/keyboards/noxary/220/info.json index 9b47d9c040..9b04a0465f 100644 --- a/keyboards/noxary/220/info.json +++ b/keyboards/noxary/220/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "220", + "keyboard_name": "220", "manufacturer": "Noxary", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4E58", "pid": "0x0899", diff --git a/keyboards/noxary/260/info.json b/keyboards/noxary/260/info.json index d1cdc077a3..d9b1aed280 100644 --- a/keyboards/noxary/260/info.json +++ b/keyboards/noxary/260/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "260", + "keyboard_name": "260", "manufacturer": "Noxary", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4E58", "pid": "0x0A29", diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/info.json index c170e987f5..aca07e4fa9 100644 --- a/keyboards/noxary/280/info.json +++ b/keyboards/noxary/280/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "280", + "keyboard_name": "280", "manufacturer": "Noxary", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4E58", "pid": "0x0AF1", diff --git a/keyboards/noxary/vulcan/info.json b/keyboards/noxary/vulcan/info.json index 87e37de6b1..579ab525f4 100644 --- a/keyboards/noxary/vulcan/info.json +++ b/keyboards/noxary/vulcan/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Vulcan", + "keyboard_name": "Vulcan", "manufacturer": "Noxary", - "url": "https://noxary.co/products/vulcan-pro-base", - "maintainer": "ai03", + "url": "https://noxary.co/products/vulcan-pro-base", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0011", diff --git a/keyboards/nyhxis/nfr_70/info.json b/keyboards/nyhxis/nfr_70/info.json index ee4f46aad7..d6d621db78 100644 --- a/keyboards/nyhxis/nfr_70/info.json +++ b/keyboards/nyhxis/nfr_70/info.json @@ -5,8 +5,8 @@ "maintainer": "Nyhxis", "diode_direction": "COL2ROW", "matrix_pins": { - "cols": [ "B2", "B3", "B1", "F7", "F6", "F5", "F4" ], - "rows": [ "D3", "D2", "D1", "D0", "C6", "D4", "E6", "D7", "B5", "B4", "B6" ] + "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "C6", "D4", "E6", "D7", "B5", "B4", "B6"] }, "usb": { "vid": "0xABCD", @@ -179,4 +179,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json index 013f8b6ab7..6fbd4c1b07 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/info.json @@ -65,4 +65,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json index f919adba2b..a1a95aca60 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Slamz", + "keyboard_name": "Slamz", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0011", diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json index c6c7378eea..fcb08b0ca6 100644 --- a/keyboards/ocean/stealth/info.json +++ b/keyboards/ocean/stealth/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Stealth", + "keyboard_name": "Stealth", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0010", diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json index b68848fbb2..bb9b8c501c 100644 --- a/keyboards/ocean/sus/info.json +++ b/keyboards/ocean/sus/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Sus", + "keyboard_name": "Sus", "manufacturer": "Ocean", - "url": " ", - "maintainer": "Ocean", + "url": " ", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0009", diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json index b4747221a2..93591d28c3 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Wang V2", + "keyboard_name": "Wang V2", "manufacturer": "Ocean", - "url": "", - "maintainer": "Ocean", + "url": "", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0004", diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json index 9b12250fb6..3ed5df8746 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Yuri", + "keyboard_name": "Yuri", "manufacturer": "Ocean", - "url": "tokopedia.com/strat0s", - "maintainer": "Ocean", + "url": "tokopedia.com/strat0s", + "maintainer": "Ocean", "usb": { "vid": "0x9624", "pid": "0x0003", diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json index 65bcd0fa28..ddd160f8f8 100644 --- a/keyboards/odelia/info.json +++ b/keyboards/odelia/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Odelia", + "keyboard_name": "Odelia", "manufacturer": "InterpolKeeb", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0x6BE3", "pid": "0xA129", diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json index 08b4b0f683..7efa8097d6 100644 --- a/keyboards/om60/info.json +++ b/keyboards/om60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "OM60", + "keyboard_name": "OM60", "manufacturer": "jun10000", - "url": "https://github.com/jun10000", - "maintainer": "jun10000", + "url": "https://github.com/jun10000", + "maintainer": "jun10000", "usb": { "vid": "0x6A6E", "pid": "0x0001", @@ -101,4 +101,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json index e5c59d5590..aa534d4b77 100644 --- a/keyboards/omnikeyish/info.json +++ b/keyboards/omnikeyish/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Omnikey-(ish)", + "keyboard_name": "Omnikey-(ish)", "manufacturer": "Henrik O. Sørensen", - "url": "https://github.com/henrikosorensen/keyboard_pcbs/tree/master/omnikeyish_pcb", - "maintainer": "qmk", + "url": "https://github.com/henrikosorensen/keyboard_pcbs/tree/master/omnikeyish_pcb", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0666", diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json index fda913aa32..a107275b18 100644 --- a/keyboards/ortho5by12/info.json +++ b/keyboards/ortho5by12/info.json @@ -20,7 +20,7 @@ "bootloader": "usbasploader", "layouts": { "LAYOUT_ortho_5x12_1x2uC": { - "layout": [ + "layout": [ {"matrix": [1, 0], "x": 0, "y": 0}, {"matrix": [0, 0], "x": 1, "y": 0}, {"matrix": [1, 1], "x": 2, "y": 0}, @@ -87,7 +87,7 @@ ] }, "LAYOUT_ortho_5x12": { - "layout": [ + "layout": [ {"matrix": [1, 0], "x": 0, "y": 0}, {"matrix": [0, 0], "x": 1, "y": 0}, {"matrix": [1, 1], "x": 2, "y": 0}, diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index 1930b04ff5..cdf5143061 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -103,4 +103,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json index d43c788302..fcce6c6fb6 100644 --- a/keyboards/owlab/suit80/ansi/info.json +++ b/keyboards/owlab/suit80/ansi/info.json @@ -123,4 +123,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json index 55761a4c89..dc57107167 100644 --- a/keyboards/owlab/suit80/iso/info.json +++ b/keyboards/owlab/suit80/iso/info.json @@ -231,4 +231,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index 0a69a4a029..3e8a2b6864 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "P18 Macro Pad", + "keyboard_name": "P18 Macro Pad", "manufacturer": "Pabile", - "url": "https://pabileonline.blogspot.com/", - "maintainer": "Pabile", + "url": "https://pabileonline.blogspot.com/", + "maintainer": "Pabile", "usb": { "vid": "0x6666", "pid": "0x6668", diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 7d0234e20e..4087cb2ef2 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "P40", + "keyboard_name": "P40", "manufacturer": "Pabile", - "url": "https://pabileonline.blogspot.com/", - "maintainer": "Pabile", + "url": "https://pabileonline.blogspot.com/", + "maintainer": "Pabile", "usb": { - "vid": "0x6666", - "pid": "0x6666", - "device_version": "0.0.1" + "vid": "0x6666", + "pid": "0x6666", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json index 890a08babe..30c1a0f508 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "P40 Ortho", "manufacturer": "Pabile", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x6666", "pid": "0x6669", @@ -109,5 +109,4 @@ ] } } - } diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json index 40037f126d..de6df45e90 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "P42", + "keyboard_name": "P42", "manufacturer": "Pabile", - "url": "https://pabileonline.blogspot.com/", - "maintainer": "Pabile", + "url": "https://pabileonline.blogspot.com/", + "maintainer": "Pabile", "usb": { "vid": "0x6666", "pid": "0x6670", diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json index 929744e59a..89c9639139 100644 --- a/keyboards/panc40/info.json +++ b/keyboards/panc40/info.json @@ -169,5 +169,4 @@ ] } } - } diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index 02d80dec23..cd8ff122bc 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -10,8 +10,8 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "rows": [ "D3", "D5", "F0", "F1" ], - "cols": [ "B1", "B3", "F7", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7" ] + "rows": ["D3", "D5", "F0", "F1"], + "cols": ["B1", "B3", "F7", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", @@ -58,192 +58,192 @@ "layouts": { "LAYOUT_ortho_2x2u": { "layout": [ - { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, - { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, - { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, - { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, - { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, - { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, - { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, - { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, - { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, - { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, - { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, - { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, - { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, - { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, - { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, - { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, - { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, - { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, - { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, - { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, - { "matrix": [3,5], "label": "Space", "x": 4, "y": 3, "w": 2 }, - { "matrix": [3,6], "label": "Space", "x": 6, "y": 3, "w": 2 }, - { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, - { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, - { "matrix": [3,10], "label": "↑", "x": 10, "y": 3 } + { "matrix": [0, 0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1, 0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1, 10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1, 11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3, 1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3, 3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3, 5], "label": "Space", "x": 4, "y": 3, "w": 2 }, + { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3, "w": 2 }, + { "matrix": [3, 8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3, 9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3, 10], "label": "↑", "x": 10, "y": 3 } ] }, "LAYOUT_mit": { "layout": [ - { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, - { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, - { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, - { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, - { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, - { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, - { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, - { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, - { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, - { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, - { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, - { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, - { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, - { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, - { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, - { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, - { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, - { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, - { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, - { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, - { "matrix": [3,4], "label": "⇓", "x": 4, "y": 3 }, - { "matrix": [3,5], "label": "Space", "x": 5, "y": 3, "w": 2 }, - { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, - { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, - { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, - { "matrix": [3,10], "label": "↑", "x": 10, "y": 3 } + { "matrix": [0, 0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1, 0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1, 10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1, 11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3, 1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3, 3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3, 4], "label": "⇓", "x": 4, "y": 3 }, + { "matrix": [3, 5], "label": "Space", "x": 5, "y": 3, "w": 2 }, + { "matrix": [3, 7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3, 8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3, 9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3, 10], "label": "↑", "x": 10, "y": 3 } ] }, "LAYOUT_ortho_4x12_hhkb": { "layout": [ - { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, - { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, - { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, - { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, - { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, - { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, - { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, - { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, - { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, - { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, - { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, - { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, - { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, - { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, - { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, - { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, - { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, - { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, - { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, - { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, - { "matrix": [3,4], "label": "&dArr", "x": 4, "y": 3 }, - { "matrix": [3,5], "label": "Space", "x": 5, "y": 3 }, - { "matrix": [3,6], "label": "Space", "x": 6, "y": 3 }, - { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, - { "matrix": [3,8], "label": "Super", "x": 8, "y": 3 }, - { "matrix": [3,9], "label": "Alt", "x": 9, "y": 3 }, - { "matrix": [3,10], "label": "Ctrl", "x": 10, "y": 3 } + { "matrix": [0, 0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1, 0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1, 10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1, 11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3, 1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3, 3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3, 4], "label": "&dArr", "x": 4, "y": 3 }, + { "matrix": [3, 5], "label": "Space", "x": 5, "y": 3 }, + { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3 }, + { "matrix": [3, 7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3, 8], "label": "Super", "x": 8, "y": 3 }, + { "matrix": [3, 9], "label": "Alt", "x": 9, "y": 3 }, + { "matrix": [3, 10], "label": "Ctrl", "x": 10, "y": 3 } ] }, "LAYOUT_ortho_bigbar": { "layout": [ - { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, - { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, - { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, - { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, - { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, - { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, - { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, - { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, - { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, - { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, - { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, - { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, - { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, - { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, - { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, - { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, - { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, - { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3, "w": 1.5 }, - { "matrix": [3,5], "label": "Space", "x": 2.5, "y": 3, "w": 7 }, - { "matrix": [3,10], "label": "Alt", "x": 9.5, "y": 3, "w": 1.5 } + { "matrix": [0, 0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1, 0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1, 10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1, 11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3, 1], "label": "Ctrl", "x": 1, "y": 3, "w": 1.5 }, + { "matrix": [3, 5], "label": "Space", "x": 2.5, "y": 3, "w": 7 }, + { "matrix": [3, 10], "label": "Alt", "x": 9.5, "y": 3, "w": 1.5 } ] } } diff --git a/keyboards/pdxkbc/info.json b/keyboards/pdxkbc/info.json index b6d93e7de1..8fe7db4c23 100644 --- a/keyboards/pdxkbc/info.json +++ b/keyboards/pdxkbc/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "pdxkbc", + "keyboard_name": "pdxkbc", "manufacturer": "Franklin Harding", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5044", "pid": "0x0001", diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 24e5777045..5544f4ac73 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "tone", + "keyboard_name": "tone", "manufacturer": "PeranekoFactory", - "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note", - "maintainer": "PeranekoFactory", + "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note", + "maintainer": "PeranekoFactory", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 24e5777045..5544f4ac73 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "tone", + "keyboard_name": "tone", "manufacturer": "PeranekoFactory", - "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note", - "maintainer": "PeranekoFactory", + "url": "https://shop.yushakobo.jp/collections/keyboard-1/products/consign_tone-note", + "maintainer": "PeranekoFactory", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json index 8288368389..df0c309266 100644 --- a/keyboards/percent/canoe_gen2/info.json +++ b/keyboards/percent/canoe_gen2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Canoe Gen2", + "keyboard_name": "Canoe Gen2", "manufacturer": "Percent Studio", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x9C12", "pid": "0x89F0", diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json index 05561927a3..325970dac8 100644 --- a/keyboards/pkb65/info.json +++ b/keyboards/pkb65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PKB65", + "keyboard_name": "PKB65", "manufacturer": "MCKeebs", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D43", "pid": "0x6060", diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 275d9e011d..828d5337b2 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "CA66", + "keyboard_name": "CA66", "manufacturer": "Barry", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5457", "pid": "0x6060", diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json index 3b9404b401..d464bc1cd9 100644 --- a/keyboards/ploopyco/trackball_thumb/info.json +++ b/keyboards/ploopyco/trackball_thumb/info.json @@ -23,12 +23,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,2], "x":1, "y":0, "h":2}, - {"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5}, - {"matrix":[0,4],"x":4, "y":0}, - {"matrix":[0,5],"x":5, "y":0.5}, - {"matrix":[0,1],"x":0, "y":1} + {"matrix":[0, 0], "x":0, "y":0}, + {"matrix":[0, 2], "x":1, "y":0, "h":2}, + {"matrix":[0, 3], "x":2.5, "y":0.25, "h":1.5}, + {"matrix":[0, 4], "x":4, "y":0}, + {"matrix":[0, 5], "x":5, "y":0.5}, + {"matrix":[0, 1], "x":0, "y":1} ] } } diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json index 602692866c..db12ee6217 100644 --- a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json +++ b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json @@ -4,7 +4,9 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "direct": [ [ "D5", "B6", "D4", "D2", "E6", "D7" ] ] + "direct": [ + ["D5", "B6", "D4", "D2", "E6", "D7"] + ] }, "rgblight": { "led_count": 3, diff --git a/keyboards/plume/plume65/info.json b/keyboards/plume/plume65/info.json index 467c7d2848..3f38c555e1 100644 --- a/keyboards/plume/plume65/info.json +++ b/keyboards/plume/plume65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Plume65", + "keyboard_name": "Plume65", "manufacturer": "Plume Keyboards LLC", - "url": "", - "maintainer": "evyd13", + "url": "", + "maintainer": "evyd13", "usb": { "vid": "0x5D66", "pid": "0x22CF", diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json index d9d5c73d82..faa54cbb16 100644 --- a/keyboards/plywrks/allaro/info.json +++ b/keyboards/plywrks/allaro/info.json @@ -3,7 +3,6 @@ "keyboard_name": "Allaro", "maintainer": "ramonimbao", "development_board": "promicro", - "diode_direction": "COL2ROW", "features": { "bootmagic": true, diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json index 2e4fcd6dbd..1b2d44a87e 100644 --- a/keyboards/projectcain/relic/info.json +++ b/keyboards/projectcain/relic/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Relic", + "keyboard_name": "Relic", "manufacturer": "projectcain", - "url": "", - "maintainer": "projectcain", + "url": "", + "maintainer": "projectcain", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json index 0a8e9ebad2..d23c4b2f46 100644 --- a/keyboards/projectcain/vault35/info.json +++ b/keyboards/projectcain/vault35/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Vault35", + "keyboard_name": "Vault35", "manufacturer": "projectcain", - "url": "", - "maintainer": "projectcain", + "url": "", + "maintainer": "projectcain", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json index ffe87488ef..ae37635cbf 100644 --- a/keyboards/projectkb/signature65/info.json +++ b/keyboards/projectkb/signature65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Signature65", + "keyboard_name": "Signature65", "manufacturer": "Project Keyboard", - "url": "https://store.projectkeyboard.com", - "maintainer": "projectkeyboard", + "url": "https://store.projectkeyboard.com", + "maintainer": "projectkeyboard", "usb": { "vid": "0x0159", "pid": "0x0165", diff --git a/keyboards/projectkb/signature87/info.json b/keyboards/projectkb/signature87/info.json index 5b9f0b6074..79ac099b44 100644 --- a/keyboards/projectkb/signature87/info.json +++ b/keyboards/projectkb/signature87/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Signature87", + "keyboard_name": "Signature87", "manufacturer": "Project Keyboard", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x0159", "pid": "0x0187", diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json index 4fdaca429a..d32d86ba91 100644 --- a/keyboards/prototypist/oceanographer/info.json +++ b/keyboards/prototypist/oceanographer/info.json @@ -10,15 +10,13 @@ "console": false, "extrakey": true, "mousekey": false, - "nkro": true + "nkro": true }, - "encoder":{ "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 2} ] }, - "ws2812": { "pin": "B3" }, @@ -33,12 +31,10 @@ "breathing": true } }, - "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "D5", "D3", "D2"] }, - "processor": "atmega32u4", "url": "", "usb": { @@ -102,7 +98,6 @@ { "matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3 } ] }, - "LAYOUT_225_2": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, @@ -157,7 +152,6 @@ { "matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3 } ] }, - "LAYOUT_625": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, @@ -211,4 +205,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index c902b16f4f..dbdbb2bd70 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -13,7 +13,7 @@ "nkro": true }, "matrix_pins": { - "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7" ], + "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7"], "rows": ["B0", "B1", "B2", "B10", "B11"] }, "processor": "STM32F303", @@ -27,212 +27,210 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, - { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, - { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, - { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, - { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, - { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, - { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, - { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, - { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, - { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, - { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, - { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, - { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, - { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, - { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, - { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, - { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, - { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, - { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, - { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, - { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, - { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, - { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, - { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, - { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, - { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, - { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, - { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, - { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, - { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, - { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, - { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, - { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, - { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, - { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, - { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, - { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, - { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, - - { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, - { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, - { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, - { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + { "matrix": [0, 0], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "!", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [0, 13], "label": "Back", "x": 13, "y": 0 }, + { "matrix": [2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "label": "~", "x": 12.75, "y": 2 }, + + { "matrix": [3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [3, 1], "label": "|", "x": 1.25, "y": 3 }, + { "matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 13], "label": "Fn", "x": 14, "y": 3 }, + { "matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_iso": { "layout": [ - { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, - { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, - { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, - { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, - { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, - { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, - { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, - { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, - { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, - { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, - { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, - { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, - { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, - - { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, - { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, - { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, - { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, - { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, - { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, - { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, - { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, - { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, - { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, - { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, - { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1 }, - { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, - { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, - { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, - { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, - { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, - { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, - { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, - { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, - { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, - { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, - { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, - { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, - - { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, - - { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, - { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, - { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + { "matrix": [0, 0], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "!", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, + + { "matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "label": "~", "x": 12.75, "y": 2 }, + + { "matrix": [3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [3, 1], "label": "|", "x": 1.25, "y": 3 }, + { "matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, + + { "matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } ] }, - "LAYOUT_60_ansi": { "layout": [ - { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, - { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, - { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, - { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, - { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, - { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, - { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, - { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, - { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, - { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, - { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, - { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, - { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, - - { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, - { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, - { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, - { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, - { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, - { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, - { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, - { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, - { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, - { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, - { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, - { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, - { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, - { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, - { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, - { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, - { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, - { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, - { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, - { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, - { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, - { "matrix": [ 2, 11], "label": "'", "x": 11.75, "y": 2 }, - { "matrix": [ 2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2 }, - - { "matrix": [ 3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3 }, - - { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, - - { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, - { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, - { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + { "matrix": [0, 0], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "!", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, + + { "matrix": [1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "label": "'", "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2 }, + + { "matrix": [3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3 }, + + { "matrix": [3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, + + { "matrix": [4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index 8751845fc9..939dd7c644 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -120,7 +120,6 @@ { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_iso": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, @@ -136,7 +135,7 @@ { "matrix": [0, 10], "label": "F10", "x": 12, "y": 0 }, { "matrix": [0, 11], "label": "F11", "x": 13, "y": 0 }, { "matrix": [0, 12], "label": "F12", "x": 14, "y": 0 }, - + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, @@ -154,7 +153,7 @@ { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, { "matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, @@ -201,7 +200,7 @@ { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, { "matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25 }, - + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, @@ -216,7 +215,6 @@ { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } ] }, - "LAYOUT_tkl_ansi": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, @@ -232,7 +230,7 @@ { "matrix": [0, 10], "label": "F10", "x": 12, "y": 0 }, { "matrix": [0, 11], "label": "F11", "x": 13, "y": 0 }, { "matrix": [0, 12], "label": "F12", "x": 14, "y": 0 }, - + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, @@ -250,7 +248,7 @@ { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, { "matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, @@ -285,7 +283,7 @@ { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 }, { "matrix": [3, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, { "matrix": [4, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, - + { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 }, { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 }, { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 }, @@ -297,7 +295,7 @@ { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, { "matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25 }, - + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, @@ -313,4 +311,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json index 019b6c7526..46776e44a0 100644 --- a/keyboards/pteropus/info.json +++ b/keyboards/pteropus/info.json @@ -66,4 +66,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json index 25abece192..c32c4f8c0f 100644 --- a/keyboards/puck/info.json +++ b/keyboards/puck/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Puck", + "keyboard_name": "Puck", "manufacturer": "OkKeebs LLC", - "url": "", - "maintainer": "john-pettigrew", + "url": "", + "maintainer": "john-pettigrew", "usb": { "vid": "0xFEED", "pid": "0x6060", diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json index 1dbf27825c..16b0ebe42a 100644 --- a/keyboards/qpockets/eggman/info.json +++ b/keyboards/qpockets/eggman/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "eggman", + "keyboard_name": "eggman", "manufacturer": "qpockets", - "url": "", - "maintainer": "qpockets", + "url": "", + "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x656D", - "device_version": "10.0.0" + "vid": "0x7170", + "pid": "0x656D", + "device_version": "10.0.0" }, "matrix_pins": { "cols": ["B7", "B4", "B3", "B2", "D3", "D2", "D1"], @@ -14,10 +14,10 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "C6", "pin_b": "C7"}, - {"pin_a": "D4", "pin_b": "D5"} - ] + "rotary": [ + {"pin_a": "C6", "pin_b": "C7"}, + {"pin_a": "D4", "pin_b": "D5"} + ] }, "processor": "atmega32u2", "bootloader": "atmel-dfu", diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json index 32d744c0a9..f54e5e8e3a 100644 --- a/keyboards/qpockets/space_space/rev1/info.json +++ b/keyboards/qpockets/space_space/rev1/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7373", - "device_version": "30.0.0" + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.0" }, "matrix_pins": { "cols": ["D4", "B4", "B5", "B6", "C6", "F7", "F6", "F0", "B0", "E6", "B1"], @@ -14,10 +14,10 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, - {"pin_a": "D6", "pin_b": "D7"} - ] + "rotary": [ + {"pin_a": "B3", "pin_b": "B2", "resolution": 3}, + {"pin_a": "D6", "pin_b": "D7"} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 949b80bd3b..635c66db99 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7373", - "device_version": "30.0.2" + "vid": "0x7170", + "pid": "0x7373", + "device_version": "30.0.2" }, "matrix_pins": { "cols": ["C6", "F6", "F1", "F4", "F5", "E6", "D6", "B2", "B5", "D3", "D2"], @@ -14,13 +14,13 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, - {"pin_a": "C7", "pin_b": "F7", "resolution": 3} - ] + "rotary": [ + {"pin_a": "B4", "pin_b": "D7", "resolution": 3}, + {"pin_a": "C7", "pin_b": "F7", "resolution": 3} + ] }, "ws2812": { - "pin": "F0" + "pin": "F0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/qpockets/wanten/info.json b/keyboards/qpockets/wanten/info.json index 4cb26a4365..df1798db24 100644 --- a/keyboards/qpockets/wanten/info.json +++ b/keyboards/qpockets/wanten/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "wanten", + "keyboard_name": "wanten", "manufacturer": "qpockets", - "url": "", - "maintainer": "qpockets", + "url": "", + "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x7774", - "device_version": "0.0.1" + "vid": "0x7170", + "pid": "0x7774", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F4", "F1", "B5", "B6", "C6", "C7", "D4", "E6", "D2", "B1", "B2", "D3"], @@ -14,10 +14,10 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F6"}, - {"pin_a": "D6", "pin_b": "D7"} - ] + "rotary": [ + {"pin_a": "F5", "pin_b": "F6"}, + {"pin_a": "D6", "pin_b": "D7"} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", @@ -176,4 +176,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json index 5f88bae831..3b81dab144 100644 --- a/keyboards/quad_h/lb75/info.json +++ b/keyboards/quad_h/lb75/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "LB75", + "keyboard_name": "LB75", "manufacturer": "QUADH", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { - "vid": "0xA103", - "pid": "0x0007", - "device_version": "0.0.1" + "vid": "0xA103", + "pid": "0x0007", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["D2", "D1", "D0", "F1", "F4", "F5", "F6", "F7"], @@ -18,7 +18,7 @@ "levels": 5 }, "ws2812": { - "pin": "B0" + "pin": "B0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index 7b48e3d79e..fdd36e9bd3 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z40 Ortho", + "keyboard_name": "Z40 Ortho", "manufacturer": "Quarkeys Stuidio", - "url": "www.quarkeys.com", - "maintainer": "TommyZ", + "url": "www.quarkeys.com", + "maintainer": "TommyZ", "usb": { "vid": "0x8490", "pid": "0x2801", @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json index 86efbdd6f4..6502c95910 100644 --- a/keyboards/quarkeys/z60/hotswap/info.json +++ b/keyboards/quarkeys/z60/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z60 Hotswap", + "keyboard_name": "Z60 Hotswap", "manufacturer": "Quarkeys Stuidio", - "url": "www.quarkeys.com", - "maintainer": "TommyZ", + "url": "www.quarkeys.com", + "maintainer": "TommyZ", "usb": { "vid": "0x8490", "pid": "0x3C02", @@ -92,4 +92,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json index ec18abfbd6..1dfc7b6039 100644 --- a/keyboards/quarkeys/z60/solder/info.json +++ b/keyboards/quarkeys/z60/solder/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z60 Solder", + "keyboard_name": "Z60 Solder", "manufacturer": "Quarkeys Stuidio", - "url": "www.quarkeys.com", - "maintainer": "TommyZ", + "url": "www.quarkeys.com", + "maintainer": "TommyZ", "usb": { "vid": "0x8490", "pid": "0x3C01", diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json index b01ce2374d..cc4b15a921 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z67 Hotswap", + "keyboard_name": "Z67 Hotswap", "manufacturer": "Quarkeys Stuidio", - "url": "www.quarkeys.com", - "maintainer": "TommyZ", + "url": "www.quarkeys.com", + "maintainer": "TommyZ", "usb": { "vid": "0x8490", "pid": "0x4102", @@ -100,4 +100,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json index 271ee5fae5..d91be1ac0f 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Z67 Solder", + "keyboard_name": "Z67 Solder", "manufacturer": "Quarkeys Stuidio", - "url": "www.quarkeys.com", - "maintainer": "TommyZ", + "url": "www.quarkeys.com", + "maintainer": "TommyZ", "usb": { "vid": "0x8490", "pid": "0x4101", @@ -104,4 +104,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json index a0106741f5..367e7ae108 100644 --- a/keyboards/qwertlekeys/calice/info.json +++ b/keyboards/qwertlekeys/calice/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Calice", + "keyboard_name": "Calice", "manufacturer": "QwertleKeys", - "url": "", - "maintainer": "Jels", + "url": "", + "maintainer": "Jels", "usb": { "vid": "0x716B", "pid": "0x0001", diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json index e134a31147..a1352700ff 100644 --- a/keyboards/rad/info.json +++ b/keyboards/rad/info.json @@ -36,4 +36,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/info.json index 36cd1dcef5..f03adc5ec9 100644 --- a/keyboards/ramlord/witf/info.json +++ b/keyboards/ramlord/witf/info.json @@ -13,8 +13,8 @@ "nkro": true }, "matrix_pins": { - "cols": ["B4", "B5", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], - "rows": ["A1", "A2", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B6", "B7", "B8"] + "cols": ["B4", "B5", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], + "rows": ["A1", "A2", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B6", "B7", "B8"] }, "indicators": { "num_lock": "A5", diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/info.json index 44e795b54f..f612870d96 100644 --- a/keyboards/rart/rart60/info.json +++ b/keyboards/rart/rart60/info.json @@ -13,8 +13,8 @@ "nkro": true }, "matrix_pins": { - "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP1", "GP0", "GP18", "GP22" ], - "rows": ["GP23", "GP25", "GP15", "GP16", "GP17" ] + "cols": ["GP24", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP6", "GP5", "GP4", "GP3", "GP1", "GP0", "GP18", "GP22"], + "rows": ["GP23", "GP25", "GP15", "GP16", "GP17"] }, "processor": "RP2040", "url": "", @@ -113,4 +113,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json index c02687ed11..c1e167d1d8 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "RARTLAND", + "keyboard_name": "RARTLAND", "manufacturer": "Alabahuy", - "url": " ", - "maintainer": "Alabahuy", + "url": " ", + "maintainer": "Alabahuy", "usb": { "vid": "0x414C", "pid": "0x6065", diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index 1dc3d80250..07943e5ca3 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "pistachio_mp", + "keyboard_name": "pistachio_mp", "manufacturer": "rate", - "url": "", - "maintainer": "rate", + "url": "", + "maintainer": "rate", "usb": { "vid": "0x5255", "pid": "0xE212", diff --git a/keyboards/redscarf_iiplus/verb/info.json b/keyboards/redscarf_iiplus/verb/info.json index 33e4aa6ea6..82892e9325 100644 --- a/keyboards/redscarf_iiplus/verb/info.json +++ b/keyboards/redscarf_iiplus/verb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "RedScarfII+ Ver.B (RS78)", + "keyboard_name": "RedScarfII+ Ver.B (RS78)", "manufacturer": "RedScarf", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/redscarf_iiplus/verc/info.json b/keyboards/redscarf_iiplus/verc/info.json index b81802999e..b0c785e1b6 100644 --- a/keyboards/redscarf_iiplus/verc/info.json +++ b/keyboards/redscarf_iiplus/verc/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "RedScarfII+ Ver.C (RS68)", + "keyboard_name": "RedScarfII+ Ver.C (RS68)", "manufacturer": "RedScarf", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/retro_75/info.json b/keyboards/retro_75/info.json index c61a79bbe1..1b15ca5e80 100644 --- a/keyboards/retro_75/info.json +++ b/keyboards/retro_75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Retro75", + "keyboard_name": "Retro75", "manufacturer": "PheonixStarr", - "url": "", - "maintainer": "zvecr", + "url": "", + "maintainer": "zvecr", "usb": { "vid": "0xFEED", "pid": "0x5275", diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json index bf398b82c8..d79d31ae9e 100644 --- a/keyboards/reviung/reviung53/info.json +++ b/keyboards/reviung/reviung53/info.json @@ -87,5 +87,4 @@ ] } } - } diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json index dc49a6943f..c0043377a9 100644 --- a/keyboards/rkg68/info.json +++ b/keyboards/rkg68/info.json @@ -1,107 +1,107 @@ { - "manufacturer": "Royal Kludge", - "keyboard_name": "rkg68", - "maintainer": "Thomaz-Peres", - "bootloader": "atmel-dfu", - "processor": "atmega32u4", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true - }, - "matrix_pins": { - "cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ], - "rows": [ "D0", "D1", "D2", "D3", "D5" ] - }, - "ws2812": { - "pin": "B3" - }, - "rgblight": { - "animations": { - "knight": true, - "rainbow_swirl": true - }, - "led_count": 4 - }, - "url": "http://en.rkgaming.com/", - "usb": { - "device_version": "1.0.0", - "pid": "0x0049", - "vid": "0x0049" - }, - "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, "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, 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, 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}, - {"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} - ] - } - } -} \ No newline at end of file + "manufacturer": "Royal Kludge", + "keyboard_name": "rkg68", + "maintainer": "Thomaz-Peres", + "bootloader": "atmel-dfu", + "processor": "atmega32u4", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "ws2812": { + "pin": "B3" + }, + "rgblight": { + "animations": { + "knight": true, + "rainbow_swirl": true + }, + "led_count": 4 + }, + "url": "http://en.rkgaming.com/", + "usb": { + "device_version": "1.0.0", + "pid": "0x0049", + "vid": "0x0049" + }, + "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, "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, 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, 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}, + {"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/rmkeebs/rm_numpad/info.json b/keyboards/rmkeebs/rm_numpad/info.json index c6ab31ece1..86ab94653a 100644 --- a/keyboards/rmkeebs/rm_numpad/info.json +++ b/keyboards/rmkeebs/rm_numpad/info.json @@ -148,6 +148,5 @@ {"matrix": [5, 4], "x": 3, "y": 5.25} ] } - } } diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json index 471a41ce1e..a029ebdc62 100644 --- a/keyboards/rotor/info.json +++ b/keyboards/rotor/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Rotor", + "keyboard_name": "Rotor", "manufacturer": "Densus Design", - "url": "https://klc-playground.com/", - "maintainer": "2Moons", + "url": "https://klc-playground.com/", + "maintainer": "2Moons", "usb": { "vid": "0x04D8", "pid": "0xE8BE", @@ -193,4 +193,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json index ce744d32f1..0b9ce15de3 100644 --- a/keyboards/rotr/info.json +++ b/keyboards/rotr/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ROTR", + "keyboard_name": "ROTR", "manufacturer": "ROTR", - "url": "https://geekhack.org/index.php?topic=107104.0", - "maintainer": "qmk", + "url": "https://geekhack.org/index.php?topic=107104.0", + "maintainer": "qmk", "usb": { "vid": "0x726F", "pid": "0x0001", diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/info.json index 9ccd546026..172c071d0a 100644 --- a/keyboards/saevus/cor/info.json +++ b/keyboards/saevus/cor/info.json @@ -26,83 +26,83 @@ "layouts": { "LAYOUT_all": { "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": [0,13], "x":13.25, "y":0 }, - { "matrix": [0,14], "x":14.25, "y":0 }, - { "matrix": [0,15], "x":15.25, "y":0 }, - { "matrix": [0,16], "x":16.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.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 }, + { "matrix": [0, 16], "x":16.75, "y":0 }, - { "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":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,15], "x":14.75, "y":1, "w":1.5 }, - { "matrix": [1,16], "x":16.75, "y":1 }, + { "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":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, 15], "x":14.75, "y":1, "w":1.5 }, + { "matrix": [1, 16], "x":16.75, "y":1 }, - { "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,14], "x":14, "y":2, "w":2.25 }, - { "matrix": [2,16], "x":16.75, "y":2 }, + { "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, 14], "x":14, "y":2, "w":2.25 }, + { "matrix": [2, 16], "x":16.75, "y":2 }, - { "matrix": [3,0], "x":0, "y":3 }, - { "matrix": [3,1], "x":1.25, "y":3, "w":2.25 }, - { "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,15], "x":15.5, "y":3.25 }, - { "matrix": [3,16], "x":16.75, "y":3 }, + { "matrix": [3, 0], "x":0, "y":3 }, + { "matrix": [3, 1], "x":1.25, "y":3, "w":2.25 }, + { "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, 15], "x":15.5, "y":3.25 }, + { "matrix": [3, 16], "x":16.75, "y":3 }, - { "matrix": [4,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,14], "x":14.5, "y":4.25 }, - { "matrix": [4,15], "x":15.5, "y":4.25 }, - { "matrix": [4,16], "x":16.5, "y":4.25 } + { "matrix": [4, 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, 14], "x":14.5, "y":4.25 }, + { "matrix": [4, 15], "x":15.5, "y":4.25 }, + { "matrix": [4, 16], "x":16.5, "y":4.25 } ] } } diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index da6acd3a3a..69219ebfc6 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "7skb", + "keyboard_name": "7skb", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEB5F", diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 40f449c126..524ecc34ea 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "7splus", + "keyboard_name": "7splus", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEAE7", diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index 681737a069..c802635334 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ajisai74", + "keyboard_name": "ajisai74", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEB54", diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 0957f6628d..1665fce7e8 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "ergoarrows", + "keyboard_name": "ergoarrows", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEA54", @@ -114,5 +114,4 @@ ] } } - } diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index c128df0f79..de9fe887e7 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "getta25", + "keyboard_name": "getta25", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0xFEED", "pid": "0x3060", diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/info.json index 8cf8504aba..8bb8511e99 100644 --- a/keyboards/salicylic_acid3/guide68/info.json +++ b/keyboards/salicylic_acid3/guide68/info.json @@ -41,7 +41,7 @@ "sleep": true, "max_brightness": 255, "split": true, - "split_count": [ 6, 6 ] + "split_count": [6, 6] }, "ws2812": { "pin": "D3" @@ -56,75 +56,75 @@ "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":[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}, - {"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, "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":1.5}, - {"matrix":[4,4], "x":5.25, "y":4, "w":1.5}, - {"matrix":[9,0], "x":7.75, "y":4, "w":1.5}, - {"matrix":[9,1], "x":9.25, "y":4, "w":1.25}, - {"matrix":[9,3], "x":10.5, "y":4, "w":1.25}, - {"matrix":[9,4], "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} + {"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}, + {"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, "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":1.5}, + {"matrix":[4, 4], "x":5.25, "y":4, "w":1.5}, + {"matrix":[9, 0], "x":7.75, "y":4, "w":1.5}, + {"matrix":[9, 1], "x":9.25, "y":4, "w":1.25}, + {"matrix":[9, 3], "x":10.5, "y":4, "w":1.25}, + {"matrix":[9, 4], "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} ] } } -} \ No newline at end of file +} diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index d0d3f1df63..63feabb939 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "jisplit89", + "keyboard_name": "jisplit89", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEB4F", diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index cbcc9f54fa..ea2645cf23 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nafuda", + "keyboard_name": "nafuda", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0xFEED", "pid": "0x3060", diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index 9a50c83ad7..8d09dc04ce 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "naked48", + "keyboard_name": "naked48", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xE8BA", diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json index 8021bf747f..dfa7175778 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "naked60", + "keyboard_name": "naked60", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEB5C", diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index 999f1e98c0..a58acf807b 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -214,5 +214,4 @@ ] } } - } diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index 9dfb147f42..f0f45f077a 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nknl7en", + "keyboard_name": "nknl7en", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEA56", diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 3eb51b4965..5713ad9084 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "nknl7jp", + "keyboard_name": "nknl7jp", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEA55", diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json index b2a8de9593..ad6c974136 100644 --- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json +++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json @@ -112,7 +112,7 @@ {"label": "K75 (F7,D7)", "matrix": [7, 5], "x": 11.25, "y": 3, "w": 1.75}, {"label": "K66 (F6,D6)", "matrix": [6, 6], "x": 13, "y": 3}, {"label": "K76 (F7,D6)", "matrix": [7, 6], "x": 14, "y": 3}, - + {"label": "K80 (F4,C7)", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, {"label": "K90 (F5,C7)", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, {"label": "K81 (F4,C6)", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, @@ -125,4 +125,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json index 7e7fe5a43e..387532d58b 100644 --- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json +++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json @@ -112,7 +112,7 @@ {"label": "K75 (F7,D7)", "matrix": [7, 5], "x": 11.25, "y": 3, "w": 1.75}, {"label": "K66 (F6,D6)", "matrix": [6, 6], "x": 13, "y": 3}, {"label": "K76 (F7,D6)", "matrix": [7, 6], "x": 14, "y": 3}, - + {"label": "K80 (F4,C7)", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, {"label": "K90 (F5,C7)", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, {"label": "K81 (F4,C6)", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, @@ -125,4 +125,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/info.json index d4afc35bfc..dd18cc12ee 100644 --- a/keyboards/sawnsprojects/plaque80/info.json +++ b/keyboards/sawnsprojects/plaque80/info.json @@ -144,4 +144,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index 170ab5d78c..59eb75c051 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -98,4 +98,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index 17cecb778c..c311c6a513 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -7,7 +7,7 @@ "diode_direction": "COL2ROW", "backlight": { "pin": "B7", - "breathing": true + "breathing": true }, "ws2812": { "pin": "F6" diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json index 2d414d5841..fca5fdca0b 100644 --- a/keyboards/shoc/info.json +++ b/keyboards/shoc/info.json @@ -85,4 +85,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/skeletn87/hotswap/info.json b/keyboards/skeletn87/hotswap/info.json index 18c918d331..61fb467ba3 100644 --- a/keyboards/skeletn87/hotswap/info.json +++ b/keyboards/skeletn87/hotswap/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Skeletn87 Hotswap", + "keyboard_name": "Skeletn87 Hotswap", "manufacturer": "BredWorks", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0xF984", "pid": "0xB5E9", diff --git a/keyboards/skeletn87/soldered/info.json b/keyboards/skeletn87/soldered/info.json index f428a78225..213f5cc36c 100644 --- a/keyboards/skeletn87/soldered/info.json +++ b/keyboards/skeletn87/soldered/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Skeletn87", + "keyboard_name": "Skeletn87", "manufacturer": "BredWorks", - "url": "", - "maintainer": "kb-elmo", + "url": "", + "maintainer": "kb-elmo", "usb": { "vid": "0xF984", "pid": "0xB5E8", diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/info.json index 2a5d8f8e7a..0bf27a69dc 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "RooPad", + "keyboard_name": "RooPad", "manufacturer": "ToastyStoemp", - "url": "", - "maintainer": "ToastyStoemp", + "url": "", + "maintainer": "ToastyStoemp", "usb": { "vid": "0x36B6", "pid": "0x0001", @@ -49,4 +49,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json index b8184da064..ec6ff48540 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/info.json @@ -11,8 +11,8 @@ "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { - "cols": ["A3" , "B9" , "B8" , "B5" , "B4", "B3" , "A6" , "A5" , "A4" , "A2" , "A1" , "A0" , "C15" , "C14"], - "rows": ["A10", "A15", "C13", "A7" , "B0"] + "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"], + "rows": ["A10", "A15", "C13", "A7", "B0"] }, "ws2812": { "pin": "B15" @@ -24,68 +24,68 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix": [0, 0 ], "w": 1, "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1 ], "w": 1, "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2 ], "w": 1, "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3 ], "w": 1, "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4 ], "w": 1, "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5 ], "w": 1, "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6 ], "w": 1, "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7 ], "w": 1, "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8 ], "w": 1, "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9 ], "w": 1, "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "Tab", "matrix": [1, 0 ], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1 ], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2 ], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3 ], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4 ], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5 ], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6 ], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7 ], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8 ], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9 ], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Caps", "matrix": [2, 0 ], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1 ], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2 ], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3 ], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4 ], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5 ], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6 ], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7 ], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8 ], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9 ], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 12.75, "y": 2 }, - { "label": "Shift", "matrix": [3, 0 ], "w": 1.25, "x": 0, "y": 3 }, - { "label": "Z", "matrix": [3, 2 ], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3 ], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4 ], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5 ], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6 ], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7 ], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8 ], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9 ], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, { "label": "MO(1)", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, - { "label": "Ctrl", "matrix": [4, 0 ], "w": 1.25, "x": 0, "y": 4 }, - { "label": "Win", "matrix": [4, 1 ], "w": 1, "x": 1.5, "y": 4 }, - { "label": "Alt", "matrix": [4, 2 ], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "Space", "matrix": [4, 6 ], "w": 7, "x": 4, "y": 4 }, - { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 }, - { "label": "Win", "matrix": [4, 11], "w": 1, "x": 12.5, "y": 4 }, - { "label": "Ctrl", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4 } + { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 }, + { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [4, 6], "w": 7, "x": 4, "y": 4 }, + { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 }, + { "label": "Win", "matrix": [4, 11], "w": 1, "x": 12.5, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4 } ] } } diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json index 5eda7443b4..4612f02066 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/info.json @@ -27,71 +27,71 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "matrix": [0, 0 ], "w": 1, "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1 ], "w": 1, "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2 ], "w": 1, "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3 ], "w": 1, "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4 ], "w": 1, "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5 ], "w": 1, "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6 ], "w": 1, "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7 ], "w": 1, "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8 ], "w": 1, "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9 ], "w": 1, "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, - { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, - { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "Tab", "matrix": [1, 0 ], "w": 1.5, "x": 0, "y": 1 }, - { "label": "Q", "matrix": [1, 1 ], "w": 1, "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2 ], "w": 1, "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3 ], "w": 1, "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4 ], "w": 1, "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5 ], "w": 1, "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6 ], "w": 1, "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7 ], "w": 1, "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8 ], "w": 1, "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9 ], "w": 1, "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "label": "]", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "label": "[", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "label": "Caps", "matrix": [2, 0 ], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1 ], "w": 1, "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2 ], "w": 1, "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3 ], "w": 1, "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4 ], "w": 1, "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5 ], "w": 1, "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6 ], "w": 1, "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7 ], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8 ], "w": 1, "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9 ], "w": 1, "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "~", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "]", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "[", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "~", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, - { "label": "Shift", "matrix": [3, 0 ], "w": 1.25, "x": 0, "y": 3 }, - { "label": "|", "matrix": [3, 1 ], "w": 1, "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2 ], "w": 1, "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3 ], "w": 1, "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4 ], "w": 1, "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5 ], "w": 1, "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6 ], "w": 1, "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7 ], "w": 1, "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8 ], "w": 1, "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9 ], "w": 1, "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "label": "|", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "MO(1)", "matrix": [3, 13 ], "w": 1, "x": 14, "y": 3 }, - { "label": "Ctrl", "matrix": [4, 0 ], "w": 1.25, "x": 0, "y": 4 }, - { "label": "Win", "matrix": [4, 1 ], "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "Alt", "matrix": [4, 2 ], "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "Space", "matrix": [4, 6 ], "w": 6.25, "x": 3.75, "y": 4 }, - { "label": "Alt", "matrix": [4, 9 ], "w": 1.25, "x": 10, "y": 4 }, - { "label": "Win", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "Menu", "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "Ctrl", "matrix": [4, 12], "w": 1.25, "x": 13.75, "y": 4 } + { "label": "MO(1)", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "Alt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "Win", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "Menu", "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 12], "w": 1.25, "x": 13.75, "y": 4 } ] } } diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json index 5e8d0207af..333bad3b87 100644 --- a/keyboards/spaceman/2_milk/info.json +++ b/keyboards/spaceman/2_milk/info.json @@ -22,8 +22,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0] }, - {"x": 0, "y": 1, "matrix": [1, 0] } + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 0, "y": 1, "matrix": [1, 0]} ] } } diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json index 9162370c4c..0814e11244 100644 --- a/keyboards/spaceman/pancake/rev1/info.json +++ b/keyboards/spaceman/pancake/rev1/info.json @@ -13,7 +13,7 @@ "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { - "layout": [ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, @@ -66,8 +66,8 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] }, - "LAYOUT_ortho_4x12": { - "layout": [ + "LAYOUT_ortho_4x12": { + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json index 22c2b2e78d..d92d5a88f6 100644 --- a/keyboards/spaceman/pancake/rev2/info.json +++ b/keyboards/spaceman/pancake/rev2/info.json @@ -17,8 +17,8 @@ "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { - "LAYOUT_ortho_4x12": { - "layout": [ + "LAYOUT_ortho_4x12": { + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json index 684da7d920..b6f05cfbcb 100644 --- a/keyboards/splitkb/aurora/corne/rev1/info.json +++ b/keyboards/splitkb/aurora/corne/rev1/info.json @@ -19,50 +19,50 @@ "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3}, - {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3}, - {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1}, - {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1}, - {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2}, - {"label": "R01", "matrix": [4, 5], "x": 9, "y": 0.2}, + {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3}, + {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3}, + {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1}, + {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2}, + {"label": "R01", "matrix": [4, 5], "x": 9, "y": 0.2}, {"label": "R02", "matrix": [4, 4], "x": 10, "y": 0.1}, {"label": "R03", "matrix": [4, 3], "x": 11, "y": 0}, {"label": "R04", "matrix": [4, 2], "x": 12, "y": 0.1}, {"label": "R05", "matrix": [4, 1], "x": 13, "y": 0.3}, {"label": "R06", "matrix": [4, 0], "x": 14, "y": 0.3}, - {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3}, - {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3}, - {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1}, - {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1}, - {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2}, - {"label": "R07", "matrix": [5, 5], "x": 9, "y": 1.2}, + {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3}, + {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1}, + {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1}, + {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2}, + {"label": "R07", "matrix": [5, 5], "x": 9, "y": 1.2}, {"label": "R08", "matrix": [5, 4], "x": 10, "y": 1.1}, {"label": "R09", "matrix": [5, 3], "x": 11, "y": 1}, {"label": "R10", "matrix": [5, 2], "x": 12, "y": 1.1}, {"label": "R11", "matrix": [5, 1], "x": 13, "y": 1.3}, {"label": "R12", "matrix": [5, 0], "x": 14, "y": 1.3}, - {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3}, - {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3}, - {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1}, - {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1}, - {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2}, - {"label": "R13", "matrix": [6, 5], "x": 9, "y": 2.2}, + {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3}, + {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3}, + {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1}, + {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1}, + {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2}, + {"label": "R13", "matrix": [6, 5], "x": 9, "y": 2.2}, {"label": "R14", "matrix": [6, 4], "x": 10, "y": 2.1}, {"label": "R15", "matrix": [6, 3], "x": 11, "y": 2}, {"label": "R16", "matrix": [6, 2], "x": 12, "y": 2.1}, {"label": "R17", "matrix": [6, 1], "x": 13, "y": 2.3}, {"label": "R18", "matrix": [6, 0], "x": 14, "y": 2.3}, - {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7}, - {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7}, - {"label": "L19", "matrix": [3, 5], "x": 6, "y": 3.2}, - {"label": "R19", "matrix": [7, 5], "x": 8, "y": 3.2}, - {"label": "R20", "matrix": [7, 4], "x": 9, "y": 3.7}, + {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7}, + {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7}, + {"label": "L19", "matrix": [3, 5], "x": 6, "y": 3.2}, + {"label": "R19", "matrix": [7, 5], "x": 8, "y": 3.2}, + {"label": "R20", "matrix": [7, 4], "x": 9, "y": 3.7}, {"label": "R21", "matrix": [7, 3], "x": 10, "y": 3.7} ] } @@ -110,36 +110,36 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - {"flags": 2, "x": 93, "y": 17}, // L RGB1 - {"flags": 2, "x": 59, "y": 3}, // L RGB2 - {"flags": 2, "x": 25, "y": 7}, // L RGB3 - {"flags": 2, "x": 29, "y": 49}, // L RGB4 - {"flags": 2, "x": 70, "y": 51}, // L RGB5 + {"flags": 2, "x": 93, "y": 17}, // L RGB1 + {"flags": 2, "x": 59, "y": 3}, // L RGB2 + {"flags": 2, "x": 25, "y": 7}, // L RGB3 + {"flags": 2, "x": 29, "y": 49}, // L RGB4 + {"flags": 2, "x": 70, "y": 51}, // L RGB5 {"flags": 2, "x": 104, "y": 55}, // L RGB6 - {"flags": 4, "matrix": [3, 2], "x": 95, "y": 63}, // L SW19 - {"flags": 4, "matrix": [3, 1], "x": 80, "y": 58}, // L SW20 - {"flags": 4, "matrix": [3, 0], "x": 60, "y": 55}, // L SW21 - {"flags": 4, "matrix": [2, 5], "x": 85, "y": 39}, // L SW13 - {"flags": 4, "matrix": [2, 4], "x": 68, "y": 37}, // L SW14 - {"flags": 4, "matrix": [2, 3], "x": 50, "y": 35}, // L SW15 - {"flags": 4, "matrix": [2, 2], "x": 33, "y": 37}, // L SW16 - {"flags": 4, "matrix": [2, 1], "x": 16, "y": 42}, // L SW17 - {"flags": 4, "matrix": [1, 5], "x": 85, "y": 21}, // L SW07 - {"flags": 4, "matrix": [1, 4], "x": 68, "y": 19}, // L SW08 - {"flags": 4, "matrix": [1, 3], "x": 50, "y": 13}, // L SW09 - {"flags": 4, "matrix": [1, 2], "x": 33, "y": 20}, // L SW10 - {"flags": 4, "matrix": [1, 1], "x": 16, "y": 24}, // L SW11 - {"flags": 4, "matrix": [0, 5], "x": 85, "y": 4}, // L SW01 - {"flags": 4, "matrix": [0, 4], "x": 68, "y": 2}, // L SW02 - {"flags": 4, "matrix": [0, 3], "x": 50, "y": 0}, // L SW03 - {"flags": 4, "matrix": [0, 2], "x": 33, "y": 3}, // L SW04 - {"flags": 4, "matrix": [0, 1], "x": 16, "y": 7}, // L SW05 - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 7}, // L SW06 - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 24}, // L SW12 - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 41}, // L SW18 + {"flags": 4, "matrix": [3, 2], "x": 95, "y": 63}, // L SW19 + {"flags": 4, "matrix": [3, 1], "x": 80, "y": 58}, // L SW20 + {"flags": 4, "matrix": [3, 0], "x": 60, "y": 55}, // L SW21 + {"flags": 4, "matrix": [2, 5], "x": 85, "y": 39}, // L SW13 + {"flags": 4, "matrix": [2, 4], "x": 68, "y": 37}, // L SW14 + {"flags": 4, "matrix": [2, 3], "x": 50, "y": 35}, // L SW15 + {"flags": 4, "matrix": [2, 2], "x": 33, "y": 37}, // L SW16 + {"flags": 4, "matrix": [2, 1], "x": 16, "y": 42}, // L SW17 + {"flags": 4, "matrix": [1, 5], "x": 85, "y": 21}, // L SW07 + {"flags": 4, "matrix": [1, 4], "x": 68, "y": 19}, // L SW08 + {"flags": 4, "matrix": [1, 3], "x": 50, "y": 13}, // L SW09 + {"flags": 4, "matrix": [1, 2], "x": 33, "y": 20}, // L SW10 + {"flags": 4, "matrix": [1, 1], "x": 16, "y": 24}, // L SW11 + {"flags": 4, "matrix": [0, 5], "x": 85, "y": 4}, // L SW01 + {"flags": 4, "matrix": [0, 4], "x": 68, "y": 2}, // L SW02 + {"flags": 4, "matrix": [0, 3], "x": 50, "y": 0}, // L SW03 + {"flags": 4, "matrix": [0, 2], "x": 33, "y": 3}, // L SW04 + {"flags": 4, "matrix": [0, 1], "x": 16, "y": 7}, // L SW05 + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 7}, // L SW06 + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 24}, // L SW12 + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 41}, // L SW18 {"flags": 2, "x": 131, "y": 17}, // R RGB1 - {"flags": 2, "x": 165, "y": 3}, // R RGB2 - {"flags": 2, "x": 199, "y": 7}, // R RGB3 + {"flags": 2, "x": 165, "y": 3}, // R RGB2 + {"flags": 2, "x": 199, "y": 7}, // R RGB3 {"flags": 2, "x": 195, "y": 49}, // R RGB4 {"flags": 2, "x": 154, "y": 51}, // R RGB5 {"flags": 2, "x": 120, "y": 55}, // R RGB6 @@ -156,12 +156,12 @@ {"flags": 4, "matrix": [5, 3], "x": 174, "y": 13}, // R SW09 {"flags": 4, "matrix": [5, 2], "x": 191, "y": 20}, // R SW10 {"flags": 4, "matrix": [5, 1], "x": 208, "y": 24}, // R SW11 - {"flags": 4, "matrix": [4, 5], "x": 139, "y": 4}, // R SW01 - {"flags": 4, "matrix": [4, 4], "x": 156, "y": 2}, // R SW02 - {"flags": 4, "matrix": [4, 3], "x": 174, "y": 0}, // R SW03 - {"flags": 4, "matrix": [4, 2], "x": 191, "y": 3}, // R SW04 - {"flags": 4, "matrix": [4, 1], "x": 208, "y": 7}, // R SW05 - {"flags": 4, "matrix": [4, 0], "x": 224, "y": 7}, // R SW06 + {"flags": 4, "matrix": [4, 5], "x": 139, "y": 4}, // R SW01 + {"flags": 4, "matrix": [4, 4], "x": 156, "y": 2}, // R SW02 + {"flags": 4, "matrix": [4, 3], "x": 174, "y": 0}, // R SW03 + {"flags": 4, "matrix": [4, 2], "x": 191, "y": 3}, // R SW04 + {"flags": 4, "matrix": [4, 1], "x": 208, "y": 7}, // R SW05 + {"flags": 4, "matrix": [4, 0], "x": 224, "y": 7}, // R SW06 {"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12 {"flags": 4, "matrix": [6, 0], "x": 224, "y": 41} // R SW18 ] diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json index efde159ccf..76b0edc116 100644 --- a/keyboards/splitkb/aurora/lily58/rev1/info.json +++ b/keyboards/splitkb/aurora/lily58/rev1/info.json @@ -13,12 +13,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5}, - {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375}, - {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125}, - {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125}, - {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25}, + {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5}, + {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375}, + {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125}, + {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125}, + {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25}, {"label": "R06", "matrix": [5, 5], "x": 10.5, "y": 0.25}, {"label": "R05", "matrix": [5, 4], "x": 11.5, "y": 0.125}, {"label": "R04", "matrix": [5, 3], "x": 12.5, "y": 0}, @@ -26,12 +26,12 @@ {"label": "R02", "matrix": [5, 1], "x": 14.5, "y": 0.375}, {"label": "R01", "matrix": [5, 0], "x": 15.5, "y": 0.5}, - {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5}, - {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375}, - {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125}, - {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125}, - {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375}, + {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125}, + {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125}, + {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25}, {"label": "R12", "matrix": [6, 5], "x": 10.5, "y": 1.25}, {"label": "R11", "matrix": [6, 4], "x": 11.5, "y": 1.125}, {"label": "R10", "matrix": [6, 3], "x": 12.5, "y": 1}, @@ -39,12 +39,12 @@ {"label": "R08", "matrix": [6, 1], "x": 14.5, "y": 1.375}, {"label": "R07", "matrix": [6, 0], "x": 15.5, "y": 1.5}, - {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5}, - {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375}, - {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125}, - {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125}, - {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25}, + {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375}, + {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125}, + {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125}, + {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25}, {"label": "R18", "matrix": [7, 5], "x": 10.5, "y": 2.25}, {"label": "R17", "matrix": [7, 4], "x": 11.5, "y": 2.125}, {"label": "R16", "matrix": [7, 3], "x": 12.5, "y": 2}, @@ -52,14 +52,14 @@ {"label": "R14", "matrix": [7, 1], "x": 14.5, "y": 2.375}, {"label": "R13", "matrix": [7, 0], "x": 15.5, "y": 2.5}, - {"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5}, - {"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375}, - {"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125}, - {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3}, - {"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125}, - {"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25}, - {"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75}, - {"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75}, + {"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375}, + {"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125}, + {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125}, + {"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25}, + {"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75}, + {"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75}, {"label": "R25", "matrix": [8, 5], "x": 10.5, "y": 3.25}, {"label": "R24", "matrix": [8, 4], "x": 11.5, "y": 3.125}, {"label": "R23", "matrix": [8, 3], "x": 12.5, "y": 3}, @@ -67,14 +67,14 @@ {"label": "R21", "matrix": [8, 1], "x": 14.5, "y": 3.375}, {"label": "R20", "matrix": [8, 0], "x": 15.5, "y": 3.5}, - {"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15}, - {"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15}, - {"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25}, - {"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25}, - {"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25}, - {"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25}, - {"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15}, - {"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15} + {"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15}, + {"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15}, + {"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25}, + {"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25}, + {"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25}, + {"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25}, + {"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15}, + {"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15} ] } }, @@ -121,51 +121,51 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - {"flags": 2, "x": 51, "y": 13}, // L RGB1 - {"flags": 2, "x": 22, "y": 18}, // L RGB2 - {"flags": 2, "x": 22, "y": 53}, // L RGB3 - {"flags": 2, "x": 58, "y": 60}, // L RGB4 - {"flags": 2, "x": 87, "y": 56}, // L RGB5 - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01 - {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02 - {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03 - {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04 - {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05 - {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06 - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07 - {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08 - {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09 - {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10 - {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11 - {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12 - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13 - {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14 - {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15 - {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16 - {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17 - {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18 - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20 - {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21 - {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22 - {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23 - {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24 - {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25 - {"flags": 4, "matrix": [4, 1], "x": 87, "y": 41}, // L SW19 - {"flags": 4, "matrix": [4, 2], "x": 36, "y": 62}, // L SW26 - {"flags": 4, "matrix": [4, 3], "x": 51, "y": 62}, // L SW27 - {"flags": 4, "matrix": [4, 4], "x": 65, "y": 64}, // L SW28 - {"flags": 4, "matrix": [4, 5], "x": 87, "y": 64}, // L SW29 + {"flags": 2, "x": 51, "y": 13}, // L RGB1 + {"flags": 2, "x": 22, "y": 18}, // L RGB2 + {"flags": 2, "x": 22, "y": 53}, // L RGB3 + {"flags": 2, "x": 58, "y": 60}, // L RGB4 + {"flags": 2, "x": 87, "y": 56}, // L RGB5 + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8}, // L SW01 + {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6}, // L SW02 + {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2}, // L SW03 + {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW04 + {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2}, // L SW05 + {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4}, // L SW06 + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23}, // L SW07 + {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21}, // L SW08 + {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17}, // L SW09 + {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW10 + {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17}, // L SW11 + {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19}, // L SW12 + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38}, // L SW13 + {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36}, // L SW14 + {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32}, // L SW15 + {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW16 + {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32}, // L SW17 + {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34}, // L SW18 + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53}, // L SW20 + {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51}, // L SW21 + {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47}, // L SW22 + {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45}, // L SW23 + {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47}, // L SW24 + {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49}, // L SW25 + {"flags": 4, "matrix": [4, 1], "x": 87, "y": 41}, // L SW19 + {"flags": 4, "matrix": [4, 2], "x": 36, "y": 62}, // L SW26 + {"flags": 4, "matrix": [4, 3], "x": 51, "y": 62}, // L SW27 + {"flags": 4, "matrix": [4, 4], "x": 65, "y": 64}, // L SW28 + {"flags": 4, "matrix": [4, 5], "x": 87, "y": 64}, // L SW29 {"flags": 2, "x": 173, "y": 13}, // R RGB1 {"flags": 2, "x": 202, "y": 18}, // R RGB2 {"flags": 2, "x": 202, "y": 53}, // R RGB3 {"flags": 2, "x": 166, "y": 60}, // R RGB4 {"flags": 2, "x": 137, "y": 56}, // R RGB5 - {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06 - {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05 - {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04 - {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03 - {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02 - {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01 + {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4}, // R SW06 + {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2}, // R SW05 + {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0}, // R SW04 + {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2}, // R SW03 + {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6}, // R SW02 + {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8}, // R SW01 {"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12 {"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11 {"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10 diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json index e5406cc721..ec85447084 100644 --- a/keyboards/splitkb/aurora/sweep/rev1/info.json +++ b/keyboards/splitkb/aurora/sweep/rev1/info.json @@ -19,36 +19,36 @@ "layouts": { "LAYOUT_split_3x5_2": { "layout": [ - {"label": "L01", "matrix": [0, 4], "x": 0, "y": 0.93}, - {"label": "L02", "matrix": [0, 3], "x": 1, "y": 0.31}, - {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "L04", "matrix": [0, 1], "x": 3, "y": 0.28}, - {"label": "L05", "matrix": [0, 0], "x": 4, "y": 0.42}, - {"label": "R05", "matrix": [4, 0], "x": 7, "y": 0.42}, - {"label": "R04", "matrix": [4, 1], "x": 8, "y": 0.28}, - {"label": "R03", "matrix": [4, 2], "x": 9, "y": 0}, + {"label": "L01", "matrix": [0, 4], "x": 0, "y": 0.93}, + {"label": "L02", "matrix": [0, 3], "x": 1, "y": 0.31}, + {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "L04", "matrix": [0, 1], "x": 3, "y": 0.28}, + {"label": "L05", "matrix": [0, 0], "x": 4, "y": 0.42}, + {"label": "R05", "matrix": [4, 0], "x": 7, "y": 0.42}, + {"label": "R04", "matrix": [4, 1], "x": 8, "y": 0.28}, + {"label": "R03", "matrix": [4, 2], "x": 9, "y": 0}, {"label": "R02", "matrix": [4, 3], "x": 10, "y": 0.31}, {"label": "R01", "matrix": [4, 4], "x": 11, "y": 0.93}, - {"label": "L06", "matrix": [1, 4], "x": 0, "y": 1.93}, - {"label": "L07", "matrix": [1, 3], "x": 1, "y": 1.31}, - {"label": "L08", "matrix": [1, 2], "x": 2, "y": 1}, - {"label": "L09", "matrix": [1, 1], "x": 3, "y": 1.28}, - {"label": "L10", "matrix": [1, 0], "x": 4, "y": 1.42}, - {"label": "R10", "matrix": [5, 0], "x": 7, "y": 1.42}, - {"label": "R09", "matrix": [5, 1], "x": 8, "y": 1.28}, - {"label": "R08", "matrix": [5, 2], "x": 9, "y": 1}, + {"label": "L06", "matrix": [1, 4], "x": 0, "y": 1.93}, + {"label": "L07", "matrix": [1, 3], "x": 1, "y": 1.31}, + {"label": "L08", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "L09", "matrix": [1, 1], "x": 3, "y": 1.28}, + {"label": "L10", "matrix": [1, 0], "x": 4, "y": 1.42}, + {"label": "R10", "matrix": [5, 0], "x": 7, "y": 1.42}, + {"label": "R09", "matrix": [5, 1], "x": 8, "y": 1.28}, + {"label": "R08", "matrix": [5, 2], "x": 9, "y": 1}, {"label": "R07", "matrix": [5, 3], "x": 10, "y": 1.31}, {"label": "R06", "matrix": [5, 4], "x": 11, "y": 1.93}, - {"label": "L11", "matrix": [2, 4], "x": 0, "y": 2.93}, - {"label": "L12", "matrix": [2, 3], "x": 1, "y": 2.31}, - {"label": "L13", "matrix": [2, 2], "x": 2, "y": 2}, - {"label": "L14", "matrix": [2, 1], "x": 3, "y": 2.28}, - {"label": "L15", "matrix": [2, 0], "x": 4, "y": 2.42}, - {"label": "R15", "matrix": [6, 0], "x": 7, "y": 2.42}, - {"label": "R14", "matrix": [6, 1], "x": 8, "y": 2.28}, - {"label": "R13", "matrix": [6, 2], "x": 9, "y": 2}, + {"label": "L11", "matrix": [2, 4], "x": 0, "y": 2.93}, + {"label": "L12", "matrix": [2, 3], "x": 1, "y": 2.31}, + {"label": "L13", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "L14", "matrix": [2, 1], "x": 3, "y": 2.28}, + {"label": "L15", "matrix": [2, 0], "x": 4, "y": 2.42}, + {"label": "R15", "matrix": [6, 0], "x": 7, "y": 2.42}, + {"label": "R14", "matrix": [6, 1], "x": 8, "y": 2.28}, + {"label": "R13", "matrix": [6, 2], "x": 9, "y": 2}, {"label": "R12", "matrix": [6, 3], "x": 10, "y": 2.31}, {"label": "R11", "matrix": [6, 4], "x": 11, "y": 2.93}, @@ -107,39 +107,39 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - {"flags": 2, "x": 71, "y": 15}, - {"flags": 2, "x": 51, "y": 8}, - {"flags": 2, "x": 10, "y": 13}, - {"flags": 2, "x": 10, "y": 42}, - {"flags": 2, "x": 41, "y": 45}, - {"flags": 2, "x": 76, "y": 50}, - {"flags": 4, "matrix": [0, 4], "x": 0, "y": 15}, - {"flags": 4, "matrix": [0, 3], "x": 20, "y": 5}, - {"flags": 4, "matrix": [0, 2], "x": 41, "y": 0}, - {"flags": 4, "matrix": [0, 1], "x": 61, "y": 4}, - {"flags": 4, "matrix": [0, 0], "x": 81, "y": 7}, - {"flags": 4, "matrix": [1, 4], "x": 0, "y": 31}, - {"flags": 4, "matrix": [1, 3], "x": 20, "y": 21}, - {"flags": 4, "matrix": [1, 2], "x": 41, "y": 16}, - {"flags": 4, "matrix": [1, 1], "x": 61, "y": 20}, - {"flags": 4, "matrix": [1, 0], "x": 81, "y": 23}, - {"flags": 4, "matrix": [2, 4], "x": 0, "y": 47}, - {"flags": 4, "matrix": [2, 3], "x": 20, "y": 37}, - {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, - {"flags": 4, "matrix": [2, 1], "x": 61, "y": 36}, - {"flags": 4, "matrix": [2, 0], "x": 81, "y": 39}, - {"flags": 4, "matrix": [3, 1], "x": 71, "y": 60}, - {"flags": 4, "matrix": [3, 0], "x": 92, "y": 64}, + {"flags": 2, "x": 71, "y": 15}, + {"flags": 2, "x": 51, "y": 8}, + {"flags": 2, "x": 10, "y": 13}, + {"flags": 2, "x": 10, "y": 42}, + {"flags": 2, "x": 41, "y": 45}, + {"flags": 2, "x": 76, "y": 50}, + {"flags": 4, "matrix": [0, 4], "x": 0, "y": 15}, + {"flags": 4, "matrix": [0, 3], "x": 20, "y": 5}, + {"flags": 4, "matrix": [0, 2], "x": 41, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 61, "y": 4}, + {"flags": 4, "matrix": [0, 0], "x": 81, "y": 7}, + {"flags": 4, "matrix": [1, 4], "x": 0, "y": 31}, + {"flags": 4, "matrix": [1, 3], "x": 20, "y": 21}, + {"flags": 4, "matrix": [1, 2], "x": 41, "y": 16}, + {"flags": 4, "matrix": [1, 1], "x": 61, "y": 20}, + {"flags": 4, "matrix": [1, 0], "x": 81, "y": 23}, + {"flags": 4, "matrix": [2, 4], "x": 0, "y": 47}, + {"flags": 4, "matrix": [2, 3], "x": 20, "y": 37}, + {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, + {"flags": 4, "matrix": [2, 1], "x": 61, "y": 36}, + {"flags": 4, "matrix": [2, 0], "x": 81, "y": 39}, + {"flags": 4, "matrix": [3, 1], "x": 71, "y": 60}, + {"flags": 4, "matrix": [3, 0], "x": 92, "y": 64}, {"flags": 2, "x": 150, "y": 15}, - {"flags": 2, "x": 190, "y": 8}, + {"flags": 2, "x": 190, "y": 8}, {"flags": 2, "x": 210, "y": 13}, {"flags": 2, "x": 220, "y": 42}, {"flags": 2, "x": 183, "y": 45}, {"flags": 2, "x": 155, "y": 50}, - {"flags": 4, "matrix": [4, 0], "x": 143, "y": 7}, - {"flags": 4, "matrix": [4, 1], "x": 163, "y": 4}, - {"flags": 4, "matrix": [4, 2], "x": 183, "y": 0}, - {"flags": 4, "matrix": [4, 3], "x": 204, "y": 5}, + {"flags": 4, "matrix": [4, 0], "x": 143, "y": 7}, + {"flags": 4, "matrix": [4, 1], "x": 163, "y": 4}, + {"flags": 4, "matrix": [4, 2], "x": 183, "y": 0}, + {"flags": 4, "matrix": [4, 3], "x": 204, "y": 5}, {"flags": 4, "matrix": [4, 4], "x": 224, "y": 15}, {"flags": 4, "matrix": [5, 0], "x": 143, "y": 23}, {"flags": 4, "matrix": [5, 1], "x": 163, "y": 20}, diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json index 8989eec072..564ba9b0e2 100644 --- a/keyboards/splitkb/kyria/rev3/info.json +++ b/keyboards/splitkb/kyria/rev3/info.json @@ -19,12 +19,12 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75}, - {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75}, - {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25}, - {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25}, - {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5}, + {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75}, + {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75}, + {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25}, + {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5}, {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5}, {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25}, {"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0}, @@ -32,12 +32,12 @@ {"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75}, {"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75}, - {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75}, - {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75}, - {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25}, - {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25}, - {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5}, + {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75}, + {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75}, + {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25}, + {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25}, + {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5}, {"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5}, {"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25}, {"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1}, @@ -45,16 +45,16 @@ {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75}, {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75}, - {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75}, - {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75}, - {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25}, - {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25}, - {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5}, - {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3}, - {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25}, - {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25}, - {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3}, + {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75}, + {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75}, + {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25}, + {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25}, + {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5}, + {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3}, + {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25}, + {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25}, + {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3}, {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5}, {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25}, {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2}, @@ -62,48 +62,48 @@ {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75}, {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75}, - {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25}, - {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25}, - {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5}, - {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4}, - {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25}, - {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25}, - {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4}, - {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5}, - {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25}, - {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}, + {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25}, + {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25}, + {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5}, + {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4}, + {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25}, + {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25}, + {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4}, + {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5}, + {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25}, + {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}, ] }, "LAYOUT_stack": { "layout": [ - {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75}, - {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75}, - {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25}, - {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25}, - {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5}, + {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75}, + {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75}, + {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25}, + {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5}, - {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75}, - {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75}, - {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25}, - {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25}, - {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5}, + {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75}, + {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75}, + {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25}, + {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25}, + {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5}, - {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75}, - {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75}, - {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25}, - {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25}, - {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5}, - {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3}, - {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25}, + {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75}, + {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75}, + {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25}, + {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25}, + {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5}, + {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3}, + {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25}, - {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25}, - {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25}, - {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5}, - {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4}, - {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25}, + {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25}, + {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25}, + {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5}, + {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4}, + {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25}, {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5}, {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25}, @@ -119,8 +119,8 @@ {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75}, {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75}, - {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25}, - {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3}, + {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25}, + {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3}, {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5}, {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25}, {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2}, @@ -128,11 +128,11 @@ {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75}, {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75}, - {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25}, - {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4}, - {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5}, - {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25}, - {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}, + {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25}, + {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4}, + {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5}, + {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25}, + {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}, ] } }, @@ -179,40 +179,40 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - {"flags": 2, "x": 75, "y": 2}, // L RGB1 - {"flags": 2, "x": 50, "y": 1}, // L RGB2 - {"flags": 2, "x": 14, "y": 4}, // L RGB3 - {"flags": 2, "x": 25, "y": 45}, // L RGB4 - {"flags": 2, "x": 58, "y": 49}, // L RGB5 - {"flags": 2, "x": 94, "y": 53}, // L RGB6 - {"flags": 4, "matrix": [3, 0], "x": 94, "y": 64}, // L SW21 - {"flags": 4, "matrix": [3, 5], "x": 79, "y": 60}, // L SW22 - {"flags": 4, "matrix": [3, 1], "x": 65, "y": 53}, // L SW23 - {"flags": 4, "matrix": [3, 2], "x": 51, "y": 49}, // L SW24 - {"flags": 4, "matrix": [3, 4], "x": 36, "y": 49}, // L SW25 + {"flags": 2, "x": 75, "y": 2}, // L RGB1 + {"flags": 2, "x": 50, "y": 1}, // L RGB2 + {"flags": 2, "x": 14, "y": 4}, // L RGB3 + {"flags": 2, "x": 25, "y": 45}, // L RGB4 + {"flags": 2, "x": 58, "y": 49}, // L RGB5 + {"flags": 2, "x": 94, "y": 53}, // L RGB6 + {"flags": 4, "matrix": [3, 0], "x": 94, "y": 64}, // L SW21 + {"flags": 4, "matrix": [3, 5], "x": 79, "y": 60}, // L SW22 + {"flags": 4, "matrix": [3, 1], "x": 65, "y": 53}, // L SW23 + {"flags": 4, "matrix": [3, 2], "x": 51, "y": 49}, // L SW24 + {"flags": 4, "matrix": [3, 4], "x": 36, "y": 49}, // L SW25 {"flags": 4, "matrix": [2, 0], "x": 101, "y": 49}, // L SW13 - {"flags": 4, "matrix": [3, 3], "x": 87, "y": 45}, // L SW14 - {"flags": 4, "matrix": [2, 1], "x": 72, "y": 38}, // L SW15 - {"flags": 4, "matrix": [2, 2], "x": 58, "y": 34}, // L SW16 - {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW17 - {"flags": 4, "matrix": [2, 4], "x": 29, "y": 34}, // L SW18 - {"flags": 4, "matrix": [2, 5], "x": 14, "y": 41}, // L SW19 - {"flags": 4, "matrix": [2, 6], "x": 0, "y": 41}, // L SW20 - {"flags": 4, "matrix": [1, 1], "x": 72, "y": 23}, // L SW07 - {"flags": 4, "matrix": [1, 2], "x": 58, "y": 19}, // L SW08 - {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW09 - {"flags": 4, "matrix": [1, 4], "x": 29, "y": 19}, // L SW10 - {"flags": 4, "matrix": [1, 5], "x": 14, "y": 26}, // L SW11 - {"flags": 4, "matrix": [1, 6], "x": 0, "y": 26}, // L SW12 - {"flags": 4, "matrix": [0, 1], "x": 72, "y": 8}, // L SW01 - {"flags": 4, "matrix": [0, 2], "x": 58, "y": 4}, // L SW02 - {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW03 - {"flags": 4, "matrix": [0, 4], "x": 29, "y": 4}, // L SW04 - {"flags": 4, "matrix": [0, 5], "x": 14, "y": 11}, // L SW05 - {"flags": 4, "matrix": [0, 6], "x": 0, "y": 11}, // L SW06 - {"flags": 2, "x": 149, "y": 2}, // R RGB1 - {"flags": 2, "x": 174, "y": 1}, // R RGB2 - {"flags": 2, "x": 210, "y": 4}, // R RGB3 + {"flags": 4, "matrix": [3, 3], "x": 87, "y": 45}, // L SW14 + {"flags": 4, "matrix": [2, 1], "x": 72, "y": 38}, // L SW15 + {"flags": 4, "matrix": [2, 2], "x": 58, "y": 34}, // L SW16 + {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30}, // L SW17 + {"flags": 4, "matrix": [2, 4], "x": 29, "y": 34}, // L SW18 + {"flags": 4, "matrix": [2, 5], "x": 14, "y": 41}, // L SW19 + {"flags": 4, "matrix": [2, 6], "x": 0, "y": 41}, // L SW20 + {"flags": 4, "matrix": [1, 1], "x": 72, "y": 23}, // L SW07 + {"flags": 4, "matrix": [1, 2], "x": 58, "y": 19}, // L SW08 + {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15}, // L SW09 + {"flags": 4, "matrix": [1, 4], "x": 29, "y": 19}, // L SW10 + {"flags": 4, "matrix": [1, 5], "x": 14, "y": 26}, // L SW11 + {"flags": 4, "matrix": [1, 6], "x": 0, "y": 26}, // L SW12 + {"flags": 4, "matrix": [0, 1], "x": 72, "y": 8}, // L SW01 + {"flags": 4, "matrix": [0, 2], "x": 58, "y": 4}, // L SW02 + {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0}, // L SW03 + {"flags": 4, "matrix": [0, 4], "x": 29, "y": 4}, // L SW04 + {"flags": 4, "matrix": [0, 5], "x": 14, "y": 11}, // L SW05 + {"flags": 4, "matrix": [0, 6], "x": 0, "y": 11}, // L SW06 + {"flags": 2, "x": 149, "y": 2}, // R RGB1 + {"flags": 2, "x": 174, "y": 1}, // R RGB2 + {"flags": 2, "x": 210, "y": 4}, // R RGB3 {"flags": 2, "x": 199, "y": 45}, // R RGB4 {"flags": 2, "x": 166, "y": 49}, // R RGB5 {"flags": 2, "x": 130, "y": 53}, // R RGB6 @@ -235,10 +235,10 @@ {"flags": 4, "matrix": [5, 4], "x": 195, "y": 19}, // R SW10 {"flags": 4, "matrix": [5, 5], "x": 210, "y": 26}, // R SW11 {"flags": 4, "matrix": [5, 6], "x": 224, "y": 26}, // R SW12 - {"flags": 4, "matrix": [4, 1], "x": 152, "y": 8}, // R SW01 - {"flags": 4, "matrix": [4, 2], "x": 166, "y": 4}, // R SW02 - {"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03 - {"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04 + {"flags": 4, "matrix": [4, 1], "x": 152, "y": 8}, // R SW01 + {"flags": 4, "matrix": [4, 2], "x": 166, "y": 4}, // R SW02 + {"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03 + {"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04 {"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05 {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}, // R SW06 ] diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json index 6dba060131..3390b8a334 100644 --- a/keyboards/sporewoh/banime40/info.json +++ b/keyboards/sporewoh/banime40/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "banime40", + "keyboard_name": "banime40", "manufacturer": "sporewoh", - "url": "https://github.com/ChrisChrisLoLo/banime40", - "maintainer": "sporewoh", + "url": "https://github.com/ChrisChrisLoLo/banime40", + "maintainer": "sporewoh", "usb": { - "vid": "0xBEAF", - "pid": "0x0001", - "device_version": "0.0.1" + "vid": "0xBEAF", + "pid": "0x0001", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json index e2189dc942..396e0f91d8 100644 --- a/keyboards/stello65/beta/info.json +++ b/keyboards/stello65/beta/info.json @@ -106,5 +106,4 @@ ] } } - } diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json index 3cff311132..f0803ededc 100644 --- a/keyboards/studiokestra/frl84/info.json +++ b/keyboards/studiokestra/frl84/info.json @@ -30,92 +30,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "matrix": [0, 0], "x":0, "y":0}, - {"label":"1", "matrix": [1, 0], "x":1, "y":0}, - {"label":"2", "matrix": [0, 1], "x":2, "y":0}, - {"label":"3", "matrix": [1, 1], "x":3, "y":0}, - {"label":"4", "matrix": [0, 2], "x":4, "y":0}, - {"label":"5", "matrix": [1, 2], "x":5, "y":0}, - {"label":"6", "matrix": [0, 3], "x":6, "y":0}, - {"label":"7", "matrix": [1, 3], "x":7, "y":0}, - {"label":"8", "matrix": [0, 4], "x":8, "y":0}, - {"label":"9", "matrix": [1, 4], "x":9, "y":0}, - {"label":"0", "matrix": [0, 5], "x":10, "y":0}, - {"label":"_", "matrix": [1, 5], "x":11, "y":0}, - {"label":"+", "matrix": [0, 6], "x":12, "y":0}, - {"label":"|", "matrix": [1, 6], "x":13, "y":0}, - {"label":"~", "matrix": [0, 7], "x":14, "y":0}, - {"label":"Num Lock", "matrix": [1, 7], "x":15, "y":0}, - {"label":"/", "matrix": [0, 8], "x":16, "y":0}, - {"label":"*", "matrix": [1, 8], "x":17, "y":0}, - {"label":"-", "matrix": [3, 8], "x":18, "y":0}, + {"label":"Esc", "matrix": [0, 0], "x":0, "y":0}, + {"label":"1", "matrix": [1, 0], "x":1, "y":0}, + {"label":"2", "matrix": [0, 1], "x":2, "y":0}, + {"label":"3", "matrix": [1, 1], "x":3, "y":0}, + {"label":"4", "matrix": [0, 2], "x":4, "y":0}, + {"label":"5", "matrix": [1, 2], "x":5, "y":0}, + {"label":"6", "matrix": [0, 3], "x":6, "y":0}, + {"label":"7", "matrix": [1, 3], "x":7, "y":0}, + {"label":"8", "matrix": [0, 4], "x":8, "y":0}, + {"label":"9", "matrix": [1, 4], "x":9, "y":0}, + {"label":"0", "matrix": [0, 5], "x":10, "y":0}, + {"label":"_", "matrix": [1, 5], "x":11, "y":0}, + {"label":"+", "matrix": [0, 6], "x":12, "y":0}, + {"label":"|", "matrix": [1, 6], "x":13, "y":0}, + {"label":"~", "matrix": [0, 7], "x":14, "y":0}, + {"label":"Num Lock", "matrix": [1, 7], "x":15, "y":0}, + {"label":"/", "matrix": [0, 8], "x":16, "y":0}, + {"label":"*", "matrix": [1, 8], "x":17, "y":0}, + {"label":"-", "matrix": [3, 8], "x":18, "y":0}, - {"label":"Tab", "matrix": [2, 0], "x":0, "y":1, "w":1.5}, - {"label":"Q", "matrix": [3, 0], "x":1.5, "y":1}, - {"label":"W", "matrix": [2, 1], "x":2.5, "y":1}, - {"label":"E", "matrix": [3, 1], "x":3.5, "y":1}, - {"label":"R", "matrix": [2, 2], "x":4.5, "y":1}, - {"label":"T", "matrix": [3, 2], "x":5.5, "y":1}, - {"label":"Y", "matrix": [2, 3], "x":6.5, "y":1}, - {"label":"U", "matrix": [3, 3], "x":7.5, "y":1}, - {"label":"I", "matrix": [2, 4], "x":8.5, "y":1}, - {"label":"O", "matrix": [3, 4], "x":9.5, "y":1}, - {"label":"P", "matrix": [2, 5], "x":10.5, "y":1}, - {"label":"{", "matrix": [3, 5], "x":11.5, "y":1}, - {"label":"}", "matrix": [2, 6], "x":12.5, "y":1}, - {"label":"Backspace", "matrix": [3, 6], "x":13.5, "y":1, "w":1.5}, - {"label":"7", "matrix": [2, 7], "x":15, "y":1}, - {"label":"8", "matrix": [3, 7], "x":16, "y":1}, - {"label":"9", "matrix": [2, 8], "x":17, "y":1}, - {"label":"+", "matrix": [5, 8], "x":18, "y":1, "h":2}, - - {"label":"Caps Lock", "matrix": [4, 0], "x":0, "y":2, "w":1.75}, - {"label":"A", "matrix": [5, 0], "x":1.75, "y":2}, - {"label":"S", "matrix": [4, 1], "x":2.75, "y":2}, - {"label":"D", "matrix": [5, 1], "x":3.75, "y":2}, - {"label":"F", "matrix": [4, 2], "x":4.75, "y":2}, - {"label":"G", "matrix": [5, 2], "x":5.75, "y":2}, - {"label":"H", "matrix": [4, 3], "x":6.75, "y":2}, - {"label":"J", "matrix": [5, 3], "x":7.75, "y":2}, - {"label":"K", "matrix": [4, 4], "x":8.75, "y":2}, - {"label":"L", "matrix": [5, 4], "x":9.75, "y":2}, - {"label":":", "matrix": [4, 5], "x":10.75, "y":2}, - {"label":"\"", "matrix": [5, 5], "x":11.75, "y":2}, - {"label":"Enter", "matrix": [4, 6], "x":12.75, "y":2, "w":2.25}, - {"label":"4", "matrix": [4, 7], "x":15, "y":2}, - {"label":"5", "matrix": [5, 7], "x":16, "y":2}, - {"label":"6", "matrix": [4, 8], "x":17, "y":2}, - - {"label":"Shift", "matrix": [6, 0], "x":0, "y":3, "w":2.25}, - {"label":"Z", "matrix": [7, 0], "x":2.25, "y":3}, - {"label":"X", "matrix": [6, 1], "x":3.25, "y":3}, - {"label":"C", "matrix": [7, 1], "x":4.25, "y":3}, - {"label":"V", "matrix": [6, 2], "x":5.25, "y":3}, - {"label":"B", "matrix": [7, 2], "x":6.25, "y":3}, - {"label":"N", "matrix": [6, 3], "x":7.25, "y":3}, - {"label":"M", "matrix": [7, 3], "x":8.25, "y":3}, - {"label":"<", "matrix": [6, 4], "x":9.25, "y":3}, - {"label":">", "matrix": [7, 4], "x":10.25, "y":3}, - {"label":"?", "matrix": [6, 5], "x":11.25, "y":3}, - {"label":"Shift", "matrix": [7, 5], "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "matrix": [6, 6], "x":14, "y":3}, - {"label":"1", "matrix": [6, 7], "x":15, "y":3}, - {"label":"2", "matrix": [7, 7], "x":16, "y":3}, - {"label":"3", "matrix": [6, 8], "x":17, "y":3}, - {"label":"Enter", "matrix": [7, 8], "x":18, "y":3, "h":2}, - - {"label":"Ctrl", "matrix": [8, 0], "x":0, "y":4, "w":1.25}, - {"label":"Win", "matrix": [9, 0], "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "matrix": [8, 1], "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "matrix": [8, 3], "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "matrix": [8, 4], "x":10, "y":4, "w":1.25}, - {"label":"Ctrl", "matrix": [8, 5], "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "matrix": [8, 6], "x":13, "y":4}, - {"label":"\u2193", "matrix": [9, 6], "x":14, "y":4}, - {"label":"\u2192", "matrix": [8, 7], "x":15, "y":4}, - {"label":"0", "matrix": [9, 7], "x":16, "y":4}, - {"label":".", "matrix": [8, 8], "x":17, "y":4} + {"label":"Tab", "matrix": [2, 0], "x":0, "y":1, "w":1.5}, + {"label":"Q", "matrix": [3, 0], "x":1.5, "y":1}, + {"label":"W", "matrix": [2, 1], "x":2.5, "y":1}, + {"label":"E", "matrix": [3, 1], "x":3.5, "y":1}, + {"label":"R", "matrix": [2, 2], "x":4.5, "y":1}, + {"label":"T", "matrix": [3, 2], "x":5.5, "y":1}, + {"label":"Y", "matrix": [2, 3], "x":6.5, "y":1}, + {"label":"U", "matrix": [3, 3], "x":7.5, "y":1}, + {"label":"I", "matrix": [2, 4], "x":8.5, "y":1}, + {"label":"O", "matrix": [3, 4], "x":9.5, "y":1}, + {"label":"P", "matrix": [2, 5], "x":10.5, "y":1}, + {"label":"{", "matrix": [3, 5], "x":11.5, "y":1}, + {"label":"}", "matrix": [2, 6], "x":12.5, "y":1}, + {"label":"Backspace", "matrix": [3, 6], "x":13.5, "y":1, "w":1.5}, + {"label":"7", "matrix": [2, 7], "x":15, "y":1}, + {"label":"8", "matrix": [3, 7], "x":16, "y":1}, + {"label":"9", "matrix": [2, 8], "x":17, "y":1}, + {"label":"+", "matrix": [5, 8], "x":18, "y":1, "h":2}, + + {"label":"Caps Lock", "matrix": [4, 0], "x":0, "y":2, "w":1.75}, + {"label":"A", "matrix": [5, 0], "x":1.75, "y":2}, + {"label":"S", "matrix": [4, 1], "x":2.75, "y":2}, + {"label":"D", "matrix": [5, 1], "x":3.75, "y":2}, + {"label":"F", "matrix": [4, 2], "x":4.75, "y":2}, + {"label":"G", "matrix": [5, 2], "x":5.75, "y":2}, + {"label":"H", "matrix": [4, 3], "x":6.75, "y":2}, + {"label":"J", "matrix": [5, 3], "x":7.75, "y":2}, + {"label":"K", "matrix": [4, 4], "x":8.75, "y":2}, + {"label":"L", "matrix": [5, 4], "x":9.75, "y":2}, + {"label":":", "matrix": [4, 5], "x":10.75, "y":2}, + {"label":"\"", "matrix": [5, 5], "x":11.75, "y":2}, + {"label":"Enter", "matrix": [4, 6], "x":12.75, "y":2, "w":2.25}, + {"label":"4", "matrix": [4, 7], "x":15, "y":2}, + {"label":"5", "matrix": [5, 7], "x":16, "y":2}, + {"label":"6", "matrix": [4, 8], "x":17, "y":2}, + + {"label":"Shift", "matrix": [6, 0], "x":0, "y":3, "w":2.25}, + {"label":"Z", "matrix": [7, 0], "x":2.25, "y":3}, + {"label":"X", "matrix": [6, 1], "x":3.25, "y":3}, + {"label":"C", "matrix": [7, 1], "x":4.25, "y":3}, + {"label":"V", "matrix": [6, 2], "x":5.25, "y":3}, + {"label":"B", "matrix": [7, 2], "x":6.25, "y":3}, + {"label":"N", "matrix": [6, 3], "x":7.25, "y":3}, + {"label":"M", "matrix": [7, 3], "x":8.25, "y":3}, + {"label":"<", "matrix": [6, 4], "x":9.25, "y":3}, + {"label":">", "matrix": [7, 4], "x":10.25, "y":3}, + {"label":"?", "matrix": [6, 5], "x":11.25, "y":3}, + {"label":"Shift", "matrix": [7, 5], "x":12.25, "y":3, "w":1.75}, + {"label":"\u2191", "matrix": [6, 6], "x":14, "y":3}, + {"label":"1", "matrix": [6, 7], "x":15, "y":3}, + {"label":"2", "matrix": [7, 7], "x":16, "y":3}, + {"label":"3", "matrix": [6, 8], "x":17, "y":3}, + {"label":"Enter", "matrix": [7, 8], "x":18, "y":3, "h":2}, + + {"label":"Ctrl", "matrix": [8, 0], "x":0, "y":4, "w":1.25}, + {"label":"Win", "matrix": [9, 0], "x":1.25, "y":4, "w":1.25}, + {"label":"Alt", "matrix": [8, 1], "x":2.5, "y":4, "w":1.25}, + {"label":"Space", "matrix": [8, 3], "x":3.75, "y":4, "w":6.25}, + {"label":"Alt", "matrix": [8, 4], "x":10, "y":4, "w":1.25}, + {"label":"Ctrl", "matrix": [8, 5], "x":11.25, "y":4, "w":1.25}, + {"label":"\u2190", "matrix": [8, 6], "x":13, "y":4}, + {"label":"\u2193", "matrix": [9, 6], "x":14, "y":4}, + {"label":"\u2192", "matrix": [8, 7], "x":15, "y":4}, + {"label":"0", "matrix": [9, 7], "x":16, "y":4}, + {"label":".", "matrix": [8, 8], "x":17, "y":4} ] } } -} \ No newline at end of file +} diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json index 36b0ffa4b9..dcc7898f61 100644 --- a/keyboards/studiokestra/galatea/rev1/info.json +++ b/keyboards/studiokestra/galatea/rev1/info.json @@ -352,4 +352,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json index 9cc8f3a266..a27edfc2d7 100644 --- a/keyboards/studiokestra/galatea/rev2/info.json +++ b/keyboards/studiokestra/galatea/rev2/info.json @@ -356,4 +356,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/subatomic/info.json b/keyboards/subatomic/info.json index f8250299f0..65b1abac26 100644 --- a/keyboards/subatomic/info.json +++ b/keyboards/subatomic/info.json @@ -97,7 +97,6 @@ {"matrix": [4, 13], "x": 13, "y": 4} ] }, - "LAYOUT_ortho_5x14_1x2uC": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -175,7 +174,6 @@ {"matrix": [4, 13], "x": 13, "y": 4} ] }, - "LAYOUT_ortho_5x14_2x2u": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/subrezon/info.json b/keyboards/subrezon/info.json index faad074acb..527aef6b35 100644 --- a/keyboards/subrezon/info.json +++ b/keyboards/subrezon/info.json @@ -1,4 +1,4 @@ { "manufacturer": "subrezon", "maintainer": "subrezon" -} \ No newline at end of file +} diff --git a/keyboards/subrezon/la_nc/info.json b/keyboards/subrezon/la_nc/info.json index 3d73586815..232f800dc3 100644 --- a/keyboards/subrezon/la_nc/info.json +++ b/keyboards/subrezon/la_nc/info.json @@ -16,49 +16,49 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Q", "matrix": [0, 0], "x": 0, "y": 0}, - { "label": "W", "matrix": [0, 1], "x": 1, "y": 0}, - { "label": "E", "matrix": [0, 2], "x": 2, "y": 0}, - { "label": "R", "matrix": [0, 3], "x": 3, "y": 0}, - { "label": "T", "matrix": [0, 4], "x": 4, "y": 0}, - { "label": "Y", "matrix": [0, 5], "x": 7, "y": 0}, - { "label": "U", "matrix": [0, 6], "x": 8, "y": 0}, - { "label": "I", "matrix": [0, 7], "x": 9, "y": 0}, - { "label": "O", "matrix": [0, 8], "x": 10, "y": 0}, - { "label": "P", "matrix": [0, 9], "x": 11, "y": 0}, - { "label": "A", "matrix": [1, 0], "x": 0, "y": 1}, - { "label": "S", "matrix": [1, 1], "x": 1, "y": 1}, - { "label": "D", "matrix": [1, 2], "x": 2, "y": 1}, - { "label": "F", "matrix": [1, 3], "x": 3, "y": 1}, - { "label": "G", "matrix": [1, 4], "x": 4, "y": 1}, - { "label": "H", "matrix": [2, 5], "x": 7, "y": 1}, - { "label": "J", "matrix": [2, 6], "x": 8, "y": 1}, - { "label": "K", "matrix": [2, 7], "x": 9, "y": 1}, - { "label": "L", "matrix": [2, 8], "x": 10, "y": 1}, - { "label": ";", "matrix": [2, 9], "x": 11, "y": 1}, - { "label": "Z", "matrix": [3, 0], "x": 0, "y": 2}, - { "label": "X", "matrix": [3, 1], "x": 1, "y": 2}, - { "label": "C", "matrix": [3, 2], "x": 2, "y": 2}, - { "label": "V", "matrix": [3, 3], "x": 3, "y": 2}, - { "label": "B", "matrix": [3, 4], "x": 4, "y": 2}, - { "label": "N", "matrix": [4, 5], "x": 7, "y": 2}, - { "label": "M", "matrix": [4, 6], "x": 8, "y": 2}, - { "label": ",", "matrix": [4, 7], "x": 9, "y": 2}, - { "label": ".", "matrix": [4, 8], "x": 10, "y": 2}, - { "label": "/", "matrix": [4, 9], "x": 11, "y": 2}, - { "label": "Tab", "matrix": [5, 0], "x": 0, "y": 3}, - { "label": "Alt", "matrix": [5, 1], "x": 1, "y": 3}, - { "label": "Ctrl", "matrix": [5, 2], "x": 2, "y": 3}, - { "label": "Raise", "matrix": [5, 3], "x": 3, "y": 3}, - { "label": "", "matrix": [5, 4], "x": 4, "y": 3}, - { "label": "Esc", "matrix": [3, 5], "x": 5, "y": 3}, - { "label": "GUI", "matrix": [4, 4], "x": 6, "y": 3}, - { "label": "Bksp", "matrix": [5, 5], "x": 7, "y": 3}, - { "label": "Shift", "matrix": [5, 6], "x": 8, "y": 3}, - { "label": "Lower", "matrix": [5, 7], "x": 9, "y": 3}, - { "label": "Delete","matrix": [5, 8], "x": 10, "y": 3}, + { "label": "Q", "matrix": [0, 0], "x": 0, "y": 0}, + { "label": "W", "matrix": [0, 1], "x": 1, "y": 0}, + { "label": "E", "matrix": [0, 2], "x": 2, "y": 0}, + { "label": "R", "matrix": [0, 3], "x": 3, "y": 0}, + { "label": "T", "matrix": [0, 4], "x": 4, "y": 0}, + { "label": "Y", "matrix": [0, 5], "x": 7, "y": 0}, + { "label": "U", "matrix": [0, 6], "x": 8, "y": 0}, + { "label": "I", "matrix": [0, 7], "x": 9, "y": 0}, + { "label": "O", "matrix": [0, 8], "x": 10, "y": 0}, + { "label": "P", "matrix": [0, 9], "x": 11, "y": 0}, + { "label": "A", "matrix": [1, 0], "x": 0, "y": 1}, + { "label": "S", "matrix": [1, 1], "x": 1, "y": 1}, + { "label": "D", "matrix": [1, 2], "x": 2, "y": 1}, + { "label": "F", "matrix": [1, 3], "x": 3, "y": 1}, + { "label": "G", "matrix": [1, 4], "x": 4, "y": 1}, + { "label": "H", "matrix": [2, 5], "x": 7, "y": 1}, + { "label": "J", "matrix": [2, 6], "x": 8, "y": 1}, + { "label": "K", "matrix": [2, 7], "x": 9, "y": 1}, + { "label": "L", "matrix": [2, 8], "x": 10, "y": 1}, + { "label": ";", "matrix": [2, 9], "x": 11, "y": 1}, + { "label": "Z", "matrix": [3, 0], "x": 0, "y": 2}, + { "label": "X", "matrix": [3, 1], "x": 1, "y": 2}, + { "label": "C", "matrix": [3, 2], "x": 2, "y": 2}, + { "label": "V", "matrix": [3, 3], "x": 3, "y": 2}, + { "label": "B", "matrix": [3, 4], "x": 4, "y": 2}, + { "label": "N", "matrix": [4, 5], "x": 7, "y": 2}, + { "label": "M", "matrix": [4, 6], "x": 8, "y": 2}, + { "label": ",", "matrix": [4, 7], "x": 9, "y": 2}, + { "label": ".", "matrix": [4, 8], "x": 10, "y": 2}, + { "label": "/", "matrix": [4, 9], "x": 11, "y": 2}, + { "label": "Tab", "matrix": [5, 0], "x": 0, "y": 3}, + { "label": "Alt", "matrix": [5, 1], "x": 1, "y": 3}, + { "label": "Ctrl", "matrix": [5, 2], "x": 2, "y": 3}, + { "label": "Raise", "matrix": [5, 3], "x": 3, "y": 3}, + { "label": "", "matrix": [5, 4], "x": 4, "y": 3}, + { "label": "Esc", "matrix": [3, 5], "x": 5, "y": 3}, + { "label": "GUI", "matrix": [4, 4], "x": 6, "y": 3}, + { "label": "Bksp", "matrix": [5, 5], "x": 7, "y": 3}, + { "label": "Shift", "matrix": [5, 6], "x": 8, "y": 3}, + { "label": "Lower", "matrix": [5, 7], "x": 9, "y": 3}, + { "label": "Delete", "matrix": [5, 8], "x": 10, "y": 3}, { "label": "Enter", "matrix": [5, 9], "x": 11, "y": 3} ] } } -} \ No newline at end of file +} diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json index 6cd8fd6ab8..70c4311196 100644 --- a/keyboards/supersplit/info.json +++ b/keyboards/supersplit/info.json @@ -68,8 +68,6 @@ { "x": 7, "y": 6, "matrix": [5, 4] }, { "x": 8, "y": 6, "matrix": [5, 5] }, - - { "x": 13, "y": 1, "matrix": [6, 5] }, { "x": 14, "y": 0.7, "matrix": [6, 4] }, { "x": 15, "y": 0, "matrix": [6, 3] }, diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json index 2c18990f02..57ce8bd79e 100644 --- a/keyboards/swiftrax/retropad/info.json +++ b/keyboards/swiftrax/retropad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Retropad", + "keyboard_name": "Retropad", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEB0C", diff --git a/keyboards/switchplate/southpaw_fullsize/info.json b/keyboards/switchplate/southpaw_fullsize/info.json index 327be486a2..3397418adf 100644 --- a/keyboards/switchplate/southpaw_fullsize/info.json +++ b/keyboards/switchplate/southpaw_fullsize/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Southpaw Fullsize", + "keyboard_name": "Southpaw Fullsize", "manufacturer": "Switchplate Peripherals", - "url": "", - "maintainer": "ai03", + "url": "", + "maintainer": "ai03", "usb": { "vid": "0xA103", "pid": "0x0017", diff --git a/keyboards/sx60/info.json b/keyboards/sx60/info.json index 183e37b974..246d2892f4 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/info.json @@ -108,7 +108,6 @@ {"matrix": [4, 13], "x": 16.25, "y": 4} ] }, - "LAYOUT_ansi_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 1.25, "y": 0}, @@ -195,7 +194,6 @@ {"matrix": [4, 13], "x": 16.25, "y": 4} ] }, - "LAYOUT_ansi_split_bs": { "layout": [ {"matrix": [0, 0], "x": 1.25, "y": 0}, @@ -281,7 +279,6 @@ {"matrix": [4, 13], "x": 16.25, "y": 4} ] }, - "LAYOUT_ansi_split_rshift": { "layout": [ {"matrix": [0, 0], "x": 1.25, "y": 0}, diff --git a/keyboards/synapse/info.json b/keyboards/synapse/info.json index 06ace305e6..85659dc8a5 100644 --- a/keyboards/synapse/info.json +++ b/keyboards/synapse/info.json @@ -4,9 +4,9 @@ "url": "", "maintainer": "qpockets", "usb": { - "vid": "0x7170", - "pid": "0x5359", - "device_version": "0.0.1" + "vid": "0x7170", + "pid": "0x5359", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["F0", "D4", "F5", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "B6"], @@ -14,10 +14,10 @@ }, "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "D7", "pin_b": "D6"}, - {"pin_a": "C7", "pin_b": "C6"} - ] + "rotary": [ + {"pin_a": "D7", "pin_b": "D6"}, + {"pin_a": "C7", "pin_b": "C6"} + ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/synthandkeys/the_debit_card/info.json b/keyboards/synthandkeys/the_debit_card/info.json index bf255b76eb..82975a4ed2 100644 --- a/keyboards/synthandkeys/the_debit_card/info.json +++ b/keyboards/synthandkeys/the_debit_card/info.json @@ -41,4 +41,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json index 91cb5a9c43..5fe9addd24 100644 --- a/keyboards/synthlabs/060/info.json +++ b/keyboards/synthlabs/060/info.json @@ -20,8 +20,8 @@ "pin": "E6" }, "matrix_pins": { - "cols": [ "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7" ], - "rows": [ "F0", "F1", "F4", "F5", "F6" ] + "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7"], + "rows": ["F0", "F1", "F4", "F5", "F6"] }, "usb": { "vid": "0x534E", @@ -32,7 +32,7 @@ "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, @@ -42,15 +42,15 @@ { "flags": 4, "matrix": [0, 7], "x":112, "y": 0 }, { "flags": 4, "matrix": [0, 8], "x":128, "y": 0 }, { "flags": 4, "matrix": [0, 9], "x":144, "y": 0 }, - { "flags": 4, "matrix": [0,10], "x":160, "y": 0 }, - { "flags": 4, "matrix": [0,11], "x":176, "y": 0 }, - { "flags": 4, "matrix": [0,12], "x":192, "y": 0 }, - { "flags": 1, "matrix": [0,13], "x":216, "y": 0 }, - - { "flags": 1, "matrix": [2,12], "x":220, "y":16 }, - { "flags": 4, "matrix": [1,12], "x":200, "y":16 }, - { "flags": 4, "matrix": [1,11], "x":184, "y":16 }, - { "flags": 4, "matrix": [1,10], "x":168, "y":16 }, + { "flags": 4, "matrix": [0, 10], "x":160, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x":176, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x":192, "y": 0 }, + { "flags": 1, "matrix": [0, 13], "x":216, "y": 0 }, + + { "flags": 1, "matrix": [2, 12], "x":220, "y":16 }, + { "flags": 4, "matrix": [1, 12], "x":200, "y":16 }, + { "flags": 4, "matrix": [1, 11], "x":184, "y":16 }, + { "flags": 4, "matrix": [1, 10], "x":168, "y":16 }, { "flags": 4, "matrix": [1, 9], "x":152, "y":16 }, { "flags": 4, "matrix": [1, 8], "x":136, "y":16 }, { "flags": 4, "matrix": [1, 7], "x":120, "y":16 }, @@ -60,9 +60,9 @@ { "flags": 4, "matrix": [1, 3], "x": 56, "y":16 }, { "flags": 4, "matrix": [1, 2], "x": 40, "y":16 }, { "flags": 4, "matrix": [1, 1], "x": 24, "y":16 }, - { "flags": 1, "matrix": [1, 0], "x": 4, "y":16 }, + { "flags": 1, "matrix": [1, 0], "x": 4, "y":16 }, - { "flags": 1, "matrix": [2, 0], "x": 6, "y":32 }, + { "flags": 1, "matrix": [2, 0], "x": 6, "y":32 }, { "flags": 4, "matrix": [2, 1], "x": 28, "y":32 }, { "flags": 4, "matrix": [2, 2], "x": 44, "y":32 }, { "flags": 4, "matrix": [2, 3], "x": 60, "y":32 }, @@ -72,14 +72,14 @@ { "flags": 4, "matrix": [2, 7], "x":124, "y":32 }, { "flags": 4, "matrix": [2, 8], "x":140, "y":32 }, { "flags": 4, "matrix": [2, 9], "x":156, "y":32 }, - { "flags": 4, "matrix": [2,10], "x":172, "y":32 }, - { "flags": 4, "matrix": [2,11], "x":188, "y":32 }, - { "flags": 1, "matrix": [2,13], "x":214, "y":32 }, - - { "flags": 1, "matrix": [3,13], "x":224, "y":48 }, - { "flags": 1, "matrix": [3,12], "x":202, "y":48 }, - { "flags": 4, "matrix": [3,11], "x":180, "y":48 }, - { "flags": 4, "matrix": [3,10], "x":164, "y":48 }, + { "flags": 4, "matrix": [2, 10], "x":172, "y":32 }, + { "flags": 4, "matrix": [2, 11], "x":188, "y":32 }, + { "flags": 1, "matrix": [2, 13], "x":214, "y":32 }, + + { "flags": 1, "matrix": [3, 13], "x":224, "y":48 }, + { "flags": 1, "matrix": [3, 12], "x":202, "y":48 }, + { "flags": 4, "matrix": [3, 11], "x":180, "y":48 }, + { "flags": 4, "matrix": [3, 10], "x":164, "y":48 }, { "flags": 4, "matrix": [3, 9], "x":148, "y":48 }, { "flags": 4, "matrix": [3, 8], "x":132, "y":48 }, { "flags": 4, "matrix": [3, 7], "x":116, "y":48 }, @@ -90,15 +90,15 @@ { "flags": 4, "matrix": [3, 2], "x": 36, "y":48 }, { "flags": 1, "matrix": [3, 0], "x": 10, "y":48 }, - { "flags": 1, "matrix": [4, 0], "x": 4, "y":64 }, + { "flags": 1, "matrix": [4, 0], "x": 4, "y":64 }, { "flags": 1, "matrix": [4, 1], "x": 24, "y":64 }, { "flags": 1, "matrix": [4, 2], "x": 44, "y":64 }, { "flags": 4, "matrix": [4, 5], "x": 78, "y":64 }, { "flags": 4, "matrix": [4, 7], "x":112, "y":64 }, { "flags": 4, "matrix": [4, 9], "x":146, "y":64 }, - { "flags": 1, "matrix": [4,11], "x":180, "y":64 }, - { "flags": 1, "matrix": [4,12], "x":200, "y":64 }, - { "flags": 1, "matrix": [4,13], "x":220, "y":64 } + { "flags": 1, "matrix": [4, 11], "x":180, "y":64 }, + { "flags": 1, "matrix": [4, 12], "x":200, "y":64 }, + { "flags": 1, "matrix": [4, 13], "x":220, "y":64 } ] }, "community_layouts": [ @@ -113,565 +113,565 @@ "layouts": { "LAYOUT_all": { "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.5 }, - { "matrix": [4,1], "x":1.5, "y":4 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4,5], "x":4, "y":4, "w":2.75 }, - { "matrix": [4,7], "x":6.75, "y":4 }, - { "matrix": [4,9], "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 }, - { "matrix": [4,13], "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, 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.5 }, + { "matrix": [4, 1], "x":1.5, "y":4 }, + { "matrix": [4, 2], "x":2.5, "y":4, "w":1.5 }, + { "matrix": [4, 5], "x":4, "y":4, "w":2.75 }, + { "matrix": [4, 7], "x":6.75, "y":4 }, + { "matrix": [4, 9], "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 }, + { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 } ] }, "LAYOUT_60_ansi": { "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": [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":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,7], "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 } + { "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, 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":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, 7], "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 } ] }, "LAYOUT_60_ansi_split_bs_rshift": { "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.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,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 } + { "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.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, 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 } ] }, "LAYOUT_60_ansi_tsangan": { "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": [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":2.75 }, - - { "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":12.5, "y":4 }, - { "matrix": [4,13], "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, "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, 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":2.75 }, + + { "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":12.5, "y":4 }, + { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 } ] }, "LAYOUT_60_tsangan_hhkb": { "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,7], "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 } + { "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, 7], "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 } ] }, "LAYOUT_60_iso": { "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": [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": [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":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,7], "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 } + { "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, 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": [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":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, 7], "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 } ] }, "LAYOUT_60_iso_split_bs_rshift": { "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":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": [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,7], "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 } + { "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":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": [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, 7], "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 } ] }, "LAYOUT_60_iso_tsangan": { "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": [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": [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":2.75 }, - - { "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":12.5, "y":4 }, - { "matrix": [4,13], "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, "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, 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": [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":2.75 }, + + { "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":12.5, "y":4 }, + { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 } ] } } diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index e90884fc0f..72bd8ae91b 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -29,57 +29,57 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]}, - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, - {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]}, + {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0, 0]}, + {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, + {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0, 2]}, + {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, + {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 4]}, + {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, + {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0, 6]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, + {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 1]}, + {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, + {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 3]}, + {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, + {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 5]}, + {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} ] }, "LAYOUT_left": { "layout": [ - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, + {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]}, + {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]}, + {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]}, + {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]}, + {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]}, + {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]} ] }, "LAYOUT_right": { "layout": [ - {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]}, + {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 5]}, + {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 3]}, + {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 1]}, - {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] }, - {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1, 0]}, + {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]}, + {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1, 2]}, - {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]}, - {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]} + {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0, 6]}, + {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0, 4]}, + {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0, 2]}, + {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0, 0]} ] } } diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index edc71222a0..2e7ef2f7a6 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -112,4 +112,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 8c572ad32f..e826e36741 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -65,4 +65,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index ac4a9102d9..bc162527b5 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -497,4 +497,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index a48fceb8d1..1afa2b1280 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -141,4 +141,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index e3af5b8371..d6852033b1 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json index 891968963c..a2e86fe27f 100644 --- a/keyboards/takashicompany/tightwriter/info.json +++ b/keyboards/takashicompany/tightwriter/info.json @@ -96,4 +96,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index f64d385270..f94a98fd22 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "namecard2x4", + "keyboard_name": "namecard2x4", "manufacturer": "takashiski", - "url": "https://skyhigh-works.hatenablog.com/", - "maintainer": "takashiski", + "url": "https://skyhigh-works.hatenablog.com/", + "maintainer": "takashiski", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 8f9f79e4f5..2c65d48a3c 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "otaku split rev.0", + "keyboard_name": "otaku split rev.0", "manufacturer": "takashiski", - "url": "", + "url": "", "maintainer": "takashiski", "usb": { "vid": "0xFEED", diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 12bd92c681..2c15c414e1 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "otaku split rev.1", + "keyboard_name": "otaku split rev.1", "manufacturer": "takashiski", - "url": "http", - "maintainer": "takashiski", + "url": "http", + "maintainer": "takashiski", "usb": { "vid": "0xFEED", "pid": "0x0000", diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json index 0f19b19eac..b89a647221 100644 --- a/keyboards/tau4/info.json +++ b/keyboards/tau4/info.json @@ -13,8 +13,8 @@ "lto": true }, "matrix_pins": { - "rows": [ "F4", "F5", "F6", "F7" ], - "cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ] + "rows": ["F4", "F5", "F6", "F7"], + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1"] }, "processor": "atmega32u4", "features": { @@ -26,7 +26,7 @@ "oled": true, "rgblight": true }, - "community_layouts": [ "ortho_4x12" ], + "community_layouts": ["ortho_4x12"], "diode_direction": "COL2ROW", "encoder": { "rotary": [ diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json index db4d36088c..db012d91ff 100644 --- a/keyboards/teahouse/ayleen/info.json +++ b/keyboards/teahouse/ayleen/info.json @@ -16,8 +16,8 @@ "nkro":true }, "matrix_pins":{ - "rows":["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7","D5", "D3"], - "cols":[ + "rows": ["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7", "D5", "D3"], + "cols": [ "F6", "D0", "D1", @@ -33,105 +33,105 @@ "pin": "C7" }, "usb":{ - "vid": "0x5448", - "pid": "0x4141", + "vid": "0x5448", + "pid": "0x4141", "device_version": "0.0.1" }, "layouts": { "LAYOUT": { "layout": [ - { "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":[5,8],"x": 9.5, "y": 0 }, - { "label": "F10", "matrix":[5,7],"x": 10.75, "y": 0 }, - { "label": "F11", "matrix":[5,6],"x": 11.75, "y": 0 }, - { "label": "F12", "matrix":[5,5],"x": 12.75, "y": 0 }, - { "label": "F13", "matrix":[5,4],"x": 13.75, "y": 0 }, - { "label": "Prtsc", "matrix":[5,3],"x": 15.25, "y": 0 }, - { "label": "Scrlk", "matrix":[5,2],"x": 16.25, "y": 0 }, - { "label": "Pause", "matrix":[5,1],"x": 17.25, "y": 0 }, + { "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":[5, 8], "x": 9.5, "y": 0 }, + { "label": "F10", "matrix":[5, 7], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix":[5, 6], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix":[5, 5], "x": 12.75, "y": 0 }, + { "label": "F13", "matrix":[5, 4], "x": 13.75, "y": 0 }, + { "label": "Prtsc", "matrix":[5, 3], "x": 15.25, "y": 0 }, + { "label": "Scrlk", "matrix":[5, 2], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix":[5, 1], "x": 17.25, "y": 0 }, - { "label": "～", "matrix":[1,0],"x": 0, "y": 1.5 }, - { "label": "1", "matrix":[1,1],"x": 1, "y": 1.5 }, - { "label": "2", "matrix":[1,2],"x": 2, "y": 1.5 }, - { "label": "3", "matrix":[1,3],"x": 3, "y": 1.5 }, - { "label": "4", "matrix":[1,4],"x": 4, "y": 1.5 }, - { "label": "5", "matrix":[1,5],"x": 5, "y": 1.5 }, - { "label": "6", "matrix":[1,6],"x": 6, "y": 1.5 }, - { "label": "7", "matrix":[1,7],"x": 7, "y": 1.5 }, - { "label": "8", "matrix":[1,8],"x": 8, "y": 1.5 }, - { "label": "9", "matrix":[6,8],"x": 9, "y": 1.5 }, - { "label": "0", "matrix":[6,7],"x": 10, "y": 1.5 }, - { "label": "-", "matrix":[6,6],"x": 11, "y": 1.5 }, - { "label": "=", "matrix":[6,5],"x": 12, "y": 1.5 }, - { "label": "backspace", "matrix":[6,4],"x": 13, "y": 1.5, "w": 2 }, - { "label": "insert", "matrix":[6,3],"x": 15.25, "y": 1.5 }, - { "label": "home", "matrix":[6,2],"x": 16.25, "y": 1.5 }, - { "label": "pg up", "matrix":[6,1],"x": 17.25, "y": 1.5 }, + { "label": "～", "matrix":[1, 0], "x": 0, "y": 1.5 }, + { "label": "1", "matrix":[1, 1], "x": 1, "y": 1.5 }, + { "label": "2", "matrix":[1, 2], "x": 2, "y": 1.5 }, + { "label": "3", "matrix":[1, 3], "x": 3, "y": 1.5 }, + { "label": "4", "matrix":[1, 4], "x": 4, "y": 1.5 }, + { "label": "5", "matrix":[1, 5], "x": 5, "y": 1.5 }, + { "label": "6", "matrix":[1, 6], "x": 6, "y": 1.5 }, + { "label": "7", "matrix":[1, 7], "x": 7, "y": 1.5 }, + { "label": "8", "matrix":[1, 8], "x": 8, "y": 1.5 }, + { "label": "9", "matrix":[6, 8], "x": 9, "y": 1.5 }, + { "label": "0", "matrix":[6, 7], "x": 10, "y": 1.5 }, + { "label": "-", "matrix":[6, 6], "x": 11, "y": 1.5 }, + { "label": "=", "matrix":[6, 5], "x": 12, "y": 1.5 }, + { "label": "backspace", "matrix":[6, 4], "x": 13, "y": 1.5, "w": 2 }, + { "label": "insert", "matrix":[6, 3], "x": 15.25, "y": 1.5 }, + { "label": "home", "matrix":[6, 2], "x": 16.25, "y": 1.5 }, + { "label": "pg up", "matrix":[6, 1], "x": 17.25, "y": 1.5 }, - { "label": "tab", "matrix":[2,0],"x": 0, "y": 2.5, "w": 1.5 }, - { "label": "q", "matrix":[2,1],"x": 1.5, "y": 2.5 }, - { "label": "w", "matrix":[2,2],"x": 2.5, "y": 2.5 }, - { "label": "e", "matrix":[2,3],"x": 3.5, "y": 2.5 }, - { "label": "r", "matrix":[2,4],"x": 4.5, "y": 2.5 }, - { "label": "t", "matrix":[2,5],"x": 5.5, "y": 2.5 }, - { "label": "y", "matrix":[2,6],"x": 6.5, "y": 2.5 }, - { "label": "u", "matrix":[2,7],"x": 7.5, "y": 2.5 }, - { "label": "i", "matrix":[2,8],"x": 8.5, "y": 2.5 }, - { "label": "o", "matrix":[7,8],"x": 9.5, "y": 2.5 }, - { "label": "p", "matrix":[7,7],"x": 10.5, "y": 2.5 }, - { "label": "{", "matrix":[7,6],"x": 11.5, "y": 2.5 }, - { "label": "}", "matrix":[7,5],"x": 12.5, "y": 2.5 }, - { "label": "|", "matrix":[7,4],"x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "delete", "matrix":[7,3],"x": 15.25, "y": 2.5 }, - { "label": "end", "matrix":[7,2],"x": 16.25, "y": 2.5 }, - { "label": "pg dn", "matrix":[7,1],"x": 17.25, "y": 2.5 }, + { "label": "tab", "matrix":[2, 0], "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "q", "matrix":[2, 1], "x": 1.5, "y": 2.5 }, + { "label": "w", "matrix":[2, 2], "x": 2.5, "y": 2.5 }, + { "label": "e", "matrix":[2, 3], "x": 3.5, "y": 2.5 }, + { "label": "r", "matrix":[2, 4], "x": 4.5, "y": 2.5 }, + { "label": "t", "matrix":[2, 5], "x": 5.5, "y": 2.5 }, + { "label": "y", "matrix":[2, 6], "x": 6.5, "y": 2.5 }, + { "label": "u", "matrix":[2, 7], "x": 7.5, "y": 2.5 }, + { "label": "i", "matrix":[2, 8], "x": 8.5, "y": 2.5 }, + { "label": "o", "matrix":[7, 8], "x": 9.5, "y": 2.5 }, + { "label": "p", "matrix":[7, 7], "x": 10.5, "y": 2.5 }, + { "label": "{", "matrix":[7, 6], "x": 11.5, "y": 2.5 }, + { "label": "}", "matrix":[7, 5], "x": 12.5, "y": 2.5 }, + { "label": "|", "matrix":[7, 4], "x": 13.5, "y": 2.5, "w": 1.5 }, + { "label": "delete", "matrix":[7, 3], "x": 15.25, "y": 2.5 }, + { "label": "end", "matrix":[7, 2], "x": 16.25, "y": 2.5 }, + { "label": "pg dn", "matrix":[7, 1], "x": 17.25, "y": 2.5 }, - { "label": "capslock", "matrix":[3,0],"x": 0, "y": 3.5, "w": 1.75 }, - { "label": "a", "matrix":[3,1],"x": 1.75, "y": 3.5 }, - { "label": "s", "matrix":[3,2],"x": 2.75, "y": 3.5 }, - { "label": "d", "matrix":[3,3],"x": 3.75, "y": 3.5 }, - { "label": "f", "matrix":[3,4],"x": 4.75, "y": 3.5 }, - { "label": "g", "matrix":[3,5],"x": 5.75, "y": 3.5 }, - { "label": "h", "matrix":[3,6],"x": 6.75, "y": 3.5 }, - { "label": "j", "matrix":[3,7],"x": 7.75, "y": 3.5 }, - { "label": "k", "matrix":[3,8],"x": 8.75, "y": 3.5 }, - { "label": "l", "matrix":[8,8],"x": 9.75, "y": 3.5 }, - { "label": ";", "matrix":[8,7],"x": 10.75, "y": 3.5 }, - { "label": "'", "matrix":[8,6],"x": 11.75, "y": 3.5 }, - { "label": "enter", "matrix":[8,5],"x": 12.75, "y": 3.5, "w": 2.25 }, + { "label": "capslock", "matrix":[3, 0], "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "a", "matrix":[3, 1], "x": 1.75, "y": 3.5 }, + { "label": "s", "matrix":[3, 2], "x": 2.75, "y": 3.5 }, + { "label": "d", "matrix":[3, 3], "x": 3.75, "y": 3.5 }, + { "label": "f", "matrix":[3, 4], "x": 4.75, "y": 3.5 }, + { "label": "g", "matrix":[3, 5], "x": 5.75, "y": 3.5 }, + { "label": "h", "matrix":[3, 6], "x": 6.75, "y": 3.5 }, + { "label": "j", "matrix":[3, 7], "x": 7.75, "y": 3.5 }, + { "label": "k", "matrix":[3, 8], "x": 8.75, "y": 3.5 }, + { "label": "l", "matrix":[8, 8], "x": 9.75, "y": 3.5 }, + { "label": ";", "matrix":[8, 7], "x": 10.75, "y": 3.5 }, + { "label": "'", "matrix":[8, 6], "x": 11.75, "y": 3.5 }, + { "label": "enter", "matrix":[8, 5], "x": 12.75, "y": 3.5, "w": 2.25 }, - { "label": "leftshift", "matrix":[4,0],"x": 0, "y": 4.5, "w": 2.25 }, - { "label": "z", "matrix":[4,1],"x": 3.25, "y": 4.5 }, - { "label": "x", "matrix":[4,2],"x": 4.25, "y": 4.5 }, - { "label": "c", "matrix":[4,3],"x": 5.25, "y": 4.5 }, - { "label": "v", "matrix":[4,4],"x": 6.25, "y": 4.5 }, - { "label": "b", "matrix":[4,5],"x": 7.25, "y": 4.5 }, - { "label": "n", "matrix":[4,6],"x": 8.25, "y": 4.5 }, - { "label": "m", "matrix":[4,7],"x": 9.25, "y": 4.5 }, - { "label": ",", "matrix":[4,8],"x": 10.25, "y": 0 }, - { "label": ".", "matrix":[9,8],"x": 11.25, "y": 4.5 }, - { "label": "/", "matrix":[9,7],"x": 12.25, "y": 4.5 }, - { "label": "rightshift", "matrix":[9,6],"x": 13.25, "y": 4.5, "w": 2.75 }, - { "label": "up", "matrix":[8,2],"x": 18.25, "y": 4.5 }, + { "label": "leftshift", "matrix":[4, 0], "x": 0, "y": 4.5, "w": 2.25 }, + { "label": "z", "matrix":[4, 1], "x": 3.25, "y": 4.5 }, + { "label": "x", "matrix":[4, 2], "x": 4.25, "y": 4.5 }, + { "label": "c", "matrix":[4, 3], "x": 5.25, "y": 4.5 }, + { "label": "v", "matrix":[4, 4], "x": 6.25, "y": 4.5 }, + { "label": "b", "matrix":[4, 5], "x": 7.25, "y": 4.5 }, + { "label": "n", "matrix":[4, 6], "x": 8.25, "y": 4.5 }, + { "label": "m", "matrix":[4, 7], "x": 9.25, "y": 4.5 }, + { "label": ",", "matrix":[4, 8], "x": 10.25, "y": 0 }, + { "label": ".", "matrix":[9, 8], "x": 11.25, "y": 4.5 }, + { "label": "/", "matrix":[9, 7], "x": 12.25, "y": 4.5 }, + { "label": "rightshift", "matrix":[9, 6], "x": 13.25, "y": 4.5, "w": 2.75 }, + { "label": "up", "matrix":[8, 2], "x": 18.25, "y": 4.5 }, - { "label": "lctrl", "matrix":[10,0],"x": 0, "y": 5.5, "w": 1.5 }, - { "label": "lwin", "matrix":[10,1],"x": 1.5, "y": 5.5 }, - { "label": "lalt", "matrix":[10,2],"x": 2.5, "y": 5.5, "w": 1.5 }, - { "label": "space", "matrix":[10,3],"x": 4, "y": 5.5, "w": 7 }, - { "label": "ralt", "matrix":[10,4],"x": 11, "y": 5.5, "w": 1.5 }, - { "label": "rwin", "matrix":[10,5],"x": 12.5, "y": 5.5, "w": 1 }, - { "label": "rctrl", "matrix":[10,8],"x": 13.5, "y": 5.5, "w":1.5}, - { "label": "left", "matrix":[9,3],"x": 15.25, "y": 5.5 }, - { "label": "down", "matrix":[9,2],"x": 16.25, "y": 5.5 }, - { "label": "right", "matrix":[9,1],"x": 17.25, "y": 5.5 } + { "label": "lctrl", "matrix":[10, 0], "x": 0, "y": 5.5, "w": 1.5 }, + { "label": "lwin", "matrix":[10, 1], "x": 1.5, "y": 5.5 }, + { "label": "lalt", "matrix":[10, 2], "x": 2.5, "y": 5.5, "w": 1.5 }, + { "label": "space", "matrix":[10, 3], "x": 4, "y": 5.5, "w": 7 }, + { "label": "ralt", "matrix":[10, 4], "x": 11, "y": 5.5, "w": 1.5 }, + { "label": "rwin", "matrix":[10, 5], "x": 12.5, "y": 5.5, "w": 1 }, + { "label": "rctrl", "matrix":[10, 8], "x": 13.5, "y": 5.5, "w":1.5}, + { "label": "left", "matrix":[9, 3], "x": 15.25, "y": 5.5 }, + { "label": "down", "matrix":[9, 2], "x": 16.25, "y": 5.5 }, + { "label": "right", "matrix":[9, 1], "x": 17.25, "y": 5.5 } ] } } diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index 91fefd99ca..2509fcdd8e 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "p1800fl", + "keyboard_name": "p1800fl", "manufacturer": "team0110", - "url": "http://team0110.store/", - "maintainer": "team0110", + "url": "http://team0110.store/", + "maintainer": "team0110", "usb": { "vid": "0xFEED", "pid": "0x3EAE", diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/info.json index b817512339..b0cf5ef3fa 100644 --- a/keyboards/teleport/native/ansi/info.json +++ b/keyboards/teleport/native/ansi/info.json @@ -6,95 +6,95 @@ "layouts": { "LAYOUT_75_ansi": { "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":[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, "w":2}, - {"matrix":[3,7], "x":15, "y":1}, + {"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, "w":2}, + {"matrix":[3, 7], "x":15, "y":1}, - {"matrix":[4,0], "x":0, "y":2, "w":1.5}, - {"matrix":[4,1], "x":1.5, "y":2}, - {"matrix":[5,1], "x":2.5, "y":2}, - {"matrix":[4,2], "x":3.5, "y":2}, - {"matrix":[5,2], "x":4.5, "y":2}, - {"matrix":[4,3], "x":5.5, "y":2}, - {"matrix":[5,3], "x":6.5, "y":2}, - {"matrix":[4,4], "x":7.5, "y":2}, - {"matrix":[5,4], "x":8.5, "y":2}, - {"matrix":[4,5], "x":9.5, "y":2}, - {"matrix":[5,5], "x":10.5, "y":2}, - {"matrix":[4,6], "x":11.5, "y":2}, - {"matrix":[5,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":[4, 0], "x":0, "y":2, "w":1.5}, + {"matrix":[4, 1], "x":1.5, "y":2}, + {"matrix":[5, 1], "x":2.5, "y":2}, + {"matrix":[4, 2], "x":3.5, "y":2}, + {"matrix":[5, 2], "x":4.5, "y":2}, + {"matrix":[4, 3], "x":5.5, "y":2}, + {"matrix":[5, 3], "x":6.5, "y":2}, + {"matrix":[4, 4], "x":7.5, "y":2}, + {"matrix":[5, 4], "x":8.5, "y":2}, + {"matrix":[4, 5], "x":9.5, "y":2}, + {"matrix":[5, 5], "x":10.5, "y":2}, + {"matrix":[4, 6], "x":11.5, "y":2}, + {"matrix":[5, 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":[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":1.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":[8, 0], "x":0, "y":4, "w":1.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.25}, - {"matrix":[11,0], "x":1.25, "y":5, "w":1.25}, - {"matrix":[11,1], "x":2.5, "y":5, "w":1.25}, - {"matrix":[10,1], "x":3.75, "y":5, "w":6.25}, - {"matrix":[10,5], "x":10, "y":5}, - {"matrix":[11,5], "x":11, "y":5}, - {"matrix":[10,6], "x":12, "y":5}, - {"matrix":[11,6], "x":13, "y":5}, - {"matrix":[10,7], "x":14, "y":5}, - {"matrix":[11,7], "x":15, "y":5} + {"matrix":[10, 0], "x":0, "y":5, "w":1.25}, + {"matrix":[11, 0], "x":1.25, "y":5, "w":1.25}, + {"matrix":[11, 1], "x":2.5, "y":5, "w":1.25}, + {"matrix":[10, 1], "x":3.75, "y":5, "w":6.25}, + {"matrix":[10, 5], "x":10, "y":5}, + {"matrix":[11, 5], "x":11, "y":5}, + {"matrix":[10, 6], "x":12, "y":5}, + {"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/teleport/native/info.json b/keyboards/teleport/native/info.json index d306a3d6c6..1553660a41 100644 --- a/keyboards/teleport/native/info.json +++ b/keyboards/teleport/native/info.json @@ -24,8 +24,7 @@ }, "diode_direction": "ROW2COL", "matrix_pins": { - "cols": [ "A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5" ], - "rows": [ "C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3" ] + "cols": ["A5", "A4", "B12", "B14", "B8", "B3", "B4", "B5"], + "rows": ["C14", "C15", "C13", "A1", "A15", "A14", "A13", "B13", "B15", "A8", "A2", "A3"] } } - diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/info.json index 30b8a1027f..1f4fbf49d0 100644 --- a/keyboards/teleport/native/iso/info.json +++ b/keyboards/teleport/native/iso/info.json @@ -6,98 +6,97 @@ "layouts": { "LAYOUT_75_iso": { "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":[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, "w":2}, - {"matrix":[3,7], "x":15, "y":1}, + {"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, "w":2}, + {"matrix":[3, 7], "x":15, "y":1}, - {"matrix":[4,0], "x":0, "y":2, "w":1.5}, - {"matrix":[4,1], "x":1.5, "y":2}, - {"matrix":[5,1], "x":2.5, "y":2}, - {"matrix":[4,2], "x":3.5, "y":2}, - {"matrix":[5,2], "x":4.5, "y":2}, - {"matrix":[4,3], "x":5.5, "y":2}, - {"matrix":[5,3], "x":6.5, "y":2}, - {"matrix":[4,4], "x":7.5, "y":2}, - {"matrix":[5,4], "x":8.5, "y":2}, - {"matrix":[4,5], "x":9.5, "y":2}, - {"matrix":[5,5], "x":10.5, "y":2}, - {"matrix":[4,6], "x":11.5, "y":2}, - {"matrix":[5,6], "x":12.5, "y":2}, - {"matrix":[5,7], "x":15, "y":2}, + {"matrix":[4, 0], "x":0, "y":2, "w":1.5}, + {"matrix":[4, 1], "x":1.5, "y":2}, + {"matrix":[5, 1], "x":2.5, "y":2}, + {"matrix":[4, 2], "x":3.5, "y":2}, + {"matrix":[5, 2], "x":4.5, "y":2}, + {"matrix":[4, 3], "x":5.5, "y":2}, + {"matrix":[5, 3], "x":6.5, "y":2}, + {"matrix":[4, 4], "x":7.5, "y":2}, + {"matrix":[5, 4], "x":8.5, "y":2}, + {"matrix":[4, 5], "x":9.5, "y":2}, + {"matrix":[5, 5], "x":10.5, "y":2}, + {"matrix":[4, 6], "x":11.5, "y":2}, + {"matrix":[5, 6], "x":12.5, "y":2}, + {"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}, - {"matrix":[4,7], "x":13.75, "y":2, "w":1.25, "h":2}, - {"matrix":[7,7], "x":15, "y":3}, + {"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}, + {"matrix":[4, 7], "x":13.75, "y":2, "w":1.25, "h":2}, + {"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}, - {"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":[8, 0], "x":0, "y":4, "w":1.25}, + {"matrix":[9, 0], "x":1.25, "y":4}, + {"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.25}, - {"matrix":[11,0], "x":1.25, "y":5, "w":1.25}, - {"matrix":[11,1], "x":2.5, "y":5, "w":1.25}, - {"matrix":[10,1], "x":3.75, "y":5, "w":6.25}, - {"matrix":[10,5], "x":10, "y":5}, - {"matrix":[11,5], "x":11, "y":5}, - {"matrix":[10,6], "x":12, "y":5}, - {"matrix":[11,6], "x":13, "y":5}, - {"matrix":[10,7], "x":14, "y":5}, - {"matrix":[11,7], "x":15, "y":5} + {"matrix":[10, 0], "x":0, "y":5, "w":1.25}, + {"matrix":[11, 0], "x":1.25, "y":5, "w":1.25}, + {"matrix":[11, 1], "x":2.5, "y":5, "w":1.25}, + {"matrix":[10, 1], "x":3.75, "y":5, "w":6.25}, + {"matrix":[10, 5], "x":10, "y":5}, + {"matrix":[11, 5], "x":11, "y":5}, + {"matrix":[10, 6], "x":12, "y":5}, + {"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/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json index 4237f63ac9..2fe282fbdf 100644 --- a/keyboards/tempo_turtle/bradpad/info.json +++ b/keyboards/tempo_turtle/bradpad/info.json @@ -5,8 +5,8 @@ "maintainer": "wxyangf", "diode_direction": "ROW2COL", "matrix_pins":{ - "rows":["B7", "D5", "C7", "D2", "D3"], - "cols":["D7", "E6", "B4", "F1"] + "rows": ["B7", "D5", "C7", "D2", "D3"], + "cols": ["D7", "E6", "B4", "F1"] }, "usb":{ "vid":"0x7474", @@ -17,7 +17,7 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout":[ + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index 869d4f16a1..39a2e87ca1 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Macrowo Pad", + "keyboard_name": "Macrowo Pad", "manufacturer": "Tender", - "url": "https//www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https//www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE936", diff --git a/keyboards/tenki/info.json b/keyboards/tenki/info.json index 2979362a61..8acbd24f8b 100644 --- a/keyboards/tenki/info.json +++ b/keyboards/tenki/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "TENKI", + "keyboard_name": "TENKI", "manufacturer": "Pixlup", - "url": "https://tokopedia.com/pixlup", - "maintainer": "eriqadams", + "url": "https://tokopedia.com/pixlup", + "maintainer": "eriqadams", "usb": { "vid": "0x5058", "pid": "0x5445", @@ -20,8 +20,8 @@ "bootloader": "caterina", "community_layouts": ["ortho_5x4"], "layouts": { - "LAYOUT_ortho_5x4": { - "layout": [ + "LAYOUT_ortho_5x4": { + "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/terrazzo/info.json b/keyboards/terrazzo/info.json index f493960049..6e099c6e46 100644 --- a/keyboards/terrazzo/info.json +++ b/keyboards/terrazzo/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Terrazzo", + "keyboard_name": "Terrazzo", "manufacturer": "MsMustard", - "url": "", - "maintainer": "MsMustard", + "url": "", + "maintainer": "MsMustard", "usb": { "vid": "0x4D4D", "pid": "0x545A", diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json index b68b781fee..a3e464a110 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "TG4x", + "keyboard_name": "TG4x", "manufacturer": "MythosMann", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D4D", "pid": "0x0458", diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json index 626cc682ae..c58438887a 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "910CE", + "keyboard_name": "910CE", "manufacturer": "TGR", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5447", "pid": "0x910C", @@ -106,7 +106,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -182,7 +181,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_iso_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json index 78f41f3149..cd1ff1f1ac 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Jane v2", + "keyboard_name": "Jane v2", "manufacturer": "TGR", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5447", "pid": "0x4A4E", diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index b8697805dd..f628405bcb 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -59,7 +59,6 @@ {"matrix": [5, 3], "x": 3, "y": 5.25} ] }, - "LAYOUT_numpad_6x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/thepanduuh/degenpad/info.json b/keyboards/thepanduuh/degenpad/info.json index 2eb86b1b7b..4a5e844b50 100644 --- a/keyboards/thepanduuh/degenpad/info.json +++ b/keyboards/thepanduuh/degenpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Degenpad", + "keyboard_name": "Degenpad", "manufacturer": "ThePanduuh", - "url": "https://github.com/ThePanduuh", - "maintainer": "ThePanduuh", + "url": "https://github.com/ThePanduuh", + "maintainer": "ThePanduuh", "usb": { "vid": "0x4A44", "pid": "0x4447", diff --git a/keyboards/thevankeyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json index 033edf09bf..37f5dec719 100644 --- a/keyboards/thevankeyboards/bananasplit/info.json +++ b/keyboards/thevankeyboards/bananasplit/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "BananaSplit 60", + "keyboard_name": "BananaSplit 60", "manufacturer": "TheVan Keyboards", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEAE", "pid": "0x8870", diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json index ab52f06af2..ef99e3d716 100644 --- a/keyboards/tkc/california/info.json +++ b/keyboards/tkc/california/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "California", + "keyboard_name": "California", "manufacturer": "TKC", - "url": "", - "maintainer": "TerryMathews", + "url": "", + "maintainer": "TerryMathews", "usb": { "vid": "0x544B", "pid": "0x0009", @@ -153,4 +153,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json index 9e4bcd442b..4e45459bb9 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "GodSpeed75", + "keyboard_name": "GodSpeed75", "manufacturer": "The Key Company", - "url": "", - "maintainer": "terrymathews", + "url": "", + "maintainer": "terrymathews", "usb": { "vid": "0x544B", "pid": "0x0006", diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json index a7b7a7d1ed..4380caba4f 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Portico75", + "keyboard_name": "Portico75", "manufacturer": "TKC", - "url": "", + "url": "", "maintainer": "TerryMathews", "usb": { "vid": "0x544B", diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json index 0ea83277ec..36f009ddb6 100644 --- a/keyboards/tkc/tkl_ab87/info.json +++ b/keyboards/tkc/tkl_ab87/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "TKL A/B87", + "keyboard_name": "TKL A/B87", "manufacturer": "TKC", - "url": "", - "maintainer": "TerryMathews", + "url": "", + "maintainer": "TerryMathews", "usb": { - "vid": "0x544B", - "pid": "0x0007", - "device_version": "0.0.1" + "vid": "0x544B", + "pid": "0x0007", + "device_version": "0.0.1" }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E6", "F6", "F4"], @@ -14,15 +14,15 @@ }, "diode_direction": "COL2ROW", "backlight": { - "pin": "B7", - "breathing": true + "pin": "B7", + "breathing": true }, "indicators": { - "caps_lock": "F1", - "scroll_lock": "F0" + "caps_lock": "F1", + "scroll_lock": "F0" }, "ws2812": { - "pin": "E2" + "pin": "E2" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json index dae8e33f11..1a9dcccda1 100644 --- a/keyboards/toad/info.json +++ b/keyboards/toad/info.json @@ -111,7 +111,6 @@ {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]} ] }, - "LAYOUT_ansi_wk": { "layout": [ {"x":0, "y":0, "matrix": [0, 0]}, @@ -198,7 +197,6 @@ {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]} ] }, - "LAYOUT_ansi_wkl": { "layout": [ {"x":0, "y":0, "matrix": [0, 0]}, @@ -282,7 +280,6 @@ {"x":13.5, "y":5.5, "w":1.5, "matrix": [5, 13]} ] }, - "LAYOUT_iso_wk": { "layout": [ {"x":0, "y":0, "matrix": [0, 0]}, @@ -370,7 +367,6 @@ {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]} ] }, - "LAYOUT_iso_wkl": { "layout": [ {"x":0, "y":0, "matrix": [0, 0]}, diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json index 6109d52078..d71fb56f0b 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/info.json @@ -2,7 +2,7 @@ "keyboard_name": "alix40", "manufacturer": "quadcube", "url": "https://tokyokeyboard.com/", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x5143", "pid": "0x4134", diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json index 173ca1b4d7..7b3cc0950d 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "TouchPad", + "keyboard_name": "TouchPad", "manufacturer": "JacoBurge", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x16D0", "pid": "0x0DB8", diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json index b0789d2683..21c69b1eb0 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/info.json @@ -4,12 +4,12 @@ "url": "https://github.com/tszaboo/Ortho4Exent", "maintainer": "tszaboo", "usb": { - "vid": "0x5453", - "pid": "0x7934", - "device_version": "0.0.1" + "vid": "0x5453", + "pid": "0x7934", + "device_version": "0.0.1" }, "ws2812": { - "pin": "B6" + "pin": "B6" }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D6", "D5", "D3", "D2", "D1", "B7", "B3", "B2"], @@ -17,7 +17,7 @@ }, "diode_direction": "ROW2COL", "indicators": { - "caps_lock": "E6" + "caps_lock": "E6" }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json index 6f3e83c24c..4ef6725b68 100644 --- a/keyboards/tweetydabird/lbs4/info.json +++ b/keyboards/tweetydabird/lbs4/info.json @@ -3,10 +3,8 @@ "manufacturer": "Tweetys Wild Thinking", "url": "https://lectronz.com/stores/tweetys-wild-thinking", "maintainer": "TweetyDaBird", - "development_board": "promicro", "bootloader_instructions": "Short marked pads on PCB, or hold top left key when plugging in.", - "features": { "bootmagic": true, "command": false, @@ -17,30 +15,25 @@ "rgblight": true, "encoder": true }, - "build": { "lto": true }, - "usb": { "vid": "0xFEED", "pid": "0x23B0", "device_version": "1.1.0" }, - "matrix_pins": { "direct": [ ["E6", "D7", "F4"], ["B5", "B4", null] ] }, - "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "F7", "resolution": 2} ] }, - "rgblight": { "led_count": 6, "hue_steps": 8, @@ -57,18 +50,17 @@ "ws2812": { "pin": "D2" }, - "layouts": { "LAYOUT": { "layout": [ - { "label": "Play", "matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, - - { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0 }, - + { "label": "Play", "matrix": [0, 2], "x": 2, "y": 0, "w": 2, "h": 2 }, + + { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F2", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "F3", "matrix": [1, 0], "x": 0, "y": 1 }, { "label": "F4", "matrix": [1, 1], "x": 1, "y": 1 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json index c6d0fe097f..8f8a689bbd 100644 --- a/keyboards/tweetydabird/lbs6/info.json +++ b/keyboards/tweetydabird/lbs6/info.json @@ -3,9 +3,7 @@ "manufacturer": "Tweetys Wild Thinking", "url": "https://lectronz.com/stores/tweetys-wild-thinking", "maintainer": "TweetyDaBird", - "development_board": "promicro", - "features": { "bootmagic": true, "command": false, @@ -16,11 +14,9 @@ "rgblight": true, "encoder": true }, - "build": { "lto": true }, - "usb": { "vid": "0xFEED", "pid": "0x23B0", @@ -29,7 +25,6 @@ "bootmagic": { "matrix": [2, 2] }, - "matrix_pins": { "direct": [ [null, "F5", null], @@ -37,13 +32,11 @@ ["C6", "E6", "B5"] ] }, - "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "F6", "resolution": 2} ] }, - "rgblight": { "led_count": 8, "hue_steps": 8, @@ -60,20 +53,19 @@ "ws2812": { "pin": "D2" }, - "layouts": { "LAYOUT": { "layout": [ - { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0 }, - - { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "Play", "matrix": [0, 1], "x": 1, "y": 0 }, + + { "label": "F1", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "F2", "matrix": [1, 1], "x": 1, "y": 1 }, { "label": "F3", "matrix": [1, 2], "x": 2, "y": 1 }, - + { "label": "F4", "matrix": [2, 0], "x": 0, "y": 2 }, { "label": "F5", "matrix": [2, 1], "x": 1, "y": 2 }, { "label": "F6", "matrix": [2, 2], "x": 2, "y": 2 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/info.json index 8cebe9b813..606784570c 100644 --- a/keyboards/tweetydabird/lotus58/elite_c/info.json +++ b/keyboards/tweetydabird/lotus58/elite_c/info.json @@ -1,3 +1,3 @@ { - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu" } diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index 6cec047a2e..452e410b62 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -9,7 +9,7 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - { "pin_a": "F5", "pin_b": "F4", "resolution": 2 } + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} ] }, "features": { @@ -23,7 +23,7 @@ "encoder": true, "rgblight": true, "split": true, - "tri_layer": true + "tri_layer": true }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], @@ -41,14 +41,14 @@ "pin": "D3" }, "split": { - "bootmagic": { + "bootmagic": { "matrix": [5, 0] }, - "enabled": true, + "enabled": true, "encoder": { "right": { "rotary": [ - { "pin_a": "F4", "pin_b": "F5", "resolution": 2 } + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} ] } }, diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json index e6f3adf19c..edf6dc0335 100644 --- a/keyboards/tzarc/ghoul/info.json +++ b/keyboards/tzarc/ghoul/info.json @@ -19,8 +19,8 @@ "driver": "WS2812" }, "matrix_pins": { - "rows": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"], - "cols": ["NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN","NO_PIN"] + "rows": ["NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"], + "cols": ["NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"] }, "usb": { "vid": "0x1209", diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index 256235a3a8..02202bef07 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Unikorn60", + "keyboard_name": "Unikorn60", "manufacturer": "Singa x TGR", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5354", "pid": "0x556B", diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index f7019e0c86..c2e0e11192 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "UraNuma", + "keyboard_name": "UraNuma", "manufacturer": "yohewi", - "url": "", - "maintainer": "yohewi", + "url": "", + "maintainer": "yohewi", "usb": { "vid": "0xFEED", "pid": "0x112D", diff --git a/keyboards/vagrant_10/info.json b/keyboards/vagrant_10/info.json index cdf4815504..46435c9dee 100644 --- a/keyboards/vagrant_10/info.json +++ b/keyboards/vagrant_10/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Vagrant 10", + "keyboard_name": "Vagrant 10", "manufacturer": "Shanduur", - "url": "https://github.com/Sho-Keebs/Vagrant-10", - "maintainer": "Shanduur", + "url": "https://github.com/Sho-Keebs/Vagrant-10", + "maintainer": "Shanduur", "usb": { "vid": "0x534C", "pid": "0x5E99", diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json index bf0ac61c34..98a9275360 100644 --- a/keyboards/vertex/angle65/info.json +++ b/keyboards/vertex/angle65/info.json @@ -22,7 +22,7 @@ }, "layouts": { "LAYOUT": { - "layout":[ + "layout": [ {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0}, {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0}, diff --git a/keyboards/vertex/angler2/info.json b/keyboards/vertex/angler2/info.json index 588695c8f4..705af3fb09 100644 --- a/keyboards/vertex/angler2/info.json +++ b/keyboards/vertex/angler2/info.json @@ -667,24 +667,24 @@ "LAYOUT_tkl_f13_ansi_tsangan": { "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": [3, 14], "x": 17.25, "y": 0}, diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json index 7b6245d72e..8b103e73ca 100644 --- a/keyboards/viktus/minne/info.json +++ b/keyboards/viktus/minne/info.json @@ -20,7 +20,7 @@ "nkro": true }, "bootmagic": { - "matrix": [1,0] + "matrix": [1, 0] }, "build": { "lto": true diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json index afe00b7652..23f884840e 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/info.json @@ -19,7 +19,7 @@ "nkro": true }, "bootmagic": { - "matrix": [0,0] + "matrix": [0, 0] }, "build": { "lto": true diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json index c977d8ebec..35ed37644f 100644 --- a/keyboards/viktus/osav2/info.json +++ b/keyboards/viktus/osav2/info.json @@ -21,7 +21,7 @@ "nkro": true }, "bootmagic": { - "matrix": [1,0] + "matrix": [1, 0] }, "build": { "lto": true diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json index 752b992b02..891ae342d2 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "SP111", + "keyboard_name": "SP111", "manufacturer": "Viktus Design LLC", - "url": "https://thekey.company/products/sp-111", - "maintainer": "blindassassin111", + "url": "https://thekey.company/products/sp-111", + "maintainer": "blindassassin111", "usb": { "vid": "0x5644", "pid": "0x5111", diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json index a2e54a757f..0959861ca9 100644 --- a/keyboards/waldo/info.json +++ b/keyboards/waldo/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "Waldo", "manufacturer": "Greenwald Designs", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x4744", "pid": "0x6060", diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json index 5387ebde1b..fb6b3e96f8 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Neuron", + "keyboard_name": "Neuron", "manufacturer": "Walletburner", - "url": "https://qmk.fm/keyboards/", - "maintainer": "worldspawn00", + "url": "https://qmk.fm/keyboards/", + "maintainer": "worldspawn00", "usb": { "vid": "0x5742", "pid": "0x6E75", diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json index 5c29b5a995..7fa45a13ab 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "We27", + "keyboard_name": "We27", "manufacturer": "@wekey", - "url": "", - "maintainer": "@wekey.dev", + "url": "", + "maintainer": "@wekey.dev", "usb": { "vid": "0x5559", "pid": "0x0001", diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index ab3d86899c..1a13213791 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -31,4 +31,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json index e2decedf4f..30e82dfad6 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WestMErgo", + "keyboard_name": "WestMErgo", "manufacturer": "WestM", - "url": "https://github.com/WestMProducts", - "maintainer": "WestM", + "url": "https://github.com/WestMProducts", + "maintainer": "WestM", "usb": { "vid": "0x574D", "pid": "0x0201", @@ -100,4 +100,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json index 70220be9e0..d4a5d079b3 100644 --- a/keyboards/wilba_tech/rama_works_kara/info.json +++ b/keyboards/wilba_tech/rama_works_kara/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KARA", + "keyboard_name": "KARA", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x4B52", diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json index 5308ead7bd..d8e412ede4 100644 --- a/keyboards/wilba_tech/rama_works_koyu/info.json +++ b/keyboards/wilba_tech/rama_works_koyu/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "KOYU", + "keyboard_name": "KOYU", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x4B59", diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json index 33efc06916..5745804c5d 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M50-A", + "keyboard_name": "M50-A", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x050A", diff --git a/keyboards/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json index 8126b7507f..ea833236b8 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/info.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M50-AX", + "keyboard_name": "M50-AX", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x150A", diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json index 2db91faf86..32f6f2a5d3 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/info.json +++ b/keyboards/wilba_tech/rama_works_m60_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M60-A", + "keyboard_name": "M60-A", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x060A", diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json index db73075d15..b7f1dc5cd6 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/info.json +++ b/keyboards/wilba_tech/rama_works_m65_b/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M65-B", + "keyboard_name": "M65-B", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x065B", diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json index 6d0945dc88..c430aed158 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/info.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "M65-BX", + "keyboard_name": "M65-BX", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x165B", diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json index e347b306ef..c41dd2786d 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/info.json +++ b/keyboards/wilba_tech/rama_works_u80_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "U80-A", + "keyboard_name": "U80-A", "manufacturer": "RAMA WORKS", - "url": "http://rama.works", - "maintainer": "Wilba", + "url": "http://rama.works", + "maintainer": "Wilba", "usb": { "vid": "0x5241", "pid": "0x080A", diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json index 1e76ecef0a..6016905bdc 100644 --- a/keyboards/wilba_tech/wt60_a/info.json +++ b/keyboards/wilba_tech/wt60_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT60-A", + "keyboard_name": "WT60-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x060A", diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json index c4436b4404..f7c3af9b05 100644 --- a/keyboards/wilba_tech/wt60_c/info.json +++ b/keyboards/wilba_tech/wt60_c/info.json @@ -87,5 +87,4 @@ ] } } - } diff --git a/keyboards/wilba_tech/wt60_g/info.json b/keyboards/wilba_tech/wt60_g/info.json index 4a4dc5261d..122d300f7a 100644 --- a/keyboards/wilba_tech/wt60_g/info.json +++ b/keyboards/wilba_tech/wt60_g/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT60-G", + "keyboard_name": "WT60-G", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x0021", diff --git a/keyboards/wilba_tech/wt60_g2/info.json b/keyboards/wilba_tech/wt60_g2/info.json index bf9227ba65..a571a226f2 100644 --- a/keyboards/wilba_tech/wt60_g2/info.json +++ b/keyboards/wilba_tech/wt60_g2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT60-G2", + "keyboard_name": "WT60-G2", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x002F", diff --git a/keyboards/wilba_tech/wt60_h2/info.json b/keyboards/wilba_tech/wt60_h2/info.json index 8cd3d6dad8..e10982a552 100644 --- a/keyboards/wilba_tech/wt60_h2/info.json +++ b/keyboards/wilba_tech/wt60_h2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT60-H2", + "keyboard_name": "WT60-H2", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x002B", diff --git a/keyboards/wilba_tech/wt60_xt/info.json b/keyboards/wilba_tech/wt60_xt/info.json index a0e578beb4..f65a73d7d8 100644 --- a/keyboards/wilba_tech/wt60_xt/info.json +++ b/keyboards/wilba_tech/wt60_xt/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT60-XT", + "keyboard_name": "WT60-XT", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x001C", diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json index beedb5da8f..aa3c16afd1 100644 --- a/keyboards/wilba_tech/wt65_a/info.json +++ b/keyboards/wilba_tech/wt65_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-A", + "keyboard_name": "WT65-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x065A", diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json index 77150f18db..9fa15989fb 100644 --- a/keyboards/wilba_tech/wt65_b/info.json +++ b/keyboards/wilba_tech/wt65_b/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-B", + "keyboard_name": "WT65-B", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x065B", diff --git a/keyboards/wilba_tech/wt65_f/info.json b/keyboards/wilba_tech/wt65_f/info.json index 6a8a762398..87491af562 100644 --- a/keyboards/wilba_tech/wt65_f/info.json +++ b/keyboards/wilba_tech/wt65_f/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-F", + "keyboard_name": "WT65-F", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x002D", diff --git a/keyboards/wilba_tech/wt65_fx/info.json b/keyboards/wilba_tech/wt65_fx/info.json index f169ec993a..a98b87ba99 100644 --- a/keyboards/wilba_tech/wt65_fx/info.json +++ b/keyboards/wilba_tech/wt65_fx/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-FX", + "keyboard_name": "WT65-FX", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x002E", diff --git a/keyboards/wilba_tech/wt65_g/info.json b/keyboards/wilba_tech/wt65_g/info.json index fa05e4433e..014f2e2719 100644 --- a/keyboards/wilba_tech/wt65_g/info.json +++ b/keyboards/wilba_tech/wt65_g/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-G", + "keyboard_name": "WT65-G", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x0022", diff --git a/keyboards/wilba_tech/wt65_g2/info.json b/keyboards/wilba_tech/wt65_g2/info.json index 72dadf15b3..a526f1e812 100644 --- a/keyboards/wilba_tech/wt65_g2/info.json +++ b/keyboards/wilba_tech/wt65_g2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-G2", + "keyboard_name": "WT65-G2", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x002A", diff --git a/keyboards/wilba_tech/wt65_h1/info.json b/keyboards/wilba_tech/wt65_h1/info.json index 8adac386de..dc992e625f 100644 --- a/keyboards/wilba_tech/wt65_h1/info.json +++ b/keyboards/wilba_tech/wt65_h1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-H1", + "keyboard_name": "WT65-H1", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x0025", diff --git a/keyboards/wilba_tech/wt65_xt/info.json b/keyboards/wilba_tech/wt65_xt/info.json index d3a18de567..22effb4b87 100644 --- a/keyboards/wilba_tech/wt65_xt/info.json +++ b/keyboards/wilba_tech/wt65_xt/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-XT", + "keyboard_name": "WT65-XT", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x001D", diff --git a/keyboards/wilba_tech/wt65_xtx/info.json b/keyboards/wilba_tech/wt65_xtx/info.json index 26b7ec6a04..4f8537f4d3 100644 --- a/keyboards/wilba_tech/wt65_xtx/info.json +++ b/keyboards/wilba_tech/wt65_xtx/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT65-XTX", + "keyboard_name": "WT65-XTX", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x001E", diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json index 82ab0c4eb9..2071007559 100644 --- a/keyboards/wilba_tech/wt69_a/info.json +++ b/keyboards/wilba_tech/wt69_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT69-A", + "keyboard_name": "WT69-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x069A", diff --git a/keyboards/wilba_tech/wt70_jb/info.json b/keyboards/wilba_tech/wt70_jb/info.json index cd53a8c16c..50ef9b3603 100644 --- a/keyboards/wilba_tech/wt70_jb/info.json +++ b/keyboards/wilba_tech/wt70_jb/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT70-JB", + "keyboard_name": "WT70-JB", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x001F", diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json index 5c384d4fdc..88ccc5fcb4 100644 --- a/keyboards/wilba_tech/wt75_a/info.json +++ b/keyboards/wilba_tech/wt75_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT75-A", + "keyboard_name": "WT75-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x075A", diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json index e2fd9a5bfc..91eadb28f3 100644 --- a/keyboards/wilba_tech/wt75_b/info.json +++ b/keyboards/wilba_tech/wt75_b/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT75-B", + "keyboard_name": "WT75-B", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x075B", diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json index 33818569ee..6cdd1795e3 100644 --- a/keyboards/wilba_tech/wt75_c/info.json +++ b/keyboards/wilba_tech/wt75_c/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT75-C", + "keyboard_name": "WT75-C", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x075C", diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json index e89ab79f41..8b0a1ad5ad 100644 --- a/keyboards/wilba_tech/wt80_a/info.json +++ b/keyboards/wilba_tech/wt80_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT80-A", + "keyboard_name": "WT80-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x080A", diff --git a/keyboards/wilba_tech/wt80_g/info.json b/keyboards/wilba_tech/wt80_g/info.json index e393c2de94..7921a4d2c3 100644 --- a/keyboards/wilba_tech/wt80_g/info.json +++ b/keyboards/wilba_tech/wt80_g/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT80-G", + "keyboard_name": "WT80-G", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x0023", diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json index 7de9331ffe..a07707d789 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WT8-A", + "keyboard_name": "WT8-A", "manufacturer": "wilba.tech", - "url": "https://wilba.tech", - "maintainer": "Wilba", + "url": "https://wilba.tech", + "maintainer": "Wilba", "usb": { "vid": "0x6582", "pid": "0x008A", diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json index aafb2f8e69..295d11c069 100644 --- a/keyboards/wilba_tech/zeal60/info.json +++ b/keyboards/wilba_tech/zeal60/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Zeal60", + "keyboard_name": "Zeal60", "manufacturer": "ZealPC", - "url": "https://zealpc.net", - "maintainer": "Wilba", + "url": "https://zealpc.net", + "maintainer": "Wilba", "usb": { "vid": "0x5A45", "pid": "0x0060", diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json index f442660b45..814ea28660 100644 --- a/keyboards/wilba_tech/zeal65/info.json +++ b/keyboards/wilba_tech/zeal65/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Zeal65", + "keyboard_name": "Zeal65", "manufacturer": "ZealPC", - "url": "https://zealpc.net", - "maintainer": "Wilba", + "url": "https://zealpc.net", + "maintainer": "Wilba", "usb": { "vid": "0x5A45", "pid": "0x0065", diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/info.json index 14ef77da0e..1e64c40abb 100644 --- a/keyboards/wolf/frogpad/info.json +++ b/keyboards/wolf/frogpad/info.json @@ -51,7 +51,7 @@ {"matrix": [3, 1], "x":1, "y":3}, {"matrix": [3, 2], "x":2, "y":3}, {"matrix": [2, 3], "x":3, "y":2, "h":2}, - + {"matrix": [4, 0], "x":0, "y":4}, {"matrix": [4, 1], "x":1, "y":4}, {"matrix": [4, 2], "x":2, "y":4}, @@ -90,4 +90,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json index 75e6b64b2e..f2839609d2 100644 --- a/keyboards/wolf/m60_b/info.json +++ b/keyboards/wolf/m60_b/info.json @@ -161,4 +161,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json index 00e5e55c36..1e7702a340 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Ryujin", + "keyboard_name": "Ryujin", "manufacturer": "Miroticaps", - "url": "", - "maintainer": "ToastyStoemp", + "url": "", + "maintainer": "ToastyStoemp", "usb": { "vid": "0x5453", "pid": "0x0200", @@ -94,4 +94,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json index 96c2fce48f..1be6824d09 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Sabre", + "keyboard_name": "Sabre", "manufacturer": "ToastyStoemp", - "url": "", - "maintainer": "ToastyStoemp", + "url": "", + "maintainer": "ToastyStoemp", "usb": { "vid": "0x5453", "pid": "0x0055", diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index b0134ff2b1..d1337177b4 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -170,4 +170,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wolf/twilight/info.json b/keyboards/wolf/twilight/info.json index 86c844d666..01cf308b3f 100644 --- a/keyboards/wolf/twilight/info.json +++ b/keyboards/wolf/twilight/info.json @@ -120,4 +120,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json index ea48cc2ff4..099327f417 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WM1", + "keyboard_name": "WM1", "manufacturer": "Wolfmark Club", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x2B29", diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json index eb66b311f5..eaa8c95705 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Scarlet Bandana Version IV Mark 2", + "keyboard_name": "Scarlet Bandana Version IV Mark 2", "manufacturer": "WoodKeys.click", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6969", diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json index 73250dbad7..8cc0971879 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Gothic50", + "keyboard_name": "Gothic50", "manufacturer": "Worldspawn00", - "url": "https://qmk.fm/keyboards", - "maintainer": "worldspawn00", + "url": "https://qmk.fm/keyboards", + "maintainer": "worldspawn00", "usb": { "vid": "0xFEED", "pid": "0x04EF", diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json index 4ff0889a35..06ee936ce7 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Gothic70", + "keyboard_name": "Gothic70", "manufacturer": "Worldspawn00", - "url": "https://qmk.fm/keyboards", - "maintainer": "worldspawn00", + "url": "https://qmk.fm/keyboards", + "maintainer": "worldspawn00", "usb": { "vid": "0x5753", "pid": "0x63CC", diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json index d281bff045..c3b7751e6b 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Houndstooth", + "keyboard_name": "Houndstooth", "manufacturer": "Worldspawn00", - "url": "https://qmk.fm/keyboards", - "maintainer": "worldspawn00", + "url": "https://qmk.fm/keyboards", + "maintainer": "worldspawn00", "usb": { "vid": "0xFEED", "pid": "0xFA9C", diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json index bbea2a211f..f542c999a1 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PAIN27", + "keyboard_name": "PAIN27", "manufacturer": "Worldspawn00", - "url": "https://qmk.fm/keyboards", - "maintainer": "worldspawn00", + "url": "https://qmk.fm/keyboards", + "maintainer": "worldspawn00", "usb": { "vid": "0xFEED", "pid": "0x9E8C", diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json index 437563ac99..7e4e25357f 100644 --- a/keyboards/xbows/woody/info.json +++ b/keyboards/xbows/woody/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "WOO-DY", + "keyboard_name": "WOO-DY", "manufacturer": "X-BOWS", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x1224", diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/info.json index 269a3f3c82..4d6888f707 100644 --- a/keyboards/xelus/xs60/hotswap/info.json +++ b/keyboards/xelus/xs60/hotswap/info.json @@ -15,7 +15,7 @@ "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5","A4","A3","A2","A1"], + "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5", "A4", "A3", "A2", "A1"], "rows": ["B4", "B3", "A15", "A14", "A7"] }, "layouts": { @@ -89,5 +89,4 @@ ] } } - } diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 8be0117d40..f9e374fee6 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "XD004", + "keyboard_name": "XD004", "manufacturer": "XIUDI", - "maintainer": "qmk", + "maintainer": "qmk", "usb": { "vid": "0x7844", "pid": "0x0404", diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json index 03b38f39ee..d41603cd3a 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/info.json @@ -22,7 +22,7 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT_96_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/yandrstudio/transition80/info.json b/keyboards/yandrstudio/transition80/info.json index fd8c7528ee..3214b88a41 100644 --- a/keyboards/yandrstudio/transition80/info.json +++ b/keyboards/yandrstudio/transition80/info.json @@ -97,7 +97,6 @@ {"label":"\"", "x":11.75, "y":3.25, "matrix": [3, 11]}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [3, 12]}, - {"label":"Shift", "x":0, "y":4.25, "w":2.25, "matrix": [4, 0]}, {"label":"Z", "x":2.25, "y":4.25, "matrix": [4, 2]}, {"label":"X", "x":3.25, "y":4.25, "matrix": [4, 3]}, diff --git a/keyboards/ydkb/chili/info.json b/keyboards/ydkb/chili/info.json index 79b2520846..a3d163c696 100644 --- a/keyboards/ydkb/chili/info.json +++ b/keyboards/ydkb/chili/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Chili", + "keyboard_name": "Chili", "manufacturer": "YDKB", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5945", "pid": "0x0001", diff --git a/keyboards/ydkb/ydpm40/info.json b/keyboards/ydkb/ydpm40/info.json index 8e2e941dcf..1166887642 100644 --- a/keyboards/ydkb/ydpm40/info.json +++ b/keyboards/ydkb/ydpm40/info.json @@ -29,107 +29,107 @@ "layouts": { "LAYOUT_ortho": { "layout": [ - { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, - { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1, 0], "label": "Caps", "x": 0, "y": 1 }, - { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, - { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, - { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, - { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, - { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, - { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, - { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, - { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, - { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, - { "matrix": [1, 10], "label": ";:", "x": 10, "y": 1 }, - { "matrix": [1, 11], "label": "Enter", "x": 11, "y": 1 }, + { "matrix": [1, 0], "label": "Caps", "x": 0, "y": 1 }, + { "matrix": [1, 1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1, 10], "label": ";:", "x": 10, "y": 1 }, + { "matrix": [1, 11], "label": "Enter", "x": 11, "y": 1 }, - { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2, 8], "label": ",<", "x": 8, "y": 2 }, - { "matrix": [2, 9], "label": ".>", "x": 9, "y": 2 }, - { "matrix": [2, 10], "label": "/?", "x": 10, "y": 2 }, - { "matrix": [2, 11], "label": "RShift", "x": 11, "y": 2 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",<", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".>", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/?", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "RShift", "x": 11, "y": 2 }, - { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 }, - { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 }, - { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, - { "matrix": [3, 3], "label": "Menu", "x": 3, "y": 3 }, - { "matrix": [3, 4], "label": "Space", "x": 4, "y": 3, "w": 2 }, - { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3, "w": 2 }, - { "matrix": [3, 8], "label": "Left", "x": 8, "y": 3 }, - { "matrix": [3, 9], "label": "Up", "x": 9, "y": 3 }, - { "matrix": [3, 10], "label": "Down", "x": 10, "y": 3 }, - { "matrix": [3, 11], "label": "Right", "x": 11, "y": 3 } + { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 }, + { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 }, + { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3, 3], "label": "Menu", "x": 3, "y": 3 }, + { "matrix": [3, 4], "label": "Space", "x": 4, "y": 3, "w": 2 }, + { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3, "w": 2 }, + { "matrix": [3, 8], "label": "Left", "x": 8, "y": 3 }, + { "matrix": [3, 9], "label": "Up", "x": 9, "y": 3 }, + { "matrix": [3, 10], "label": "Down", "x": 10, "y": 3 }, + { "matrix": [3, 11], "label": "Right", "x": 11, "y": 3 } ] }, "LAYOUT_stagger": { "layout": [ - { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, - { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0, 11], "label": "BS", "x": 11, "y": 0 }, - { "matrix": [1, 0], "label": "Caps", "x": 0, "y": 1, "w": 1.5 }, - { "matrix": [1, 1], "label": "A", "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "label": "S", "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "label": "D", "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "label": "F", "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "label": "G", "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "label": "H", "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "label": "J", "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "label": "K", "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "label": "L", "x": 9.5, "y": 1 }, - { "matrix": [1, 11], "label": "Enter", "x": 10.5, "y": 1, "w": 1.5 }, + { "matrix": [1, 0], "label": "Caps", "x": 0, "y": 1, "w": 1.5 }, + { "matrix": [1, 1], "label": "A", "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "label": "S", "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "label": "D", "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "label": "F", "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "label": "G", "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "label": "H", "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "label": "J", "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "label": "K", "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "label": "L", "x": 9.5, "y": 1 }, + { "matrix": [1, 11], "label": "Enter", "x": 10.5, "y": 1, "w": 1.5 }, - { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, - { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, - { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, - { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, - { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, - { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, - { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, - { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, - { "matrix": [2, 8], "label": ",<", "x": 8, "y": 2 }, - { "matrix": [2, 9], "label": ".>", "x": 9, "y": 2 }, - { "matrix": [2, 10], "label": "/?", "x": 10, "y": 2 }, - { "matrix": [2, 11], "label": "RShift", "x": 11, "y": 2 }, + { "matrix": [2, 0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2, 1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2, 2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2, 3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2, 4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2, 5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2, 6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2, 7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2, 8], "label": ",<", "x": 8, "y": 2 }, + { "matrix": [2, 9], "label": ".>", "x": 9, "y": 2 }, + { "matrix": [2, 10], "label": "/?", "x": 10, "y": 2 }, + { "matrix": [2, 11], "label": "RShift", "x": 11, "y": 2 }, - { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 }, - { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 }, - { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, - { "matrix": [3, 3], "label": "Menu", "x": 3, "y": 3, "w": 1.25 }, - { "matrix": [3, 4], "label": "Space", "x": 4.25, "y": 3, "w": 1.75 }, - { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3, "w": 1.75 }, - { "matrix": [3, 8], "label": "Left", "x": 7.75, "y": 3, "w": 1.25 }, - { "matrix": [3, 9], "label": "Up", "x": 9, "y": 3 }, - { "matrix": [3, 10], "label": "Down", "x": 10, "y": 3 }, - { "matrix": [3, 11], "label": "Right", "x": 11, "y": 3 } + { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 }, + { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 }, + { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3, 3], "label": "Menu", "x": 3, "y": 3, "w": 1.25 }, + { "matrix": [3, 4], "label": "Space", "x": 4.25, "y": 3, "w": 1.75 }, + { "matrix": [3, 6], "label": "Space", "x": 6, "y": 3, "w": 1.75 }, + { "matrix": [3, 8], "label": "Left", "x": 7.75, "y": 3, "w": 1.25 }, + { "matrix": [3, 9], "label": "Up", "x": 9, "y": 3 }, + { "matrix": [3, 10], "label": "Down", "x": 10, "y": 3 }, + { "matrix": [3, 11], "label": "Right", "x": 11, "y": 3 } ] } } diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json index 67080ad327..6db959539c 100644 --- a/keyboards/yeehaw/info.json +++ b/keyboards/yeehaw/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Yeehaw", + "keyboard_name": "Yeehaw", "manufacturer": "squashkb", - "url": "https://squashkb.com/product/yeehaw", - "maintainer": "Tsquash", + "url": "https://squashkb.com/product/yeehaw", + "maintainer": "Tsquash", "usb": { "vid": "0x5351", "pid": "0x5458", diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json index c0b1644fea..23f0788d0f 100644 --- a/keyboards/yiancardesigns/gingham/info.json +++ b/keyboards/yiancardesigns/gingham/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Gingham", + "keyboard_name": "Gingham", "manufacturer": "Yiancar-Designs", - "url": "https://yiancar-designs.com/product/gingham/", - "maintainer": "Yiancar", + "url": "https://yiancar-designs.com/product/gingham/", + "maintainer": "Yiancar", "usb": { "vid": "0x8968", "pid": "0x4748", diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index 93e0c7797a..97046275fc 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -166,7 +166,7 @@ "pid": "0x0075", "vid": "0x594D" }, - "community_layouts": [ "ortho_5x15" ], + "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { "layout": [ diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index 709f382c0a..285baacdac 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -91,7 +91,6 @@ {"matrix": [0, 3], "x": 5, "y": 3, "w": 1.5} ] }, - "LAYOUT_ortho_4x6_left": { "layout": [ {"matrix": [0, 3], "x": 0, "y": 0, "w": 1.5}, @@ -123,7 +122,6 @@ {"matrix": [5, 0], "x": 5.5, "y": 3} ] }, - "LAYOUT_numpad_6x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/info.json index 9868188d06..25af6ff0b7 100644 --- a/keyboards/ymdk/ymd09/info.json +++ b/keyboards/ymdk/ymd09/info.json @@ -50,14 +50,14 @@ "layout": [ { "flags": 4, "matrix": [0, 2], "x": 64, "y": 0 }, //7 { "flags": 4, "matrix": [0, 1], "x": 32, "y": 0 }, //8 - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, //9 + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, //9 { "flags": 4, "matrix": [1, 2], "x": 64, "y": 32 }, //4 { "flags": 4, "matrix": [1, 1], "x": 32, "y": 32 }, //5 - { "flags": 4, "matrix": [1, 0], "x": 0, "y": 32 }, //6 + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 32 }, //6 { "flags": 4, "matrix": [2, 2], "x": 64, "y": 64 }, //1 { "flags": 4, "matrix": [2, 1], "x": 32, "y": 64 }, //2 - { "flags": 4, "matrix": [2, 0], "x": 0, "y": 64 } //3 + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 64 } //3 ], - "center_point": [ 32, 32 ], + "center_point": [32, 32], } } diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index 6fd647bc93..cfa103de9a 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -292,6 +292,5 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] } - } } diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/info.json index 395a9b8bfd..0dd60bace3 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/info.json @@ -294,6 +294,5 @@ {"matrix": [3, 11], "x": 11, "y": 3} ] } - } } diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json index 96f83d3412..f603439d39 100644 --- a/keyboards/ymdk/ymd96/info.json +++ b/keyboards/ymdk/ymd96/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "YMD96", + "keyboard_name": "YMD96", "manufacturer": "YMDK", - "url": "", - "maintainer": "sparkyman215", + "url": "", + "maintainer": "sparkyman215", "usb": { "vid": "0x20A0", "pid": "0x422D", diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index 40ceef8705..730c82faa4 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "yosino58", + "keyboard_name": "yosino58", "manufacturer": "sakuranbo0046", - "url": "https://github.com/sakurachari/yosino58", - "maintainer": "sakuranbo0046", + "url": "https://github.com/sakurachari/yosino58", + "maintainer": "sakuranbo0046", "usb": { "vid": "0x0F6A", "pid": "0x01B8", diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json index dd01bef783..8a22e6272c 100644 --- a/keyboards/zicodia/tklfrlnrlmlao/info.json +++ b/keyboards/zicodia/tklfrlnrlmlao/info.json @@ -26,11 +26,11 @@ "layouts": { "LAYOUT_all": { "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.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, 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": [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, "w": 1.5 }, { "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": [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, 8], "x": 8.75, "y": 2.25 }, { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 }, { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.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 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index e762ab1d48..ee3c3dfe47 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -13,7 +13,7 @@ "rows": ["C13", "C14", "A5", "A4", "A3"] }, "diode_direction": "COL2ROW", - "backlight": { + "backlight": { "pin": "A6", "breathing": true }, diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json index ff6ddf5c3b..3f2e5c7f96 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "After", "manufacturer": "ZTBoards", - "url": "ztb.mx", + "url": "ztb.mx", "maintainer": "phlopsuh", "usb": { "vid": "0x0927", diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json index cf1d120db3..74c11229e0 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Noon", + "keyboard_name": "Noon", "manufacturer": "ZTBoards", - "url": "ztb.mx", - "maintainer": "phlopsuh", + "url": "ztb.mx", + "maintainer": "phlopsuh", "usb": { "vid": "0x0927", "pid": "0x0002", -- cgit v1.3.1 From 5faa23d54ca1e3ab83097f2a07922f48800616e6 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Mon, 15 May 2023 22:27:37 +1000 Subject: Keymap introspection for combos. (#19670) --- builddefs/build_test.mk | 4 ++ data/mappings/info_config.hjson | 4 +- docs/config_options.md | 2 - docs/feature_combo.md | 33 ++--------- docs/ja/config_options.md | 2 - docs/ja/feature_combo.md | 6 +- keyboards/0xcb/splaytoraid/keymaps/pi/config.h | 1 - keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c | 6 +- keyboards/3w6/keymaps/helltm/combos.h | 4 +- .../gherkin/keymaps/stevexyz/config.h | 2 - .../nori/keymaps/wings_36key/config.h | 2 - .../nori/keymaps/wings_36key/keymap.c | 4 +- .../ashpil/modelm_usbc/keymaps/ashpil/config.h | 1 - .../ashpil/modelm_usbc/keymaps/ashpil/keymap.c | 4 +- keyboards/b_sides/rev41lp/keymaps/namnlos/config.h | 2 - keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c | 2 +- keyboards/bluebell/swoop/keymaps/kyek/config.h | 1 - keyboards/bluebell/swoop/keymaps/kyek/keymap.c | 34 ++++++------ keyboards/centromere/keymaps/mini_bom/config.h | 1 - keyboards/centromere/keymaps/mini_bom/keymap.c | 14 ++--- keyboards/chord/zero/keymaps/default/keymap.c | 2 - .../converter/usb_usb/keymaps/chriskopher/combo.c | 2 +- .../converter/usb_usb/keymaps/chriskopher/config.h | 1 - keyboards/converter/usb_usb/keymaps/narze/config.h | 1 - keyboards/crkbd/keymaps/antosha417/keymap.c | 8 +-- keyboards/crkbd/keymaps/cameronjlarsen/keymap.c | 7 +-- keyboards/crkbd/keymaps/markstos/config.h | 5 +- keyboards/crkbd/keymaps/markstos/keymap.c | 4 +- keyboards/crkbd/keymaps/nimishgautam/config.h | 3 +- keyboards/crkbd/keymaps/nimishgautam/keymap.c | 64 +++++++++++----------- keyboards/crkbd/keymaps/pdl/config.h | 1 - .../drhigsby/dubba175/keymaps/default/config.h | 1 - .../drhigsby/dubba175/keymaps/default/keymap.c | 8 +-- keyboards/drhigsby/ogurec/keymaps/default/config.h | 1 - keyboards/drhigsby/ogurec/keymaps/default/keymap.c | 6 +- keyboards/drhigsby/packrat/keymaps/3uc/config.h | 1 - keyboards/drhigsby/packrat/keymaps/3uc/keymap.c | 7 +-- .../drhigsby/packrat/keymaps/default/config.h | 1 - .../drhigsby/packrat/keymaps/default/keymap.c | 5 +- .../ergodox_ez/keymaps/hacker_dvorak/config.h | 2 - keyboards/eu_isolation/keymaps/bigspace/config.h | 27 +++++---- keyboards/eu_isolation/keymaps/bigspace/keymap.c | 26 ++++----- keyboards/eu_isolation/keymaps/default/config.h | 21 ++++--- keyboards/eu_isolation/keymaps/default/keymap.c | 22 ++++---- keyboards/eu_isolation/keymaps/mit/config.h | 21 ++++--- keyboards/eu_isolation/keymaps/mit/keymap.c | 22 ++++---- keyboards/foostan/cornelius/keymaps/pdl/config.h | 1 - keyboards/free_willy/keymaps/colemak/config.h | 1 - keyboards/free_willy/keymaps/colemak/keymap.c | 2 +- keyboards/free_willy/keymaps/default/config.h | 1 - keyboards/free_willy/keymaps/default/keymap.c | 2 +- keyboards/gboards/g/keymap_combo.h | 3 - .../gmmk/pro/rev1/ansi/keymaps/mike1808/config.h | 1 - .../gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c | 2 +- keyboards/handwired/aek64/keymaps/4sstylz/config.h | 3 - keyboards/handwired/aek64/keymaps/4sstylz/keymap.c | 4 +- keyboards/ibnuda/alicia_cook/keymaps/rick/config.h | 1 - keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/default/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default/keymap.c | 2 +- .../ibnuda/squiggle/keymaps/default38/config.h | 1 - .../ibnuda/squiggle/keymaps/default38/keymap.c | 2 +- .../ibnuda/squiggle/keymaps/defaultfull/config.h | 1 - .../ibnuda/squiggle/keymaps/defaultfull/keymap.c | 2 +- .../squiggle/keymaps/defaultminidox/config.h | 1 - .../squiggle/keymaps/defaultminidox/keymap.c | 2 +- .../squiggle/keymaps/rick-complicated/config.h | 1 - .../squiggle/keymaps/rick-complicated/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/rick/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick/keymap.c | 2 +- keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h | 1 - keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c | 4 +- .../ergodox_infinity/keymaps/narze/config.h | 1 - keyboards/k34/keymaps/default/config.h | 24 ++++---- keyboards/k34/keymaps/default/keymap.c | 2 +- keyboards/keebformom/keymaps/default/config.h | 19 ------- keyboards/keebformom/keymaps/default/keymap.c | 8 +-- .../keycapsss/plaid_pad/keymaps/oled/config.h | 2 - .../keycapsss/plaid_pad/keymaps/oled/keymap.c | 2 +- .../kprepublic/bm40hsrgb/keymaps/34keys/config.h | 1 - .../kprepublic/bm40hsrgb/keymaps/34keys/keymap.c | 16 +++--- .../bm68hsrgb/rev1/keymaps/peepeetee/config.h | 1 - .../bm80hsrgb/keymaps/peepeetee/config.h | 3 +- .../kprepublic/jj40/keymaps/stevexyz/config.h | 2 - keyboards/lets_split/keymaps/shaymdev/config.h | 2 - keyboards/lets_split/keymaps/shaymdev/keymap.c | 38 ++++++------- keyboards/lily58/keymaps/muuko/config.h | 4 -- keyboards/lily58/keymaps/muuko/keymap.c | 2 +- keyboards/lily58/keymaps/narze/config.h | 1 - .../makenova/omega/omega4/keymaps/default/config.h | 1 - .../makenova/omega/omega4/keymaps/default/keymap.c | 4 +- .../omega/omega4/keymaps/default_10u_bar/config.h | 1 - .../omega/omega4/keymaps/default_10u_bar/keymap.c | 4 +- .../omega/omega4/keymaps/default_6u_bar/config.h | 1 - .../omega/omega4/keymaps/default_6u_bar/keymap.c | 4 +- .../minidox/keymaps/rsthd_combos/config.h | 2 - .../minidox/keymaps/rsthd_combos/keymap.c | 2 +- keyboards/massdrop/alt/keymaps/b_/config.h | 1 - keyboards/massdrop/alt/keymaps/pregame/config.h | 1 - keyboards/massdrop/ctrl/keymaps/endgame/config.h | 1 - .../massdrop/ctrl/keymaps/matthewrobo/config.h | 1 - keyboards/massdrop/ctrl/keymaps/xanimos/config.h | 1 - keyboards/maxr1998/pulse4k/config.h | 1 - .../maxr1998/pulse4k/keymaps/default/keymap.c | 2 +- .../maxr1998/pulse4k/keymaps/maxr1998/keymap.c | 2 +- keyboards/nimrod/keymaps/default/config.h | 1 - keyboards/nimrod/keymaps/default/keymap.c | 2 +- .../nimrod/keymaps/default_center_space/config.h | 1 - .../nimrod/keymaps/default_center_space/keymap.c | 2 +- .../nimrod/keymaps/default_left_space/config.h | 1 - .../nimrod/keymaps/default_left_space/keymap.c | 2 +- .../nimrod/keymaps/default_right_space/config.h | 1 - .../nimrod/keymaps/default_right_space/keymap.c | 2 +- .../nimrod/keymaps/default_split_space/config.h | 1 - .../nimrod/keymaps/default_split_space/keymap.c | 2 +- keyboards/orthodox/keymaps/shaymdev/config.h | 2 - keyboards/orthodox/keymaps/shaymdev/keymap.c | 38 ++++++------- keyboards/pierce/keymaps/durken1/config.h | 1 - keyboards/pierce/keymaps/durken1/keymap.c | 22 ++++---- keyboards/planck/keymaps/antosha417/keymap.c | 7 +-- keyboards/planck/keymaps/ariccb/keymap.c | 4 +- keyboards/planck/keymaps/dvz/config.h | 2 - keyboards/planck/keymaps/dvz/keymap.c | 2 +- keyboards/planck/keymaps/narze/config.h | 1 - keyboards/planck/keymaps/rootiest/config.h | 1 - keyboards/planck/keymaps/rootiest/keymap.c | 2 +- keyboards/preonic/keymaps/brauner/keymap.c | 5 +- .../program_yoink/ortho/keymaps/default/config.h | 3 +- .../program_yoink/ortho/keymaps/default/keymap.c | 2 +- .../ortho/keymaps/ortho_split/config.h | 3 +- .../ortho/keymaps/ortho_split/keymap.c | 2 +- .../staggered/keymaps/default/config.h | 3 +- .../staggered/keymaps/default/keymap.c | 2 +- .../staggered/keymaps/split_bar/config.h | 3 +- .../staggered/keymaps/split_bar/keymap.c | 2 +- .../projectcain/relic/keymaps/default/config.h | 1 - .../projectcain/relic/keymaps/default/keymap.c | 16 +++--- .../projectcain/vault35/keymaps/default/config.h | 1 - .../projectcain/vault35/keymaps/default/keymap.c | 48 ++++++++-------- .../projectcain/vault45/keymaps/default/config.h | 31 +++++------ .../projectcain/vault45/keymaps/default/keymap.c | 26 ++++----- keyboards/q4z/keymaps/default/config.h | 1 - keyboards/q4z/keymaps/default/keymap.c | 2 +- keyboards/q4z/keymaps/rjboone/config.h | 2 - keyboards/q4z/keymaps/rjboone/keymap.c | 2 +- keyboards/qpockets/eggman/keymaps/default/config.h | 3 +- keyboards/qpockets/eggman/keymaps/default/keymap.c | 2 +- .../space_space/rev1/keymaps/big_space/config.h | 3 +- .../space_space/rev1/keymaps/big_space/keymap.c | 2 +- .../space_space/rev1/keymaps/default/config.h | 3 +- .../space_space/rev1/keymaps/default/keymap.c | 2 +- .../space_space/rev2/keymaps/big_space/config.h | 3 +- .../space_space/rev2/keymaps/big_space/keymap.c | 8 +-- .../space_space/rev2/keymaps/default/config.h | 3 +- .../space_space/rev2/keymaps/default/keymap.c | 8 +-- .../space_space/rev2/keymaps/qpockets/config.h | 3 +- .../space_space/rev2/keymaps/qpockets/keymap.c | 10 ++-- keyboards/qpockets/wanten/keymaps/2u_bars/config.h | 3 +- keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c | 11 ++-- keyboards/qpockets/wanten/keymaps/625_bar/config.h | 3 +- keyboards/qpockets/wanten/keymaps/625_bar/keymap.c | 11 ++-- keyboards/qpockets/wanten/keymaps/default/config.h | 3 +- keyboards/qpockets/wanten/keymaps/default/keymap.c | 11 ++-- .../rgbkb/zen/rev1/keymaps/cwebster2/config.h | 7 --- .../sweep/keymaps/flinguenheld/features/combo.c | 5 -- .../splitkb/kyria/keymaps/cameronjlarsen/keymap.c | 5 +- keyboards/splitkb/kyria/keymaps/cwebster2/config.h | 4 -- keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c | 2 +- keyboards/synapse/keymaps/7u_space/config.h | 3 +- keyboards/synapse/keymaps/7u_space/keymap.c | 4 +- keyboards/synapse/keymaps/default/config.h | 3 +- keyboards/synapse/keymaps/default/keymap.c | 4 +- .../tominabox1/adalyn/keymaps/default/config.h | 1 - .../tominabox1/adalyn/keymaps/default/keymap.c | 2 +- .../tominabox1/le_chiffre/keymaps/default/config.h | 1 - .../tominabox1/le_chiffre/keymaps/default/keymap.c | 2 +- keyboards/tominabox1/qaz/keymaps/default/config.h | 1 - keyboards/tominabox1/qaz/keymaps/default/keymap.c | 2 +- .../qaz/keymaps/default_big_space/config.h | 1 - .../qaz/keymaps/default_big_space/keymap.c | 2 +- .../underscore33/rev1/keymaps/default/config.h | 1 - .../underscore33/rev1/keymaps/default/keymap.c | 2 +- .../rev1/keymaps/default_big_space/config.h | 1 - .../rev1/keymaps/default_big_space/keymap.c | 2 +- .../underscore33/rev2/keymaps/default/config.h | 1 - .../underscore33/rev2/keymaps/default/keymap.c | 2 +- .../rev2/keymaps/default_big_space/config.h | 1 - .../rev2/keymaps/default_big_space/keymap.c | 2 +- keyboards/xiudi/xd75/keymaps/4sstylz/config.h | 1 - keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c | 2 +- keyboards/ymdk/melody96/keymaps/dvz/config.h | 1 - keyboards/ymdk/melody96/keymaps/dvz/keymap.c | 2 +- quantum/keymap_introspection.c | 21 +++++++ quantum/keymap_introspection.h | 21 +++++++ quantum/process_keycode/process_combo.c | 23 +++----- quantum/process_keycode/process_combo.h | 2 +- tests/caps_word/caps_word_combo/test.mk | 1 + .../caps_word_combo/test_caps_word_combo.cpp | 23 -------- tests/caps_word/caps_word_combo/test_combos.c | 20 +++++++ tests/combo/test.mk | 2 + tests/combo/test_combo.cpp | 15 ----- tests/combo/test_combos.c | 17 ++++++ tests/test_common/keycode_util.hpp | 1 + users/art/funcs/string_funcs.c | 48 ++++++++-------- users/danielo515/combo.c | 2 +- users/danielo515/config.h | 1 - users/ericgebhart/extensions/keymap_combo.h | 3 - users/ibnuda/combo.h | 4 +- users/ibnuda/config.h | 3 +- users/issmirnov/config.h | 1 - users/issmirnov/issmirnov.c | 4 +- users/kuchosauronad0/combo.h | 5 +- users/kuchosauronad0/config.h | 1 - users/manna-harbour_miryoku/config.h | 1 - .../manna-harbour_miryoku/manna-harbour_miryoku.c | 2 +- users/muppetjones/config.h | 2 - users/muppetjones/features/combos.c | 3 +- users/narze/superduper.c | 2 +- users/ninjonas/combos.c | 4 +- users/ninjonas/config.h | 2 - users/pdl/pdl.c | 2 +- users/talljoe/config.h | 1 - users/uqs/uqs.c | 2 - users/yet-another-developer/combo.h | 5 +- users/yet-another-developer/config.h | 1 - users/zigotica/combos.c | 5 +- 226 files changed, 533 insertions(+), 729 deletions(-) delete mode 100644 keyboards/handwired/aek64/keymaps/4sstylz/config.h delete mode 100644 keyboards/keebformom/keymaps/default/config.h create mode 100644 tests/caps_word/caps_word_combo/test_combos.c create mode 100644 tests/combo/test_combos.c (limited to 'keyboards/maple_computing') diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk index 4230598373..9eead77bea 100644 --- a/builddefs/build_test.mk +++ b/builddefs/build_test.mk @@ -75,6 +75,10 @@ $(TEST)_SRC += \ tests/test_common/main.cpp \ $(QUANTUM_PATH)/logging/print.c +ifneq ($(strip $(INTROSPECTION_KEYMAP_C)),) +$(TEST)_DEFS += -DINTROSPECTION_KEYMAP_C=\"$(strip $(INTROSPECTION_KEYMAP_C))\" +endif + $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC) $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC) $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS) diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index 4a825b7fe5..e53d90da39 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -43,7 +43,6 @@ "DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.double_tap_shift_turns_on", "value_type": "bool"}, // Combos - "COMBO_COUNT": {"info_key": "combo.count", "value_type": "int"}, "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"}, // Dynamic Keymap @@ -182,9 +181,10 @@ "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true}, "TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true}, "UNUSED_PINS": {"info_key": "_invalid.unused_pins", "deprecated": true}, + "COMBO_COUNT": {"info_key": "_invalid.combo.count", "invalid": true}, // USB params, need to mark as failure when specified in config.h, rather than deprecated - "DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version", "deprecated": true, "replace_with": "`usb.device_version` in info.json"} + "DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version", "deprecated": true, "replace_with": "`usb.device_version` in info.json"}, "MANUFACTURER": {"info_key": "manufacturer", "value_type": "str", "deprecated": true, "replace_with": "`manufacturer` in info.json"}, "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"}, "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"}, diff --git a/docs/config_options.md b/docs/config_options.md index 5ea71d993e..4698260118 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -186,8 +186,6 @@ If you define these options you will enable the associated feature, which may in * how long before oneshot times out * `#define ONESHOT_TAP_TOGGLE 2` * how many taps before oneshot toggle is triggered -* `#define COMBO_COUNT 2` - * Set this to the number of combos that you're using in the [Combo](feature_combo.md) feature. Or leave it undefined and programmatically set the count. * `#define COMBO_TERM 200` * how long for the Combo keys to be detected. Defaults to `TAPPING_TERM` if not defined. * `#define COMBO_MUST_HOLD_MODS` diff --git a/docs/feature_combo.md b/docs/feature_combo.md index 075fe252ae..fd241061fb 100644 --- a/docs/feature_combo.md +++ b/docs/feature_combo.md @@ -4,15 +4,12 @@ The Combo feature is a chording type solution for adding custom actions. It lets To enable this feature, you need to add `COMBO_ENABLE = yes` to your `rules.mk`. -Additionally, in your `config.h`, you'll need to specify the number of combos that you'll be using, by adding `#define COMBO_COUNT 1` (replacing 1 with the number that you're using). It is also possible to not define this and instead set the variable `COMBO_LEN` yourself. There's a trick where we don't need to think about this variable at all. More on this later. - - Then, in your `keymap.c` file, you'll need to define a sequence of keys, terminated with `COMBO_END`, and a structure to list the combination of keys, and its resulting action. ```c const uint16_t PROGMEM test_combo1[] = {KC_A, KC_B, COMBO_END}; const uint16_t PROGMEM test_combo2[] = {KC_C, KC_D, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(test_combo1, KC_ESC), COMBO(test_combo2, LCTL(KC_Z)), // keycodes with modifiers are possible too! }; @@ -33,7 +30,7 @@ It is possible to overlap combos. Before, with the example below both combos wou ```c const uint16_t PROGMEM test_combo1[] = {LSFT_T(KC_A), LT(1, KC_B), COMBO_END}; const uint16_t PROGMEM test_combo2[] = {LSFT_T(KC_A), LT(1, KC_B), KC_C, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(test_combo1, KC_ESC) COMBO(test_combo2, KC_TAB) }; @@ -41,17 +38,15 @@ combo_t key_combos[COMBO_COUNT] = { ## Examples -A long list of combos can be defined in an `enum` list that ends with `COMBO_LENGTH` and you can leave `COMBO_COUNT` undefined: +A long list of combos can be defined in an `enum` list: ```c enum combos { AB_ESC, JK_TAB, QW_SFT, - SD_LAYER, - COMBO_LENGTH + SD_LAYER }; -uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! const uint16_t PROGMEM ab_combo[] = {KC_A, KC_B, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; @@ -72,9 +67,7 @@ For a more complicated implementation, you can use the `process_combo_event` fun enum combo_events { EM_EMAIL, BSPC_LSFT_CLEAR, - COMBO_LENGTH }; -uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END}; const uint16_t PROGMEM clear_line_combo[] = {KC_BSPC, KC_LSFT, COMBO_END}; @@ -259,18 +252,6 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode } ``` -### Variable Length Combos -If you leave `COMBO_COUNT` undefined in `config.h`, it allows you to programmatically declare the size of the Combo data structure and avoid updating `COMBO_COUNT`. Instead a variable called `COMBO_LEN` has to be set. It can be set with something similar to the following in `keymap.c`: `uint16_t COMBO_LEN = ARRAY_SIZE(key_combos);` or by adding `COMBO_LENGTH` as the *last* entry in the combo enum and then `uint16_t COMBO_LEN = COMBO_LENGTH;` as such: -```c -enum myCombos { - ..., - COMBO_LENGTH -}; -uint16_t COMBO_LEN = COMBO_LENGTH; -``` -Regardless of the method used to declare `COMBO_LEN`, this also requires to convert the `combo_t key_combos[COMBO_COUNT] = {...};` line to `combo_t key_combos[] = {...};`. - - ### Combo timer Normally, the timer is started on the first key press and then reset on every subsequent key press within the `COMBO_TERM`. @@ -300,10 +281,8 @@ Here's an example where a combo resolves to two modifiers, and on key releases t ```c enum combos { - AB_MODS, - COMBO_LENGTH + AB_MODS }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM ab_combo[] = {KC_A, KC_B, COMBO_END}; @@ -415,6 +394,4 @@ SUBS(TH_THE, "the", KC_T, KC_H) // SUBS uses SEND_STRING to output the give ... ``` -Now, you can update only one place to add or alter combos. You don't even need to remember to update the `COMBO_COUNT` or the `COMBO_LEN` variables at all. Everything is taken care of. Magic! - For small to huge ready made dictionaries of combos, you can check out http://combos.gboards.ca/. diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md index 4f9f1f2770..5e98da5eee 100644 --- a/docs/ja/config_options.md +++ b/docs/ja/config_options.md @@ -176,8 +176,6 @@ QMK での全ての利用可能な設定にはデフォルトがあります。 * ワンショットがタイムアウトするまでの時間 * `#define ONESHOT_TAP_TOGGLE 2` * ワンショットトグルが引き起こされるまでのタップ数 -* `#define COMBO_COUNT 2` - * [コンボ](ja/feature_combo.md)機能で使っているコンボの数にこれを設定します。 * `#define COMBO_TERM 200` * コンボキーが検出されるまでの時間。定義されていない場合は、デフォルトは `TAPPING_TERM` です。 * `#define TAP_CODE_DELAY 100` diff --git a/docs/ja/feature_combo.md b/docs/ja/feature_combo.md index bd46e88b7f..0c0591e5f7 100644 --- a/docs/ja/feature_combo.md +++ b/docs/ja/feature_combo.md @@ -18,7 +18,7 @@ ```c const uint16_t PROGMEM test_combo[] = {KC_A, KC_B, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = {COMBO(test_combo, KC_ESC)}; +combo_t key_combos[] = {COMBO(test_combo, KC_ESC)}; ``` これは、A と B のキーを押した場合に、"Escape" を送信します。 @@ -38,7 +38,7 @@ enum combos { const uint16_t PROGMEM ab_combo[] = {KC_A, KC_B, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [AB_ESC] = COMBO(ab_combo, KC_ESC), [JK_TAB] = COMBO(jk_combo, KC_TAB) }; @@ -55,7 +55,7 @@ enum combo_events { const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZC_COPY] = COMBO_ACTION(copy_combo), [XV_PASTE] = COMBO_ACTION(paste_combo), }; diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h index 52e39aef65..1786ae776d 100644 --- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h +++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h @@ -10,7 +10,6 @@ #ifdef COMBO_ENABLE - #define COMBO_COUNT 9 #define COMBO_TERM 20 #define COMBO_ONLY_FROM_LAYER 0 #endif diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c index 29953eedef..07036b7245 100644 --- a/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c +++ b/keyboards/0xcb/splaytoraid/keymaps/pi/keymap.c @@ -73,7 +73,7 @@ const uint16_t PROGMEM ent_combo[] = {HM_K, HM_L, COMBO_END}; const uint16_t PROGMEM tab_combo[] = {HM_F, HM_D, COMBO_END}; const uint16_t PROGMEM esc_combo[] = {HM_D, HM_S, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(ae_combo, RALT(KC_Q)), COMBO(ss_combo, RALT(KC_S)), COMBO(ue_combo, RALT(KC_Y)), @@ -298,7 +298,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NUMBERS] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FUNCTION] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; - - - - diff --git a/keyboards/3w6/keymaps/helltm/combos.h b/keyboards/3w6/keymaps/helltm/combos.h index 85f44cd0d4..99173ecb22 100644 --- a/keyboards/3w6/keymaps/helltm/combos.h +++ b/keyboards/3w6/keymaps/helltm/combos.h @@ -19,16 +19,14 @@ #define CB(name, action, ...) C_##name, enum user_combos { #include "combos.def" - COMBO_LENGTH }; #undef CB -uint16_t COMBO_LEN = COMBO_LENGTH; #define CB(name, action, ...) const uint16_t PROGMEM name##_combo[] = {__VA_ARGS__, COMBO_END}; #include "combos.def" #undef CB -combo_t key_combos[COMBO_LENGTH] = { +combo_t key_combos[] = { #define CB(name, action, ...) COMBO(name##_combo, action), #include "combos.def" #undef CB diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h index 589a67f03d..c97c9c2f4b 100644 --- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h +++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h @@ -37,8 +37,6 @@ // how long before oneshot times out #define ONESHOT_TAP_TOGGLE 2 // how many taps before oneshot toggle is triggered - #define COMBO_COUNT 2 - // Set this to the number of combos that you're using in the Combo feature. #define COMBO_TERM 200 // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. #define TAP_CODE_DELAY 100 diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h index f076ded9ba..0ac12473e0 100644 --- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h +++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h @@ -19,7 +19,5 @@ #define RETRO_TAPPING_PER_KEY #define TAPPING_TERM_PER_KEY -#define COMBO_COUNT 2 // number of combos used #define COMBO_TERM 40 // time out for combos in ms #define TAPPING_TERM 200 // time out for tap-hold in ms - diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c index 40d59ecf76..fc6b19ff3c 100644 --- a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c +++ b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c @@ -99,14 +99,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(df_tab, KC_TAB), COMBO(jk_alt, KC_LALT), }; layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} +} uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h index d5cef677e8..59cec33010 100644 --- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h +++ b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h @@ -20,5 +20,4 @@ /* Add combos */ -#define COMBO_COUNT 1 #define COMBO_TERM 200 diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c index 3556aac483..e8df1f0c81 100644 --- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c +++ b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c @@ -32,7 +32,7 @@ enum combo_events { const uint16_t PROGMEM reset_combo[] = {KC_LCTL, KC_PAUS, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [CTRL_PAUS_RESET] = COMBO_ACTION(reset_combo), }; @@ -44,4 +44,4 @@ void process_combo_event(uint16_t combo_index, bool pressed) { } break; } -} \ No newline at end of file +} diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h index 19b366f4a8..10f5ddf146 100644 --- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h +++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h @@ -21,8 +21,6 @@ #define BACKLIGHT_LIMIT_VAL 255 #define BACKLIGHT_DEFAULT_LEVEL 3 -#define COMBO_COUNT 3 - #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX #define QUICK_TAP_TERM 0 diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c index 0642cdc333..c90f7e25a1 100644 --- a/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c +++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; const uint16_t PROGMEM cut_combo[] = {KC_Z, KC_X, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZC_COPY] = COMBO_ACTION(copy_combo), [XV_PASTE] = COMBO_ACTION(paste_combo), [ZX_CUT] = COMBO_ACTION(cut_combo), diff --git a/keyboards/bluebell/swoop/keymaps/kyek/config.h b/keyboards/bluebell/swoop/keymaps/kyek/config.h index e48703e02d..6b06855a5a 100644 --- a/keyboards/bluebell/swoop/keymaps/kyek/config.h +++ b/keyboards/bluebell/swoop/keymaps/kyek/config.h @@ -15,4 +15,3 @@ */ #pragma once #define ONESHOT_TIMEOUT 1000 -#define COMBO_COUNT 2 diff --git a/keyboards/bluebell/swoop/keymaps/kyek/keymap.c b/keyboards/bluebell/swoop/keymaps/kyek/keymap.c index 10fde34180..1901c24f27 100644 --- a/keyboards/bluebell/swoop/keymaps/kyek/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/kyek/keymap.c @@ -33,7 +33,7 @@ enum combos { }; const uint16_t PROGMEM accent_combo[] = {KC_SPC, MO(_SYM1), COMBO_END}; const uint16_t PROGMEM settings_combo[] = {MO(_EXT), SFT_T(KC_SPC), COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ACC] = COMBO(accent_combo, MO(_ACC)), [SET] = COMBO(settings_combo, MO(_SET)), }; @@ -78,37 +78,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_EXT] = LAYOUT_split_3x5_3( KC_ESC, _______, _______, _______, _______, KC_PAGE_UP, KC_HOME, KC_UP, KC_END, KC_CAPS, OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT, KC_PAGE_DOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DELETE, - UNDO, CUT, COPY, KC_TAB, PASTE, DEL_WORD, KC_BSPC, _______, _______, _______, + UNDO, CUT, COPY, KC_TAB, PASTE, DEL_WORD, KC_BSPC, _______, _______, _______, _______, _______, _______, KC_ENT, FNC, _______ ), [_FNC] = LAYOUT_split_3x5_3( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT, KC_F11, KC_F12, KC_PSCR, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + OS_ALT, OS_GUI, OS_SFT, OS_CTL, OS_RALT, KC_F11, KC_F12, KC_PSCR, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_SYM2] = LAYOUT_split_3x5_3( - IT_CIRC, IT_UNDS, IT_PND, IT_EURO, IT_HASH, _______, _______, _______, _______, _______, - BACKTICK, TILDE, IT_BSLS, IT_PIPE, IT_AMPR, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + IT_CIRC, IT_UNDS, IT_PND, IT_EURO, IT_HASH, _______, _______, _______, _______, _______, + BACKTICK, TILDE, IT_BSLS, IT_PIPE, IT_AMPR, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_ACC] = LAYOUT_split_3x5_3( - _______, _______, _______, CEGR, _______, _______, _______, _______, _______, _______, - IT_AGRV, IT_IGRV, IT_OGRV, IT_EGRV, IT_EACU, _______, _______, _______, _______, _______, - _______, _______, _______, IT_UGRV, _______, _______, _______, _______, _______, _______, + _______, _______, _______, CEGR, _______, _______, _______, _______, _______, _______, + IT_AGRV, IT_IGRV, IT_OGRV, IT_EGRV, IT_EACU, _______, _______, _______, _______, _______, + _______, _______, _______, IT_UGRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_SET] = LAYOUT_split_3x5_3( - _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, _______, - _______, _______, _______, RGB_M_B, RGB_M_P, RGB_HUI, RGB_HUD, _______, _______, _______, - QK_BOOT, _______, _______, RGB_M_R, RGB_TOG, RGB_SAI, RGB_SAD, _______, _______, QK_BOOT, + _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, _______, + _______, _______, _______, RGB_M_B, RGB_M_P, RGB_HUI, RGB_HUD, _______, _______, _______, + QK_BOOT, _______, _______, RGB_M_R, RGB_TOG, RGB_SAI, RGB_SAD, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______ ), // [_TEMP] = LAYOUT_split_3x5_3( -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, // _______, _______, _______, _______, _______, _______ // ), }; diff --git a/keyboards/centromere/keymaps/mini_bom/config.h b/keyboards/centromere/keymaps/mini_bom/config.h index 7c40fba2a3..7a79437fab 100644 --- a/keyboards/centromere/keymaps/mini_bom/config.h +++ b/keyboards/centromere/keymaps/mini_bom/config.h @@ -17,7 +17,6 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 10 # define COMBO_TERM 50 #endif diff --git a/keyboards/centromere/keymaps/mini_bom/keymap.c b/keyboards/centromere/keymaps/mini_bom/keymap.c index 82e68aafa5..1dd8f60c5a 100644 --- a/keyboards/centromere/keymaps/mini_bom/keymap.c +++ b/keyboards/centromere/keymaps/mini_bom/keymap.c @@ -20,7 +20,7 @@ // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. +// entirely and just use numbers. enum centromere_layers @@ -57,7 +57,7 @@ enum centromere_layers * | | | | | | | | * '-------------------------' '-----------------' */ - + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, KC_NO, KC_NO, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, KC_NO, KC_NO, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, KC_NO, - CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL + CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL ), /* Keymap 2: Pad/Function layer @@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMB] = LAYOUT( KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, KC_NO, - KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, KC_NO, + KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, KC_NO, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT ), @@ -137,8 +137,8 @@ const uint16_t PROGMEM combo_less[] = {KC_H, KC_J, COMBO_END}; const uint16_t PROGMEM combo_more[] = {KC_K, KC_L, COMBO_END}; const uint16_t PROGMEM combo_quot[] = {KC_N, KC_M, COMBO_END}; const uint16_t PROGMEM combo_dash[] = {KC_X, KC_C, COMBO_END}; - -combo_t key_combos[COMBO_COUNT] = { + +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), [COMBO_ESC] = COMBO(combo_esc,KC_ESC), @@ -148,6 +148,6 @@ combo_t key_combos[COMBO_COUNT] = { [COMBO_LESS] = COMBO(combo_less,KC_LT), [COMBO_MORE] = COMBO(combo_more,KC_GT), [COMBO_QUOT] = COMBO(combo_quot, KC_QUOT), - [COMBO_DASH] = COMBO(combo_dash, KC_MINS), + [COMBO_DASH] = COMBO(combo_dash, KC_MINS), }; #endif diff --git a/keyboards/chord/zero/keymaps/default/keymap.c b/keyboards/chord/zero/keymaps/default/keymap.c index 0469288fd4..a1edbe0cff 100644 --- a/keyboards/chord/zero/keymaps/default/keymap.c +++ b/keyboards/chord/zero/keymaps/default/keymap.c @@ -21,5 +21,3 @@ const uint16_t PROGMEM bootloader_combo[] = { combo_t key_combos[] = { COMBO(bootloader_combo, QK_BOOTLOADER), }; - -uint16_t COMBO_LEN = sizeof(key_combos) / sizeof(key_combos[0]); diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c index 68a3eda04c..3b89488648 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END}; // Combo: S + D fo const uint16_t PROGMEM kl_combo[] = {KC_K, KC_L, COMBO_END}; // Combo: K + L for Meh modifier // Register the combo action -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [SD_LAYER_COMBO] = COMBO_ACTION(sd_combo), [KL_MEH_COMBO] = COMBO_ACTION(kl_combo), }; diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h index 04066edc02..8f26d25799 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h @@ -20,5 +20,4 @@ #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Allows configuration of hold on other key press per key in keymap.c -#define COMBO_COUNT 2 // Number of defined combos #define COMBO_TERM 20 // Delay for combo keys to be chained together diff --git a/keyboards/converter/usb_usb/keymaps/narze/config.h b/keyboards/converter/usb_usb/keymaps/narze/config.h index fddd9cd376..a7fccc4187 100644 --- a/keyboards/converter/usb_usb/keymaps/narze/config.h +++ b/keyboards/converter/usb_usb/keymaps/narze/config.h @@ -24,7 +24,6 @@ #define TAPPING_TERM 100 #define COMBO_TERM 20 -#define COMBO_COUNT 1 #define PERMISSIVE_HOLD diff --git a/keyboards/crkbd/keymaps/antosha417/keymap.c b/keyboards/crkbd/keymaps/antosha417/keymap.c index bdee148485..47771b531e 100644 --- a/keyboards/crkbd/keymaps/antosha417/keymap.c +++ b/keyboards/crkbd/keymaps/antosha417/keymap.c @@ -165,11 +165,8 @@ enum combo_events { DELQ_COMBO, SAVEQ_COMBO, BSPCQ_COMBO, - BSPCWQ_COMBO, - - COMBO_LENGTH + BSPCWQ_COMBO }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END}; const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END}; @@ -216,7 +213,7 @@ combo_t key_combos[] = { [SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE), [BSPCWQ_COMBO] = COMBO(bspcwq_combo, DELETE_WORD), }; - + #ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { @@ -398,4 +395,3 @@ void matrix_scan_user(void) { #include "mod_tap_keys.h" #undef MOD_TAP_KEY } - diff --git a/keyboards/crkbd/keymaps/cameronjlarsen/keymap.c b/keyboards/crkbd/keymaps/cameronjlarsen/keymap.c index e7bccb5c73..54ad19dc0b 100644 --- a/keyboards/crkbd/keymaps/cameronjlarsen/keymap.c +++ b/keyboards/crkbd/keymaps/cameronjlarsen/keymap.c @@ -30,7 +30,7 @@ enum layers { // One shot mods enum keycodes { - OS_SHFT = QK_USER, + OS_SHFT = QK_USER, OS_CTRL, OS_ALT, OS_GUI, @@ -159,11 +159,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; enum combo_events { - CAPS_COMBO, - // Other combos... - COMBO_LENGTH + CAPS_COMBO }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM caps_combo[] = {KC_F, KC_J, COMBO_END}; diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h index 5644812e5e..24101724de 100644 --- a/keyboards/crkbd/keymaps/markstos/config.h +++ b/keyboards/crkbd/keymaps/markstos/config.h @@ -43,11 +43,9 @@ This is the C configuration file for the keymap #define QMK_SPEAKER C6 // When enabled, typing a mod-tap plus second within term will register as the mod-combo -// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold +// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold #define PERMISSIVE_HOLD -#define COMBO_COUNT 2 - // Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing. // They would have be held together intentionally to trigger this. #define COMBO_TERM 40 @@ -56,4 +54,3 @@ This is the C configuration file for the keymap // I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on. #define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */ #define ONESHOT_TIMEOUT 2000 /* Time (in ms) before the one shot key is released */ - diff --git a/keyboards/crkbd/keymaps/markstos/keymap.c b/keyboards/crkbd/keymaps/markstos/keymap.c index ca5be183b1..1f95ee52b2 100644 --- a/keyboards/crkbd/keymaps/markstos/keymap.c +++ b/keyboards/crkbd/keymaps/markstos/keymap.c @@ -18,7 +18,7 @@ enum combos { const uint16_t PROGMEM df_combo[] = {KC_D, KC_F, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // Add commonly used dash to home row [DF_DASH] = COMBO(df_combo, KC_MINS), // For Vim, put Escape on the home row @@ -43,7 +43,7 @@ enum custom_layers { #define GUI_ENT GUI_T(KC_ENT) #define LOW_TAB LT(_LOWER, KC_TAB) #define RSE_BSP LT(_RAISE, KC_BSPC) -#define OSM_SFT OSM(MOD_LSFT) +#define OSM_SFT OSM(MOD_LSFT) // For _RAISE layer diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h index d169988be7..b4c5bc9e0a 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/config.h +++ b/keyboards/crkbd/keymaps/nimishgautam/config.h @@ -15,7 +15,6 @@ // combo -#define COMBO_COUNT 7 #define EXTRA_SHORT_COMBOS //Tapping values @@ -68,7 +67,7 @@ // NOTE: the below effects are super cool but they go absolutely nuts if you manually set hsv colors (eg with layers) //#define ENABLE_RGB_MATRIX_TYPING_HEATMAP - //#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + //#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH //#define ENABLE_RGB_MATRIX_SOLID_REACTIVE #endif diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c index 0c0a3e3544..389a5bfdb1 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c +++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c @@ -20,7 +20,7 @@ enum custom_key_codes { MOVE_END_LINE_TERMINAL, // move to the end of the line in the terminal /* macros */ PASTE_VIM, // paste in vim from system register - ACIRCLE, // å + ACIRCLE, // å ADOT, // ä ODOT, // ö COMPOSE_MACRO, // compose key for mac or linux @@ -44,7 +44,7 @@ enum { #define SHOW_WINDOWS LCTL(KC_UP) //'Expose' on Mac, overview on linux. Just all the windows #define WINDOW_LEFT LCTL(LGUI(LSFT(KC_LEFT))) //custom shortcut for this feature -- make window take up 50% left screen (using gui and ctl to make it os agnostic) #define WINDOW_RIGHT LCTL(LGUI(LSFT(KC_RIGHT))) //custom shortcut for this feature -- make window take up 50% right screen (using gui and ctl to make it os agnostic)/fully custom shortcut, using ctl and gui keys so will need them both irrespective of os -#define SHOW_APP_WINDOWS LCTL(KC_DOWN) +#define SHOW_APP_WINDOWS LCTL(KC_DOWN) #define LOCK_SCREEN LCTL(LGUI(KC_Q)) //manually set this on linux to match osx default #define EURO LALT(LSFT(KC_2)) #define EMOJI_KBD LCTL(LGUI(KC_SPACE)) //manually set this on linux to match osx default, with 'emote' on linux and a custom shortcut (probably better to use compose feature) @@ -86,7 +86,7 @@ const uint16_t PROGMEM adot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_RALT,KC_L), COM // combo - press combo+ ; to get ö const uint16_t PROGMEM odot_combo[] = {KC_BSPC, KC_SPACE, MT(MOD_LCTL,KC_SCLN),COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(compose_combo, COMPOSE_MACRO), COMBO(search_combo, FINDER), COMBO(calculator_combo, CALCULATOR), @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMS] = LAYOUT_split_3x6_3( //numbers //,-----------------------------------------------------. ,-----------------------------------------------------. - SCREENSHOT, KC_EXCLAIM,KC_AT, KC_HASH, KC_DOLLAR,KC_PERCENT, KC_CIRCUMFLEX, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_PIPE, + SCREENSHOT, KC_EXCLAIM,KC_AT, KC_HASH, KC_DOLLAR,KC_PERCENT, KC_CIRCUMFLEX, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_PIPE, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI,KC_PLUS, KC_EQL, KC_4, KC_5, KC_6, KC_BSLS, KC_TRANSPARENT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUM_MASK] = LAYOUT_split_3x6_3( //NUM MASK, so I can still have backspace/enter/tab etc but with the nums, arrows and formatters too //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_UP, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT, + KC_TRANSPARENT, KC_TRANSPARENT,KC_TRANSPARENT, KC_UP, KC_TRANSPARENT,KC_TRANSPARENT, KC_TRANSPARENT, KC_7, KC_8, KC_9, KC_TRANSPARENT, KC_TRANSPARENT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| TO(_BASE), KC_TRANSPARENT, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRANSPARENT, KC_TRANSPARENT, KC_4, KC_5, KC_6, KC_TRANSPARENT, KC_TRANSPARENT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN_KEYS] = LAYOUT_split_3x6_3( //fn keys, terminal text navigation keys //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TRANSPARENT, KC_LCBR,KC_LBRC, KC_RBRC, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL, MOVE_END_LINE_TERMINAL, KC_F7, KC_F8, KC_F9, KC_F11, KC_TRANSPARENT, + KC_TRANSPARENT, KC_LCBR,KC_LBRC, KC_RBRC, KC_RCBR, MOVE_BEGIN_LINE_TERMINAL, MOVE_END_LINE_TERMINAL, KC_F7, KC_F8, KC_F9, KC_F11, KC_TRANSPARENT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| TO(_BASE), KC_LCTL, KC_LALT, KC_RSFT, KC_LGUI, KC_TRANSPARENT, KC_TRANSPARENT, KC_F4, KC_F5, KC_F6, KC_F12, KC_TRANSPARENT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -173,7 +173,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT , KC_HASH , KC_TRANSPARENT, KC_F10 //`--------------------------' `--------------------------' ) - + }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -183,19 +183,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // as of this writing, you can't do a layer tap (LT) // and also send a shifted code, like left parens - // If you call such a function, it'll do the layer shift but + // If you call such a function, it'll do the layer shift but // it'll ignore the key code on tap... this is the workaround - + case LT(_NUMS,KC_LPRN): // Shift to _NUMS layer on hold, but send left paren on press if (record->tap.count && record->event.pressed) { - tap_code16(KC_LPRN); - return false; + tap_code16(KC_LPRN); + return false; } break; case LT(_NUMS,KC_RPRN): // Shift to _NUMS on hold, send right parens on press if (record->tap.count && record->event.pressed) { - tap_code16(KC_RPRN); - return false; + tap_code16(KC_RPRN); + return false; } break; @@ -203,20 +203,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->tap.count && record->event.pressed) { tap_code16(SHOW_WINDOWS); // Intercept tap function } else if (record->event.pressed) { - tap_code16(WINDOW_LEFT); // Intercept hold function + tap_code16(WINDOW_LEFT); // Intercept hold function } return false; break; - + case LT(0, NUMERIC_WIN_RIGHT): if (record->tap.count && record->event.pressed) { layer_on(_NUM_MASK);// Intercept tap function } else if (record->event.pressed) { - tap_code16(WINDOW_RIGHT); // Intercept hold function + tap_code16(WINDOW_RIGHT); // Intercept hold function } return false; break; - + case PASTE_VIM: if (record->event.pressed){ SEND_STRING(SS_TAP(X_ESCAPE)"\"+pi"); @@ -225,7 +225,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; //only read the keymap config if it's one of the below cases (instead of every time) - case DEL_WORD: + case DEL_WORD: case SELECT_LEFT_WD: case SELECT_RIGHT_WD: case SELECT_LEFT_LINE: @@ -235,7 +235,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case MOVE_LEFT_LINE: case MOVE_RIGHT_LINE: case PASTE_NOSTYLE: - case MOVE_BEGIN_LINE_TERMINAL: + case MOVE_BEGIN_LINE_TERMINAL: case MOVE_END_LINE_TERMINAL: case ACIRCLE: case ADOT: @@ -313,28 +313,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(LCTL(RSFT(KC_V))); } else { //osx - tap_code16(LGUI(LALT(LSFT(KC_V)))); + tap_code16(LGUI(LALT(LSFT(KC_V)))); } break; case MOVE_BEGIN_LINE_TERMINAL: if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(KC_HOME); } else { //osx - tap_code16(LSFT(KC_HOME)); + tap_code16(LSFT(KC_HOME)); } break; case MOVE_END_LINE_TERMINAL: if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(KC_END); } else { //osx - tap_code16(LSFT(KC_END)); + tap_code16(LSFT(KC_END)); } break; case ACIRCLE: // å if(keymap_config.swap_lctl_lgui){ //Linux SEND_STRING(SS_TAP(X_COMPOSE_KEY)"aa"); } else { //osx - tap_code16(LALT(KC_A)); + tap_code16(LALT(KC_A)); } break; case ADOT: // ä @@ -351,14 +351,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING(SS_LALT("u")"o"); } break; - case COMPOSE_MACRO: + case COMPOSE_MACRO: if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(COMPOSE_KEY); } else { //osx tap_code16(COMPOSE_MAC); } break; - case SCREENSHOT: + case SCREENSHOT: if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(KC_PSCR); } else { //osx @@ -381,7 +381,7 @@ void dance_left_finished (tap_dance_state_t *state, void *user_data) { if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(KC_HOME); } else { //osx - tap_code16(LGUI(KC_LEFT)); + tap_code16(LGUI(KC_LEFT)); } } else { //2 taps, make a circumflex tap_code16(KC_CIRC); @@ -394,7 +394,7 @@ void dance_right_finished (tap_dance_state_t *state, void *user_data) { if(keymap_config.swap_lctl_lgui){ //Linux tap_code16(KC_END); } else { //osx - tap_code16(LGUI(KC_RIGHT)); + tap_code16(LGUI(KC_RIGHT)); } } else { //2 taps, dollar tap_code16(KC_DOLLAR); @@ -429,7 +429,7 @@ void set_lighting_user(void) { led_t led_state = host_keyboard_led_state(); if(led_state.caps_lock){ rgblight_sethsv_noeeprom(HSV_RED); - } + } //rgblight_sethsv(HSV_OFF); break; case _NUMS: @@ -482,7 +482,7 @@ void oled_render_general_state(void){ else { oled_write_ln_P(PSTR("OSX"), false); } - + //oled_write_ln(get_u8_str(get_current_wpm(), '0'), false); /* led_t led_state = host_keyboard_led_state(); @@ -492,7 +492,7 @@ void oled_render_general_state(void){ //Layer color has to be handled by master - // led state doesn't have to be handled by master, but + // led state doesn't have to be handled by master, but // the keyboard will freeze if you type too fast // and have this handled on the slave side @@ -541,7 +541,7 @@ void oled_render_layer_mod_state(void) { break; case _FN_KEYS: oled_write_ln_P(PSTR("Fn"), false); - break; + break; default: break; } @@ -575,7 +575,7 @@ void oled_render_layer_mod_state(void) { bool oled_task_user(void) { if (is_keyboard_master()) { oled_render_general_state(); - } + } else { oled_render_layer_mod_state(); } diff --git a/keyboards/crkbd/keymaps/pdl/config.h b/keyboards/crkbd/keymaps/pdl/config.h index b25d48de02..f2a5a522ea 100644 --- a/keyboards/crkbd/keymaps/pdl/config.h +++ b/keyboards/crkbd/keymaps/pdl/config.h @@ -26,5 +26,4 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define COMBO_PDL -#define COMBO_COUNT 28 #define COMBO_TERM 100 diff --git a/keyboards/drhigsby/dubba175/keymaps/default/config.h b/keyboards/drhigsby/dubba175/keymaps/default/config.h index 7a4761b1ae..8f9a59ed69 100644 --- a/keyboards/drhigsby/dubba175/keymaps/default/config.h +++ b/keyboards/drhigsby/dubba175/keymaps/default/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define COMBO_COUNT 8 #define COMBO_TERM 40 diff --git a/keyboards/drhigsby/dubba175/keymaps/default/keymap.c b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c index 37bae5b435..9a701bc9fe 100644 --- a/keyboards/drhigsby/dubba175/keymaps/default/keymap.c +++ b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [combo_ESC] = COMBO(esc_combo, KC_ESC), [combo_BACK] = COMBO(bspc_combo, KC_BSPC), [combo_TAB] = COMBO(tab_combo, KC_TAB), @@ -71,12 +71,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT, xxx, xxx, xxx, xxx, KC_PGUP, KC_PGDN ), - + [_FN] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_F11, KC_F12, - xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, - xxx, xxx, xxx, xxx, xxx, xxx + xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, + xxx, xxx, xxx, xxx, xxx, xxx ) }; diff --git a/keyboards/drhigsby/ogurec/keymaps/default/config.h b/keyboards/drhigsby/ogurec/keymaps/default/config.h index 9ff2d89acc..5d9acf020f 100644 --- a/keyboards/drhigsby/ogurec/keymaps/default/config.h +++ b/keyboards/drhigsby/ogurec/keymaps/default/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define COMBO_COUNT 7 #define COMBO_TERM 40 diff --git a/keyboards/drhigsby/ogurec/keymaps/default/keymap.c b/keyboards/drhigsby/ogurec/keymaps/default/keymap.c index 691f5c95a1..42a6f94781 100644 --- a/keyboards/drhigsby/ogurec/keymaps/default/keymap.c +++ b/keyboards/drhigsby/ogurec/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [combo_ESC] = COMBO(esc_combo, KC_ESC), [combo_BACK] = COMBO(bspc_combo, KC_BSPC), [combo_TAB] = COMBO(tab_combo, KC_TAB), @@ -68,9 +68,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT_ortho_3x12( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, - KC_VOLD, KC_VOLU, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_MRWD, KC_MFFD, xxx, xxx, xxx + KC_VOLD, KC_VOLU, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_MRWD, KC_MFFD, xxx, xxx, xxx ) }; diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/config.h b/keyboards/drhigsby/packrat/keymaps/3uc/config.h index 9ff2d89acc..5d9acf020f 100644 --- a/keyboards/drhigsby/packrat/keymaps/3uc/config.h +++ b/keyboards/drhigsby/packrat/keymaps/3uc/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define COMBO_COUNT 7 #define COMBO_TERM 40 diff --git a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c index f037a47acb..110d76f2cd 100644 --- a/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c +++ b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [combo_ESC] = COMBO(esc_combo, KC_ESC), [combo_BACK] = COMBO(bspc_combo, KC_BSPC), [combo_TAB] = COMBO(tab_combo, KC_TAB), @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { xxx, xxx, xxx, xxx, xxx, BASE, xxx, KC_P7, KC_P8, KC_P9, KC_PPLS, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_P4, KC_P5, KC_P6, KC_PCMM, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_P1, KC_P2, KC_P3, KC_PEQL, - xxx, xxx, xxx, xxx, KC_P0, KC_PDOT, KC_PENT + xxx, xxx, xxx, xxx, KC_P0, KC_PDOT, KC_PENT ), @@ -85,8 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, xxx, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_F11, KC_F12, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, - xxx, xxx, xxx, xxx, xxx, xxx, xxx + xxx, xxx, xxx, xxx, xxx, xxx, xxx ) }; - diff --git a/keyboards/drhigsby/packrat/keymaps/default/config.h b/keyboards/drhigsby/packrat/keymaps/default/config.h index 9ff2d89acc..5d9acf020f 100644 --- a/keyboards/drhigsby/packrat/keymaps/default/config.h +++ b/keyboards/drhigsby/packrat/keymaps/default/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define COMBO_COUNT 7 #define COMBO_TERM 40 diff --git a/keyboards/drhigsby/packrat/keymaps/default/keymap.c b/keyboards/drhigsby/packrat/keymaps/default/keymap.c index 74df6a73e6..fbc814b2b4 100644 --- a/keyboards/drhigsby/packrat/keymaps/default/keymap.c +++ b/keyboards/drhigsby/packrat/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [combo_ESC] = COMBO(esc_combo, KC_ESC), [combo_BACK] = COMBO(bspc_combo, KC_BSPC), [combo_TAB] = COMBO(tab_combo, KC_TAB), @@ -74,8 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, xxx, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, KC_F11, KC_F12, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, - xxx, xxx, xxx, xxx, xxx, xxx + xxx, xxx, xxx, xxx, xxx, xxx ) }; - diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h index e90d7184ee..05d30392ff 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h @@ -30,10 +30,8 @@ #undef ONESHOT_TIMEOUT #define ONESHOT_TIMEOUT 5000 -#define COMBO_COUNT 4 #define COMBO_TERM 200 - #undef RGBLIGHT_HUE_STEP #define RGBLIGHT_HUE_STEP 24 diff --git a/keyboards/eu_isolation/keymaps/bigspace/config.h b/keyboards/eu_isolation/keymaps/bigspace/config.h index 96783a4c87..ad4389af3e 100644 --- a/keyboards/eu_isolation/keymaps/bigspace/config.h +++ b/keyboards/eu_isolation/keymaps/bigspace/config.h @@ -1,19 +1,18 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License 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 COMBO_COUNT 5 #define COMBO_TERM 175 diff --git a/keyboards/eu_isolation/keymaps/bigspace/keymap.c b/keyboards/eu_isolation/keymaps/bigspace/keymap.c index 8970e217fb..7568659de0 100644 --- a/keyboards/eu_isolation/keymaps/bigspace/keymap.c +++ b/keyboards/eu_isolation/keymaps/bigspace/keymap.c @@ -1,16 +1,16 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General 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 QMK_KEYBOARD_H @@ -31,7 +31,7 @@ enum WOMBO_COMBOS { const uint16_t PROGMEM VOLUME_UP_COMBO[] = { KC_F1, KC_F2, COMBO_END }; const uint16_t PROGMEM VOLUME_DN_COMBO[] = { KC_F3, KC_F4, COMBO_END }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [VOLUME_UP] = COMBO(VOLUME_UP_COMBO, KC_VOLU), [VOLUME_DOWN] = COMBO(VOLUME_DN_COMBO, KC_VOLD) }; diff --git a/keyboards/eu_isolation/keymaps/default/config.h b/keyboards/eu_isolation/keymaps/default/config.h index cb82301892..ad4389af3e 100644 --- a/keyboards/eu_isolation/keymaps/default/config.h +++ b/keyboards/eu_isolation/keymaps/default/config.h @@ -1,19 +1,18 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore * -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. * -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License 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 COMBO_COUNT 5 #define COMBO_TERM 175 diff --git a/keyboards/eu_isolation/keymaps/default/keymap.c b/keyboards/eu_isolation/keymaps/default/keymap.c index fc433815ff..65dc381974 100644 --- a/keyboards/eu_isolation/keymaps/default/keymap.c +++ b/keyboards/eu_isolation/keymaps/default/keymap.c @@ -1,16 +1,16 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore * -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. * -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General 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 QMK_KEYBOARD_H @@ -31,7 +31,7 @@ enum WOMBO_COMBOS { const uint16_t PROGMEM VOLUME_UP_COMBO[] = { KC_F1, KC_F2, COMBO_END }; const uint16_t PROGMEM VOLUME_DN_COMBO[] = { KC_F3, KC_F4, COMBO_END }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [VOLUME_UP] = COMBO(VOLUME_UP_COMBO, KC_VOLU), [VOLUME_DOWN] = COMBO(VOLUME_DN_COMBO, KC_VOLD) }; diff --git a/keyboards/eu_isolation/keymaps/mit/config.h b/keyboards/eu_isolation/keymaps/mit/config.h index cb82301892..ad4389af3e 100644 --- a/keyboards/eu_isolation/keymaps/mit/config.h +++ b/keyboards/eu_isolation/keymaps/mit/config.h @@ -1,19 +1,18 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore * -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. * -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License 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 COMBO_COUNT 5 #define COMBO_TERM 175 diff --git a/keyboards/eu_isolation/keymaps/mit/keymap.c b/keyboards/eu_isolation/keymaps/mit/keymap.c index 208e61b3e1..68cdaa750a 100644 --- a/keyboards/eu_isolation/keymaps/mit/keymap.c +++ b/keyboards/eu_isolation/keymaps/mit/keymap.c @@ -1,16 +1,16 @@ /* Copyright 2020 Austin "TuckTuckFloof" Ashmore * -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. * -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General 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 QMK_KEYBOARD_H @@ -31,7 +31,7 @@ enum WOMBO_COMBOS { const uint16_t PROGMEM VOLUME_UP_COMBO[] = { KC_F1, KC_F2, COMBO_END }; const uint16_t PROGMEM VOLUME_DN_COMBO[] = { KC_F3, KC_F4, COMBO_END }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [VOLUME_UP] = COMBO(VOLUME_UP_COMBO, KC_VOLU), [VOLUME_DOWN] = COMBO(VOLUME_DN_COMBO, KC_VOLD) }; diff --git a/keyboards/foostan/cornelius/keymaps/pdl/config.h b/keyboards/foostan/cornelius/keymaps/pdl/config.h index b25d48de02..f2a5a522ea 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/config.h +++ b/keyboards/foostan/cornelius/keymaps/pdl/config.h @@ -26,5 +26,4 @@ along with this program. If not, see . #define TAPPING_TERM 200 #define COMBO_PDL -#define COMBO_COUNT 28 #define COMBO_TERM 100 diff --git a/keyboards/free_willy/keymaps/colemak/config.h b/keyboards/free_willy/keymaps/colemak/config.h index a9f255d42b..e94eb1842b 100644 --- a/keyboards/free_willy/keymaps/colemak/config.h +++ b/keyboards/free_willy/keymaps/colemak/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/free_willy/keymaps/colemak/keymap.c b/keyboards/free_willy/keymaps/colemak/keymap.c index 5be593ad50..54dba8f02e 100644 --- a/keyboards/free_willy/keymaps/colemak/keymap.c +++ b/keyboards/free_willy/keymaps/colemak/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM combo_esc[] = {KC_N, KC_T, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; const uint16_t PROGMEM combo_ret[] = {KC_LGUI, KC_LALT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { //[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/free_willy/keymaps/default/config.h b/keyboards/free_willy/keymaps/default/config.h index a9f255d42b..e94eb1842b 100644 --- a/keyboards/free_willy/keymaps/default/config.h +++ b/keyboards/free_willy/keymaps/default/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/free_willy/keymaps/default/keymap.c b/keyboards/free_willy/keymaps/default/keymap.c index 0801caf412..de377d7513 100644 --- a/keyboards/free_willy/keymaps/default/keymap.c +++ b/keyboards/free_willy/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_J, KC_F, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { //[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h index c062a298a5..33520d18af 100644 --- a/keyboards/gboards/g/keymap_combo.h +++ b/keyboards/gboards/g/keymap_combo.h @@ -41,10 +41,7 @@ #define TOGG A_ENUM enum combos { #include "combos.def" - COMBO_LENGTH }; -// Export length to combo module -uint16_t COMBO_LEN = COMBO_LENGTH; // Bake combos into mem #undef COMB diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h index da70d56b7b..ece08ecfee 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see . */ -#define COMBO_COUNT 1 #define COMBO_TERM 100 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c index 30c59e941d..70b60526ce 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [JK_ESC] = COMBO(jk_combo, KC_ESC), }; diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/config.h b/keyboards/handwired/aek64/keymaps/4sstylz/config.h deleted file mode 100644 index 914861332f..0000000000 --- a/keyboards/handwired/aek64/keymaps/4sstylz/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define COMBO_COUNT 1 diff --git a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c index bdfce062d3..8f136b51fd 100644 --- a/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c +++ b/keyboards/handwired/aek64/keymaps/4sstylz/keymap.c @@ -15,7 +15,7 @@ enum custom_keycodes { }; const uint16_t PROGMEM lock_combo[] = {KC_J, KC_K, KC_L, KC_SCLN, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = {COMBO(lock_combo, LGUI(KC_O))}; +combo_t key_combos[] = {COMBO(lock_combo, LGUI(KC_O))}; // Define the keycodes for one qwerty layer and one Fn layer. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Ctrl │ Alt │↯ATab │ Space │ Gui │ Alt │ Ctrl │ * └──────┴──────┴──────┴──────────────────────────────────────────────────────────────┴──────┴──────┴──────┘ * - * Hidden features :  + * Hidden features : * - Left Shift is also Home on a single tap. * - Left Ctrl is also End on a single tap. * - Right Shift is also page-up on a single tap. diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index ccfd50638b..d4b4480810 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -16,7 +16,6 @@ #pragma once #define COMBO_TERM 50 -#define COMBO_COUNT 50 #define PERMISSIVE_HOLD #define TAPPING_TERM 175 #define TAPPING_TERM 175 diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c index 88c3784754..9c1f0cb63e 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c @@ -188,7 +188,7 @@ const uint16_t PROGMEM rl_r_m_i_combo[] = {RLR, RLM, RLI, COMBO_END}; // both hand combinations. const uint16_t PROGMEM bl_m_m_combo[] = {LLM, RLM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [L_U_PINKY_RING] = COMBO(lu_p_r_combo, KC_TAB), [L_U_RING_MIDDLE] = COMBO(lu_r_m_combo, KC_QUES), diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c index c85099a144..47269b07ff 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h index fa95320e90..822264ca78 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h @@ -20,5 +20,4 @@ along with this program. If not, see . #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c index aa51f479ff..8e4685757c 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h index 65eec1d7f8..127f7d0fb8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h @@ -17,5 +17,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c index 78f9617cf0..0d56ef08a8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c index 477aa2229e..171f1a373e 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h index 9920602ab8..2392b46be6 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h @@ -1,7 +1,6 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD #define LEADER_TIMEOUT 300 diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c index c030738400..b28fc84499 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[] = {KC_M, KC_B, COMBO_END}; // both hand combinations. const uint16_t PROGMEM j_w_combo[] = {KC_J, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [COLON_COMMA] = COMBO(colon_comma_combo, KC_TAB), [COMMA_DOT] = COMBO(comma_dot_combo, KC_QUES), diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c index f0ab692f28..75ea54c548 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[] = {KC_M, KC_B, COMBO_END}; // both hand combinations. const uint16_t PROGMEM j_w_combo[] = {KC_J, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [COLON_COMMA] = COMBO(colon_comma_combo, KC_TAB), [COMMA_DOT] = COMBO(comma_dot_combo, KC_QUES), diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h index 4f3cc95f30..2a432a5b2e 100644 --- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h +++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h @@ -20,5 +20,4 @@ */ #pragma once -#define COMBO_COUNT 3 #define COMBO_TERM 200 diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c index ae8b42851c..bdcb153413 100644 --- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c +++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, NK_TOGG, _______, _______, _______, _______, _______, BL_UP, + _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, NK_TOGG, _______, _______, _______, _______, _______, BL_UP, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_STEP ), [2] = LAYOUT_ansi( @@ -52,7 +52,7 @@ const uint16_t PROGMEM slashDown_combo[] = {KC_SLSH, KC_DOWN, COMBO_END}; const uint16_t PROGMEM slashUp_combo[] = {KC_SLSH, KC_UP, COMBO_END}; const uint16_t PROGMEM raltBackspace_combo[] = {KC_RALT, KC_BSPC, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [SLSHDN_PGDN] = COMBO(slashDown_combo, KC_PGDN), [SLSHUP_PGUP] = COMBO(slashUp_combo, KC_PGUP), [RALTBKSPC_DELETE] = COMBO(raltBackspace_combo, KC_DEL), diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h index 3fef45f887..9c9bca5961 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h +++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h @@ -4,7 +4,6 @@ #define TAPPING_TERM 150 #define COMBO_TERM 20 -#define COMBO_COUNT 1 #define PERMISSIVE_HOLD diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h index c86bbebdc7..f16dbc0042 100644 --- a/keyboards/k34/keymaps/default/config.h +++ b/keyboards/k34/keymaps/default/config.h @@ -1,23 +1,21 @@ /* Copyright Wong Jing Ping <@wongjingping> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * */ #pragma once // use 1 combo -#define COMBO_COUNT 1 #define COMBO_TERM 300 // mod taps for home row mods #define TAPPING_TERM_PER_KEY - diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c index 6bd8e402da..ae8b7dc340 100644 --- a/keyboards/k34/keymaps/default/keymap.c +++ b/keyboards/k34/keymaps/default/keymap.c @@ -33,7 +33,7 @@ enum layer_names { /* combos */ const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = {COMBO(jk_combo, KC_ESC)}; +combo_t key_combos[] = {COMBO(jk_combo, KC_ESC)}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ diff --git a/keyboards/keebformom/keymaps/default/config.h b/keyboards/keebformom/keymaps/default/config.h deleted file mode 100644 index 2c89e93739..0000000000 --- a/keyboards/keebformom/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 Sandipratama - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License 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 COMBO_COUNT 7 diff --git a/keyboards/keebformom/keymaps/default/keymap.c b/keyboards/keebformom/keymaps/default/keymap.c index 1c8180edcc..d51dcd356a 100644 --- a/keyboards/keebformom/keymaps/default/keymap.c +++ b/keyboards/keebformom/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_CIRC, KC_UNDS, KC_MINS, KC_4, KC_5, KC_6, KC_PERC, KC_AMPR, KC_LBRC, KC_RBRC, KC_ASTR, _______, _______, KC_1, KC_2, KC_3, TO(0), _______, KC_BSLS, KC_PIPE, _______, _______, _______, KC_EQL, KC_0, KC_BSPC -), +), /* THIRD * ,---------------------------------------------------------------------. @@ -75,10 +75,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_THIRD] = LAYOUT_ortho_4x10( KC_INS, KC_HOME, KC_PGUP, KC_NO, SGUI(KC_S), LCTL(KC_A), KC_NO, KC_NO, KC_UP, KC_NO, - KC_DEL, KC_END, KC_PGDN, KC_NO, LCTL(KC_S), LCTL(KC_C), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, + KC_DEL, KC_END, KC_PGDN, KC_NO, LCTL(KC_S), LCTL(KC_C), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, LWIN(KC_E), LCTL(KC_V), KC_NO, KC_NO, KC_NO, KC_NO, TO(0), _______, _______, _______, _______, _______, _______, KC_VOLD, _______, KC_VOLU -), +), /* FOURTH * ,---------------------------------------------------------------------. * |RGB M+| HUD | HUI | | F1 | F2 | F3 | F4 | F5 | F6 | @@ -106,7 +106,7 @@ const uint16_t PROGMEM test_combo4[] = {KC_A, KC_S, COMBO_END}; const uint16_t PROGMEM test_combo5[] = {KC_G, KC_H, COMBO_END}; const uint16_t PROGMEM test_combo6[] = {KC_B, KC_N, COMBO_END}; const uint16_t PROGMEM test_combo7[] = {KC_O, KC_P, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(test_combo1, KC_ESC), COMBO(test_combo2, TO(3)), COMBO(test_combo3, KC_CAPS), diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h b/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h index 902e9052b7..ddb539fb09 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h +++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/config.h @@ -18,5 +18,3 @@ // place overrides here #define OLED_FONT_H "keyboards/keycapsss/plaid_pad/keymaps/oled/glcdfont.c" - -#define COMBO_COUNT 3 diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c index ff5c9231ea..371e8e9941 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c @@ -72,7 +72,7 @@ const uint16_t PROGMEM zeroDot_combo[] = {KC_P0, KC_PDOT, COMBO_END}; const uint16_t PROGMEM leftDown_combo[] = {KC_LEFT, KC_DOWN, COMBO_END}; const uint16_t PROGMEM prevPlay_combo[] = {KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO1] = COMBO_ACTION(zeroDot_combo), [COMBO2] = COMBO_ACTION(leftDown_combo), [COMBO3] = COMBO_ACTION(prevPlay_combo), diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h index 3a48491679..72377c2701 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h @@ -24,7 +24,6 @@ #define MOUSEKEY_TIME_TO_MAX 64 // The firmware is too large! -#define COMBO_COUNT 1 // number of combo #define COMBO_TERM 80 // timeout period for combos to 40ms. //disable broken animations diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c index 423dd14325..09490aa940 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c @@ -37,21 +37,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_Navi] = LAYOUT_planck_mit( KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ESC, KC_NO, KC_NO, KC_DEL, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LSFT, HOME_S, HOME_D, HOME_F, KC_TAB, KC_NO, KC_NO, KC_ENT, KC_RSFT, HOME_K, HOME_L, HOME_QU, - KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, KC_NO, KC_NO, KC_BTN2, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, KC_NO, KC_NO, KC_BTN2, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, Lay_SPC, KC_NO, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO - ), + ), [_Numb] = LAYOUT_planck_mit( KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, KC_NO, KC_NO, KC_DEL, KC_NO, KC_NO, KC_NO, KC_NO, KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, KC_NO, KC_NO, KC_ENT, KC_RSFT, HOME_K, HOME_L, HOME_QU, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KR_HAEN, KC_NO, KC_NO, KC_NO, KC_NO, KC_0, KC_MINS, KC_NO, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO - ), + ), [_Func] = LAYOUT_planck_mit( KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_F4, KC_F5, KC_F6, KC_SCRL, KC_NO, KC_NO, KC_CAPS, KC_RSFT, HOME_K, HOME_L, HOME_QU, KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUS, KC_NO, KC_NO, KC_INS, KC_NO, KC_NO, KR_HAEN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, Lay_SPC, KC_NO, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO - ), + ), }; @@ -75,10 +75,8 @@ layer_state_t layer_state_set_user(layer_state_t state) { } // COMBO key for HOME ROW modifier -// modify `config.h` file -// by adding #define COMBO_COUNT 1 (replacing 1 with the number that you’re using). // modify `rules.mk` file -// by adding # COMBO_ENABLE = yes +// by adding # COMBO_ENABLE = yes enum combos { SFT_HAN, @@ -86,6 +84,6 @@ enum combos { const uint16_t PROGMEM sft_han_combo[] = {LSFT_T(KC_F), LT(_Func,KC_SPC), COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [SFT_HAN] = COMBO(sft_han_combo, KC_LNG1), -}; \ No newline at end of file +}; diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h index ceb40da092..13eefdef65 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h @@ -49,7 +49,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 300 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h index eaff1148d0..06a7409110 100644 --- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h +++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h @@ -34,7 +34,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 300 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. @@ -75,7 +74,7 @@ #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation #define DISABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back #define DISABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left -#define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right +#define DISABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right // =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS ============================================================= // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! #define DISABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h index 48d86aedf5..46fbfe21c3 100644 --- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h +++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h @@ -32,8 +32,6 @@ // how long before oneshot times out #define ONESHOT_TAP_TOGGLE 2 // how many taps before oneshot toggle is triggered - #define COMBO_COUNT 2 - // Set this to the number of combos that you're using in the Combo feature. #define COMBO_TERM 200 // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. #define TAP_CODE_DELAY 100 diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index a54a63fd48..3ae9165cfd 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -50,6 +50,4 @@ along with this program. If not, see . } #endif -#define COMBO_COUNT 1 - #define TAPPING_TERM 220 diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c index 19a2c082df..fe919133a9 100644 --- a/keyboards/lets_split/keymaps/shaymdev/keymap.c +++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c @@ -35,14 +35,14 @@ enum custom_keycodes { #define RAISE MO(_RAISE) #define RAS RAISE -enum combos //match combo_count in config.h +enum combos { EU_ENT, }; const uint16_t PROGMEM eu_combo[] = {KC_E, KC_U, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [EU_ENT] = COMBO_ACTION(eu_combo), }; @@ -58,38 +58,38 @@ void process_combo_event(uint16_t combo_index, bool pressed) { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DVORAK] = LAYOUT( - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, - XXXXXXX, KC_ENT, KC_LALT, TT(LWR), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX +[_DVORAK] = LAYOUT( + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, + XXXXXXX, KC_ENT, KC_LALT, TT(LWR), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX ), -[_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, +[_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -[_LOWER] = LAYOUT( - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, +[_LOWER] = LAYOUT( + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______, _______ //This kp_0 is blocking the space key.... may want to do something about that. ), -[_RAISE] = LAYOUT( +[_RAISE] = LAYOUT( _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, _______, KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -[_ADJUST] = LAYOUT( - TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, - RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, +[_ADJUST] = LAYOUT( + TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h index 5d833d34d0..29a0801d2e 100644 --- a/keyboards/lily58/keymaps/muuko/config.h +++ b/keyboards/lily58/keymaps/muuko/config.h @@ -33,8 +33,4 @@ along with this program. If not, see . #endif #define TAPPING_TERM 120 -#ifdef COMBO_COUNT -#undef COMBO_COUNT -#endif -#define COMBO_COUNT 2 #define COMBO_TERM 20 diff --git a/keyboards/lily58/keymaps/muuko/keymap.c b/keyboards/lily58/keymaps/muuko/keymap.c index c984202b9e..b5cc97ee38 100644 --- a/keyboards/lily58/keymaps/muuko/keymap.c +++ b/keyboards/lily58/keymaps/muuko/keymap.c @@ -36,7 +36,7 @@ static long int oled_timeout = 300000; enum combos { ESCAPE_COMBO, DELETE_COMBO }; const uint16_t PROGMEM escape_combo[] = { KC_GRV, KC_1, COMBO_END }; const uint16_t PROGMEM delete_combo[] = { KC_DOT, KC_SLSH, COMBO_END }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ESCAPE_COMBO] = COMBO(escape_combo, KC_ESC), [DELETE_COMBO] = COMBO(delete_combo, KC_DEL) }; diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h index 814338c18f..300321b3db 100644 --- a/keyboards/lily58/keymaps/narze/config.h +++ b/keyboards/lily58/keymaps/narze/config.h @@ -29,7 +29,6 @@ along with this program. If not, see . // #define EE_HANDS #define COMBO_TERM 20 -#define COMBO_COUNT 3 #define PERMISSIVE_HOLD diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h index c60e064e21..067267521d 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h @@ -4,7 +4,6 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 4 # define COMBO_TERM 50 #endif diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c index 583d5a8a3d..cfe3233145 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c +++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END}; const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(combo_bspc,KC_BSPC), // 1 COMBO(combo_ent,KC_ENT), // 2 COMBO(combo_tab,KC_TAB), // 3 @@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) -}; \ No newline at end of file +}; diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h index c60e064e21..067267521d 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h @@ -4,7 +4,6 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 4 # define COMBO_TERM 50 #endif diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c index 2cbc706ee4..b443a57a65 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c +++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END}; const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(combo_bspc,KC_BSPC), // 1 COMBO(combo_ent,KC_ENT), // 2 COMBO(combo_tab,KC_TAB), // 3 @@ -62,4 +62,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, QK_BOOT ) -}; \ No newline at end of file +}; diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h index c60e064e21..067267521d 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h +++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h @@ -4,7 +4,6 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 4 # define COMBO_TERM 50 #endif diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c index e5e9cc05a6..00c135b3f3 100644 --- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c +++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END}; const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(combo_bspc,KC_BSPC), // 1 COMBO(combo_ent,KC_ENT), // 2 COMBO(combo_tab,KC_TAB), // 3 @@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS ) -}; \ No newline at end of file +}; diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h index 98f8d6b071..a7d11feca5 100644 --- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h +++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h @@ -2,6 +2,4 @@ #define EE_HANDS - -#define COMBO_COUNT 10 #define COMBO_TERM 100 diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c index e795e76207..33bfc7340e 100644 --- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c +++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM kz_combo[] = {KC_K, KC_Z, COMBO_END}; const uint16_t PROGMEM dm_combo[] = {KC_D, KC_M, COMBO_END}; const uint16_t PROGMEM bx_combo[] = {KC_B, KC_X, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [TOP_L] = COMBO(fk_combo, KC_ESC), [TOP_R] = COMBO(zl_combo, KC_AT), [MID_L] = COMBO(hd_combo, KC_TAB), diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h index d87bdade68..8607cd8186 100644 --- a/keyboards/massdrop/alt/keymaps/b_/config.h +++ b/keyboards/massdrop/alt/keymaps/b_/config.h @@ -37,7 +37,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 3000 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. #define TAP_CODE_DELAY 25 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h index 331b34c9b0..27bf1a8332 100644 --- a/keyboards/massdrop/alt/keymaps/pregame/config.h +++ b/keyboards/massdrop/alt/keymaps/pregame/config.h @@ -50,7 +50,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 3000 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h index c8fa629552..34aa3cd666 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h +++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h @@ -34,7 +34,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 300 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h index a17ad45c4c..a17e3e76bf 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h @@ -52,7 +52,6 @@ along with this program. If not, see . // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 300 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h index 2166f67e8c..0c08219181 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h @@ -50,7 +50,6 @@ // #define LEADER_KEY_STRICT_KEY_PROCESSING // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. // #define ONESHOT_TIMEOUT 300 // How long before oneshot times out // #define ONESHOT_TAP_TOGGLE 2 // How many taps before oneshot toggle is triggered -// #define COMBO_COUNT 2 // Set this to the number of combos that you're using in the Combo feature. // #define COMBO_TERM 200 // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. // #define TAP_CODE_DELAY 100 // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. // #define TAP_HOLD_CAPS_DELAY 80 // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h index 5da4e44855..0b552acfda 100644 --- a/keyboards/maxr1998/pulse4k/config.h +++ b/keyboards/maxr1998/pulse4k/config.h @@ -18,7 +18,6 @@ #pragma once /* Combo setup */ -#define COMBO_COUNT 1 #define COMBO_TERM 150 /* RGB LED Setup */ diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c index 243a96ba74..b190159f24 100644 --- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c +++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [LED_ADJUST] = COMBO_ACTION(led_adjust_combo) }; diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c index 2aad1fa346..3f1dfbee3f 100644 --- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c +++ b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [LED_ADJUST] = COMBO_ACTION(led_adjust_combo) }; diff --git a/keyboards/nimrod/keymaps/default/config.h b/keyboards/nimrod/keymaps/default/config.h index 9684b5caed..8cafd470cd 100644 --- a/keyboards/nimrod/keymaps/default/config.h +++ b/keyboards/nimrod/keymaps/default/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 3 # define COMBO_TERM 150 #endif diff --git a/keyboards/nimrod/keymaps/default/keymap.c b/keyboards/nimrod/keymaps/default/keymap.c index 47b8f4ac78..a0a2aec6fe 100644 --- a/keyboards/nimrod/keymaps/default/keymap.c +++ b/keyboards/nimrod/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_TAB] = COMBO(combo_tab,KC_TAB), [COMBO_ESC] = COMBO(combo_esc,KC_ESC), [COMBO_DEL] = COMBO(combo_del,KC_DEL), diff --git a/keyboards/nimrod/keymaps/default_center_space/config.h b/keyboards/nimrod/keymaps/default_center_space/config.h index 9684b5caed..8cafd470cd 100644 --- a/keyboards/nimrod/keymaps/default_center_space/config.h +++ b/keyboards/nimrod/keymaps/default_center_space/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 3 # define COMBO_TERM 150 #endif diff --git a/keyboards/nimrod/keymaps/default_center_space/keymap.c b/keyboards/nimrod/keymaps/default_center_space/keymap.c index c87ab2cb46..c41f986c7c 100644 --- a/keyboards/nimrod/keymaps/default_center_space/keymap.c +++ b/keyboards/nimrod/keymaps/default_center_space/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_TAB] = COMBO(combo_tab,KC_TAB), [COMBO_ESC] = COMBO(combo_esc,KC_ESC), [COMBO_DEL] = COMBO(combo_del,KC_DEL), diff --git a/keyboards/nimrod/keymaps/default_left_space/config.h b/keyboards/nimrod/keymaps/default_left_space/config.h index 9684b5caed..8cafd470cd 100644 --- a/keyboards/nimrod/keymaps/default_left_space/config.h +++ b/keyboards/nimrod/keymaps/default_left_space/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 3 # define COMBO_TERM 150 #endif diff --git a/keyboards/nimrod/keymaps/default_left_space/keymap.c b/keyboards/nimrod/keymaps/default_left_space/keymap.c index c1bbd129d9..cf1346cb7f 100644 --- a/keyboards/nimrod/keymaps/default_left_space/keymap.c +++ b/keyboards/nimrod/keymaps/default_left_space/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_TAB] = COMBO(combo_tab,KC_TAB), [COMBO_ESC] = COMBO(combo_esc,KC_ESC), [COMBO_DEL] = COMBO(combo_del,KC_DEL), diff --git a/keyboards/nimrod/keymaps/default_right_space/config.h b/keyboards/nimrod/keymaps/default_right_space/config.h index 9684b5caed..8cafd470cd 100644 --- a/keyboards/nimrod/keymaps/default_right_space/config.h +++ b/keyboards/nimrod/keymaps/default_right_space/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 3 # define COMBO_TERM 150 #endif diff --git a/keyboards/nimrod/keymaps/default_right_space/keymap.c b/keyboards/nimrod/keymaps/default_right_space/keymap.c index 4bcd41c57b..dcc9358610 100644 --- a/keyboards/nimrod/keymaps/default_right_space/keymap.c +++ b/keyboards/nimrod/keymaps/default_right_space/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_TAB] = COMBO(combo_tab,KC_TAB), [COMBO_ESC] = COMBO(combo_esc,KC_ESC), [COMBO_DEL] = COMBO(combo_del,KC_DEL), diff --git a/keyboards/nimrod/keymaps/default_split_space/config.h b/keyboards/nimrod/keymaps/default_split_space/config.h index ad0cd6ffdd..8cafd470cd 100644 --- a/keyboards/nimrod/keymaps/default_split_space/config.h +++ b/keyboards/nimrod/keymaps/default_split_space/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 150 #endif diff --git a/keyboards/nimrod/keymaps/default_split_space/keymap.c b/keyboards/nimrod/keymaps/default_split_space/keymap.c index e0667e4b5a..2b8c5f8125 100644 --- a/keyboards/nimrod/keymaps/default_split_space/keymap.c +++ b/keyboards/nimrod/keymaps/default_split_space/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 7852878ee7..79d7cddec0 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -48,6 +48,4 @@ along with this program. If not, see . } #endif -#define COMBO_COUNT 1 - #define TAPPING_TERM 220 diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 495a61c2e4..24fca7661e 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -enum orthodox_layers +enum orthodox_layers { _DVORAK, _QWERTY, @@ -30,14 +30,14 @@ enum orthodox_layers _ADJUST, }; -enum combos //match combo_count in config.h +enum combos { EU_ENT, }; const uint16_t PROGMEM eu_combo[] = {KC_E, KC_U, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [EU_ENT] = COMBO_ACTION(eu_combo), }; @@ -66,33 +66,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT( - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS ), -[_QWERTY] = LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT +[_QWERTY] = LAYOUT( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT ), -[_LOWER] = LAYOUT( - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ +[_LOWER] = LAYOUT( + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ ), -[_RAISE] = LAYOUT( +[_RAISE] = LAYOUT( _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, _______, KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX ), -[_ADJUST] = LAYOUT( - TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, - RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, - RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY +[_ADJUST] = LAYOUT( + TO_DV, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, + RGB_TOG, RGB_MOD, VK_TOGG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h index 8ff2df3709..ecc59f31bd 100644 --- a/keyboards/pierce/keymaps/durken1/config.h +++ b/keyboards/pierce/keymaps/durken1/config.h @@ -25,7 +25,6 @@ #define PERMISSIVE_HOLD // Combo settings -#define COMBO_COUNT 3 #define COMBO_TERM 35 #ifdef PS2_DRIVER_USART diff --git a/keyboards/pierce/keymaps/durken1/keymap.c b/keyboards/pierce/keymaps/durken1/keymap.c index a4f77753a8..5bc2f4d307 100644 --- a/keyboards/pierce/keymaps/durken1/keymap.c +++ b/keyboards/pierce/keymaps/durken1/keymap.c @@ -17,25 +17,25 @@ #include QMK_KEYBOARD_H #include "keymap_swedish.h" -enum layers { - BASE, - MBO, - SYM, - NUM, +enum layers { + BASE, + MBO, + SYM, + NUM, FN }; -enum combos { - WF_ARNG, - EI_ADIA, - UK_ODIA +enum combos { + WF_ARNG, + EI_ADIA, + UK_ODIA }; #if defined PS2_MOUSE_ENABLE #include "ps2_mouse.h" #endif -#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE +#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE static uint16_t auto_buttons_timer; extern int tp_buttons; // mousekey button state set in action.c and used in ps2_mouse.c @@ -82,7 +82,7 @@ const uint16_t PROGMEM arng_combo[] = {ALT_R, SFT_S, COMBO_END}; const uint16_t PROGMEM adia_combo[] = {SFT_E, ALT_I, COMBO_END}; const uint16_t PROGMEM odia_combo[] = {SE_U, SE_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [WF_ARNG] = COMBO(arng_combo, SE_ARNG), [EI_ADIA] = COMBO(adia_combo, SE_ADIA), [UK_ODIA] = COMBO(odia_combo, SE_ODIA) diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c index 2a6caca201..06bc0b8657 100644 --- a/keyboards/planck/keymaps/antosha417/keymap.c +++ b/keyboards/planck/keymaps/antosha417/keymap.c @@ -397,11 +397,8 @@ enum combo_events { DELQ_COMBO, SAVEQ_COMBO, BSPCQ_COMBO, - BSPCWQ_COMBO, - - COMBO_LENGTH + BSPCWQ_COMBO }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END}; const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END}; @@ -448,5 +445,3 @@ combo_t key_combos[] = { [SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE), [BSPCWQ_COMBO] = COMBO(bspcwq_combo, A(KC_BSPC)), }; - - diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c index 4237955bb5..5caaf1922e 100644 --- a/keyboards/planck/keymaps/ariccb/keymap.c +++ b/keyboards/planck/keymaps/ariccb/keymap.c @@ -511,10 +511,8 @@ enum combo_events { CSS_STYLE, HTML_GENERIC_TAG, CTLRGHT, - CTLLEFT, - COMBO_LENGTH + CTLLEFT }; -uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END}; const uint16_t PROGMEM email_work_combo[] = {KC_E, KC_K, COMBO_END}; diff --git a/keyboards/planck/keymaps/dvz/config.h b/keyboards/planck/keymaps/dvz/config.h index bcdc3e57d6..ab925009ed 100644 --- a/keyboards/planck/keymaps/dvz/config.h +++ b/keyboards/planck/keymaps/dvz/config.h @@ -50,8 +50,6 @@ // Most tactile encoders have detents every 4 stages #define ENCODER_RESOLUTION 4 -#define COMBO_COUNT 4 - #ifdef AUDIO_ENABLE #define DAC_SAMPLE_MAX 65535/2 #endif diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c index d69bf18620..ff57d28cf8 100644 --- a/keyboards/planck/keymaps/dvz/keymap.c +++ b/keyboards/planck/keymaps/dvz/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END}; const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END}; const uint16_t PROGMEM sz_combo[] = {KC_S, DE_Z, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [AE] = COMBO(ae_combo, DE_AE), [OE] = COMBO(oe_combo, DE_OE), [UE] = COMBO(ue_combo, DE_UE), diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h index fddd9cd376..a7fccc4187 100644 --- a/keyboards/planck/keymaps/narze/config.h +++ b/keyboards/planck/keymaps/narze/config.h @@ -24,7 +24,6 @@ #define TAPPING_TERM 100 #define COMBO_TERM 20 -#define COMBO_COUNT 1 #define PERMISSIVE_HOLD diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h index 1cca7e5ba9..3d2d3f38a6 100644 --- a/keyboards/planck/keymaps/rootiest/config.h +++ b/keyboards/planck/keymaps/rootiest/config.h @@ -111,7 +111,6 @@ /* * COMBO-KEY options */ -#define COMBO_COUNT 2 #define COMBO_TERM 300 /* * MACRO per-key options diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c index ce3b69ed1f..7e3b8af367 100644 --- a/keyboards/planck/keymaps/rootiest/keymap.c +++ b/keyboards/planck/keymaps/rootiest/keymap.c @@ -168,7 +168,7 @@ enum combo_events { ZC_COPY, XV_PASTE }; const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZC_COPY] = COMBO_ACTION(copy_combo), [XV_PASTE] = COMBO_ACTION(paste_combo), }; diff --git a/keyboards/preonic/keymaps/brauner/keymap.c b/keyboards/preonic/keymaps/brauner/keymap.c index 24a350e6d4..398abfa741 100644 --- a/keyboards/preonic/keymaps/brauner/keymap.c +++ b/keyboards/preonic/keymaps/brauner/keymap.c @@ -56,17 +56,14 @@ enum combos { COMBO_LBRC_RBRC, /* [|] */ COMBO_LCBR_RCBR, /* {|} */ COMBO_LT_GT, /* <|> */ - COMBO_MAX, }; -uint16_t COMBO_LEN = COMBO_MAX; - const uint16_t PROGMEM combo_lprn_rprn[] = {KC_LPRN, KC_RPRN, COMBO_END}; const uint16_t PROGMEM combo_lbrc_rbrc[] = {KC_LBRC, KC_RBRC, COMBO_END}; const uint16_t PROGMEM combo_lcbr_rcbr[] = {KC_LCBR, KC_RCBR, COMBO_END}; const uint16_t PROGMEM combo_lt_gt[] = {KC_LT, KC_GT, COMBO_END}; -combo_t key_combos[COMBO_MAX] = { +combo_t key_combos[] = { [COMBO_LPRN_RPRN] = COMBO_ACTION(combo_lprn_rprn), [COMBO_LBRC_RBRC] = COMBO_ACTION(combo_lbrc_rbrc), [COMBO_LCBR_RCBR] = COMBO_ACTION(combo_lcbr_rcbr), diff --git a/keyboards/program_yoink/ortho/keymaps/default/config.h b/keyboards/program_yoink/ortho/keymaps/default/config.h index ea7075aecb..eb4161b940 100644 --- a/keyboards/program_yoink/ortho/keymaps/default/config.h +++ b/keyboards/program_yoink/ortho/keymaps/default/config.h @@ -20,6 +20,5 @@ #define TAPPING_TERM 200 #ifdef COMBO_ENABLE -# define COMBO_COUNT 10 # define COMBO_TERM 60 -#endif \ No newline at end of file +#endif diff --git a/keyboards/program_yoink/ortho/keymaps/default/keymap.c b/keyboards/program_yoink/ortho/keymaps/default/keymap.c index 6719a38b0a..35f58efc4f 100644 --- a/keyboards/program_yoink/ortho/keymaps/default/keymap.c +++ b/keyboards/program_yoink/ortho/keymaps/default/keymap.c @@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { const uint16_t PROGMEM combo_ent[] = {KC_DOT, KC_SLSH, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_ENT] = COMBO(combo_ent,KC_ENT), }; diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h b/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h index ea7075aecb..eb4161b940 100644 --- a/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h +++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/config.h @@ -20,6 +20,5 @@ #define TAPPING_TERM 200 #ifdef COMBO_ENABLE -# define COMBO_COUNT 10 # define COMBO_TERM 60 -#endif \ No newline at end of file +#endif diff --git a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c index 837dc1e754..7e14d95efc 100644 --- a/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c +++ b/keyboards/program_yoink/ortho/keymaps/ortho_split/keymap.c @@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_ENT] = COMBO(combo_ent,KC_ENT), }; diff --git a/keyboards/program_yoink/staggered/keymaps/default/config.h b/keyboards/program_yoink/staggered/keymaps/default/config.h index c4b4470e96..8759b84226 100644 --- a/keyboards/program_yoink/staggered/keymaps/default/config.h +++ b/keyboards/program_yoink/staggered/keymaps/default/config.h @@ -20,6 +20,5 @@ #define TAPPING_TERM 200 #ifdef COMBO_ENABLE -# define COMBO_COUNT 10 # define COMBO_TERM 200 -#endif \ No newline at end of file +#endif diff --git a/keyboards/program_yoink/staggered/keymaps/default/keymap.c b/keyboards/program_yoink/staggered/keymaps/default/keymap.c index 8780cad06e..aa7a288705 100644 --- a/keyboards/program_yoink/staggered/keymaps/default/keymap.c +++ b/keyboards/program_yoink/staggered/keymaps/default/keymap.c @@ -68,7 +68,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH), }; diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/config.h b/keyboards/program_yoink/staggered/keymaps/split_bar/config.h index 842b3b8011..8759b84226 100644 --- a/keyboards/program_yoink/staggered/keymaps/split_bar/config.h +++ b/keyboards/program_yoink/staggered/keymaps/split_bar/config.h @@ -20,6 +20,5 @@ #define TAPPING_TERM 200 #ifdef COMBO_ENABLE -# define COMBO_COUNT 10 # define COMBO_TERM 200 -#endif +#endif diff --git a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c index d37722e7bc..1053fb7aa4 100644 --- a/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c +++ b/keyboards/program_yoink/staggered/keymaps/split_bar/keymap.c @@ -66,7 +66,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH), }; diff --git a/keyboards/projectcain/relic/keymaps/default/config.h b/keyboards/projectcain/relic/keymaps/default/config.h index ebe839c4c4..c1d6e02d40 100644 --- a/keyboards/projectcain/relic/keymaps/default/config.h +++ b/keyboards/projectcain/relic/keymaps/default/config.h @@ -17,7 +17,6 @@ #pragma once #define ENCODER_RESOLUTION 2 -#define COMBO_COUNT 6 #define COMBO_TERM 50 #define QUICK_TAP_TERM 0 #define DISABLE_LEADER diff --git a/keyboards/projectcain/relic/keymaps/default/keymap.c b/keyboards/projectcain/relic/keymaps/default/keymap.c index f2e61c4b1c..58d36d4e27 100644 --- a/keyboards/projectcain/relic/keymaps/default/keymap.c +++ b/keyboards/projectcain/relic/keymaps/default/keymap.c @@ -25,22 +25,22 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_all( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOTE, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOTE, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(1), KC_LCTL, MO(1), SFT_T(KC_BSPC), KC_SPACE, KC_SPACE, MO(2), KC_LALT, MO(2) ), [NUM] = LAYOUT_all( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_KP_SLASH, KC_7, KC_8, KC_9, KC_MINUS, KC_BSPC, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_KP_ASTERISK, KC_4, KC_5, KC_6, KC_PLUS, - SC_LCPO, KC_X, KC_C, KC_V, KC_B, KC_0, KC_1, KC_2, KC_3, SC_RCPC, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_KP_ASTERISK, KC_4, KC_5, KC_6, KC_PLUS, + SC_LCPO, KC_X, KC_C, KC_V, KC_B, KC_0, KC_1, KC_2, KC_3, SC_RCPC, MO(1), KC_LCTL, KC_TRNS, SFT_T(KC_BSPC), KC_TRNS, KC_SPACE, KC_TRNS, KC_LALT, MO(2) ), - + [SYM] = LAYOUT_all( S(KC_GRV), KC_GRV, KC_TRNS, S(KC_BSLS), KC_BSLS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), QK_BOOT, - S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), - S(KC_LBRC), KC_LBRC, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_RBRC, S(KC_RBRC), + S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), + S(KC_LBRC), KC_LBRC, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_RBRC, S(KC_RBRC), MO(1), KC_LCTL, KC_TRNS, SFT_T(KC_BSPC), KC_TRNS, KC_SPACE, KC_TRNS, KC_LALT, MO(2) ), @@ -64,7 +64,7 @@ const uint16_t PROGMEM qw_combo[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM as_combo[] = {KC_A, KC_S, COMBO_END}; const uint16_t PROGMEM fj_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [KL_SLSH] = COMBO(kl_combo, S(KC_SLSH)), [JK_MINUS] = COMBO(jk_combo, KC_MINUS), [LQUOTE_ENTER] = COMBO(lquote_combo, KC_ENTER), diff --git a/keyboards/projectcain/vault35/keymaps/default/config.h b/keyboards/projectcain/vault35/keymaps/default/config.h index 885d5ad9cb..672d4a1dde 100644 --- a/keyboards/projectcain/vault35/keymaps/default/config.h +++ b/keyboards/projectcain/vault35/keymaps/default/config.h @@ -16,6 +16,5 @@ #pragma once -#define COMBO_COUNT 2 #define COMBO_TERM 50 #define QUICK_TAP_TERM 0 diff --git a/keyboards/projectcain/vault35/keymaps/default/keymap.c b/keyboards/projectcain/vault35/keymaps/default/keymap.c index 4244edd999..5bb3a622b2 100644 --- a/keyboards/projectcain/vault35/keymaps/default/keymap.c +++ b/keyboards/projectcain/vault35/keymaps/default/keymap.c @@ -1,18 +1,18 @@ - /* Copyright 2021 projectcain - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + /* Copyright 2021 projectcain + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General 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 QMK_KEYBOARD_H @@ -28,24 +28,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_split_4space( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOTE, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOTE, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LALT(KC_TAB), MO(1), SFT_T(KC_BSPC), KC_SPACE, MO(2), QK_BOOT ), [NUM] = LAYOUT_split_4space( - KC_PGUP, KC_HOME, KC_UP, KC_END, KC_WBAK, KC_PSLS, KC_7, KC_8, KC_9, KC_PMNS, KC_DEL, - KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_WFWD, KC_PAST, KC_4, KC_5, KC_6, KC_PPLS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_PDOT, + KC_PGUP, KC_HOME, KC_UP, KC_END, KC_WBAK, KC_PSLS, KC_7, KC_8, KC_9, KC_PMNS, KC_DEL, + KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_WFWD, KC_PAST, KC_4, KC_5, KC_6, KC_PPLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT(KC_F4), RALT(KC_F4) ), - + [SYM] = LAYOUT_split_4space( - S(KC_GRV), KC_GRV, KC_BSLS, S(KC_BSLS), KC_TRNS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), C(KC_T), - S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + S(KC_GRV), KC_GRV, KC_BSLS, S(KC_BSLS), KC_TRNS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), C(KC_T), + S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_TRNS ), @@ -60,7 +60,7 @@ enum combos { const uint16_t PROGMEM kl_combo[] = {KC_K, KC_L, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [KL_SLSH] = COMBO(kl_combo, S(KC_SLSH)), [JK_MINUS] = COMBO(jk_combo, KC_MINUS) }; diff --git a/keyboards/projectcain/vault45/keymaps/default/config.h b/keyboards/projectcain/vault45/keymaps/default/config.h index 4a98bb89d4..6fd8ebf9d5 100644 --- a/keyboards/projectcain/vault45/keymaps/default/config.h +++ b/keyboards/projectcain/vault45/keymaps/default/config.h @@ -1,21 +1,20 @@ - /* Copyright 2021 projectcain - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + /* Copyright 2021 projectcain + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License 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 COMBO_COUNT 2 #define COMBO_TERM 50 #define QUICK_TAP_TERM 0 diff --git a/keyboards/projectcain/vault45/keymaps/default/keymap.c b/keyboards/projectcain/vault45/keymaps/default/keymap.c index ec8de8b604..87baccad04 100644 --- a/keyboards/projectcain/vault45/keymaps/default/keymap.c +++ b/keyboards/projectcain/vault45/keymaps/default/keymap.c @@ -1,14 +1,14 @@ - /* Copyright 2021 projectcain - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + /* Copyright 2021 projectcain + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * */ #include QMK_KEYBOARD_H @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_PDOT, KC_RBRC, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_RCTL), RALT(KC_F4), RALT(KC_F4) ), - + [SYM] = LAYOUT_split_4space( RGB_TOG, S(KC_GRV), KC_GRV, KC_BSLS, S(KC_BSLS), KC_TRNS, KC_TRNS, S(KC_MINS), KC_EQL, KC_TRNS, C(KC_W), C(KC_T), KC_TRNS, KC_TRNS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), KC_SCLN, S(KC_SCLN), KC_TRNS, @@ -53,7 +53,7 @@ enum combos { const uint16_t PROGMEM kl_combo[] = {KC_K, KC_L, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [KL_SLSH] = COMBO(kl_combo, S(KC_SLSH)), [JK_MINUS] = COMBO(jk_combo, KC_MINUS) }; diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/q4z/keymaps/default/config.h index c129199230..88392557de 100644 --- a/keyboards/q4z/keymaps/default/config.h +++ b/keyboards/q4z/keymaps/default/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -#define COMBO_COUNT 5 #define COMBO_TERM 200 #endif diff --git a/keyboards/q4z/keymaps/default/keymap.c b/keyboards/q4z/keymaps/default/keymap.c index 45fe8c2dd5..4a7c28acb1 100644 --- a/keyboards/q4z/keymaps/default/keymap.c +++ b/keyboards/q4z/keymaps/default/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h index 7530b24262..9264f33bae 100644 --- a/keyboards/q4z/keymaps/rjboone/config.h +++ b/keyboards/q4z/keymaps/rjboone/config.h @@ -18,6 +18,4 @@ #undef TAPPING_TERM #define TAPPING_TERM 300 -#undef COMBO_COUNT -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/q4z/keymaps/rjboone/keymap.c b/keyboards/q4z/keymaps/rjboone/keymap.c index 8e764e4735..c54ec014ec 100644 --- a/keyboards/q4z/keymaps/rjboone/keymap.c +++ b/keyboards/q4z/keymaps/rjboone/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h index 90d12ee7da..cc4b487fe8 100644 --- a/keyboards/qpockets/eggman/keymaps/default/config.h +++ b/keyboards/qpockets/eggman/keymaps/default/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif +#endif diff --git a/keyboards/qpockets/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c index 13a34c14b0..9e6ec192c2 100644 --- a/keyboards/qpockets/eggman/keymaps/default/keymap.c +++ b/keyboards/qpockets/eggman/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h index fd24168f47..40d4cc44c4 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c index 9755cdec3f..1bbdd632e8 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c +++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c @@ -120,7 +120,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h index fd24168f47..40d4cc44c4 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c index 09b74316a8..4b0262d4ed 100644 --- a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c +++ b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c @@ -122,7 +122,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h index fd24168f47..40d4cc44c4 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c index afde5f7b20..3c8b875d47 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c +++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -52,14 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS, - KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS ), [_NAV] = LAYOUT_big_space( KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT, - KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS ), }; @@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h index 7fdb8504a6..e398cb5b2d 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c index 7d47cf4f8d..faf9c0f3d4 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c +++ b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_NAV] = LAYOUT_default( KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F4, KC_F5, KC_F6, KC_F7, KC_TAB, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_LCAP, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; @@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h index 31291ecc8f..98cdcbcdb1 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h +++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 25 -#endif +#endif diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c index c163c6eac9..1c3cdfc61f 100644 --- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c +++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -41,19 +41,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_PSCR, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, KC_MPLY ), - + [_SYM] = LAYOUT_default( KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_NAV] = LAYOUT_default( KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_TAB, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; @@ -65,7 +65,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h index 072519ff6c..77051be69b 100644 --- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h +++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 25 -#endif +#endif diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c index d8c75895bf..3322fc8923 100644 --- a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c +++ b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -21,7 +21,7 @@ enum layers{ _GAME, _SYM, _NAV - + }; enum combo_events { @@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SNIP, KC_LGUI, KC_LCTL, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, TG(_GAME), KC_MUTE ), - + [_GAME] = LAYOUT_2u_bars( KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, KC_ESC, KC_SPC, KC_GUP_BSPC, KC_RALT, KC_TRNS, KC_BSPC ), - + [_SYM] = LAYOUT_2u_bars( KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, @@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), @@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = { [COMBO_DEL] = COMBO(combo_del,KC_DEL) }; #endif - diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h index 072519ff6c..77051be69b 100644 --- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h +++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 25 -#endif +#endif diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c index c9dcfd4af5..1bd1be2f66 100644 --- a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c +++ b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -21,7 +21,7 @@ enum layers{ _GAME, _SYM, _NAV - + }; enum combo_events { @@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPRV, KC_DZ, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SNIP, KC_LGUI, KC_LCTL, KC_UP_SPC, KC_RALT, TG(_GAME) ), - + [_GAME] = LAYOUT_625_bar( KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS ), - + [_SYM] = LAYOUT_625_bar( KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, @@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), @@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = { [COMBO_DEL] = COMBO(combo_del,KC_DEL) }; #endif - diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h index 072519ff6c..77051be69b 100644 --- a/keyboards/qpockets/wanten/keymaps/default/config.h +++ b/keyboards/qpockets/wanten/keymaps/default/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 25 -#endif +#endif diff --git a/keyboards/qpockets/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c index cafcd61d31..13d8a30146 100644 --- a/keyboards/qpockets/wanten/keymaps/default/keymap.c +++ b/keyboards/qpockets/wanten/keymaps/default/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -21,7 +21,7 @@ enum layers{ _GAME, _SYM, _NAV - + }; enum combo_events { @@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SNIP, KC_LGUI, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, TG(_GAME), KC_MUTE ), - + [_GAME] = LAYOUT_default( KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_GUP_BSPC, KC_RALT, KC_TRNS, KC_BSPC ), - + [_SYM] = LAYOUT_default( KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, @@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), @@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = { [COMBO_DEL] = COMBO(combo_del,KC_DEL) }; #endif - diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h index 7e523656b8..e4ece8082b 100644 --- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h @@ -17,11 +17,4 @@ along with this program. If not, see . #pragma once - -#define EE_HANDS - -#ifdef COMBO_ENABLE - #define COMBO_COUNT 2 -#endif - #define EE_HANDS diff --git a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c index e5b897dc62..c382eedddc 100644 --- a/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c +++ b/keyboards/splitkb/aurora/sweep/keymaps/flinguenheld/features/combo.c @@ -96,12 +96,7 @@ enum combos { SHIFT_LEFT, ALTGR_LEFT, CONTROL_SHIFT_LEFT, - - /* Just to replace the define in config.h */ - COMBO_LENGTH, }; -uint16_t COMBO_LEN = COMBO_LENGTH; - /* Sequences fo keys */ const uint16_t PROGMEM combo_leader[] = {LT(_MOUSE, KC_COMM), LT(_ARROWS, KC_DOT), COMBO_END}; diff --git a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c index 294d6a278f..902cb33b54 100644 --- a/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cameronjlarsen/keymap.c @@ -176,11 +176,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; enum combo_events { - CAPS_COMBO, - // Other combos... - COMBO_LENGTH + CAPS_COMBO }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM caps_combo[] = {KC_F, KC_J, COMBO_END}; diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h index 1fa51f23f1..e6fc5e2d0f 100644 --- a/keyboards/splitkb/kyria/keymaps/cwebster2/config.h +++ b/keyboards/splitkb/kyria/keymaps/cwebster2/config.h @@ -42,10 +42,6 @@ //#define RGBLIGHT_STARTUP_ANIMATION #endif -#ifdef COMBO_ENABLE - #define COMBO_COUNT 5 -#endif - #define EE_HANDS //#define DEBUG_MATRIX_SCAN_RATE diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c index 9c31e2617c..3a5aa429d5 100644 --- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM curly_combo[] = { KC_F, KC_P, COMBO_END }; const uint16_t PROGMEM parens_combo[] = { KC_P, KC_B, COMBO_END }; const uint16_t PROGMEM square_combo[] = { KC_D, KC_V, COMBO_END }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZX_COPY] = COMBO(copy_combo, LCTL_T(KC_C)), [CV_PASTE] = COMBO(paste_combo, LCTL_T(KC_V)), [PB_PARENS] = COMBO(parens_combo, KC_LPRN), diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/synapse/keymaps/7u_space/config.h index 7fdb8504a6..e398cb5b2d 100644 --- a/keyboards/synapse/keymaps/7u_space/config.h +++ b/keyboards/synapse/keymaps/7u_space/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/synapse/keymaps/7u_space/keymap.c b/keyboards/synapse/keymaps/7u_space/keymap.c index 1791db3abe..b530e91c78 100644 --- a/keyboards/synapse/keymaps/7u_space/keymap.c +++ b/keyboards/synapse/keymaps/7u_space/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/synapse/keymaps/default/config.h index 7fdb8504a6..e398cb5b2d 100644 --- a/keyboards/synapse/keymaps/default/config.h +++ b/keyboards/synapse/keymaps/default/config.h @@ -21,6 +21,5 @@ /*Combos*/ #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 50 -#endif \ No newline at end of file +#endif diff --git a/keyboards/synapse/keymaps/default/keymap.c b/keyboards/synapse/keymaps/default/keymap.c index adaa51bddb..3428272ee9 100644 --- a/keyboards/synapse/keymaps/default/keymap.c +++ b/keyboards/synapse/keymaps/default/keymap.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 QMK_KEYBOARD_H enum layers{ @@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_ENT] = COMBO(combo_ent,KC_ENT), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/adalyn/keymaps/default/config.h b/keyboards/tominabox1/adalyn/keymaps/default/config.h index d8b87f9478..efedd99714 100644 --- a/keyboards/tominabox1/adalyn/keymaps/default/config.h +++ b/keyboards/tominabox1/adalyn/keymaps/default/config.h @@ -16,6 +16,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 200 #endif diff --git a/keyboards/tominabox1/adalyn/keymaps/default/keymap.c b/keyboards/tominabox1/adalyn/keymaps/default/keymap.c index 21cc74fa9f..b05dc48703 100644 --- a/keyboards/tominabox1/adalyn/keymaps/default/keymap.c +++ b/keyboards/tominabox1/adalyn/keymaps/default/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h index 67b668d4bb..8f0df1847a 100644 --- a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h +++ b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define COMBO_COUNT 5 #define COMBO_TERM 30 diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c index c9bc442a67..e9205d94b3 100644 --- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c +++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c @@ -80,7 +80,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/qaz/keymaps/default/config.h b/keyboards/tominabox1/qaz/keymaps/default/config.h index 12482ff6fe..4e92aadf64 100644 --- a/keyboards/tominabox1/qaz/keymaps/default/config.h +++ b/keyboards/tominabox1/qaz/keymaps/default/config.h @@ -1,6 +1,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 200 #endif diff --git a/keyboards/tominabox1/qaz/keymaps/default/keymap.c b/keyboards/tominabox1/qaz/keymaps/default/keymap.c index cf721292a6..3e0b763f9e 100644 --- a/keyboards/tominabox1/qaz/keymaps/default/keymap.c +++ b/keyboards/tominabox1/qaz/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/qaz/keymaps/default_big_space/config.h b/keyboards/tominabox1/qaz/keymaps/default_big_space/config.h index 12482ff6fe..4e92aadf64 100644 --- a/keyboards/tominabox1/qaz/keymaps/default_big_space/config.h +++ b/keyboards/tominabox1/qaz/keymaps/default_big_space/config.h @@ -1,6 +1,5 @@ #pragma once #ifdef COMBO_ENABLE -# define COMBO_COUNT 5 # define COMBO_TERM 200 #endif diff --git a/keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c index 13f105add0..ecf28ca9c7 100644 --- a/keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c +++ b/keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h b/keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h index 82cbcc42cb..cb5bb474b2 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c index 517f0aafda..cf4eca1a4b 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h index 82cbcc42cb..cb5bb474b2 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c index 6b5eda2b45..59bff4940b 100644 --- a/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c +++ b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h b/keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h index 82cbcc42cb..cb5bb474b2 100644 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h +++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c index 2a415b8e94..be37e1bdd2 100644 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c +++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h index 82cbcc42cb..cb5bb474b2 100644 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h +++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h @@ -16,5 +16,4 @@ #pragma once /* Combos */ -#define COMBO_COUNT 5 #define COMBO_TERM 50 diff --git a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c index 6b5eda2b45..59bff4940b 100644 --- a/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c +++ b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), [COMBO_TAB] = COMBO(combo_tab,KC_TAB), diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h index bb939188ca..6241444a84 100644 --- a/keyboards/xiudi/xd75/keymaps/4sstylz/config.h +++ b/keyboards/xiudi/xd75/keymaps/4sstylz/config.h @@ -24,7 +24,6 @@ #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_HOME #define LCPO_KEYS KC_LCTL, KC_TRNS, KC_END -#define COMBO_COUNT 1 #define TAPPING_TERM 175 #define BACKLIGHT_BREATHING diff --git a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c index f21aa059b4..5222497937 100644 --- a/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/4sstylz/keymap.c @@ -38,7 +38,7 @@ enum combo_events { }; const uint16_t PROGMEM lock_combo[] = {KC_J, KC_K, KC_L, KC_SCLN, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = {COMBO(lock_combo, SCR_LCK)}; +combo_t key_combos[] = {COMBO(lock_combo, SCR_LCK)}; // Layer shorthand #define _QW 0 diff --git a/keyboards/ymdk/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h index 9c834bdce1..380e11a3a1 100644 --- a/keyboards/ymdk/melody96/keymaps/dvz/config.h +++ b/keyboards/ymdk/melody96/keymaps/dvz/config.h @@ -16,7 +16,6 @@ #pragma once -#define COMBO_COUNT 4 #define COMBO_TERM 100 //#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE diff --git a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c index b0f01eead6..20d4d1e510 100644 --- a/keyboards/ymdk/melody96/keymaps/dvz/keymap.c +++ b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END}; const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END}; const uint16_t PROGMEM sz_combo[] = {KC_S, KC_Y, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [UML_AE] = COMBO(ae_combo, KC_QUOT), [UML_OE] = COMBO(oe_combo, KC_SCLN), [UML_UE] = COMBO(ue_combo, KC_LBRC), diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c index 977b949340..e4a01d2e9a 100644 --- a/quantum/keymap_introspection.c +++ b/quantum/keymap_introspection.c @@ -70,3 +70,24 @@ __attribute__((weak)) uint16_t keycode_at_encodermap_location(uint8_t layer_num, } #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Combos + +#if defined(COMBO_ENABLE) + +uint16_t combo_count_raw(void) { + return sizeof(key_combos) / sizeof(combo_t); +} +__attribute__((weak)) uint16_t combo_count(void) { + return combo_count_raw(); +} + +combo_t* combo_get_raw(uint16_t combo_idx) { + return &key_combos[combo_idx]; +} +__attribute__((weak)) combo_t* combo_get(uint16_t combo_idx) { + return combo_get_raw(combo_idx); +} + +#endif // defined(COMBO_ENABLE) diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h index 201de937cb..2012a2b8cc 100644 --- a/quantum/keymap_introspection.h +++ b/quantum/keymap_introspection.h @@ -34,3 +34,24 @@ uint16_t keycode_at_encodermap_location_raw(uint8_t layer_num, uint8_t encoder_i uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise); #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Combos + +#if defined(COMBO_ENABLE) + +// Forward declaration of combo_t so we don't need to deal with header reordering +struct combo_t; +typedef struct combo_t combo_t; + +// Get the number of combos defined in the user's keymap, stored in firmware rather than any other persistent storage +uint16_t combo_count_raw(void); +// Get the number of combos defined in the user's keymap, potentially stored dynamically +uint16_t combo_count(void); + +// Get the keycode for the encoder mapping location, stored in firmware rather than any other persistent storage +combo_t* combo_get_raw(uint16_t combo_idx); +// Get the keycode for the encoder mapping location, potentially stored dynamically +combo_t* combo_get(uint16_t combo_idx); + +#endif // defined(COMBO_ENABLE) diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index 2670ccabed..bbee560be9 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -19,14 +19,7 @@ #include "process_combo.h" #include "action_tapping.h" #include "action.h" - -#ifdef COMBO_COUNT -__attribute__((weak)) combo_t key_combos[COMBO_COUNT]; -uint16_t COMBO_LEN = COMBO_COUNT; -#else -extern combo_t key_combos[]; -extern uint16_t COMBO_LEN; -#endif +#include "keymap_introspection.h" __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {} @@ -195,8 +188,8 @@ static inline uint16_t _get_combo_term(uint16_t combo_index, combo_t *combo) { void clear_combos(void) { uint16_t index = 0; longest_term = 0; - for (index = 0; index < COMBO_LEN; ++index) { - combo_t *combo = &key_combos[index]; + for (index = 0; index < combo_count(); ++index) { + combo_t *combo = combo_get(index); if (!COMBO_ACTIVE(combo)) { RESET_COMBO_STATE(combo); } @@ -287,7 +280,7 @@ void drop_combo_from_buffer(uint16_t combo_index) { queued_combo_t *qcombo = &combo_buffer[i]; if (qcombo->combo_index == combo_index) { - combo_t *combo = &key_combos[combo_index]; + combo_t *combo = combo_get(combo_index); DISABLE_COMBO(combo); if (i == combo_buffer_read) { @@ -354,7 +347,7 @@ static inline void apply_combos(void) { // Apply all buffered normal combos. for (uint8_t i = combo_buffer_read; i != combo_buffer_write; INCREMENT_MOD(i)) { queued_combo_t *buffered_combo = &combo_buffer[i]; - combo_t * combo = &key_combos[buffered_combo->combo_index]; + combo_t * combo = combo_get(buffered_combo->combo_index); #ifdef COMBO_MUST_TAP_PER_COMBO if (get_combo_must_tap(buffered_combo->combo_index, combo)) { @@ -459,7 +452,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t * combo_t *drop = NULL; for (uint8_t combo_buffer_i = combo_buffer_read; combo_buffer_i != combo_buffer_write; INCREMENT_MOD(combo_buffer_i)) { queued_combo_t *qcombo = &combo_buffer[combo_buffer_i]; - combo_t * buffered_combo = &key_combos[qcombo->combo_index]; + combo_t * buffered_combo = combo_get(qcombo->combo_index); if ((drop = overlaps(buffered_combo, combo))) { DISABLE_COMBO(drop); @@ -565,8 +558,8 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) { } #endif - for (uint16_t idx = 0; idx < COMBO_LEN; ++idx) { - combo_t *combo = &key_combos[idx]; + for (uint16_t idx = 0; idx < combo_count(); ++idx) { + combo_t *combo = combo_get(idx); is_combo_key |= process_single_combo(combo, keycode, record, idx); no_combo_keys_pressed = no_combo_keys_pressed && (NO_COMBO_KEYS_ARE_DOWN || COMBO_ACTIVE(combo) || COMBO_DISABLED(combo)); } diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h index e430c4a5f7..bba5d5ee63 100644 --- a/quantum/process_keycode/process_combo.h +++ b/quantum/process_keycode/process_combo.h @@ -37,7 +37,7 @@ # define COMBO_BUFFER_LENGTH 4 #endif -typedef struct { +typedef struct combo_t { const uint16_t *keys; uint16_t keycode; #ifdef EXTRA_SHORT_COMBOS diff --git a/tests/caps_word/caps_word_combo/test.mk b/tests/caps_word/caps_word_combo/test.mk index 9f2e157189..c294864113 100644 --- a/tests/caps_word/caps_word_combo/test.mk +++ b/tests/caps_word/caps_word_combo/test.mk @@ -17,3 +17,4 @@ CAPS_WORD_ENABLE = yes COMBO_ENABLE = yes AUTO_SHIFT_ENABLE = yes +INTROSPECTION_KEYMAP_C = test_combos.c diff --git a/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp index 0876cc91a3..2cee203dfd 100644 --- a/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp +++ b/tests/caps_word/caps_word_combo/test_caps_word_combo.cpp @@ -38,29 +38,6 @@ using ::testing::AnyOf; using ::testing::InSequence; using ::testing::TestParamInfo; -extern "C" { -// Define some combos to use for the test, including overlapping combos and -// combos that chord tap-hold keys. -enum combo_events { AB_COMBO, BC_COMBO, AD_COMBO, DE_COMBO, FGHI_COMBO, COMBO_LENGTH }; -uint16_t COMBO_LEN = COMBO_LENGTH; - -const uint16_t ab_combo[] PROGMEM = {KC_A, KC_B, COMBO_END}; -const uint16_t bc_combo[] PROGMEM = {KC_B, KC_C, COMBO_END}; -const uint16_t ad_combo[] PROGMEM = {KC_A, LCTL_T(KC_D), COMBO_END}; -const uint16_t de_combo[] PROGMEM = {LCTL_T(KC_D), LT(1, KC_E), COMBO_END}; -const uint16_t fghi_combo[] PROGMEM = {KC_F, KC_G, KC_H, KC_I, COMBO_END}; - -// clang-format off -combo_t key_combos[] = { - [AB_COMBO] = COMBO(ab_combo, KC_SPC), // KC_A + KC_B = KC_SPC - [BC_COMBO] = COMBO(bc_combo, KC_X), // KC_B + KC_C = KC_X - [AD_COMBO] = COMBO(ad_combo, KC_Y), // KC_A + LCTL_T(KC_D) = KC_Y - [DE_COMBO] = COMBO(de_combo, KC_Z), // LCTL_T(KC_D) + LT(1, KC_E) = KC_Z - [FGHI_COMBO] = COMBO(fghi_combo, KC_W) // KC_F + KC_G + KC_H + KC_I = KC_W -}; -// clang-format on -} // extern "C" - namespace { // To test combos thorougly, we test them with pressing the chord keys with diff --git a/tests/caps_word/caps_word_combo/test_combos.c b/tests/caps_word/caps_word_combo/test_combos.c new file mode 100644 index 0000000000..1d07118d50 --- /dev/null +++ b/tests/caps_word/caps_word_combo/test_combos.c @@ -0,0 +1,20 @@ +#include + +// Define some combos to use for the test, including overlapping combos and +// combos that chord tap-hold keys. +enum combo_events { AB_COMBO, BC_COMBO, AD_COMBO, DE_COMBO, FGHI_COMBO }; + +const uint16_t ab_combo[] PROGMEM = {KC_A, KC_B, COMBO_END}; +const uint16_t bc_combo[] PROGMEM = {KC_B, KC_C, COMBO_END}; +const uint16_t ad_combo[] PROGMEM = {KC_A, LCTL_T(KC_D), COMBO_END}; +const uint16_t de_combo[] PROGMEM = {LCTL_T(KC_D), LT(1, KC_E), COMBO_END}; +const uint16_t fghi_combo[] PROGMEM = {KC_F, KC_G, KC_H, KC_I, COMBO_END}; + +// clang-format off +combo_t key_combos[] = { + [AB_COMBO] = COMBO(ab_combo, KC_SPC), // KC_A + KC_B = KC_SPC + [BC_COMBO] = COMBO(bc_combo, KC_X), // KC_B + KC_C = KC_X + [AD_COMBO] = COMBO(ad_combo, KC_Y), // KC_A + LCTL_T(KC_D) = KC_Y + [DE_COMBO] = COMBO(de_combo, KC_Z), // LCTL_T(KC_D) + LT(1, KC_E) = KC_Z + [FGHI_COMBO] = COMBO(fghi_combo, KC_W) // KC_F + KC_G + KC_H + KC_I = KC_W +}; diff --git a/tests/combo/test.mk b/tests/combo/test.mk index ce6f9fc2b0..4776b9d0c4 100644 --- a/tests/combo/test.mk +++ b/tests/combo/test.mk @@ -2,3 +2,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later COMBO_ENABLE = yes + +INTROSPECTION_KEYMAP_C = test_combos.c diff --git a/tests/combo/test_combo.cpp b/tests/combo/test_combo.cpp index b7aea27f4c..ac852f9d16 100644 --- a/tests/combo/test_combo.cpp +++ b/tests/combo/test_combo.cpp @@ -10,21 +10,6 @@ #include "test_fixture.hpp" #include "test_keymap_key.hpp" -extern "C" { -enum combos { modtest, osmshift, COMBO_LENGTH }; -uint16_t COMBO_LEN = COMBO_LENGTH; - -uint16_t const modtest_combo[] = {KC_Y, KC_U, COMBO_END}; -uint16_t const osmshift_combo[] = {KC_Z, KC_X, COMBO_END}; - -// clang-format off -combo_t key_combos[] = { - [modtest] = COMBO(modtest_combo, RSFT_T(KC_SPACE)), - [osmshift] = COMBO(osmshift_combo, OSM(MOD_LSFT)) -}; -// clang-format on -} - using testing::_; using testing::InSequence; diff --git a/tests/combo/test_combos.c b/tests/combo/test_combos.c new file mode 100644 index 0000000000..8dcb364c6e --- /dev/null +++ b/tests/combo/test_combos.c @@ -0,0 +1,17 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// Copyright 2023 @filterpaper +// Copyright 2023 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +enum combos { modtest, osmshift }; + +uint16_t const modtest_combo[] = {KC_Y, KC_U, COMBO_END}; +uint16_t const osmshift_combo[] = {KC_Z, KC_X, COMBO_END}; + +// clang-format off +combo_t key_combos[] = { + [modtest] = COMBO(modtest_combo, RSFT_T(KC_SPACE)), + [osmshift] = COMBO(osmshift_combo, OSM(MOD_LSFT)) +}; +// clang-format on diff --git a/tests/test_common/keycode_util.hpp b/tests/test_common/keycode_util.hpp index d5a520d4b2..3143ab364e 100644 --- a/tests/test_common/keycode_util.hpp +++ b/tests/test_common/keycode_util.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include std::string get_keycode_identifier_or_default(uint16_t keycode); diff --git a/users/art/funcs/string_funcs.c b/users/art/funcs/string_funcs.c index 319b1310e4..1ea86779cc 100644 --- a/users/art/funcs/string_funcs.c +++ b/users/art/funcs/string_funcs.c @@ -37,10 +37,8 @@ enum combo_events { ED_ENTER, ED_CS_ENTER, - BSPC_LSFT_CLEAR, - COMBO_LENGTH + BSPC_LSFT_CLEAR }; -uint16_t COMBO_LEN = COMBO_LENGTH; // do not remove - needed for combos to work const uint16_t PROGMEM combo_up[] = {KC_W, KC_R, COMBO_END}; const uint16_t PROGMEM combo_left[] = {KC_S, KC_E, COMBO_END}; @@ -122,7 +120,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) { tap_code16(A(KC_RIGHT)); } } - break; + break; case BSPC_LSFT_CLEAR: if (pressed) { tap_code16(KC_END); @@ -134,7 +132,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) { if (pressed) { tap_code16(C(S(KC_ENTER))); } - break; + break; } } @@ -210,63 +208,63 @@ void send_string_with_translation(char *string) { case 'w': toPrint = 'd'; - break; + break; case 'e': toPrint = 'r'; - break; + break; case 'r': toPrint = 'w'; - break; + break; case 't': toPrint = 'b'; - break; + break; case 'y': toPrint = 'j'; - break; + break; case 'u': toPrint = 'f'; - break; + break; case 'i': toPrint = 'u'; - break; + break; case 'o': toPrint = 'p'; - break; + break; case 'p': toPrint = ';'; - break; + break; case 'd': toPrint = 'h'; - break; + break; case 'f': toPrint = 't'; - break; + break; case 'h': toPrint = 'y'; - break; + break; case 'j': toPrint = 'n'; - break; + break; case 'k': toPrint = 'e'; - break; + break; case 'l': toPrint = 'o'; - break; + break; case ';': toPrint = 'i'; - break; + break; case 'b': toPrint = 'm'; - break; + break; case 'n': toPrint = 'k'; - break; + break; case 'm': toPrint = 'l'; - break; + break; } if (isUpperCase) { isUpperCase = 0; @@ -306,4 +304,4 @@ void send_shifted_strings_add(char *string1, char *string2) { send_string(string2); char_to_bspace = strlen(string1) + strlen(string2); } -} \ No newline at end of file +} diff --git a/users/danielo515/combo.c b/users/danielo515/combo.c index b33cb838bc..dae53f6e85 100644 --- a/users/danielo515/combo.c +++ b/users/danielo515/combo.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM n_m[] = {KC_N, KC_M, COMBO_END}; const uint16_t PROGMEM o_p_combo[] = {KC_O, KC_P, COMBO_END}; const uint16_t PROGMEM m_cm_dot_combo[] = {KC_M, KC_COMMA, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [JK_ESC] = COMBO(jk_combo, KC_ESC), [YU_COM] = COMBO(yu_combo, KC_AMPR), [UI_COM] = COMBO(ui_combo, KC_CIRC), diff --git a/users/danielo515/config.h b/users/danielo515/config.h index 11007eb27f..c5f9b08389 100644 --- a/users/danielo515/config.h +++ b/users/danielo515/config.h @@ -1,7 +1,6 @@ #pragma once #if defined(COMBO_ENABLE) -# define COMBO_COUNT 11 # define COMBO_TERM 25 #endif // !COMBO_ENABLE // Timeout settings for leader key diff --git a/users/ericgebhart/extensions/keymap_combo.h b/users/ericgebhart/extensions/keymap_combo.h index cd9684e601..e918fa08ea 100644 --- a/users/ericgebhart/extensions/keymap_combo.h +++ b/users/ericgebhart/extensions/keymap_combo.h @@ -52,10 +52,7 @@ void process_combo_event(uint16_t combo_index, bool pressed); #define TOGG A_ENUM enum combos { #include "combos.def" - COMBO_LENGTH }; -// Export length to combo module -uint16_t COMBO_LEN = COMBO_LENGTH; // Bake combos into mem #undef COMB diff --git a/users/ibnuda/combo.h b/users/ibnuda/combo.h index d7e79764a9..c4fd5f12ed 100644 --- a/users/ibnuda/combo.h +++ b/users/ibnuda/combo.h @@ -64,7 +64,7 @@ const uint16_t PROGMEM rl_i_ii_combo[] = {RLI, RLII, COMBO_END}; // both hand combinations. const uint16_t PROGMEM bl_m_m_combo[] = {LLM, RLM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [R_U_PINKY_RING] = COMBO(lu_p_r_combo, KC_TAB), [R_U_RING_MIDDLE] = COMBO(lu_r_m_combo, KC_QUES), @@ -93,4 +93,4 @@ combo_t key_combos[COMBO_COUNT] = { // both hand combinations. [B_L_MIDDLE_MIDDLE] = COMBO(bl_m_m_combo, KC_ENT), -}; \ No newline at end of file +}; diff --git a/users/ibnuda/config.h b/users/ibnuda/config.h index c4fec5bc2d..957d24a04c 100644 --- a/users/ibnuda/config.h +++ b/users/ibnuda/config.h @@ -1,6 +1,5 @@ #pragma once #define COMBO_TERM 50 -#define COMBO_COUNT 50 -#define PERMISSIVE_HOLD \ No newline at end of file +#define PERMISSIVE_HOLD diff --git a/users/issmirnov/config.h b/users/issmirnov/config.h index 5fe78f7a53..a74f6fbc91 100644 --- a/users/issmirnov/config.h +++ b/users/issmirnov/config.h @@ -21,7 +21,6 @@ #define ONESHOT_TIMEOUT 2000 // Enable combos for vim -#define COMBO_COUNT 5 // Specify the number of combos used. BE SURE TO INCREMENT AS NEEDED #define COMBO_TERM 50 // window in milliseconds to trigger combo // Allow more than 4 keys to be sent to the system. Useful for gaming. diff --git a/users/issmirnov/issmirnov.c b/users/issmirnov/issmirnov.c index 45ef7b19a7..ecfb423ee2 100644 --- a/users/issmirnov/issmirnov.c +++ b/users/issmirnov/issmirnov.c @@ -15,9 +15,7 @@ const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM copy_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; - -// BE SURE TO UPDATE THE CONFIG.H "COMBO_COUNT" value when you add elements here! -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(jk_combo, KC_ESC), COMBO(df_combo, KC_COLON), COMBO(sd_combo, KC_SLASH), diff --git a/users/kuchosauronad0/combo.h b/users/kuchosauronad0/combo.h index e2ff09ab5a..6fb3eaf58c 100644 --- a/users/kuchosauronad0/combo.h +++ b/users/kuchosauronad0/combo.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "quantum.h" enum combo_events { ZV_COPY, @@ -12,10 +12,9 @@ const uint16_t PROGMEM cut_combo[] = {KC_X, KC_V, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM sleep_combo[] = {KC_Q, KC_P, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZV_COPY] = COMBO_ACTION(copy_combo), [XV_CUT] = COMBO_ACTION(cut_combo), [CV_PASTE] = COMBO_ACTION(paste_combo), [QP_SLEEP] = COMBO_ACTION(sleep_combo), }; - diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h index 28e41215b9..58ef7a20f8 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -56,7 +56,6 @@ #endif // !LEADER_ENABLE #if defined(COMBO_ENABLE) -# define COMBO_COUNT 4 # define COMBO_TERM 150 #endif // !COMBO_ENABLE diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index 3656e9eded..f2bc9c331b 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -34,7 +34,6 @@ // Thumb Combos #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS) - #define COMBO_COUNT 8 #define COMBO_TERM 200 #define EXTRA_SHORT_COMBOS #endif diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c index 389580759b..58b68c2727 100644 --- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c +++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM thumbcombos_sym[] = {KC_UNDS, KC_LPRN, COMBO_END}; const uint16_t PROGMEM thumbcombos_sym[] = {KC_RPRN, KC_UNDS, COMBO_END}; #endif const uint16_t PROGMEM thumbcombos_fun[] = {KC_SPC, KC_TAB, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(thumbcombos_base_right, LT(U_FUN, KC_DEL)), COMBO(thumbcombos_base_left, LT(U_MEDIA, KC_ESC)), COMBO(thumbcombos_nav, KC_DEL), diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h index cbc318d24f..742a97950d 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -35,6 +35,4 @@ #endif - -#define COMBO_COUNT 3 #define COMBO_TERM 40 diff --git a/users/muppetjones/features/combos.c b/users/muppetjones/features/combos.c index a6d14bb25c..a357b3ad4e 100644 --- a/users/muppetjones/features/combos.c +++ b/users/muppetjones/features/combos.c @@ -27,8 +27,7 @@ const uint16_t PROGMEM h_comm_tab[] = {KC_H, KC_COMM, COMBO_END}; const uint16_t PROGMEM l_u_scln[] = {KC_L, KC_U, COMBO_END}; const uint16_t PROGMEM j_m_caps[] = {KC_J, KC_M, COMBO_END}; -// COMBO_COUNT defined in config.h -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [H_COMM_TAB] = COMBO(h_comm_tab, KC_TAB), [L_U_SCLN] = COMBO(l_u_scln, KC_SCLN), [J_M_CAPS] = COMBO(j_m_caps, KC_CAPS), diff --git a/users/narze/superduper.c b/users/narze/superduper.c index b497ce2e68..7545685727 100644 --- a/users/narze/superduper.c +++ b/users/narze/superduper.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM superduper_combos[SUPERDUPER_COMBO_COUNT][3] = { [_QWOC] = {CM_S, CM_D, COMBO_END}, }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [CB_SUPERDUPER] = COMBO_ACTION(superduper_combos[_QWERTY]), }; diff --git a/users/ninjonas/combos.c b/users/ninjonas/combos.c index 8d1cd6510f..3346af4ce4 100644 --- a/users/ninjonas/combos.c +++ b/users/ninjonas/combos.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM tab_combo[] = {KC_Q, KC_T, COMBO_END}; const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [EQ_QUIT] = COMBO_ACTION(quit_combo), [RW_CLOSE] = COMBO_ACTION(close_combo), [QT_TAB] = COMBO_ACTION(tab_combo), @@ -52,4 +52,4 @@ void process_combo_event(uint16_t combo_index, bool pressed) { break; } } -#endif \ No newline at end of file +#endif diff --git a/users/ninjonas/config.h b/users/ninjonas/config.h index 565e40e841..17bb03865c 100644 --- a/users/ninjonas/config.h +++ b/users/ninjonas/config.h @@ -15,8 +15,6 @@ #define MOUSEKEY_WHEEL_DELAY 0 #ifdef COMBO_ENABLE - #undef COMBO_COUNT #undef COMBO_TERM - #define COMBO_COUNT 5 #define COMBO_TERM 60 #endif diff --git a/users/pdl/pdl.c b/users/pdl/pdl.c index 5b90a0b310..1ad2e02c12 100644 --- a/users/pdl/pdl.c +++ b/users/pdl/pdl.c @@ -181,7 +181,7 @@ const uint16_t PROGMEM xcombo_redo[] = {KC_B, KC_H, COMBO_END}; const uint16_t PROGMEM xcombo_pgup[] = {KC_G, KC_B, COMBO_END}; const uint16_t PROGMEM xcombo_pgdn[] = {KC_G, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [VCOMBO_PU] = COMBO(vcombo_pu, KC_CIRC), [VCOMBO_NU] = COMBO(vcombo_nu, KC_LBRC), [VCOMBO_EU] = COMBO(vcombo_eu, LSFT(KC_9)), diff --git a/users/talljoe/config.h b/users/talljoe/config.h index dcdbbd89f4..6cf0605be3 100644 --- a/users/talljoe/config.h +++ b/users/talljoe/config.h @@ -19,5 +19,4 @@ #define RESET_LAYER 15 -#define COMBO_COUNT 2 #define COMBO_TERM 250 diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index 83733bbe2a..cd5e86bdcb 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c @@ -125,8 +125,6 @@ const uint16_t PROGMEM my_combos[][4] = { {KC_BTN1, KC_BTN2, KC_BTN3, COMBO_END}, }; -const uint16_t COMBO_LEN = ARRAY_SIZE(my_action_combos) + ARRAY_SIZE(my_combos); - #define MY_ACTION_COMBO(ck) \ [ck] = { .keys = &(my_action_combos[ck][0]) } #define MY_COMBO(ck) \ diff --git a/users/yet-another-developer/combo.h b/users/yet-another-developer/combo.h index e2ff09ab5a..6fb3eaf58c 100644 --- a/users/yet-another-developer/combo.h +++ b/users/yet-another-developer/combo.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "quantum.h" enum combo_events { ZV_COPY, @@ -12,10 +12,9 @@ const uint16_t PROGMEM cut_combo[] = {KC_X, KC_V, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM sleep_combo[] = {KC_Q, KC_P, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZV_COPY] = COMBO_ACTION(copy_combo), [XV_CUT] = COMBO_ACTION(cut_combo), [CV_PASTE] = COMBO_ACTION(paste_combo), [QP_SLEEP] = COMBO_ACTION(sleep_combo), }; - diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h index e783d08dc5..4836822eb4 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -17,7 +17,6 @@ #endif // !LEADER_ENABLE #if defined(COMBO_ENABLE) - #define COMBO_COUNT 4 #define COMBO_TERM 150 #endif // !COMBO_ENABLE diff --git a/users/zigotica/combos.c b/users/zigotica/combos.c index a4d4f15618..3f37f3c859 100644 --- a/users/zigotica/combos.c +++ b/users/zigotica/combos.c @@ -15,10 +15,8 @@ along with this program. If not, see . enum combos { EM_EMAIL, - CL_CAPSL, - COMBO_LENGTH + CL_CAPSL }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM email_combo[] = {LT(_SYM, KC_E), KC_M, COMBO_END}; const uint16_t PROGMEM caps_combo[] = {KC_C, KC_L, COMBO_END}; @@ -37,4 +35,3 @@ void process_combo_event(uint16_t combo_index, bool pressed) { break; } } - -- cgit v1.3.1