From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/aeboards/aegis/aegis.h | 43 - keyboards/aeboards/aegis/info.json | 234 +- keyboards/aeboards/ext65/rev1/info.json | 177 +- keyboards/aeboards/ext65/rev1/rev1.c | 2 +- keyboards/aeboards/ext65/rev1/rev1.h | 40 - keyboards/aeboards/ext65/rev2/info.json | 177 +- keyboards/aeboards/ext65/rev2/rev2.c | 2 +- keyboards/aeboards/ext65/rev2/rev2.h | 40 - keyboards/aeboards/ext65/rev3/info.json | 512 +-- keyboards/aeboards/ext65/rev3/rev3.c | 2 +- keyboards/aeboards/ext65/rev3/rev3.h | 40 - keyboards/alfredslab/swift65/hotswap/hotswap.h | 35 - keyboards/alfredslab/swift65/hotswap/info.json | 138 +- keyboards/alfredslab/swift65/solder/info.json | 576 +-- keyboards/alfredslab/swift65/solder/solder.h | 77 - keyboards/baguette/baguette.c | 2 +- keyboards/baguette/baguette.h | 57 - keyboards/baguette/info.json | 283 +- keyboards/bajjak/bajjak.h | 27 - keyboards/bajjak/info.json | 116 +- keyboards/bbrfkr/dynamis/dynamis.c | 2 +- keyboards/bbrfkr/dynamis/dynamis.h | 78 - keyboards/bbrfkr/dynamis/info.json | 280 +- keyboards/bear_face/v1/info.json | 166 +- keyboards/bear_face/v1/v1.c | 2 +- keyboards/bear_face/v1/v1.h | 36 - keyboards/bear_face/v2/info.json | 335 +- keyboards/bear_face/v2/v2.c | 2 +- keyboards/bear_face/v2/v2.h | 52 - keyboards/boardrun/classic/classic.h | 33 - keyboards/boardrun/classic/info.json | 152 +- keyboards/bolsa/damapad/damapad.c | 2 +- keyboards/bolsa/damapad/damapad.h | 42 - keyboards/bolsa/damapad/info.json | 143 +- keyboards/capsunlocked/cu24/cu24.h | 57 - keyboards/capsunlocked/cu24/info.json | 62 +- keyboards/chavdai40/info.json | 94 - keyboards/chavdai40/rev1/info.json | 104 +- keyboards/chavdai40/rev1/rev1.h | 49 - keyboards/chavdai40/rev2/info.json | 104 +- keyboards/chavdai40/rev2/rev2.h | 49 - .../checkerboards/candybar_ortho/candybar_ortho.h | 67 - keyboards/checkerboards/candybar_ortho/info.json | 218 +- keyboards/checkerboards/plexus75/info.json | 236 +- keyboards/checkerboards/plexus75/plexus75.h | 65 - keyboards/checkerboards/plexus75_he/info.json | 238 +- keyboards/checkerboards/plexus75_he/plexus75_he.h | 76 - keyboards/checkerboards/quark_plus/info.json | 231 +- keyboards/checkerboards/quark_plus/quark_plus.c | 2 +- keyboards/checkerboards/quark_plus/quark_plus.h | 82 - keyboards/checkerboards/quark_squared/info.json | 228 +- .../checkerboards/quark_squared/quark_squared.c | 17 - .../checkerboards/quark_squared/quark_squared.h | 76 - keyboards/coarse/ixora/info.json | 38 +- keyboards/coarse/ixora/ixora.h | 40 - keyboards/converter/adb_usb/adb_usb.h | 108 - keyboards/converter/adb_usb/info.json | 399 +- keyboards/converter/m0110_usb/info.json | 325 +- keyboards/converter/m0110_usb/m0110_usb.h | 131 - keyboards/converter/sun_usb/type5/info.json | 793 ++-- keyboards/converter/sun_usb/type5/type5.h | 148 - keyboards/crimsonkeyboards/resume1800/info.json | 253 +- keyboards/crimsonkeyboards/resume1800/resume1800.h | 53 - keyboards/delikeeb/vaneelaex/info.json | 381 +- keyboards/delikeeb/vaneelaex/vaneelaex.h | 42 - keyboards/deltasplit75/v2/info.json | 208 +- keyboards/deltasplit75/v2/v2.h | 55 - keyboards/dinofizz/fnrow/v1/info.json | 81 +- keyboards/dinofizz/fnrow/v1/v1.c | 2 +- keyboards/dinofizz/fnrow/v1/v1.h | 25 - keyboards/drhigsby/bkf/bkf.h | 53 - keyboards/drhigsby/bkf/info.json | 109 +- keyboards/drhigsby/packrat/info.json | 247 +- keyboards/drhigsby/packrat/packrat.c | 16 - keyboards/drhigsby/packrat/packrat.h | 79 - keyboards/ebastler/isometria_75/rev1/info.json | 187 +- keyboards/ebastler/isometria_75/rev1/rev1.h | 35 - keyboards/ergoslab/rev1/info.json | 113 +- keyboards/ergoslab/rev1/rev1.c | 2 +- keyboards/ergoslab/rev1/rev1.h | 22 - keyboards/eu_isolation/eu_isolation.h | 59 - keyboards/eu_isolation/info.json | 298 +- keyboards/evolv/evolv.c | 18 - keyboards/evolv/evolv.h | 54 - keyboards/evolv/info.json | 421 +- keyboards/exclusive/e85/hotswap/hotswap.c | 2 +- keyboards/exclusive/e85/hotswap/hotswap.h | 63 - keyboards/exclusive/e85/hotswap/info.json | 379 +- keyboards/eyeohdesigns/babyv/babyv.h | 71 - keyboards/eyeohdesigns/babyv/info.json | 221 +- keyboards/eyeohdesigns/sprh/info.json | 1128 ++--- keyboards/eyeohdesigns/sprh/sprh.c | 16 - keyboards/eyeohdesigns/sprh/sprh.h | 139 - keyboards/eyeohdesigns/theboulevard/info.json | 651 ++- keyboards/eyeohdesigns/theboulevard/theboulevard.c | 17 - keyboards/eyeohdesigns/theboulevard/theboulevard.h | 169 - keyboards/flehrad/numbrero/info.json | 98 +- keyboards/flehrad/numbrero/numbrero.h | 30 - keyboards/gboards/butterstick/butterstick.c | 2 +- keyboards/gboards/butterstick/butterstick.h | 11 - keyboards/gboards/butterstick/info.json | 40 +- keyboards/gboards/butterstick/sten.h | 2 +- keyboards/gorthage_truck/gorthage_truck.c | 17 - keyboards/gorthage_truck/gorthage_truck.h | 77 - keyboards/gorthage_truck/info.json | 399 +- keyboards/handwired/aranck/aranck.h | 39 - keyboards/handwired/aranck/info.json | 97 +- keyboards/handwired/concertina/64key/64key.h | 56 - keyboards/handwired/concertina/64key/info.json | 88 +- keyboards/handwired/curiosity/curiosity.h | 41 - keyboards/handwired/curiosity/info.json | 110 +- keyboards/handwired/dactyl/dactyl.h | 29 - keyboards/handwired/dactyl/info.json | 89 +- keyboards/handwired/dactyl_manuform/5x6/5x6.h | 30 - keyboards/handwired/dactyl_manuform/5x6/info.json | 128 +- .../handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h | 44 - .../handwired/dactyl_manuform/5x6_2_5/info.json | 134 +- keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h | 28 - .../handwired/dactyl_manuform/5x6_5/info.json | 126 +- keyboards/handwired/dactyl_manuform/5x7/5x7.h | 37 - keyboards/handwired/dactyl_manuform/5x7/info.json | 148 +- keyboards/handwired/dactyl_manuform/6x6/6x6.h | 62 - keyboards/handwired/dactyl_manuform/6x6/info.json | 368 +- keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h | 37 - .../handwired/dactyl_manuform/6x6_4/info.json | 194 +- .../dactyl_manuform/6x6_kinesis/6x6_kinesis.h | 37 - .../dactyl_manuform/6x6_kinesis/info.json | 194 +- keyboards/handwired/dactyl_manuform/6x7/6x7.h | 35 - keyboards/handwired/dactyl_manuform/6x7/info.json | 206 +- .../handwired/dactyl_manuform/dmote/62key/62key.h | 44 - .../dactyl_manuform/dmote/62key/info.json | 126 +- .../handwired/dactyl_promicro/dactyl_promicro.h | 29 - keyboards/handwired/dactyl_promicro/info.json | 153 +- keyboards/handwired/dactyl_rah/dactyl_rah.h | 44 - keyboards/handwired/dactyl_rah/info.json | 163 +- keyboards/handwired/heisenberg/heisenberg.h | 39 - keyboards/handwired/heisenberg/info.json | 107 +- keyboards/handwired/pterodactyl/info.json | 141 +- keyboards/handwired/pterodactyl/matrix.c | 1 - keyboards/handwired/pterodactyl/pterodactyl.c | 2 +- keyboards/handwired/pterodactyl/pterodactyl.h | 38 - keyboards/handwired/skakunm_dactyl/info.json | 88 +- .../handwired/skakunm_dactyl/skakunm_dactyl.h | 25 - keyboards/handwired/steamvan/rev1/info.json | 217 +- keyboards/handwired/steamvan/rev1/rev1.h | 80 - .../tractyl_manuform/4x6_right/4x6_right.c | 2 +- .../tractyl_manuform/4x6_right/4x6_right.h | 46 - .../handwired/tractyl_manuform/4x6_right/info.json | 113 +- .../tractyl_manuform/5x6_right/5x6_right.c | 2 +- .../tractyl_manuform/5x6_right/5x6_right.h | 49 - .../tractyl_manuform/5x6_right/f411/f411.c | 2 +- .../handwired/tractyl_manuform/5x6_right/info.json | 139 +- .../handwired/tractyl_manuform/tractyl_manuform.h | 6 - keyboards/handwired/twig/twig50/info.json | 66 +- keyboards/handwired/twig/twig50/twig50.h | 20 - keyboards/hhkb/jp/info.json | 144 +- keyboards/hhkb/jp/jp.h | 28 - keyboards/io_mini1800/info.json | 376 +- keyboards/io_mini1800/io_mini1800.c | 4 - keyboards/io_mini1800/io_mini1800.h | 52 - keyboards/jacky_studio/bear_65/rev2/info.json | 631 +-- keyboards/jacky_studio/bear_65/rev2/rev2.h | 76 - keyboards/jacky_studio/s7_elephant/rev1/info.json | 4660 +++++++++++--------- keyboards/jacky_studio/s7_elephant/rev1/rev1.h | 869 ---- keyboards/jae/j01/info.json | 188 +- keyboards/jae/j01/j01.c | 2 +- keyboards/jae/j01/j01.h | 61 - keyboards/jagdpietr/drakon/drakon.c | 2 +- keyboards/jagdpietr/drakon/drakon.h | 91 - keyboards/jagdpietr/drakon/info.json | 161 +- keyboards/kb_elmo/vertex/info.json | 376 +- keyboards/kb_elmo/vertex/vertex.h | 69 - keyboards/keybage/radpad/info.json | 114 +- keyboards/keybage/radpad/radpad.h | 87 - keyboards/kingly_keys/ave/staggered/info.json | 234 +- keyboards/kingly_keys/ave/staggered/staggered.h | 52 - keyboards/knobgoblin/info.json | 47 +- keyboards/knobgoblin/knobgoblin.c | 2 +- keyboards/knobgoblin/knobgoblin.h | 32 - keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c | 2 +- keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h | 30 - keyboards/kprepublic/bm40hsrgb/info.json | 97 +- keyboards/kwub/bloop/bloop.h | 76 - keyboards/kwub/bloop/info.json | 304 +- keyboards/labbe/labbeminiv1/info.json | 8 +- keyboards/labbe/labbeminiv1/labbeminiv1.c | 2 +- keyboards/labbe/labbeminiv1/labbeminiv1.h | 20 - keyboards/latincompass/latin47ble/info.json | 95 +- keyboards/latincompass/latin47ble/latin47ble.h | 30 - keyboards/latincompass/latinpadble/info.json | 34 +- keyboards/latincompass/latinpadble/latinpadble.c | 16 - keyboards/latincompass/latinpadble/latinpadble.h | 33 - keyboards/lm_keyboard/lm60n/info.json | 1043 ++--- keyboards/lm_keyboard/lm60n/lm60n.h | 204 - keyboards/lw67/info.json | 335 +- keyboards/lw67/lw67.c | 17 - keyboards/lw67/lw67.h | 131 - keyboards/lw75/info.json | 423 +- keyboards/lw75/lw75.c | 4 - keyboards/lw75/lw75.h | 138 - keyboards/machkeyboards/mach3/info.json | 47 +- keyboards/machkeyboards/mach3/mach3.c | 2 +- keyboards/machkeyboards/mach3/mach3.h | 29 - keyboards/macro1/info.json | 174 +- keyboards/macro1/macro1.c | 16 - keyboards/macro1/macro1.h | 115 - keyboards/marksard/treadstone48/rev2/info.json | 304 +- keyboards/marksard/treadstone48/rev2/rev2.h | 48 - keyboards/meme/info.json | 313 +- keyboards/meme/meme.h | 97 - keyboards/merge/um70/info.json | 366 +- keyboards/merge/um70/um70.c | 2 +- keyboards/merge/um70/um70.h | 97 - keyboards/merge/um80/info.json | 116 +- keyboards/merge/um80/um80.c | 2 +- keyboards/merge/um80/um80.h | 43 - keyboards/mode/m80v1/m80s/info.json | 193 +- keyboards/mode/m80v1/m80s/m80s.h | 32 - keyboards/mode/m80v2/m80v2s/info.json | 197 +- keyboards/mode/m80v2/m80v2s/m80v2s.h | 39 - keyboards/moonlander/info.json | 89 +- keyboards/moonlander/moonlander.c | 2 +- keyboards/moonlander/moonlander.h | 24 - keyboards/ms_sculpt/info.json | 178 +- keyboards/ms_sculpt/ms_sculpt.h | 25 - keyboards/nightly_boards/adellein/adellein.h | 35 - keyboards/nightly_boards/adellein/info.json | 214 +- keyboards/nopunin10did/jabberwocky/v1/info.json | 366 +- keyboards/nopunin10did/jabberwocky/v1/v1.h | 65 - keyboards/nopunin10did/jabberwocky/v2/info.json | 498 ++- keyboards/nopunin10did/jabberwocky/v2/v2.h | 65 - keyboards/nyhxis/nfr_70/info.json | 318 +- keyboards/nyhxis/nfr_70/nfr_70.h | 63 - keyboards/owlab/suit80/ansi/ansi.h | 36 - keyboards/owlab/suit80/ansi/info.json | 188 +- keyboards/quad_h/lb75/info.json | 356 +- keyboards/quad_h/lb75/lb75.c | 2 +- keyboards/quad_h/lb75/lb75.h | 73 - keyboards/rart/rartlite/info.json | 242 +- keyboards/rart/rartlite/rartlite.c | 2 +- keyboards/rart/rartlite/rartlite.h | 50 - keyboards/redscarf_iiplus/verb/info.json | 184 +- keyboards/redscarf_iiplus/verb/verb.h | 59 - keyboards/reviung/reviung34/info.json | 148 +- keyboards/reviung/reviung34/reviung34.h | 52 - keyboards/rominronin/katana60/rev2/info.json | 1108 ++--- keyboards/rominronin/katana60/rev2/rev2.h | 238 - keyboards/sck/m0116b/info.json | 347 +- keyboards/sck/m0116b/m0116b.h | 58 - keyboards/sentraq/s65_plus/info.json | 322 +- keyboards/sentraq/s65_plus/s65_plus.h | 34 - keyboards/sirius/uni660/rev2/ansi/ansi.h | 25 - keyboards/sirius/uni660/rev2/ansi/info.json | 182 +- keyboards/sirius/uni660/rev2/iso/info.json | 184 +- keyboards/sirius/uni660/rev2/iso/iso.h | 25 - keyboards/sirius/uni660/rev2/rev2.h | 6 - keyboards/tetris/info.json | 61 +- keyboards/tetris/tetris.h | 19 - keyboards/the_royal/liminal/info.json | 107 +- keyboards/the_royal/liminal/liminal.h | 19 - keyboards/the_royal/schwann/info.json | 277 +- keyboards/the_royal/schwann/schwann.h | 44 - keyboards/tokyokeyboard/alix40/alix40.h | 29 - keyboards/tokyokeyboard/alix40/info.json | 284 +- keyboards/tominabox1/underscore33/rev1/info.json | 87 +- keyboards/tominabox1/underscore33/rev1/rev1.h | 46 - keyboards/tominabox1/underscore33/rev2/info.json | 88 +- keyboards/tominabox1/underscore33/rev2/rev2.h | 46 - keyboards/walletburner/cajal/cajal.h | 43 - keyboards/walletburner/cajal/info.json | 120 +- keyboards/wavtype/foundation/foundation.h | 85 - keyboards/wavtype/foundation/info.json | 688 +-- keyboards/westfoxtrot/aanzee/aanzee.h | 60 - keyboards/westfoxtrot/aanzee/info.json | 152 +- keyboards/westfoxtrot/cypher/rev1/info.json | 383 +- keyboards/westfoxtrot/cypher/rev1/rev1.c | 2 +- keyboards/westfoxtrot/cypher/rev1/rev1.h | 68 - keyboards/westm/westm9/info.json | 20 +- keyboards/westm/westm9/rev1/rev1.c | 2 +- keyboards/westm/westm9/rev2/rev2.c | 2 +- keyboards/westm/westm9/westm9.h | 30 - keyboards/xelus/rs108/info.json | 235 +- keyboards/xelus/rs108/rs108.h | 42 - keyboards/xelus/xs108/info.json | 245 +- keyboards/xelus/xs108/xs108.h | 56 - keyboards/ydkb/yd68/info.json | 75 +- keyboards/ydkb/yd68/yd68.c | 2 +- keyboards/ydkb/yd68/yd68.h | 59 - 288 files changed, 19933 insertions(+), 21424 deletions(-) delete mode 100644 keyboards/aeboards/aegis/aegis.h delete mode 100644 keyboards/aeboards/ext65/rev1/rev1.h delete mode 100644 keyboards/aeboards/ext65/rev2/rev2.h delete mode 100644 keyboards/aeboards/ext65/rev3/rev3.h delete mode 100644 keyboards/alfredslab/swift65/hotswap/hotswap.h delete mode 100644 keyboards/alfredslab/swift65/solder/solder.h delete mode 100644 keyboards/baguette/baguette.h delete mode 100644 keyboards/bbrfkr/dynamis/dynamis.h delete mode 100644 keyboards/bear_face/v1/v1.h delete mode 100644 keyboards/bear_face/v2/v2.h delete mode 100644 keyboards/boardrun/classic/classic.h delete mode 100644 keyboards/bolsa/damapad/damapad.h delete mode 100644 keyboards/capsunlocked/cu24/cu24.h delete mode 100644 keyboards/chavdai40/rev1/rev1.h delete mode 100644 keyboards/chavdai40/rev2/rev2.h delete mode 100644 keyboards/checkerboards/candybar_ortho/candybar_ortho.h delete mode 100644 keyboards/checkerboards/plexus75/plexus75.h delete mode 100644 keyboards/checkerboards/plexus75_he/plexus75_he.h delete mode 100644 keyboards/checkerboards/quark_plus/quark_plus.h delete mode 100644 keyboards/checkerboards/quark_squared/quark_squared.c delete mode 100644 keyboards/checkerboards/quark_squared/quark_squared.h delete mode 100644 keyboards/coarse/ixora/ixora.h delete mode 100644 keyboards/converter/adb_usb/adb_usb.h delete mode 100644 keyboards/converter/m0110_usb/m0110_usb.h delete mode 100644 keyboards/converter/sun_usb/type5/type5.h delete mode 100644 keyboards/crimsonkeyboards/resume1800/resume1800.h delete mode 100644 keyboards/delikeeb/vaneelaex/vaneelaex.h delete mode 100644 keyboards/deltasplit75/v2/v2.h delete mode 100644 keyboards/dinofizz/fnrow/v1/v1.h delete mode 100644 keyboards/drhigsby/bkf/bkf.h delete mode 100644 keyboards/drhigsby/packrat/packrat.c delete mode 100644 keyboards/drhigsby/packrat/packrat.h delete mode 100644 keyboards/ebastler/isometria_75/rev1/rev1.h delete mode 100644 keyboards/ergoslab/rev1/rev1.h delete mode 100644 keyboards/eu_isolation/eu_isolation.h delete mode 100644 keyboards/evolv/evolv.c delete mode 100644 keyboards/evolv/evolv.h delete mode 100644 keyboards/exclusive/e85/hotswap/hotswap.h delete mode 100644 keyboards/eyeohdesigns/babyv/babyv.h delete mode 100644 keyboards/eyeohdesigns/sprh/sprh.c delete mode 100644 keyboards/eyeohdesigns/sprh/sprh.h delete mode 100644 keyboards/eyeohdesigns/theboulevard/theboulevard.c delete mode 100644 keyboards/eyeohdesigns/theboulevard/theboulevard.h delete mode 100644 keyboards/flehrad/numbrero/numbrero.h delete mode 100644 keyboards/gboards/butterstick/butterstick.h delete mode 100644 keyboards/gorthage_truck/gorthage_truck.c delete mode 100644 keyboards/gorthage_truck/gorthage_truck.h delete mode 100644 keyboards/handwired/aranck/aranck.h delete mode 100644 keyboards/handwired/concertina/64key/64key.h delete mode 100644 keyboards/handwired/curiosity/curiosity.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/5x6.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x7/5x7.h delete mode 100644 keyboards/handwired/dactyl_manuform/6x6/6x6.h delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h delete mode 100644 keyboards/handwired/dactyl_manuform/6x7/6x7.h delete mode 100644 keyboards/handwired/dactyl_manuform/dmote/62key/62key.h delete mode 100644 keyboards/handwired/dactyl_promicro/dactyl_promicro.h delete mode 100644 keyboards/handwired/dactyl_rah/dactyl_rah.h delete mode 100644 keyboards/handwired/heisenberg/heisenberg.h delete mode 100644 keyboards/handwired/pterodactyl/pterodactyl.h delete mode 100644 keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h delete mode 100644 keyboards/handwired/steamvan/rev1/rev1.h delete mode 100644 keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h delete mode 100644 keyboards/handwired/twig/twig50/twig50.h delete mode 100644 keyboards/hhkb/jp/jp.h delete mode 100644 keyboards/io_mini1800/io_mini1800.c delete mode 100644 keyboards/io_mini1800/io_mini1800.h delete mode 100644 keyboards/jacky_studio/bear_65/rev2/rev2.h delete mode 100644 keyboards/jacky_studio/s7_elephant/rev1/rev1.h delete mode 100644 keyboards/jae/j01/j01.h delete mode 100644 keyboards/jagdpietr/drakon/drakon.h delete mode 100644 keyboards/kb_elmo/vertex/vertex.h delete mode 100644 keyboards/keybage/radpad/radpad.h delete mode 100644 keyboards/kingly_keys/ave/staggered/staggered.h delete mode 100644 keyboards/knobgoblin/knobgoblin.h delete mode 100755 keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h delete mode 100644 keyboards/kwub/bloop/bloop.h delete mode 100644 keyboards/labbe/labbeminiv1/labbeminiv1.h delete mode 100644 keyboards/latincompass/latin47ble/latin47ble.h delete mode 100644 keyboards/latincompass/latinpadble/latinpadble.c delete mode 100644 keyboards/latincompass/latinpadble/latinpadble.h delete mode 100644 keyboards/lm_keyboard/lm60n/lm60n.h delete mode 100644 keyboards/lw67/lw67.c delete mode 100644 keyboards/lw67/lw67.h delete mode 100644 keyboards/lw75/lw75.c delete mode 100644 keyboards/lw75/lw75.h delete mode 100644 keyboards/machkeyboards/mach3/mach3.h delete mode 100644 keyboards/macro1/macro1.c delete mode 100644 keyboards/macro1/macro1.h delete mode 100644 keyboards/marksard/treadstone48/rev2/rev2.h delete mode 100644 keyboards/meme/meme.h delete mode 100644 keyboards/merge/um70/um70.h delete mode 100644 keyboards/merge/um80/um80.h delete mode 100644 keyboards/mode/m80v1/m80s/m80s.h delete mode 100644 keyboards/mode/m80v2/m80v2s/m80v2s.h delete mode 100644 keyboards/ms_sculpt/ms_sculpt.h delete mode 100644 keyboards/nopunin10did/jabberwocky/v1/v1.h delete mode 100644 keyboards/nopunin10did/jabberwocky/v2/v2.h delete mode 100644 keyboards/nyhxis/nfr_70/nfr_70.h delete mode 100644 keyboards/owlab/suit80/ansi/ansi.h delete mode 100644 keyboards/quad_h/lb75/lb75.h delete mode 100644 keyboards/rart/rartlite/rartlite.h delete mode 100755 keyboards/redscarf_iiplus/verb/verb.h delete mode 100755 keyboards/reviung/reviung34/reviung34.h delete mode 100644 keyboards/rominronin/katana60/rev2/rev2.h delete mode 100644 keyboards/sck/m0116b/m0116b.h delete mode 100644 keyboards/sentraq/s65_plus/s65_plus.h delete mode 100644 keyboards/sirius/uni660/rev2/ansi/ansi.h delete mode 100644 keyboards/sirius/uni660/rev2/iso/iso.h delete mode 100755 keyboards/tetris/tetris.h delete mode 100644 keyboards/the_royal/liminal/liminal.h delete mode 100644 keyboards/the_royal/schwann/schwann.h delete mode 100644 keyboards/tokyokeyboard/alix40/alix40.h delete mode 100644 keyboards/tominabox1/underscore33/rev1/rev1.h delete mode 100644 keyboards/tominabox1/underscore33/rev2/rev2.h delete mode 100644 keyboards/walletburner/cajal/cajal.h delete mode 100644 keyboards/wavtype/foundation/foundation.h delete mode 100644 keyboards/westfoxtrot/aanzee/aanzee.h delete mode 100644 keyboards/westfoxtrot/cypher/rev1/rev1.h delete mode 100644 keyboards/westm/westm9/westm9.h delete mode 100644 keyboards/xelus/rs108/rs108.h delete mode 100644 keyboards/xelus/xs108/xs108.h delete mode 100644 keyboards/ydkb/yd68/yd68.h (limited to 'keyboards') diff --git a/keyboards/aeboards/aegis/aegis.h b/keyboards/aeboards/aegis/aegis.h deleted file mode 100644 index 95ffb73dde..0000000000 --- a/keyboards/aeboards/aegis/aegis.h +++ /dev/null @@ -1,43 +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_aegis( \ - K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \ - K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0108, \ - K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, \ - K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606, K0706, K0607, K0707, K0608, \ - K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, K0906, K0807, K0907, K0808, K0908, \ - K1000, K1100, K1001, K1101, K1002, K1102, K1003, K1103, K1105, K1107, K1008, K1108 \ -) { \ - { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008 }, \ - { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \ - { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208 }, \ - { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \ - { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408 }, \ - { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \ - { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608 }, \ - { K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, _____ }, \ - { K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808 }, \ - { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908 }, \ - { K1000, K1001, K1002, K1003, _____, _____, _____, _____, K1008 }, \ - { K1100, K1101, K1102, K1103, _____, K1105, _____, K1107, K1108 } \ -} diff --git a/keyboards/aeboards/aegis/info.json b/keyboards/aeboards/aegis/info.json index 63b9ea551e..5fe143318f 100644 --- a/keyboards/aeboards/aegis/info.json +++ b/keyboards/aeboards/aegis/info.json @@ -18,123 +18,123 @@ "layouts": { "LAYOUT_aegis": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - - {"x": 4.5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - - {"x": 4.5, "y": 1.5}, - {"x": 5.5, "y": 1.5}, - {"x": 6.5, "y": 1.5}, - {"x": 7.5, "y": 1.5}, - {"x": 8.5, "y": 1.5}, - {"x": 9.5, "y": 1.5}, - {"x": 10.5, "y": 1.5}, - {"x": 11.5, "y": 1.5}, - {"x": 12.5, "y": 1.5}, - {"x": 13.5, "y": 1.5}, - {"x": 14.5, "y": 1.5}, - {"x": 15.5, "y": 1.5}, - {"x": 16.5, "y": 1.5}, - {"x": 17.5, "y": 1.5}, - {"x": 18.5, "y": 1.5}, - - {"x": 0, "y": 2.5}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2.5}, - - {"x": 4.5, "y": 2.5, "w": 1.5}, - {"x": 6, "y": 2.5}, - {"x": 7, "y": 2.5}, - {"x": 8, "y": 2.5}, - {"x": 9, "y": 2.5}, - {"x": 10, "y": 2.5}, - {"x": 11, "y": 2.5}, - {"x": 12, "y": 2.5}, - {"x": 13, "y": 2.5}, - {"x": 14, "y": 2.5}, - {"x": 15, "y": 2.5}, - {"x": 16, "y": 2.5}, - {"x": 17, "y": 2.5}, - {"x": 18, "y": 2.5, "w": 1.5}, - - {"x": 0, "y": 3.5}, - {"x": 1, "y": 3.5}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3.5}, - - {"x": 4.5, "y": 3.5, "w": 1.75}, - {"x": 6.25, "y": 3.5}, - {"x": 7.25, "y": 3.5}, - {"x": 8.25, "y": 3.5}, - {"x": 9.25, "y": 3.5}, - {"x": 10.25, "y": 3.5}, - {"x": 11.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.5}, - {"x": 14.25, "y": 3.5}, - {"x": 15.25, "y": 3.5}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, - - {"x": 0, "y": 4.5}, - {"x": 1, "y": 4.5}, - {"x": 2, "y": 4.5}, - {"x": 3, "y": 4.5}, - - {"x": 4.25, "y": 4.75}, - - {"x": 5.5, "y": 4.5, "w": 1.25}, - {"x": 6.75, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4.5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4.5}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.5}, - {"x": 14.75, "y": 4.5}, - {"x": 15.75, "y": 4.5}, - {"x": 16.75, "y": 4.5, "w": 1.75}, - {"x": 18.5, "y": 4.5}, - - {"x": 0, "y": 5.5}, - {"x": 1, "y": 5.5}, - {"x": 2, "y": 5.5}, - - {"x": 3.25, "y": 5.75}, - {"x": 4.25, "y": 5.75}, - {"x": 5.25, "y": 5.75}, - - {"x": 6.5, "y": 5.5, "w": 1.25}, - {"x": 7.75, "y": 5.5, "w": 1.25}, - {"x": 9, "y": 5.5, "w": 6.25}, - {"x": 15.25, "y": 5.5, "w": 1.5}, - {"x": 16.75, "y": 5.5, "w": 1.25}, - {"x": 18, "y": 5.5, "w": 1.5} + {"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.5, "y": 0}, + + {"matrix": [1, 2], "x": 6.5, "y": 0}, + {"matrix": [0, 3], "x": 7.5, "y": 0}, + {"matrix": [1, 3], "x": 8.5, "y": 0}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 15.5, "y": 0}, + {"matrix": [0, 7], "x": 16.5, "y": 0}, + {"matrix": [1, 7], "x": 17.5, "y": 0}, + {"matrix": [0, 8], "x": 18.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + + {"matrix": [2, 2], "x": 4.5, "y": 1.5}, + {"matrix": [3, 2], "x": 5.5, "y": 1.5}, + {"matrix": [2, 3], "x": 6.5, "y": 1.5}, + {"matrix": [3, 3], "x": 7.5, "y": 1.5}, + {"matrix": [2, 4], "x": 8.5, "y": 1.5}, + {"matrix": [3, 4], "x": 9.5, "y": 1.5}, + {"matrix": [2, 5], "x": 10.5, "y": 1.5}, + {"matrix": [3, 5], "x": 11.5, "y": 1.5}, + {"matrix": [2, 6], "x": 12.5, "y": 1.5}, + {"matrix": [3, 6], "x": 13.5, "y": 1.5}, + {"matrix": [2, 7], "x": 14.5, "y": 1.5}, + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + {"matrix": [2, 8], "x": 16.5, "y": 1.5}, + {"matrix": [3, 8], "x": 17.5, "y": 1.5}, + {"matrix": [1, 8], "x": 18.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [5, 0], "x": 1, "y": 2.5}, + {"matrix": [4, 1], "x": 2, "y": 2.5}, + {"matrix": [5, 1], "x": 3, "y": 2.5}, + + {"matrix": [4, 2], "x": 4.5, "y": 2.5, "w": 1.5}, + {"matrix": [5, 2], "x": 6, "y": 2.5}, + {"matrix": [4, 3], "x": 7, "y": 2.5}, + {"matrix": [5, 3], "x": 8, "y": 2.5}, + {"matrix": [4, 4], "x": 9, "y": 2.5}, + {"matrix": [5, 4], "x": 10, "y": 2.5}, + {"matrix": [4, 5], "x": 11, "y": 2.5}, + {"matrix": [5, 5], "x": 12, "y": 2.5}, + {"matrix": [4, 6], "x": 13, "y": 2.5}, + {"matrix": [5, 6], "x": 14, "y": 2.5}, + {"matrix": [4, 7], "x": 15, "y": 2.5}, + {"matrix": [5, 7], "x": 16, "y": 2.5}, + {"matrix": [4, 8], "x": 17, "y": 2.5}, + {"matrix": [5, 8], "x": 18, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5}, + {"matrix": [7, 0], "x": 1, "y": 3.5}, + {"matrix": [6, 1], "x": 2, "y": 3.5}, + {"matrix": [7, 1], "x": 3, "y": 3.5}, + + {"matrix": [6, 2], "x": 4.5, "y": 3.5, "w": 1.75}, + {"matrix": [7, 2], "x": 6.25, "y": 3.5}, + {"matrix": [6, 3], "x": 7.25, "y": 3.5}, + {"matrix": [7, 3], "x": 8.25, "y": 3.5}, + {"matrix": [6, 4], "x": 9.25, "y": 3.5}, + {"matrix": [7, 4], "x": 10.25, "y": 3.5}, + {"matrix": [6, 5], "x": 11.25, "y": 3.5}, + {"matrix": [7, 5], "x": 12.25, "y": 3.5}, + {"matrix": [6, 6], "x": 13.25, "y": 3.5}, + {"matrix": [7, 6], "x": 14.25, "y": 3.5}, + {"matrix": [6, 7], "x": 15.25, "y": 3.5}, + {"matrix": [7, 7], "x": 16.25, "y": 3.5}, + {"matrix": [6, 8], "x": 17.25, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.5}, + {"matrix": [9, 0], "x": 1, "y": 4.5}, + {"matrix": [8, 1], "x": 2, "y": 4.5}, + {"matrix": [9, 1], "x": 3, "y": 4.5}, + + {"matrix": [8, 2], "x": 4.25, "y": 4.75}, + + {"matrix": [9, 2], "x": 5.5, "y": 4.5, "w": 1.25}, + {"matrix": [8, 3], "x": 6.75, "y": 4.5}, + {"matrix": [9, 3], "x": 7.75, "y": 4.5}, + {"matrix": [8, 4], "x": 8.75, "y": 4.5}, + {"matrix": [9, 4], "x": 9.75, "y": 4.5}, + {"matrix": [8, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 5], "x": 11.75, "y": 4.5}, + {"matrix": [8, 6], "x": 12.75, "y": 4.5}, + {"matrix": [9, 6], "x": 13.75, "y": 4.5}, + {"matrix": [8, 7], "x": 14.75, "y": 4.5}, + {"matrix": [9, 7], "x": 15.75, "y": 4.5}, + {"matrix": [8, 8], "x": 16.75, "y": 4.5, "w": 1.75}, + {"matrix": [9, 8], "x": 18.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5}, + {"matrix": [11, 0], "x": 1, "y": 5.5}, + {"matrix": [10, 1], "x": 2, "y": 5.5}, + + {"matrix": [11, 1], "x": 3.25, "y": 5.75}, + {"matrix": [10, 2], "x": 4.25, "y": 5.75}, + {"matrix": [11, 2], "x": 5.25, "y": 5.75}, + + {"matrix": [10, 3], "x": 6.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 3], "x": 7.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 9, "y": 5.5, "w": 6.25}, + {"matrix": [11, 7], "x": 15.25, "y": 5.5, "w": 1.5}, + {"matrix": [10, 8], "x": 16.75, "y": 5.5, "w": 1.25}, + {"matrix": [11, 8], "x": 18, "y": 5.5, "w": 1.5} ] } } diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/info.json index d56d3902c2..ffe8d2443e 100644 --- a/keyboards/aeboards/ext65/rev1/info.json +++ b/keyboards/aeboards/ext65/rev1/info.json @@ -17,103 +17,104 @@ "layouts": { "LAYOUT_ext65": { "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": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "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": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0}, + {"matrix": [1, 7], "x": 15.5, "y": 0}, + {"matrix": [0, 8], "x": 16.5, "y": 0}, + {"matrix": [1, 8], "x": 17.5, "y": 0}, + {"matrix": [5, 8], "x": 18.5, "y": 0}, + {"matrix": [0, 9], "x": 19.5, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 4.5, "y": 1, "w": 1.5}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1, "w": 1.5}, - {"x": 19.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12, "y": 1}, + {"matrix": [2, 6], "x": 13, "y": 1}, + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [2, 7], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [2, 8], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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}, - {"x": 4.5, "y": 2, "w": 1.75}, - {"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": 16.25, "y": 2}, - {"x": 17.25, "y": 2, "w": 2.25}, - {"x": 19.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2}, + {"matrix": [5, 6], "x": 14.25, "y": 2}, + {"matrix": [4, 7], "x": 15.25, "y": 2}, + {"matrix": [5, 7], "x": 16.25, "y": 2}, + {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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}, - {"x": 4.5, "y": 3, "w": 2.25}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3, "w": 1.75}, - {"x": 18.5, "y": 3}, - {"x": 19.5, "y": 3}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 6.75, "y": 3}, + {"matrix": [6, 3], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [6, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 3}, + {"matrix": [6, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 5], "x": 12.75, "y": 3}, + {"matrix": [6, 6], "x": 13.75, "y": 3}, + {"matrix": [7, 6], "x": 14.75, "y": 3}, + {"matrix": [6, 7], "x": 15.75, "y": 3}, + {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [6, 8], "x": 18.5, "y": 3}, + {"matrix": [7, 9], "x": 19.5, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4.5, "y": 4, "w": 1.5}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4, "w": 1.5}, - {"x": 8.5, "y": 4, "w": 6.25}, - {"x": 14.75, "y": 4, "w": 1.25}, - {"x": 16, "y": 4}, + {"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}, - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4}, - {"x": 19.5, "y": 4} + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 6, "y": 4}, + {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5}, + {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25}, + {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [9, 9], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/aeboards/ext65/rev1/rev1.c b/keyboards/aeboards/ext65/rev1/rev1.c index c1e81204db..adbae94816 100644 --- a/keyboards/aeboards/ext65/rev1/rev1.c +++ b/keyboards/aeboards/ext65/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" void keyboard_pre_init_user(void) { // Call the keyboard pre init code. diff --git a/keyboards/aeboards/ext65/rev1/rev1.h b/keyboards/aeboards/ext65/rev1/rev1.h deleted file mode 100644 index fadfef6ddc..0000000000 --- a/keyboards/aeboards/ext65/rev1/rev1.h +++ /dev/null @@ -1,40 +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" - -#define ____ KC_NO - -#define LAYOUT_ext65( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \ - K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \ - K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \ - { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \ - { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \ - { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \ -} diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json index 159f8e8787..bfdcae090e 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/info.json @@ -26,103 +26,104 @@ "layouts": { "LAYOUT_ext65": { "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": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "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": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - {"x": 17.5, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0}, + {"matrix": [1, 7], "x": 15.5, "y": 0}, + {"matrix": [0, 8], "x": 16.5, "y": 0}, + {"matrix": [1, 8], "x": 17.5, "y": 0}, + {"matrix": [5, 8], "x": 18.5, "y": 0}, + {"matrix": [0, 9], "x": 19.5, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "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}, - {"x": 4.5, "y": 1, "w": 1.5}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1, "w": 1.5}, - {"x": 19.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12, "y": 1}, + {"matrix": [2, 6], "x": 13, "y": 1}, + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [2, 7], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [2, 8], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "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}, - {"x": 4.5, "y": 2, "w": 1.75}, - {"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": 16.25, "y": 2}, - {"x": 17.25, "y": 2, "w": 2.25}, - {"x": 19.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2}, + {"matrix": [5, 6], "x": 14.25, "y": 2}, + {"matrix": [4, 7], "x": 15.25, "y": 2}, + {"matrix": [5, 7], "x": 16.25, "y": 2}, + {"matrix": [4, 8], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "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}, - {"x": 4.5, "y": 3, "w": 2.25}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3, "w": 1.75}, - {"x": 18.5, "y": 3}, - {"x": 19.5, "y": 3}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 6.75, "y": 3}, + {"matrix": [6, 3], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [6, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 3}, + {"matrix": [6, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 5], "x": 12.75, "y": 3}, + {"matrix": [6, 6], "x": 13.75, "y": 3}, + {"matrix": [7, 6], "x": 14.75, "y": 3}, + {"matrix": [6, 7], "x": 15.75, "y": 3}, + {"matrix": [7, 8], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [6, 8], "x": 18.5, "y": 3}, + {"matrix": [7, 9], "x": 19.5, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4.5, "y": 4, "w": 1.5}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4, "w": 1.5}, - {"x": 8.5, "y": 4, "w": 6.25}, - {"x": 14.75, "y": 4, "w": 1.25}, - {"x": 16, "y": 4}, + {"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}, - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4}, - {"x": 19.5, "y": 4} + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 6, "y": 4}, + {"matrix": [8, 3], "x": 7, "y": 4, "w": 1.5}, + {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 6.25}, + {"matrix": [9, 6], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [8, 7], "x": 16, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [9, 9], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/aeboards/ext65/rev2/rev2.c b/keyboards/aeboards/ext65/rev2/rev2.c index 998a91ccfc..6fe2d469dc 100644 --- a/keyboards/aeboards/ext65/rev2/rev2.c +++ b/keyboards/aeboards/ext65/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" // Tested and verified working on ext65rev2 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } diff --git a/keyboards/aeboards/ext65/rev2/rev2.h b/keyboards/aeboards/ext65/rev2/rev2.h deleted file mode 100644 index fadfef6ddc..0000000000 --- a/keyboards/aeboards/ext65/rev2/rev2.h +++ /dev/null @@ -1,40 +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" - -#define ____ KC_NO - -#define LAYOUT_ext65( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K508, K009, \ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K209, \ - K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K408, K409, \ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K708, K608, K709, \ - K800, K900, K801, K901, K802, K902, K803, K805, K906, K807, K908, K808, K909 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, ____ }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, ____ }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, ____ }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, ____ }, \ - { K700, K701, K702, K703, K704, K705, K706, ____, K708, K709 }, \ - { K800, K801, K802, K803, ____, K805, ____, K807, K808, ____ }, \ - { K900, K901, K902, ____, ____, ____, K906, ____, K908, K909 } \ -} diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json index 90d59a943c..bb507545a0 100644 --- a/keyboards/aeboards/ext65/rev3/info.json +++ b/keyboards/aeboards/ext65/rev3/info.json @@ -22,425 +22,99 @@ "layouts": { "LAYOUT_ext65_hotswap": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "label": "Esc", - "x": 4.5, - "y": 0 - }, - { - "label": "!", - "x": 5.5, - "y": 0 - }, - { - "label": "@", - "x": 6.5, - "y": 0 - }, - { - "label": "#", - "x": 7.5, - "y": 0 - }, - { - "label": "$", - "x": 8.5, - "y": 0 - }, - { - "label": "%", - "x": 9.5, - "y": 0 - }, - { - "label": "^", - "x": 10.5, - "y": 0 - }, - { - "label": "&", - "x": 11.5, - "y": 0 - }, - { - "label": "*", - "x": 12.5, - "y": 0 - }, - { - "label": "(", - "x": 13.5, - "y": 0 - }, - { - "label": ")", - "x": 14.5, - "y": 0 - }, - { - "label": "_", - "x": 15.5, - "y": 0 - }, - { - "label": "+", - "x": 16.5, - "y": 0 - }, - { - "label": "Backspace", - "x": 17.5, - "y": 0, - "w": 2 - }, - { - "label": "Home", - "x": 19.5, - "y": 0 - }, - { - "x": 0, - "y": 1, - "h": 2 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "label": "Tab", - "x": 4.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 6, - "y": 1 - }, - { - "label": "W", - "x": 7, - "y": 1 - }, - { - "label": "E", - "x": 8, - "y": 1 - }, - { - "label": "R", - "x":