aboutsummaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/108key_trackpoint/108key_trackpoint.h23
-rw-r--r--keyboards/handwired/108key_trackpoint/info.json242
-rw-r--r--keyboards/handwired/3dfoxc/3dfoxc.h38
-rw-r--r--keyboards/handwired/3dfoxc/info.json425
-rw-r--r--keyboards/handwired/42/42.h32
-rw-r--r--keyboards/handwired/42/info.json88
-rw-r--r--keyboards/handwired/acacia/acacia.h49
-rw-r--r--keyboards/handwired/acacia/info.json87
-rw-r--r--keyboards/handwired/aek64/aek64.h34
-rw-r--r--keyboards/handwired/aek64/info.json72
-rw-r--r--keyboards/handwired/aim65/aim65.h36
-rw-r--r--keyboards/handwired/aim65/info.json112
-rw-r--r--keyboards/handwired/amigopunk/amigopunk.h35
-rw-r--r--keyboards/handwired/amigopunk/info.json160
-rw-r--r--keyboards/handwired/angel/angel.h40
-rw-r--r--keyboards/handwired/angel/info.json53
-rw-r--r--keyboards/handwired/atreus50/atreus50.c2
-rw-r--r--keyboards/handwired/atreus50/atreus50.h21
-rw-r--r--keyboards/handwired/atreus50/info.json100
-rw-r--r--keyboards/handwired/bigmac/bigmac.h33
-rw-r--r--keyboards/handwired/bigmac/info.json178
-rw-r--r--keyboards/handwired/bolek/bolek.h43
-rw-r--r--keyboards/handwired/bolek/info.json79
-rw-r--r--keyboards/handwired/brain/brain.h28
-rw-r--r--keyboards/handwired/brain/info.json117
-rw-r--r--keyboards/handwired/carpolly/carpolly.h36
-rw-r--r--keyboards/handwired/carpolly/info.json89
-rw-r--r--keyboards/handwired/chiron/chiron.h42
-rw-r--r--keyboards/handwired/chiron/info.json148
-rw-r--r--keyboards/handwired/cmd60/cmd60.h19
-rw-r--r--keyboards/handwired/cmd60/info.json126
-rw-r--r--keyboards/handwired/consolekeyboard/18key/18key.h26
-rw-r--r--keyboards/handwired/consolekeyboard/18key/info.json41
-rw-r--r--keyboards/handwired/consolekeyboard/20key/20key.h26
-rw-r--r--keyboards/handwired/consolekeyboard/20key/info.json46
-rw-r--r--keyboards/handwired/consolekeyboard/27key/27key.h28
-rw-r--r--keyboards/handwired/consolekeyboard/27key/info.json62
-rw-r--r--keyboards/handwired/consolekeyboard/30key/30key.h28
-rw-r--r--keyboards/handwired/consolekeyboard/30key/info.json69
-rw-r--r--keyboards/handwired/croxsplit44/croxsplit44.h32
-rw-r--r--keyboards/handwired/croxsplit44/info.json88
-rw-r--r--keyboards/handwired/d48/d48.h19
-rw-r--r--keyboards/handwired/d48/info.json101
-rw-r--r--keyboards/handwired/dactyl_left/dactyl_left.h42
-rw-r--r--keyboards/handwired/dactyl_left/info.json43
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h29
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/info.json88
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/4x6.h27
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/info.json107
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h26
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/info.json100
-rw-r--r--keyboards/handwired/daishi/daishi.h23
-rw-r--r--keyboards/handwired/daishi/info.json265
-rw-r--r--keyboards/handwired/datahand/datahand.h34
-rw-r--r--keyboards/handwired/datahand/info.json116
-rw-r--r--keyboards/handwired/dqz11n1g/dqz11n1g.h51
-rw-r--r--keyboards/handwired/dqz11n1g/info.json261
-rw-r--r--keyboards/handwired/eagleii/eagleii.h24
-rw-r--r--keyboards/handwired/eagleii/info.json159
-rw-r--r--keyboards/handwired/ergocheap/ergocheap.h41
-rw-r--r--keyboards/handwired/ergocheap/info.json147
-rw-r--r--keyboards/handwired/evk/v1_3/info.json206
-rw-r--r--keyboards/handwired/evk/v1_3/v1_3.c2
-rw-r--r--keyboards/handwired/evk/v1_3/v1_3.h43
-rw-r--r--keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h46
-rw-r--r--keyboards/handwired/fc200rt_qmk/info.json104
-rw-r--r--keyboards/handwired/fivethirteen/fivethirteen.h19
-rw-r--r--keyboards/handwired/fivethirteen/info.json132
-rw-r--r--keyboards/handwired/frenchdev/frenchdev.h35
-rw-r--r--keyboards/handwired/frenchdev/info.json213
-rw-r--r--keyboards/handwired/freoduo/freoduo.h39
-rw-r--r--keyboards/handwired/freoduo/info.json129
-rw-r--r--keyboards/handwired/hacked_motospeed/hacked_motospeed.h46
-rw-r--r--keyboards/handwired/hacked_motospeed/info.json54
-rw-r--r--keyboards/handwired/hexon38/hexon38.h17
-rw-r--r--keyboards/handwired/hexon38/info.json80
-rw-r--r--keyboards/handwired/hnah40/hnah40.h38
-rw-r--r--keyboards/handwired/hnah40/info.json87
-rw-r--r--keyboards/handwired/hwpm87/hwpm87.h24
-rw-r--r--keyboards/handwired/hwpm87/info.json188
-rw-r--r--keyboards/handwired/ibm122m/ibm122m.h41
-rw-r--r--keyboards/handwired/ibm122m/info.json266
-rw-r--r--keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h40
-rw-r--r--keyboards/handwired/ibm_wheelwriter/info.json134
-rw-r--r--keyboards/handwired/jopr/info.json672
-rw-r--r--keyboards/handwired/jopr/jopr.c2
-rw-r--r--keyboards/handwired/jopr/jopr.h24
-rw-r--r--keyboards/handwired/k8split/info.json96
-rw-r--r--keyboards/handwired/k8split/k8split.h37
-rw-r--r--keyboards/handwired/kbod/info.json126
-rw-r--r--keyboards/handwired/kbod/kbod.h22
-rw-r--r--keyboards/handwired/ks63/info.json399
-rw-r--r--keyboards/handwired/ks63/ks63.h23
-rw-r--r--keyboards/handwired/lagrange/info.json147
-rw-r--r--keyboards/handwired/lagrange/lagrange.h26
-rw-r--r--keyboards/handwired/magicforce61/info.json126
-rw-r--r--keyboards/handwired/magicforce61/magicforce61.h17
-rw-r--r--keyboards/handwired/magicforce68/info.json145
-rw-r--r--keyboards/handwired/magicforce68/magicforce68.h19
-rw-r--r--keyboards/handwired/marauder/info.json202
-rw-r--r--keyboards/handwired/marauder/marauder.h41
-rw-r--r--keyboards/handwired/minorca/info.json87
-rw-r--r--keyboards/handwired/minorca/minorca.h15
-rw-r--r--keyboards/handwired/not_so_minidox/info.json84
-rw-r--r--keyboards/handwired/not_so_minidox/not_so_minidox.h21
-rw-r--r--keyboards/handwired/oem_iso_fullsize/info.json229
-rw-r--r--keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h38
-rw-r--r--keyboards/handwired/ortho5x13/info.json132
-rw-r--r--keyboards/handwired/ortho5x13/ortho5x13.h18
-rw-r--r--keyboards/handwired/ortho5x14/info.json138
-rw-r--r--keyboards/handwired/ortho5x14/ortho5x14.h34
-rw-r--r--keyboards/handwired/p65rgb/info.json143
-rw-r--r--keyboards/handwired/p65rgb/p65rgb.c2
-rw-r--r--keyboards/handwired/p65rgb/p65rgb.h42
-rw-r--r--keyboards/handwired/pilcrow/info.json83
-rw-r--r--keyboards/handwired/pilcrow/pilcrow.h19
-rw-r--r--keyboards/handwired/pill60/info.json128
-rw-r--r--keyboards/handwired/pill60/pill60.h42
-rw-r--r--keyboards/handwired/prime_exl/info.json96
-rw-r--r--keyboards/handwired/prime_exl/prime_exl.h40
-rw-r--r--keyboards/handwired/promethium/info.json106
-rw-r--r--keyboards/handwired/promethium/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/promethium/keymaps/priyadi/keymap.c8
-rw-r--r--keyboards/handwired/promethium/promethium.h20
-rw-r--r--keyboards/handwired/pteron/info.json112
-rw-r--r--keyboards/handwired/pteron/pteron.h17
-rw-r--r--keyboards/handwired/pteron44/info.json88
-rw-r--r--keyboards/handwired/pteron44/pteron44.h31
-rw-r--r--keyboards/handwired/retro_refit/info.json168
-rw-r--r--keyboards/handwired/retro_refit/readme.md28
-rw-r--r--keyboards/handwired/retro_refit/retro_refit.c2
-rw-r--r--keyboards/handwired/retro_refit/retro_refit.h35
-rw-r--r--keyboards/handwired/selene/info.json244
-rw-r--r--keyboards/handwired/selene/selene.h16
-rw-r--r--keyboards/handwired/slash/info.json126
-rw-r--r--keyboards/handwired/slash/slash.h36
-rw-r--r--keyboards/handwired/space_oddity/info.json135
-rw-r--r--keyboards/handwired/space_oddity/space_oddity.h19
-rw-r--r--keyboards/handwired/split65/info.json80
-rw-r--r--keyboards/handwired/split65/promicro/info.json88
-rw-r--r--keyboards/handwired/split65/promicro/promicro.h38
-rw-r--r--keyboards/handwired/split65/stm32/info.json88
-rw-r--r--keyboards/handwired/split65/stm32/stm32.h38
-rw-r--r--keyboards/handwired/stef9998/split_5x7/info.json139
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rev1/rev1.h40
-rw-r--r--keyboards/handwired/swiftrax/beegboy/beegboy.h42
-rw-r--r--keyboards/handwired/swiftrax/beegboy/info.json218
-rw-r--r--keyboards/handwired/swiftrax/pandamic/info.json105
-rw-r--r--keyboards/handwired/swiftrax/pandamic/pandamic.h40
-rw-r--r--keyboards/handwired/swiftrax/unsplit/info.json88
-rw-r--r--keyboards/handwired/swiftrax/unsplit/unsplit.h35
-rw-r--r--keyboards/handwired/symmetric70_proto/info.json145
-rw-r--r--keyboards/handwired/symmetric70_proto/symmetric70_proto.c2
-rw-r--r--keyboards/handwired/symmetric70_proto/symmetric70_proto.h41
-rw-r--r--keyboards/handwired/t111/info.json123
-rw-r--r--keyboards/handwired/t111/t111.h57
-rw-r--r--keyboards/handwired/terminus_mini/info.json95
-rw-r--r--keyboards/handwired/terminus_mini/terminus_mini.h39
-rw-r--r--keyboards/handwired/traveller/info.json100
-rw-r--r--keyboards/handwired/traveller/traveller.c2
-rw-r--r--keyboards/handwired/traveller/traveller.h17
-rw-r--r--keyboards/handwired/tsubasa/info.json127
-rw-r--r--keyboards/handwired/tsubasa/tsubasa.c2
-rw-r--r--keyboards/handwired/tsubasa/tsubasa.h47
-rw-r--r--keyboards/handwired/twadlee/tp69/info.json76
-rw-r--r--keyboards/handwired/twadlee/tp69/tp69.h48
-rw-r--r--keyboards/handwired/unicomp_mini_m/info.json190
-rw-r--r--keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h49
-rw-r--r--keyboards/handwired/unk/rev1/info.json140
-rw-r--r--keyboards/handwired/unk/rev1/rev1.h28
-rw-r--r--keyboards/handwired/videowriter/info.json90
-rw-r--r--keyboards/handwired/videowriter/videowriter.h59
-rw-r--r--keyboards/handwired/xealous/rev1/info.json131
-rw-r--r--keyboards/handwired/xealous/rev1/rev1.h24
-rw-r--r--keyboards/handwired/z150/info.json96
-rw-r--r--keyboards/handwired/z150/z150.c2
-rw-r--r--keyboards/handwired/z150/z150.h54
-rw-r--r--keyboards/handwired/zergo/info.json170
-rw-r--r--keyboards/handwired/zergo/zergo.h35
179 files changed, 6015 insertions, 8446 deletions
diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h b/keyboards/handwired/108key_trackpoint/108key_trackpoint.h
deleted file mode 100644
index 100f4cb932..0000000000
--- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K019, K020, K021, K022, \
- \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K215, K216, K217, K219, K220, K221, K222, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K319, K320, K321, \
- K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K419, K420, K421, K422, \
- K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K513, K516, K519, K520, K521, \
- K600, K601, K603, K606, K610, K611, K613, K614, K615, K616, K617, K619, K621, K622, \
- K705, K706, K707 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, KC_NO, K019, K020, K021, K022 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214, K215, K216, K217, KC_NO, K219, K220, K221, K222 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, KC_NO, K319, K320, K321, KC_NO }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K419, K420, K421, K422 }, \
- { KC_NO, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, KC_NO, K513, KC_NO, KC_NO, K516, KC_NO, KC_NO, K519, K520, K521, KC_NO }, \
- { K600, K601, KC_NO, K603, KC_NO, KC_NO, K606, KC_NO, KC_NO, KC_NO, K610, K611, KC_NO, K613, K614, K615, K616, K617, KC_NO, K619, KC_NO, K621, K622 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
index e771c4b8aa..605c77875d 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/info.json
@@ -18,117 +18,137 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Print Screen", "x":15.25, "y":0},
- {"label":"Scroll Lock", "x":16.25, "y":0},
- {"label":"Pause", "x":17.25, "y":0},
- {"label":"Mute", "x":18.5, "y":0},
- {"label":"Previous", "x":19.5, "y":0},
- {"label":"Next", "x":20.5, "y":0},
- {"label":"Play", "x":21.5, "y":0},
- {"label":"`", "x":0, "y":1.5},
- {"label":"1", "x":1, "y":1.5},
- {"label":"2", "x":2, "y":1.5},
- {"label":"3", "x":3, "y":1.5},
- {"label":"4", "x":4, "y":1.5},
- {"label":"5", "x":5, "y":1.5},
- {"label":"6", "x":6, "y":1.5},
- {"label":"7", "x":7, "y":1.5},
- {"label":"8", "x":8, "y":1.5},
- {"label":"9", "x":9, "y":1.5},
- {"label":"0", "x":10, "y":1.5},
- {"label":"-", "x":11, "y":1.5},
- {"label":"=", "x":12, "y":1.5},
- {"label":"Backspace", "x":13, "y":1.5, "w":2},
- {"label":"Insert", "x":15.25, "y":1.5},
- {"label":"Home", "x":16.25, "y":1.5},
- {"label":"Page Up", "x":17.25, "y":1.5},
- {"label":"Num Lock", "x":18.5, "y":1.5},
- {"label":"/", "x":19.5, "y":1.5},
- {"label":"*", "x":20.5, "y":1.5},
- {"label":"-", "x":21.5, "y":1.5},
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"[", "x":11.5, "y":2.5},
- {"label":"]", "x":12.5, "y":2.5},
- {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
- {"label":"Delete", "x":15.25, "y":2.5},
- {"label":"End", "x":16.25, "y":2.5},
- {"label":"Page Down", "x":17.25, "y":2.5},
- {"label":"7", "x":18.5, "y":2.5},
- {"label":"8", "x":19.5, "y":2.5},
- {"label":"9", "x":20.5, "y":2.5},
- {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":";", "x":10.75, "y":3.5},
- {"label":"'", "x":11.75, "y":3.5},
- {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
- {"label":"4", "x":18.5, "y":3.5},
- {"label":"5", "x":19.5, "y":3.5},
- {"label":"6", "x":20.5, "y":3.5},
- {"label":"+", "x":21.5, "y":2.5, "h":2},
- {"label":"Shift", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":",", "x":9.25, "y":4.5},
- {"label":".", "x":10.25, "y":4.5},
- {"label":"/", "x":11.25, "y":4.5},
- {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
- {"label":"Up", "x":16.25, "y":4.5},
- {"label":"1", "x":18.5, "y":4.5},
- {"label":"2", "x":19.5, "y":4.5},
- {"label":"3", "x":20.5, "y":4.5},
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"LGUI", "x":1.25, "y":5.5, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
- {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
- {"label":"Alt", "x":10, "y":5.5, "w":1.25},
- {"label":"RGUI", "x":11.25, "y":5.5, "w":1.25},
- {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
- {"label":"Left", "x":15.25, "y":5.5},
- {"label":"Down", "x":16.25, "y":5.5},
- {"label":"Right", "x":17.25, "y":5.5},
- {"label":"0", "x":18.5, "y":5.5, "w":2},
- {"label":".", "x":20.5, "y":5.5},
- {"label":"Enter", "x":21.5, "y":4.5, "h":2},
- {"label":"Mouse1", "x":5.25, "y":6.5},
- {"label":"Mouse3", "x":6.25, "y":6.5},
- {"label":"Mouse2", "x":7.25, "y":6.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 19], "x": 18.5, "y": 0},
+ {"matrix": [0, 20], "x": 19.5, "y": 0},
+ {"matrix": [0, 21], "x": 20.5, "y": 0},
+ {"matrix": [0, 22], "x": 21.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [2, 1], "x": 1, "y": 1.5},
+ {"matrix": [2, 2], "x": 2, "y": 1.5},
+ {"matrix": [2, 3], "x": 3, "y": 1.5},
+ {"matrix": [2, 4], "x": 4, "y": 1.5},
+ {"matrix": [2, 5], "x": 5, "y": 1.5},
+ {"matrix": [2, 6], "x": 6, "y": 1.5},
+ {"matrix": [2, 7], "x": 7, "y": 1.5},
+ {"matrix": [2, 8], "x": 8, "y": 1.5},
+ {"matrix": [2, 9], "x": 9, "y": 1.5},
+ {"matrix": [2, 10], "x": 10, "y": 1.5},
+ {"matrix": [2, 11], "x": 11, "y": 1.5},
+ {"matrix": [2, 12], "x": 12, "y": 1.5},
+ {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 1.5},
+ {"matrix": [2, 16], "x": 16.25, "y": 1.5},
+ {"matrix": [2, 17], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 19], "x": 18.5, "y": 1.5},
+ {"matrix": [2, 20], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 21], "x": 20.5, "y": 1.5},
+ {"matrix": [2, 22], "x": 21.5, "y": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+ {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+ {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+ {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+ {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+ {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+ {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+ {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [3, 15], "x": 15.25, "y": 2.5},
+ {"matrix": [3, 16], "x": 16.25, "y": 2.5},
+ {"matrix": [3, 17], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 19], "x": 18.5, "y": 2.5},
+ {"matrix": [3, 20], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 21], "x": 20.5, "y": 2.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+ {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+ {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+ {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+ {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+ {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+ {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+ {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+ {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+ {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 19], "x": 18.5, "y": 3.5},
+ {"matrix": [4, 20], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 21], "x": 20.5, "y": 3.5},
+ {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [5, 16], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 19], "x": 18.5, "y": 4.5},
+ {"matrix": [5, 20], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 21], "x": 20.5, "y": 4.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [6, 15], "x": 15.25, "y": 5.5},
+ {"matrix": [6, 16], "x": 16.25, "y": 5.5},
+ {"matrix": [6, 17], "x": 17.25, "y": 5.5},
+
+ {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [6, 21], "x": 20.5, "y": 5.5},
+ {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [7, 5], "x": 5.25, "y": 6.5},
+ {"matrix": [7, 6], "x": 6.25, "y": 6.5},
+ {"matrix": [7, 7], "x": 7.25, "y": 6.5}
]
}
}
diff --git a/keyboards/handwired/3dfoxc/3dfoxc.h b/keyboards/handwired/3dfoxc/3dfoxc.h
deleted file mode 100644
index b632cff2ce..0000000000
--- a/keyboards/handwired/3dfoxc/3dfoxc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 david l goodrich <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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 XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
- { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
- { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json
index bafce6ccbf..6974199846 100644
--- a/keyboards/handwired/3dfoxc/info.json
+++ b/keyboards/handwired/3dfoxc/info.json
@@ -18,358 +18,79 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "K00 (B0,B5)",
- "x": 0,
- "y": 0
- },
- {
- "label": "K01 (B0,B6)",
- "x": 1,
- "y": 0
- },
- {
- "label": "K02 (B0,B7)",
- "x": 2,
- "y": 0
- },
- {
- "label": "K03 (B0,C0)",
- "x": 3,
- "y": 0
- },
- {
- "label": "K04 (B0,C1)",
- "x": 4,
- "y": 0
- },
- {
- "label": "K05 (B0,C2)",
- "x": 5,
- "y": 0
- },
- {
- "label": "K06 (B0,C3)",
- "x": 6,
- "y": 0
- },
- {
- "label": "K07 (B0,C4)",
- "x": 7,
- "y": 0
- },
- {
- "label": "K08 (B0,C5)",
- "x": 8,
- "y": 0
- },
- {
- "label": "K09 (B0,C6)",
- "x": 9,
- "y": 0
- },
- {
- "label": "K0A (B0,C7)",
- "x": 10,
- "y": 0
- },
- {
- "label": "K0B (B0,D0)",
- "x": 11,
- "y": 0
- },
- {
- "label": "K0C (B0,D1)",
- "x": 12,
- "y": 0
- },
- {
- "label": "K0D (B0,D2)",
- "x": 13,
- "y": 0
- },
- {
- "label": "K0E (B0,D3)",
- "x": 14,
- "y": 0
- },
- {
- "label": "K0F (B0,D4)",
- "x": 15,
- "y": 0
- },
- {
- "label": "K10 (B1,B5)",
- "x": 0,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "K12 (B1,B7)",
- "x": 1.5,
- "y": 1
- },
- {
- "label": "K13 (B1,C0)",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "K14 (B1,C1)",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "K15 (B1,C2)",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "K16 (B1,C3)",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "K17 (B1,C4)",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "K18 (B1,C5)",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "K19 (B1,C6)",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "K1A (B1,C7)",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "K1B (B1,D0)",
- "x": 10.5,
- "y": 1
- },
- {
- "label": "K1C (B1,D1)",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "K1D (B1,D2)",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "K1E (B1,D3)",
- "x": 13.5,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "K1F (B1,D4)",
- "x": 15,
- "y": 1
- },
- {
- "label": "K20 (B2,B5)",
- "x": 0,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "K22 (B2,B7)",
- "x": 1.75,
- "y": 2
- },
- {
- "label": "K23 (B2,C0)",
- "x": 2.75,
- "y": 2
- },
- {
- "label": "K24 (B2,C1)",
- "x": 3.75,
- "y": 2
- },
- {
- "label": "K25 (B2,C2)",
- "x": 4.75,
- "y": 2
- },
- {
- "label": "K26 (B2,C3)",
- "x": 5.75,
- "y": 2
- },
- {
- "label": "K27 (B2,C4)",
- "x": 6.75,
- "y": 2
- },
- {
- "label": "K28 (B2,C5)",
- "x": 7.75,
- "y": 2
- },
- {
- "label": "K29 (B2,C6)",
- "x": 8.75,
- "y": 2
- },
- {
- "label": "K2A (B2,C7)",
- "x": 9.75,
- "y": 2
- },
- {
- "label": "K2B (B2,D0)",
- "x": 10.75,
- "y": 2
- },
- {
- "label": "K2C (B2,D1)",
- "x": 11.75,
- "y": 2
- },
- {
- "label": "K2D (B2,D2)",
- "x": 12.75,
- "y": 2,
- "w": 2.25
- },
- {
- "label": "K2F (B2,D4)",
- "x": 15,
- "y": 2
- },
- {
- "label": "K31 (B3,B6)",
- "x": 0,
- "y": 3,
- "w": 2.25
- },
- {
- "label": "K32 (B3,B7)",
- "x": 2.25,
- "y": 3
- },
- {
- "label": "K33 (B3,C0)",
- "x": 3.25,
- "y": 3
- },
- {
- "label": "K34 (B3,C1)",
- "x": 4.25,
- "y": 3
- },
- {
- "label": "K35 (B3,C2)",
- "x": 5.25,
- "y": 3
- },
- {
- "label": "K36 (B3,C3)",
- "x": 6.25,
- "y": 3
- },
- {
- "label": "K37 (B3,C4)",
- "x": 7.25,
- "y": 3
- },
- {
- "label": "K38 (B3,C5)",
- "x": 8.25,
- "y": 3
- },
- {
- "label": "K39 (B3,C6)",
- "x": 9.25,
- "y": 3
- },
- {
- "label": "K3A (B3,C7)",
- "x": 10.25,
- "y": 3
- },
- {
- "label": "K3B (B3,D0)",
- "x": 11.25,
- "y": 3
- },
- {
- "label": "K3D (B3,D2)",
- "x": 12.25,
- "y": 3,
- "w": 1.75
- },
- {
- "label": "K3E (B3,D3)",
- "x": 14,
- "y": 3
- },
- {
- "label": "K3F (B3,D4)",
- "x": 15,
- "y": 3
- },
- {
- "label": "K40 (B4,B5)",
- "x": 0,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "K41 (B4,B6)",
- "x": 1.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "K43 (B4,C0)",
- "x": 2.5,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "K46 (B4,C3)",
- "x": 3.75,
- "y": 4,
- "w": 6.25
- },
- {
- "label": "K4A (B4,C7)",
- "x": 10,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "K4B (B4,D0)",
- "x": 11.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "K4D (B4,D2)",
- "x": 13,
- "y": 4
- },
- {
- "label": "K4E (B4,D3)",
- "x": 14,
- "y": 4
- },
- {
- "label": "K4F (B4,D4)",
- "x": 15,
- "y": 4
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
}
},
diff --git a/keyboards/handwired/42/42.h b/keyboards/handwired/42/42.h
deleted file mode 100644
index 5be29bf252..0000000000
--- a/keyboards/handwired/42/42.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Angelo Gazzola (nglgzz)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K33, K34, K35, K36, K37, K38 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { ___, ___, ___, K33, K34, K35, K36, K37, K38, ___, ___, ___ } \
-}
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index f887edea52..dccafc6d86 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -18,51 +18,55 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.625},
- {"x":1, "y":0.417},
- {"x":2, "y":0.208},
- {"x":3, "y":0},
- {"x":4, "y":0.208},
- {"x":5, "y":0.417},
- {"x":8.5, "y":0.417},
- {"x":9.5, "y":0.208},
- {"x":10.5, "y":0},
- {"x":11.5, "y":0.208},
- {"x":12.5, "y":0.417},
- {"x":13.5, "y":0.625},
+ {"matrix": [0, 0], "x": 0, "y": 0.625},
+ {"matrix": [0, 1], "x": 1, "y": 0.417},
+ {"matrix": [0, 2], "x": 2, "y": 0.208},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.208},
+ {"matrix": [0, 5], "x": 5, "y": 0.417},
- {"x":0, "y":1.625},
- {"x":1, "y":1.417},
- {"x":2, "y":1.208},
- {"x":3, "y":1},
- {"x":4, "y":1.208},
- {"x":5, "y":1.417},
- {"x":8.5, "y":1.417},
- {"x":9.5, "y":1.208},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1.208},
- {"x":12.5, "y":1.417},
- {"x":13.5, "y":1.625},
+ {"matrix": [0, 6], "x": 8.5, "y": 0.417},
+ {"matrix": [0, 7], "x": 9.5, "y": 0.208},
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0.208},
+ {"matrix": [0, 10], "x": 12.5, "y": 0.417},
+ {"matrix": [0, 11], "x": 13.5, "y": 0.625},
- {"x":0, "y":2.625},
- {"x":1, "y":2.417},
- {"x":2, "y":2.208},
- {"x":3, "y":2},
- {"x":4, "y":2.208},
- {"x":5, "y":2.417},
- {"x":8.5, "y":2.417},
- {"x":9.5, "y":2.208},
- {"x":10.5, "y":2},
- {"x":11.5, "y":2.208},
- {"x":12.5, "y":2.417},
- {"x":13.5, "y":2.625},
+ {"matrix": [1, 0], "x": 0, "y": 1.625},
+ {"matrix": [1, 1], "x": 1, "y": 1.417},
+ {"matrix": [1, 2], "x": 2, "y": 1.208},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.208},
+ {"matrix": [1, 5], "x": 5, "y": 1.417},
- {"x":4, "y":3.208},
- {"x":5, "y":3.417},
- {"x":5.75, "y":4.417},
- {"x":7.75, "y":4.417},
- {"x":8.5, "y":3.417},
- {"x":9.5, "y":3.208}
+ {"matrix": [1, 6], "x": 8.5, "y": 1.417},
+ {"matrix": [1, 7], "x": 9.5, "y": 1.208},
+ {"matrix": [1, 8], "x": 10.5, "y": 1},
+ {"matrix": [1, 9], "x": 11.5, "y": 1.208},
+ {"matrix": [1, 10], "x": 12.5, "y": 1.417},
+ {"matrix": [1, 11], "x": 13.5, "y": 1.625},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.625},
+ {"matrix": [2, 1], "x": 1, "y": 2.417},
+ {"matrix": [2, 2], "x": 2, "y": 2.208},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.208},
+ {"matrix": [2, 5], "x": 5, "y": 2.417},
+
+ {"matrix": [2, 6], "x": 8.5, "y": 2.417},
+ {"matrix": [2, 7], "x": 9.5, "y": 2.208},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2.208},
+ {"matrix": [2, 10], "x": 12.5, "y": 2.417},
+ {"matrix": [2, 11], "x": 13.5, "y": 2.625},
+
+ {"matrix": [3, 3], "x": 4, "y": 3.208},
+ {"matrix": [3, 4], "x": 5, "y": 3.417},
+ {"matrix": [3, 5], "x": 5.75, "y": 4.417},
+
+ {"matrix": [3, 6], "x": 7.75, "y": 4.417},
+ {"matrix": [3, 7], "x": 8.5, "y": 3.417},
+ {"matrix": [3, 8], "x": 9.5, "y": 3.208}
]
}
}
diff --git a/keyboards/handwired/acacia/acacia.h b/keyboards/handwired/acacia/acacia.h
deleted file mode 100644
index 060caa6adc..0000000000
--- a/keyboards/handwired/acacia/acacia.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 Jens Peter Secher <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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"
-
-/*
- * ┌───┐ ┌───┐
- * ┌───┤02 ├───┐ ┌───┤07 ├───┐
- * ┌───┤01 ├───┤03 ├───┐ ┌───┤06 ├───┤08 ├───┐
- * ┌───┤00 ├───┤12 ├───┤33 │ │36 ├───┤17 ├───┤09 ├───┐
- * │30 ├───┤11 ├───┤13 ├───┤ ├───┤16 ├───┤18 ├───┤39 │
- * ├───┤10 ├───┤22 ├───┤43 │ │46 ├───┤27 ├───┤19 ├───┤
- * │40 ├───┤21 ├───┤23 ├───┘ └───┤26 ├───┤28 ├───┤49 │
- * └───┤20 ├───┘ └───┘ └───┘ └───┤29 ├───┘
- * └───┘ ┌───┐ ┌───┬───┐ ┌───┬───┐ ┌───┐ └───┘
- * │04 │ │14 │24 ├───┐ ┌───┤25 │15 │ │05 │
- * └───┘ └───┤ │34 ├───┐ ┌───┤35 │ ├───┘ └───┘ ┌───┐
- * └───┤ │44 │ │45 │ ├───┘ │38+│
- * └───┤ │ │ ├───┘ └───┘
- * └───┘ └───┘
- * + K38 is hidden.
- */
-#define LAYOUT( \
- K30, K00, K01, K02, K03, K33, K36, K06, K07, K08, K09, K39, \
- K40, K10, K11, K12, K13, K43, K46, K16, K17, K18, K19, K49, \
- K20, K21, K22, K23, K26, K27, K28, K29, \
- K04, K14, K24, K34, K44, K45, K35, K25, K15, K05, K38 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, KC_NO, KC_NO, K33, K34, K35, K36, KC_NO, K38, K39 }, \
- { K40, KC_NO, KC_NO, K43, K44, K45, K46, KC_NO, KC_NO, K49 }, \
-}
diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/info.json
index 8054fff3ac..65a4b49a69 100644
--- a/keyboards/handwired/acacia/info.json
+++ b/keyboards/handwired/acacia/info.json
@@ -20,57 +20,56 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"B", "x":0, "y":0.5},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0.5},
+ {"matrix": [3, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [3, 3], "x": 5, "y": 0.5},
- {"label":"H", "x":10.5, "y":0.5},
- {"label":"U", "x":11.5, "y":0},
- {"label":"I", "x":12.5, "y":0},
- {"label":"O", "x":13.5, "y":0},
- {"label":"P", "x":14.5, "y":0},
- {"label":"Y", "x":15.5, "y":0.5},
+ {"matrix": [3, 6], "x": 10.5, "y": 0.5},
+ {"matrix": [0, 6], "x": 11.5, "y": 0},
+ {"matrix": [0, 7], "x": 12.5, "y": 0},
+ {"matrix": [0, 8], "x": 13.5, "y": 0},
+ {"matrix": [0, 9], "x": 14.5, "y": 0},
+ {"matrix": [3, 9], "x": 15.5, "y": 0.5},
- {"label":"Tab", "x":0, "y":1.5},
- {"label":"A", "x":1, "y":1},
- {"label":"S", "x":2, "y":1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1},
- {"label":"G", "x":5, "y":1.5},
+ {"matrix": [4, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [4, 3], "x": 5, "y": 1.5},
- {"label":"N", "x":10.5, "y":1.5},
- {"label":"J", "x":11.5, "y":1},
- {"label":"K", "x":12.5, "y":1},
- {"label":"L", "x":13.5, "y":1},
- {"label":":", "x":14.5, "y":1},
- {"label":"Enter", "x":15.5, "y":1.5},
+ {"matrix": [4, 6], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 11.5, "y": 1},
+ {"matrix": [1, 7], "x": 12.5, "y": 1},
+ {"matrix": [1, 8], "x": 13.5, "y": 1},
+ {"matrix": [1, 9], "x": 14.5, "y": 1},
+ {"matrix": [4, 9], "x": 15.5, "y": 1.5},
- {"label":"Z", "x":1, "y":2},
- {"label":"X", "x":2, "y":2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
- {"label":"M", "x":11.5, "y":2},
- {"label":"<", "x":12.5, "y":2},
- {"label":">", "x":13.5, "y":2},
- {"label":"'", "x":14.5, "y":2},
+ {"matrix": [2, 6], "x": 11.5, "y": 2},
+ {"matrix": [2, 7], "x": 12.5, "y": 2},
+ {"matrix": [2, 8], "x": 13.5, "y": 2},
+ {"matrix": [2, 9], "x": 14.5, "y": 2},
- {"label":"Next", "x":2.25, "y":3},
- {"label":"Alt", "x":3.5, "y":3},
- {"label":"BS", "x":4.5, "y":3},
- {"label":"Esc", "x":5.5, "y":3},
- {"label":"Shift", "x":6.5, "y":3},
+ {"matrix": [0, 4], "x": 2.25, "y": 3},
+ {"matrix": [1, 4], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [4, 4], "x": 6.5, "y": 3},
+ {"matrix": [4, 5], "x": 9.25, "y": 3},
- {"label":"RAlt", "x":9.25, "y":3},
- {"label":"Space", "x":10.25, "y":3},
- {"label":"Del", "x":11.25, "y":3},
- {"label":"Alt", "x":12.25, "y":3},
- {"label":"Play", "x":13.5, "y":3},
-
- {"label":"Debug", "x":8, "y":1}
+ {"matrix": [3, 5], "x": 10.25, "y": 3},
+ {"matrix": [2, 5], "x": 11.25, "y": 3},
+ {"matrix": [1, 5], "x": 12.25, "y": 3},
+ {"matrix": [0, 5], "x": 13.5, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 1}
]
}
}
diff --git a/keyboards/handwired/aek64/aek64.h b/keyboards/handwired/aek64/aek64.h
deleted file mode 100644
index 6378448760..0000000000
--- a/keyboards/handwired/aek64/aek64.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012,2013 Jun Wako <[email protected]> <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General 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"
-
-/* Alps64 physical definition macro */
-#define LAYOUT( \
- k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 , \
- k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, \
- k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 , \
- k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, \
- k40, k41, k42, k46, k411, k412, k413 \
-) { \
- { k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 }, \
- { k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, KC_NO }, \
- { k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 }, \
- { k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, KC_NO }, \
- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, k413 }, \
-}
diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json
index 4c71a69358..dfa762ce81 100644
--- a/keyboards/handwired/aek64/info.json
+++ b/keyboards/handwired/aek64/info.json
@@ -21,8 +21,74 @@
"processor": "at90usb1286",
"bootloader": "halfkay",
"layouts": {
- "LAYOUT": {
- "layout": [{"label":"Esc", "x":0, "y":0, "w":1.25}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.25, "y":0}, {"label":"6", "x":6.25, "y":0}, {"label":"7", "x":7.25, "y":0}, {"label":"8", "x":8.25, "y":0}, {"label":"9", "x":9.25, "y":0}, {"label":"0", "x":10.25, "y":0}, {"label":"\u00b0", "x":11.25, "y":0}, {"label":"+", "x":12.25, "y":0}, {"label":"Backspace", "x":13.25, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"Z", "x":2.75, "y":1}, {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, {"label":"Y", "x":6.75, "y":1}, {"label":"U", "x":7.75, "y":1}, {"label":"I", "x":8.75, "y":1}, {"label":"O", "x":9.75, "y":1}, {"label":"P", "x":10.75, "y":1}, {"label":"{", "x":11.75, "y":1}, {"label":"}", "x":12.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"Q", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":"M", "x":11, "y":2}, {"label":"%", "x":12, "y":2}, {"label":"&micro;", "x":13, "y":2}, {"label":"Enter", "x":14, "y":1, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":">", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"?", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"&sect;", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Opt", "x":1.5, "y":4, "w":1.25}, {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, {"label":"Space", "x":4.25, "y":4, "w":6.5}, {"label":"Cmd", "x":10.75, "y":4, "w":1.5}, {"label":"Opt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4.25, "y": 4, "w": 6.5},
+ {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/handwired/aim65/aim65.h b/keyboards/handwired/aim65/aim65.h
deleted file mode 100644
index cce4a603af..0000000000
--- a/keyboards/handwired/aim65/aim65.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K62, K71, K61, K74, K64, K75, K65, K76, K66, K77, K67, K72, K53, \
- K52, K42, K51, K41, K54, K44, K55, K45, K56, K46, K57, K47, K22, K40, \
- K60, K31, K21, K34, K24, K35, K25, K36, K26, K37, K27, K33, K12, K23,\
- K70, K01, K11, K04, K14, K05, K15, K06, K16, K07, K17, K20, \
- K00 \
-) { \
- { K00, K01, KC_NO, KC_NO, K04, K05, K06, K07 }, \
- { KC_NO, K11, K12, KC_NO, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, KC_NO, K44, K45, K46, K47 }, \
- { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, KC_NO, K64, K65, K66, K67 }, \
- { K70, K71, K72, KC_NO, K74, K75, K76, K77 }, \
-}
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
index 9439a11c76..e7c363794f 100644
--- a/keyboards/handwired/aim65/info.json
+++ b/keyboards/handwired/aim65/info.json
@@ -22,60 +22,64 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K62 (B3,B6)", "x":1, "y":0},
- {"label":"K71 (B1,C6)", "x":2, "y":0},
- {"label":"K61 (B3,C6)", "x":3, "y":0},
- {"label":"K74 (B1,F7)", "x":4, "y":0},
- {"label":"K64 (B3,F7)", "x":5, "y":0},
- {"label":"K75 (B1,F6)", "x":6, "y":0},
- {"label":"K65 (B3,F6)", "x":7, "y":0},
- {"label":"K76 (B1,F5)", "x":8, "y":0},
- {"label":"K66 (B3,F5)", "x":9, "y":0},
- {"label":"K77 (B1,F4)", "x":10, "y":0},
- {"label":"K67 (B3,F4)", "x":11, "y":0},
- {"label":"K72 (B1,B6)", "x":12, "y":0},
- {"label":"K53 (B5,B2)", "x":13, "y":0},
- {"label":"K52 (B5,B6)", "x":0, "y":1, "w":1.5},
- {"label":"K42 (B4,B6)", "x":1.5, "y":1},
- {"label":"K51 (B5,C6)", "x":2.5, "y":1},
- {"label":"K41 (B4,C6)", "x":3.5, "y":1},
- {"label":"K54 (B5,F7)", "x":4.5, "y":1},
- {"label":"K44 (B4,F7)", "x":5.5, "y":1},
- {"label":"K55 (B5,F6)", "x":6.5, "y":1},
- {"label":"K45 (B4,F6)", "x":7.5, "y":1},
- {"label":"K56 (B5,F5)", "x":8.5, "y":1},
- {"label":"K46 (B4,F5)", "x":9.5, "y":1},
- {"label":"K57 (B5,F4)", "x":10.5, "y":1},
- {"label":"K47 (B4,F4)", "x":11.5, "y":1},
- {"label":"K22 (D7,B6)", "x":12.5, "y":1},
- {"label":"K40 (B4,D1)", "x":13.5, "y":1},
- {"label":"K60 (B3,D1)", "x":0.75, "y":2},
- {"label":"K31 (E6,C6)", "x":1.75, "y":2},
- {"label":"K21 (D7,C6)", "x":2.75, "y":2},
- {"label":"K34 (E6,F7)", "x":3.75, "y":2},
- {"label":"K24 (D7,F7)", "x":4.75, "y":2},
- {"label":"K35 (E6,F6)", "x":5.75, "y":2},
- {"label":"K25 (D7,F6)", "x":6.75, "y":2},
- {"label":"K36 (E6,F5)", "x":7.75, "y":2},
- {"label":"K26 (D7,F5)", "x":8.75, "y":2},
- {"label":"K37 (E6,F4)", "x":9.75, "y":2},
- {"label":"K27 (D7,F4)", "x":10.75, "y":2},
- {"label":"K33 (E6,B2)", "x":11.75, "y":2},
- {"label":"K12 (D4,B6)", "x":12.75, "y":2},
- {"label":"K23 (D7,B2)", "x":13.75, "y":2, "w":1.5},
- {"label":"K70 (B1,D1)", "x":0.75, "y":3, "w":1.5},
- {"label":"K01 (D0,C6)", "x":2.25, "y":3},
- {"label":"K11 (D4,C6)", "x":3.25, "y":3},
- {"label":"K04 (D0,F7)", "x":4.25, "y":3},
- {"label":"K14 (D4,F7)", "x":5.25, "y":3},
- {"label":"K05 (D0,F6)", "x":6.25, "y":3},
- {"label":"K15 (D4,F6)", "x":7.25, "y":3},
- {"label":"K06 (D0,F5)", "x":8.25, "y":3},
- {"label":"K16 (D4,F5)", "x":9.25, "y":3},
- {"label":"K07 (D0,F4)", "x":10.25, "y":3},
- {"label":"K17 (D4,F4)", "x":11.25, "y":3},
- {"label":"K20 (D7,D1)", "x":12.25, "y":3, "w":1.5},
- {"label":"K00 (D0,D1)", "x":3.25, "y":4, "w":8}
+ {"matrix": [6, 2], "x": 1, "y": 0},
+ {"matrix": [7, 1], "x": 2, "y": 0},
+ {"matrix": [6, 1], "x": 3, "y": 0},
+ {"matrix": [7, 4], "x": 4, "y": 0},
+ {"matrix": [6, 4], "x": 5, "y": 0},
+ {"matrix": [7, 5], "x": 6, "y": 0},
+ {"matrix": [6, 5], "x": 7, "y": 0},
+ {"matrix": [7, 6], "x": 8, "y": 0},
+ {"matrix": [6, 6], "x": 9, "y": 0},
+ {"matrix": [7, 7], "x": 10, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [7, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+
+ {"matrix": [5, 2], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [4, 2], "x": 1.5, "y": 1},
+ {"matrix": [5, 1], "x": 2.5, "y": 1},
+ {"matrix": [4, 1], "x": 3.5, "y": 1},
+ {"matrix": [5, 4], "x": 4.5, "y": 1},
+ {"matrix": [4, 4], "x": 5.5, "y": 1},
+ {"matrix": [5, 5], "x": 6.5, "y": 1},
+ {"matrix": [4, 5], "x": 7.5, "y": 1},
+ {"matrix": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [4, 6], "x": 9.5, "y": 1},
+ {"matrix": [5, 7], "x": 10.5, "y": 1},
+ {"matrix": [4, 7], "x": 11.5, "y": 1},
+ {"matrix": [2, 2], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 13.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 0.75, "y": 2},
+ {"matrix": [3, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 1], "x": 2.75, "y": 2},
+ {"matrix": [3, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [3, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 5], "x": 6.75, "y": 2},
+ {"matrix": [3, 6], "x": 7.75, "y": 2},
+ {"matrix": [2, 6], "x": 8.75, "y": 2},
+ {"matrix": [3, 7], "x": 9.75, "y": 2},
+ {"matrix": [2, 7], "x": 10.75, "y": 2},
+ {"matrix": [3, 3], "x": 11.75, "y": 2},
+ {"matrix": [1, 2], "x": 12.75, "y": 2},
+ {"matrix": [2, 3], "x": 13.75, "y": 2, "w": 1.5},
+
+ {"matrix": [7, 0], "x": 0.75, "y": 3, "w": 1.5},
+ {"matrix": [0, 1], "x": 2.25, "y": 3},
+ {"matrix": [1, 1], "x": 3.25, "y": 3},
+ {"matrix": [0, 4], "x": 4.25, "y": 3},
+ {"matrix": [1, 4], "x": 5.25, "y": 3},
+ {"matrix": [0, 5], "x": 6.25, "y": 3},
+ {"matrix": [1, 5], "x": 7.25, "y": 3},
+ {"matrix": [0, 6], "x": 8.25, "y": 3},
+ {"matrix": [1, 6], "x": 9.25, "y": 3},
+ {"matrix": [0, 7], "x": 10.25, "y": 3},
+ {"matrix": [1, 7], "x": 11.25, "y": 3},
+ {"matrix": [2, 0], "x": 12.25, "y": 3, "w": 1.5},
+
+ {"matrix": [0, 0], "x": 3.25, "y": 4, "w": 8}
]
}
}
diff --git a/keyboards/handwired/amigopunk/amigopunk.h b/keyboards/handwired/amigopunk/amigopunk.h
deleted file mode 100644
index 273cd09e3f..0000000000
--- a/keyboards/handwired/amigopunk/amigopunk.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2021 Christiano Haesbaert <[email protected]>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
- K51, K53, K57, K5B, K5D, K5E, K5F, K5G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, KC_NO, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO }, \
- { KC_NO, K51, KC_NO, K53, KC_NO, KC_NO, KC_NO, K57, KC_NO, KC_NO, KC_NO, K5B, KC_NO, K5D, K5E, K5F, K5G }, \
-}
diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json
index c3d96e0771..301c358140 100644
--- a/keyboards/handwired/amigopunk/info.json
+++ b/keyboards/handwired/amigopunk/info.json
@@ -23,92 +23,92 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"x":16, "y":0},
+ {"matrix": [0, 16], "x": 16, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1, "w":2},
- {"x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
- {"x":0, "y":2, "w":1.5},
- {"x":1.5, "y":2},
- {"x":2.5, "y":2},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2},
- {"x":5.5, "y":2},
- {"x":6.5, "y":2},
- {"x":7.5, "y":2},
- {"x":8.5, "y":2},
- {"x":9.5, "y":2},
- {"x":10.5, "y":2},
- {"x":11.5, "y":2},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2, "w":1.5},
- {"x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 2], "x": 1.5, "y": 2},
+ {"matrix": [2, 3], "x": 2.5, "y": 2},
+ {"matrix": [2, 4], "x": 3.5, "y": 2},
+ {"matrix": [2, 5], "x": 4.5, "y": 2},
+ {"matrix": [2, 6], "x": 5.5, "y": 2},
+ {"matrix": [2, 7], "x": 6.5, "y": 2},
+ {"matrix": [2, 8], "x": 7.5, "y": 2},
+ {"matrix": [2, 9], "x": 8.5, "y": 2},
+ {"matrix": [2, 10], "x": 9.5, "y": 2},
+ {"matrix": [2, 11], "x": 10.5, "y": 2},
+ {"matrix": [2, 12], "x": 11.5, "y": 2},
+ {"matrix": [2, 13], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
- {"x":8.75, "y":3},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3},
- {"x":11.75, "y":3},
- {"x":12.75, "y":3, "w":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3},
+ {"matrix": [3, 3], "x": 2.75, "y": 3},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3},
+ {"matrix": [3, 7], "x": 6.75, "y": 3},
+ {"matrix": [3, 8], "x": 7.75, "y": 3},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"x":0, "y":4, "w":2.25},
- {"x":2.25, "y":4},
- {"x":3.25, "y":4},
- {"x":4.25, "y":4},
- {"x":5.25, "y":4},
- {"x":6.25, "y":4},
- {"x":7.25, "y":4},
- {"x":8.25, "y":4},
- {"x":9.25, "y":4},
- {"x":10.25, "y":4},
- {"x":11.25, "y":4},
- {"x":12.25, "y":4, "w":2.75},
- {"x":15, "y":4},
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 15], "x": 15, "y": 4},
- {"x":1, "y":5, "w":1.5},
- {"x":2.5, "y":5, "w":1.5},
- {"x":4, "y":5, "w":7},
- {"x":11, "y":5, "w":1.5},
- {"x":12.5, "y":5, "w":1.5},
- {"x":14, "y":5},
- {"x":15, "y":5},
- {"x":16, "y":5}
+ {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 7], "x": 4, "y": 5, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5}
]
}
}
diff --git a/keyboards/handwired/angel/angel.h b/keyboards/handwired/angel/angel.h
deleted file mode 100644
index f39fac97d6..0000000000
--- a/keyboards/handwired/angel/angel.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 James Sa <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1a , k1b ,\
- k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2a , k2b , k2c ,\
- k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3a , k3b , k3c , k3d ,\
- k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4a , k4b \
-) \
-{ \
- { k11, k12, k13, k14, k15,KC_NO,KC_NO, k16, k17, k18, k19, k1a, k1b }, \
- { k21, k22, k23, k24, k25, k26, KC_NO, k27, k28, k29, k2a, k2b, k2c }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { KC_NO,k41,k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, KC_NO} \
-}
diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json
index 3bf7d83178..10916016cf 100644
--- a/keyboards/handwired/angel/info.json
+++ b/keyboards/handwired/angel/info.json
@@ -17,7 +17,58 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.25}, {"x":5.75, "y":3, "w":1.5}, {"x":7.25, "y":3, "w":1.25}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 7], "x": 6, "y": 0},
+ {"matrix": [0, 8], "x": 7, "y": 0},
+ {"matrix": [0, 9], "x": 8, "y": 0},
+ {"matrix": [0, 10], "x": 9, "y": 0},
+ {"matrix": [0, 11], "x": 10, "y": 0},
+ {"matrix": [0, 12], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 1], "x": 0.5, "y": 3},
+ {"matrix": [3, 2], "x": 1.5, "y": 3},
+ {"matrix": [3, 3], "x": 2.5, "y": 3},
+ {"matrix": [3, 4], "x": 3.5, "y": 3},
+ {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c
index 225a51bcce..7b4e6f9586 100644
--- a/keyboards/handwired/atreus50/atreus50.c
+++ b/keyboards/handwired/atreus50/atreus50.c
@@ -1,4 +1,4 @@
-#include "atreus50.h"
+#include "quantum.h"
void matrix_init_kb(void) {
diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h
deleted file mode 100644
index 710292a187..0000000000
--- a/keyboards/handwired/atreus50/atreus50.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
- k30, k31, k32, k33, k34, k35, kM0, kM1, k36, k37, k38, k39, k3A, k3B \
-) { \
- { k00, k01, k02, k03, k04, k05, XXX, k06, k07, k08, k09, k0A, k0B }, \
- { k10, k11, k12, k13, k14, k15, XXX, k16, k17, k18, k19, k1A, k1B }, \
- { k20, k21, k22, k23, k24, k25, kM0, k26, k27, k28, k29, k2A, k2B }, \
- { k30, k31, k32, k33, k34, k35, kM1, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define KC_ KC_TRNS
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index 70cb5aa1f2..cb1d6f6f0a 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -21,63 +21,63 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Tab", "x":0, "y":0.5},
- {"label":"Q", "x":1, "y":0.5},
- {"label":"W", "x":2, "y":0.25},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.25},
- {"label":"T", "x":5, "y":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
- {"label":"Y", "x":9, "y":0.5},
- {"label":"U", "x":10, "y":0.25},
- {"label":"I", "x":11, "y":0},
- {"label":"O", "x":12, "y":0.25},
- {"label":"P", "x":13, "y":0.5},
- {"label":"-", "x":14, "y":0.5},
+ {"matrix": [0, 7], "x": 9, "y": 0.5},
+ {"matrix": [0, 8], "x": 10, "y": 0.25},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0.25},
+ {"matrix": [0, 11], "x": 13, "y": 0.5},
+ {"matrix": [0, 12], "x": 14, "y": 0.5},
- {"label":"Ctrl/Esc", "x":0, "y":1.5},
- {"label":"A", "x":1, "y":1.5},
- {"label":"S", "x":2, "y":1.25},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.25},
- {"label":"G", "x":5, "y":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"label":"H", "x":9, "y":1.5},
- {"label":"J", "x":10, "y":1.25},
- {"label":"K", "x":11, "y":1},
- {"label":"L", "x":12, "y":1.25},
- {"label":";", "x":13, "y":1.5},
- {"label":"'", "x":14, "y":1.5},
+ {"matrix": [1, 7], "x": 9, "y": 1.5},
+ {"matrix": [1, 8], "x": 10, "y": 1.25},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1.25},
+ {"matrix": [1, 11], "x": 13, "y": 1.5},
+ {"matrix": [1, 12], "x": 14, "y": 1.5},
- {"label":"LShift", "x":0, "y":2.5},
- {"label":"Z", "x":1, "y":2.5},
- {"label":"X", "x":2, "y":2.25},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.25},
- {"label":"B", "x":5, "y":2.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
- {"label":"N", "x":9, "y":2.5},
- {"label":"M", "x":10, "y":2.25},
- {"label":",", "x":11, "y":2},
- {"label":".", "x":12, "y":2.25},
- {"label":"/", "x":13, "y":2.5},
- {"label":"Shift/Enter", "x":14, "y":2.5},
+ {"matrix": [2, 7], "x": 9, "y": 2.5},
+ {"matrix": [2, 8], "x": 10, "y": 2.25},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2.25},
+ {"matrix": [2, 11], "x": 13, "y": 2.5},
+ {"matrix": [2, 12], "x": 14, "y": 2.5},
- {"label":"`", "x":0, "y":3.5},
- {"label":"LCtrl", "x":1, "y":3.5},
- {"label":"LAlt", "x":2, "y":3.25},
- {"label":"LGUI", "x":3, "y":3},
- {"label":"Lower", "x":4, "y":3.25},
- {"label":"Space", "x":5, "y":3.5},
- {"label":"Fn", "x":6, "y":2.75, "h":1.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 3.5},
+ {"matrix": [2, 6], "x": 6, "y": 2.75, "h": 1.5},
- {"label":"RShift", "x":8, "y":2.75, "h":1.5},
- {"label":"Back Space", "x":9, "y":3.5},
- {"label":"Raise", "x":10, "y":3.25},
- {"label":"Left", "x":11, "y":3},
- {"label":"Down", "x":12, "y":3.25},
- {"label":"Up", "x":13, "y":3.5},
- {"label":"Right", "x":14, "y":3.5}
+ {"matrix": [3, 6], "x": 8, "y": 2.75, "h": 1.5},
+ {"matrix": [3, 7], "x": 9, "y": 3.5},
+ {"matrix": [3, 8], "x": 10, "y": 3.25},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3.25},
+ {"matrix": [3, 11], "x": 13, "y": 3.5},
+ {"matrix": [3, 12], "x": 14, "y": 3.5}
]
}
}
diff --git a/keyboards/handwired/bigmac/bigmac.h b/keyboards/handwired/bigmac/bigmac.h
deleted file mode 100644
index 43ba78d311..0000000000
--- a/keyboards/handwired/bigmac/bigmac.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Taylore101
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, \
- K40, K41, K43, K45, K46, K47, K48, K49, K4B, K4D, K4E, K4F, K4G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G }, \
- { K40, K41, KC_NO, K43, KC_NO, K45, K46, K47, K48, K49, KC_NO, K4B, KC_NO, K4D, K4E, K4F, K4G }, \
-}
diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json
index 13c523245c..b9377ae6c4 100644
--- a/keyboards/handwired/bigmac/info.json
+++ b/keyboards/handwired/bigmac/info.json
@@ -18,88 +18,104 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (F0,B6)", "x":0, "y":0, "w":1.5},
- {"label":"K01 (F0,B2)", "x":1.5, "y":0},
- {"label":"K02 (F0,B3)", "x":2.5, "y":0},
- {"label":"K03 (F0,B1)", "x":3.5, "y":0},
- {"label":"K04 (F0,F7)", "x":4.5, "y":0},
- {"label":"K05 (F0,F6)", "x":5.5, "y":0},
- {"label":"K06 (F0,F5)", "x":7, "y":0},
- {"label":"K07 (F0,F4)", "x":8, "y":0},
- {"label":"K08 (F0,D3)", "x":9, "y":0},
- {"label":"K09 (F0,D2)", "x":10.5, "y":0},
- {"label":"K0A (F0,D1)", "x":11.5, "y":0},
- {"label":"K0B (F0,D0)", "x":12.5, "y":0},
- {"label":"K0C (F0,D4)", "x":13.5, "y":0},
- {"label":"K0D (F0,C6)", "x":14.5, "y":0},
- {"label":"K0E (F0,D7)", "x":15.5, "y":0},
- {"label":"K0F (F0,E6)", "x":16.5, "y":0},
- {"label":"K0G (F0,B4)", "x":17.5, "y":0, "w":1.5},
- {"label":"K10 (F1,B6)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (F1,B2)", "x":1.5, "y":1},
- {"label":"K12 (F1,B3)", "x":2.5, "y":1},
- {"label":"K13 (F1,B1)", "x":3.5, "y":1},
- {"label":"K14 (F1,F7)", "x":4.5, "y":1},
- {"label":"K15 (F1,F6)", "x":5.5, "y":1},
- {"label":"K16 (F1,F5)", "x":7, "y":1},
- {"label":"K17 (F1,F4)", "x":8, "y":1},
- {"label":"K18 (F1,D3)", "x":9, "y":1},
- {"label":"K19 (F1,D2)", "x":10.5, "y":1},
- {"label":"K1A (F1,D1)", "x":11.5, "y":1},
- {"label":"K1B (F1,D0)", "x":12.5, "y":1},
- {"label":"K1C (F1,D4)", "x":13.5, "y":1},
- {"label":"K1D (F1,C6)", "x":14.5, "y":1},
- {"label":"K1E (F1,D7)", "x":15.5, "y":1},
- {"label":"K1F (F1,E6)", "x":16.5, "y":1},
- {"label":"K1G (F1,B4)", "x":17.5, "y":1, "w":1.5},
- {"label":"K20 (C7,B6)", "x":0, "y":2, "w":1.5},
- {"label":"K21 (C7,B2)", "x":1.5, "y":2},
- {"label":"K22 (C7,B3)", "x":2.5, "y":2},
- {"label":"K23 (C7,B1)", "x":3.5, "y":2},
- {"label":"K24 (C7,F7)", "x":4.5, "y":2},
- {"label":"K25 (C7,F6)", "x":5.5, "y":2},
- {"label":"K26 (C7,F5)", "x":7, "y":2},
- {"label":"K27 (C7,F4)", "x":8, "y":2},
- {"label":"K28 (C7,D3)", "x":9, "y":2},
- {"label":"K29 (C7,D2)", "x":10.5, "y":2},
- {"label":"K2A (C7,D1)", "x":11.5, "y":2},
- {"label":"K2B (C7,D0)", "x":12.5, "y":2},
- {"label":"K2C (C7,D4)", "x":13.5, "y":2},
- {"label":"K2D (C7,C6)", "x":14.5, "y":2},
- {"label":"K2E (C7,D7)", "x":15.5, "y":2},
- {"label":"K2F (C7,E6)", "x":16.5, "y":2, "w":1.5},
- {"label":"K2G (C7,B4)", "x":18, "y":2},
- {"label":"K30 (D5,B6)", "x":0, "y":3, "w":1.5},
- {"label":"K31 (D5,B2)", "x":1.5, "y":3},
- {"label":"K32 (D5,B3)", "x":2.5, "y":3},
- {"label":"K33 (D5,B1)", "x":3.5, "y":3},
- {"label":"K34 (D5,F7)", "x":4.5, "y":3},
- {"label":"K35 (D5,F6)", "x":5.5, "y":3},
- {"label":"K36 (D5,F5)", "x":7, "y":3},
- {"label":"K37 (D5,F4)", "x":8, "y":3},
- {"label":"K38 (D5,D3)", "x":9, "y":3},
- {"label":"K39 (D5,D2)", "x":10.5, "y":3},
- {"label":"K3A (D5,D1)", "x":11.5, "y":3},
- {"label":"K3B (D5,D0)", "x":12.5, "y":3},
- {"label":"K3C (D5,D4)", "x":13.5, "y":3},
- {"label":"K3D (D5,C6)", "x":14.5, "y":3},
- {"label":"K3E (D5,D7)", "x":15.5, "y":3, "w":1.5},
- {"label":"K3F (D5,E6)", "x":17, "y":3},
- {"label":"K3G (D5,B4)", "x":18, "y":3},
- {"label":"K40 (B7,B6)", "x":0, "y":4, "w":1.5},
- {"label":"K41 (B7,B2)", "x":1.5, "y":4, "w":1.5},
- {"label":"K43 (B7,B1)", "x":3, "y":4, "w":1.5},
- {"label":"K45 (B7,F6)", "x":4.5, "y":4, "w":2},
- {"label":"K46 (B7,F5)", "x":7, "y":4},
- {"label":"K47 (B7,F4)", "x":8, "y":4},
- {"label":"K48 (B7,D3)", "x":9, "y":4},
- {"label":"K49 (B7,D2)", "x":10.5, "y":4, "w":2},
- {"label":"K4B (B7,D0)", "x":12.5, "y":4, "w":1.5},
- {"label":"K4D (B7,C6)", "x":14, "y":4, "w":1.5},
- {"label":"K4E (B7,D7)", "x":16, "y":4},
- {"label":"K4F (B7,E6)", "x":17, "y":4},
- {"label":"K4G (B7,B4)", "x":18, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+
+ {"matrix": [1, 9], "x": 10.5, "y": 1},
+ {"matrix": [1, 10], "x": 11.5, "y": 1},
+ {"matrix": [1, 11], "x": 12.5, "y": 1},
+ {"matrix": [1, 12], "x": 13.5, "y": 1},
+ {"matrix": [1, 13], "x": 14.5, "y": 1},
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2},
+ {"matrix": [2, 11], "x": 12.5, "y": 2},
+ {"matrix": [2, 12], "x": 13.5, "y": 2},
+ {"matrix": [2, 13], "x": 14.5, "y": 2},
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 16], "x": 18, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+
+ {"matrix": [3, 9], "x": 10.5, "y": 3},
+ {"matrix": [3, 10], "x": 11.5, "y": 3},
+ {"matrix": [3, 11], "x": 12.5, "y": 3},
+ {"matrix": [3, 12], "x": 13.5, "y": 3},
+ {"matrix": [3, 13], "x": 14.5, "y": 3},
+ {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+ {"matrix": [3, 16], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2},
+
+ {"matrix": [4, 6], "x": 7, "y": 4},
+ {"matrix": [4, 7], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9, "y": 4},
+
+ {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 2},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4}
]
}
}
+
}
diff --git a/keyboards/handwired/bolek/bolek.h b/keyboards/handwired/bolek/bolek.h
deleted file mode 100644
index 4fc0f5a2fd..0000000000
--- a/keyboards/handwired/bolek/bolek.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 Mikołaj Biel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K405, K406, K407, K408, K409, \
- K100, K101, K102, K103, K104, K505, K506, K507, K508, K509, \
- K200, K201, K202, K203, K204, K605, K606, K607, K608, K609, \
- K302, K303, K304, K705, K706, K707 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K100, K101, K102, K103, K104, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, K302, K303, K304, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K405, K406, K407, K408, K409 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505, K506, K507, K508, K509 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K605, K606, K607, K608, K609 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json
index e72d4f45fb..43e306932f 100644
--- a/keyboards/handwired/bolek/info.json
+++ b/keyboards/handwired/bolek/info.json
@@ -18,42 +18,49 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Q", "x": 0, "y": 0.25 },
- { "label": "W", "x": 1, "y": 0 },
- { "label": "E", "x": 2, "y": 0 },
- { "label": "R", "x": 3, "y": 0.25 },
- { "label": "T", "x": 4, "y": 0.5 },
- { "label": "Y", "x": 7.75, "y": 0.5 },
- { "label": "U", "x": 8.75, "y": 0.25 },
- { "label": "I", "x": 9.75, "y": 0 },
- { "label": "O", "x": 10.75, "y": 0 },
- { "label": "P", "x": 11.75, "y": 0.25 },
- { "label": "A", "x": 0, "y": 1.25 },
- { "label": "S", "x": 1, "y": 1 },
- { "label": "D", "x": 2, "y": 1 },
- { "label": "F", "x": 3, "y": 1.25 },
- { "label": "G", "x": 4, "y": 1.5 },
- { "label": "H", "x": 7.75, "y": 1.5 },
- { "label": "J", "x": 8.75, "y": 1.25 },
- { "label": "K", "x": 9.75, "y": 1 },
- { "label": "L", "x": 10.75, "y": 1 },
- { "label": ";", "x": 11.75, "y": 1.25 },
- { "label": "Z", "x": 0, "y": 2.25 },
- { "label": "X", "x": 1, "y": 2 },
- { "label": "C", "x": 2, "y": 2 },
- { "label": "V", "x": 3, "y": 2.25 },
- { "label": "B", "x": 4, "y": 2.5 },
- { "label": "N", "x": 7.75, "y": 2.5 },
- { "label": "M", "x": 8.75, "y": 2.25 },
- { "label": ",", "x": 9.75, "y": 2 },
- { "label": ".", "x": 10.75, "y": 2 },
- { "label": "'", "x": 11.75, "y": 2.25 },
- { "label": "ESC", "x": 3.25, "y": 3.75 },
- { "label": "SPC", "x": 4.25, "y": 4 },
- { "label": "TAB", "x": 5.25, "y": 4.25 },
- { "label": "RET", "x": 6.5, "y": 4.25 },
- { "label": "BSPC", "x": 7.5, "y": 4 },
- { "label": "RESET", "x": 8.5, "y": 3.75 }
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 5], "x": 7.75, "y": 0.5},
+ {"matrix": [4, 6], "x": 8.75, "y": 0.25},
+ {"matrix": [4, 7], "x": 9.75, "y": 0},
+ {"matrix": [4, 8], "x": 10.75, "y": 0},
+ {"matrix": [4, 9], "x": 11.75, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 5], "x": 7.75, "y": 1.5},
+ {"matrix": [5, 6], "x": 8.75, "y": 1.25},
+ {"matrix": [5, 7], "x": 9.75, "y": 1},
+ {"matrix": [5, 8], "x": 10.75, "y": 1},
+ {"matrix": [5, 9], "x": 11.75, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 5], "x": 7.75, "y": 2.5},
+ {"matrix": [6, 6], "x": 8.75, "y": 2.25},
+ {"matrix": [6, 7], "x": 9.75, "y": 2},
+ {"matrix": [6, 8], "x": 10.75, "y": 2},
+ {"matrix": [6, 9], "x": 11.75, "y": 2.25},
+
+ {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+ {"matrix": [3, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 4], "x": 5.25, "y": 4.25},
+
+ {"matrix": [7, 5], "x": 6.5, "y": 4.25},
+ {"matrix": [7, 6], "x": 7.5, "y": 4},
+ {"matrix": [7, 7], "x": 8.5, "y": 3.75}
]
}
}
diff --git a/keyboards/handwired/brain/brain.h b/keyboards/handwired/brain/brain.h
deleted file mode 100644
index a0f2ad6848..0000000000
--- a/keyboards/handwired/brain/brain.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-
-
-
-#define LAYOUT( \
- L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, \
- L43, L44, L45, R41, R42, R43 \
- ) \
- { \
- { KC_NO, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { KC_NO, L31, L32, L33, L34, L35, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, L43, L44, L45, KC_NO}, \
-\
- { R00, R01, R02, R03, R04, R05, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { KC_NO, R31, R32, R33, R34, R35, KC_NO }, \
- { KC_NO, R41, R42, R43, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index 042d38046b..77506e8746 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -35,66 +35,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":1},
- {"x":2, "y":0.5},
- {"x":3, "y":0},
- {"x":4, "y":0.5},
- {"x":5, "y":0.75},
- {"x":6, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":0.75},
- {"x":10, "y":0.5},
- {"x":11, "y":0},
- {"x":12, "y":0.5},
- {"x":13, "y":1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.75},
+ {"matrix": [0, 6], "x": 6, "y": 1},
- {"x":0, "y":2.25},
- {"x":1, "y":2},
- {"x":2, "y":1.5},
- {"x":3, "y":1},
- {"x":4, "y":1.5},
- {"x":5, "y":1.75},
- {"x":6, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":1.75},
- {"x":10, "y":1.5},
- {"x":11, "y":1},
- {"x":12, "y":1.5},
- {"x":13, "y":2},
- {"x":14, "y":2.25},
+ {"matrix": [5, 0], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 0.75},
+ {"matrix": [5, 2], "x": 10, "y": 0.5},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.5},
+ {"matrix": [5, 5], "x": 13, "y": 1},
- {"x":0, "y":3.25},
- {"x":1, "y":3},
- {"x":2, "y":2.5},
- {"x":3, "y":2},
- {"x":4, "y":2.5},
- {"x":5, "y":2.75},
- {"x":6, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":2.75},
- {"x":10, "y":2.5},
- {"x":11, "y":2},
- {"x":12, "y":2.5},
- {"x":13, "y":3},
- {"x":14, "y":3.25},
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.75},
+ {"matrix": [1, 6], "x": 6, "y": 2},
- {"x":1, "y":4},
- {"x":2, "y":3.5},
- {"x":3.5, "y":4.25},
- {"x":4.5, "y":4.25},
- {"x":5.5, "y":4.25},
- {"x":8.5, "y":4.25},
- {"x":9.5, "y":4.25},
- {"x":10.5, "y":4.25},
- {"x":12, "y":3.5},
- {"x":13, "y":4},
+ {"matrix": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 1.75},
+ {"matrix": [6, 2], "x": 10, "y": 1.5},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.5},
+ {"matrix": [6, 5], "x": 13, "y": 2},
+ {"matrix": [6, 6], "x": 14, "y": 2.25},
- {"x":3.5, "y":5.25},
- {"x":4.5, "y":5.25},
- {"x":5.5, "y":5.25},
- {"x":8.5, "y":5.25},
- {"x":9.5, "y":5.25},
- {"x":10.5, "y":5.25}
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.75},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+
+ {"matrix": [7, 0], "x": 8, "y": 3},
+ {"matrix": [7, 1], "x": 9, "y": 2.75},
+ {"matrix": [7, 2], "x": 10, "y": 2.5},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.5},
+ {"matrix": [7, 5], "x": 13, "y": 3},
+ {"matrix": [7, 6], "x": 14, "y": 3.25},
+
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+
+ {"matrix": [8, 1], "x": 8.5, "y": 4.25},
+ {"matrix": [8, 2], "x": 9.5, "y": 4.25},
+ {"matrix": [8, 3], "x": 10.5, "y": 4.25},
+ {"matrix": [8, 4], "x": 12, "y": 3.5},
+ {"matrix": [8, 5], "x": 13, "y": 4},
+
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 5.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 5.25},
+
+ {"matrix": [9, 1], "x": 8.5, "y": 5.25},
+ {"matrix": [9, 2], "x": 9.5, "y": 5.25},
+ {"matrix": [9, 3], "x": 10.5, "y": 5.25}
]
}
}
diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h
deleted file mode 100644
index ddcf98fcdb..0000000000
--- a/keyboards/handwired/carpolly/carpolly.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Paul Enrico N. Viola
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K36, K3A, K3B, K3C \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
- { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json
index 3cac934d6e..a0f28d3eeb 100644
--- a/keyboards/handwired/carpolly/info.json
+++ b/keyboards/handwired/carpolly/info.json
@@ -18,49 +18,52 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (B0,F0)", "x": 0, "y": 0 },
- { "label": "K01 (B0,F1)", "x": 1, "y": 0 },
- { "label": "K02 (B0,F4)", "x": 2, "y": 0 },
- { "label": "K03 (B0,F5)", "x": 3, "y": 0 },
- { "label": "K04 (B0,F6)", "x": 4, "y": 0 },
- { "label": "K05 (B0,B6)", "x": 5, "y": 0 },
- { "label": "K06 (B0,B5)", "x": 6, "y": 0 },
- { "label": "K07 (B0,B4)", "x": 7, "y": 0 },
- { "label": "K08 (B0,D7)", "x": 8, "y": 0 },
- { "label": "K09 (B0,D6)", "x": 9, "y": 0 },
- { "label": "K0A (B0,D4)", "x": 10, "y": 0 },
- { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 },
- { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 },
- { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 },
- { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 },
- { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 },
- { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 },
- { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 },
- { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 },
- { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 },
- { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 },
- { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 },
- { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 },
- { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 },
- { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 },
- { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 },
- { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
- { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 },
- { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 },
- { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 },
- { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 },
- { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 },
- { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 },
- { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 },
- { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 },
- { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 },
- { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 },
- { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 },
- { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 },
- { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 },
- { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 },
- { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
- { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3}
]
}
}
diff --git a/keyboards/handwired/chiron/chiron.h b/keyboards/handwired/chiron/chiron.h
deleted file mode 100644
index 9d1ab385a5..0000000000
--- a/keyboards/handwired/chiron/chiron.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Mike Hix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
- ) \
- { \
- /* Left Half */ \
- { L06, L05, L04, L03, L02, L01, L00 }, \
- { L16, L15, L14, L13, L12, L11, L10 }, \
- { L26, L25, L24, L23, L22, L21, L20 }, \
- { L36, L35, L34, L33, L32, L31, L30 }, \
- { L45, L44, L43, KC_NO, L42, L41, L40 }, \
- /* Right Half */ \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R45, R44, R43, KC_NO, R42, R41, R40 } \
- }
-
-#define LAYOUT_chiron LAYOUT
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
index e5c076a77c..2cb9a7a4d9 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/info.json
@@ -25,77 +25,89 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_chiron": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
- {"label":"R00", "x":8, "y":0},
- {"label":"R01", "x":9, "y":0},
- {"label":"R02", "x":10, "y":0},
- {"label":"R03", "x":11, "y":0},
- {"label":"R04", "x":12, "y":0},
- {"label":"R05", "x":13, "y":0},
- {"label":"R06", "x":14, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"L16", "x":6, "y":1},
- {"label":"R10", "x":8, "y":1},
- {"label":"R11", "x":9, "y":1},
- {"label":"R12", "x":10, "y":1},
- {"label":"R13", "x":11, "y":1},
- {"label":"R14", "x":12, "y":1},
- {"label":"R15", "x":13, "y":1},
- {"label":"R16", "x":14, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"L26", "x":6, "y":2},
- {"label":"R20", "x":8, "y":2},
- {"label":"R21", "x":9, "y":2},
- {"label":"R22", "x":10, "y":2},
- {"label":"R23", "x":11, "y":2},
- {"label":"R24", "x":12, "y":2},
- {"label":"R25", "x":13, "y":2},
- {"label":"R26", "x":14, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"L36", "x":6, "y":3},
- {"label":"R30", "x":8, "y":3},
- {"label":"R31", "x":9, "y":3},
- {"label":"R32", "x":10, "y":3},
- {"label":"R33", "x":11, "y":3},
- {"label":"R34", "x":12, "y":3},
- {"label":"R35", "x":13, "y":3},
- {"label":"R36", "x":14, "y":3},
- {"label":"L40", "x":0, "y":4},
- {"label":"L41", "x":1, "y":4},
- {"label":"L42", "x":2, "y":4},
- {"label":"L43", "x":4, "y":4, "h":1.25},
- {"label":"L44", "x":5, "y":4, "h":1.25},
- {"label":"L45", "x":6, "y":4, "h":1.25},
- {"label":"R40", "x":8, "y":4, "h":1.25},
- {"label":"R41", "x":9, "y":4, "h":1.25},
- {"label":"R42", "x":10, "y":4, "h":1.25},
- {"label":"R43", "x":12, "y":4},
- {"label":"R44", "x":13, "y":4},
- {"label":"R45", "x":14, "y":4}
+ {"matrix": [0, 6], "x": 0, "y": 0},
+ {"matrix": [0, 5], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 6, "y": 0},
+
+ {"matrix": [5, 6], "x": 8, "y": 0},
+ {"matrix": [5, 5], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [1, 4], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 1], "x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 6, "y": 1},
+
+ {"matrix": [6, 6], "x": 8, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 6], "x": 0, "y": 2},
+ {"matrix": [2, 5], "x": 1, "y": 2},
+ {"matrix": [2, 4], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 1], "x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 6, "y": 2},
+
+ {"matrix": [7, 6], "x": 8, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 6], "x": 0, "y": 3},
+ {"matrix": [3, 5], "x": 1, "y": 3},
+ {"matrix": [3, 4], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 1], "x": 5, "y": 3},
+ {"matrix": [3, 0], "x": 6, "y": 3},
+
+ {"matrix": [8, 6], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [4, 6], "x": 0, "y": 4},
+ {"matrix": [4, 5], "x": 1, "y": 4},
+ {"matrix": [4, 4], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
+ {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
+ {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
+ {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 13, "y": 4},
+ {"matrix": [9, 0], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/handwired/cmd60/cmd60.h b/keyboards/handwired/cmd60/cmd60.h
deleted file mode 100644
index 5c196e899f..0000000000
--- a/keyboards/handwired/cmd60/cmd60.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3D, \
- k40, k41, k42, k45, k4A, k4B, k4C, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, XXX, k3D }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
-}
diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json
index f3db2960f5..7236fc7961 100644
--- a/keyboards/handwired/cmd60/info.json
+++ b/keyboards/handwired/cmd60/info.json
@@ -18,67 +18,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"GUI", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/consolekeyboard/18key/18key.h b/keyboards/handwired/consolekeyboard/18key/18key.h
deleted file mode 100644
index 9625d9806c..0000000000
--- a/keyboards/handwired/consolekeyboard/18key/18key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K004, K005, K006, K008, K009, K010, \
- K100, K101, K102, K104, K105, K106, K108, K109, K110 \
-) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \
-}
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
index f4b99ed3f7..3a37174f36 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -21,27 +21,30 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,C6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K04 (D1,B3)", "x":4, "y":0},
- {"label":"K05 (D1,B2)", "x":5, "y":0},
- {"label":"K06 (D1,B6)", "x":6, "y":0},
- {"label":"K08 (D1,E6)", "x":8, "y":0},
- {"label":"K09 (D1,C4)", "x":9, "y":0},
- {"label":"K0A (D1,C5)", "x":10, "y":0},
- {"label":"K10 (D0,D4)", "x":0, "y":1},
- {"label":"K11 (D0,C6)", "x":1, "y":1},
- {"label":"K12 (D0,D7)", "x":2, "y":1},
- {"label":"K14 (D0,B3)", "x":4, "y":1},
- {"label":"K15 (D0,B2)", "x":5, "y":1},
- {"label":"K16 (D0,B6)", "x":6, "y":1},
- {"label":"K18 (D0,E6)", "x":8, "y":1},
- {"label":"K19 (D0,C4)", "x":9, "y":1},
- {"label":"K1A (D0,C5)", "x":10, "y":1}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1}
]
}
}
-
}
diff --git a/keyboards/handwired/consolekeyboard/20key/20key.h b/keyboards/handwired/consolekeyboard/20key/20key.h
deleted file mode 100644
index bd109caf36..0000000000
--- a/keyboards/handwired/consolekeyboard/20key/20key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K004, K005, K006, K007, K009, K010, K011, \
- K100, K101, K102, K104, K105, K106, K107, K109, K110, K111 \
-) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \
-}
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index c62b02259c..1dc5a331e1 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
@@ -21,28 +21,32 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,C6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K04 (D1,B3)", "x":4, "y":0},
- {"label":"K05 (D1,B2)", "x":5, "y":0},
- {"label":"K06 (D1,B6)", "x":6, "y":0},
- {"label":"K07 (D1,E6)", "x":7, "y":0},
- {"label":"K09 (D1,B5)", "x":9, "y":0},
- {"label":"K0A (D1,C4)", "x":10, "y":0},
- {"label":"K0B (D1,C5)", "x":11, "y":0},
- {"label":"K10 (D0,D4)", "x":0, "y":1},
- {"label":"K11 (D0,C6)", "x":1, "y":1},
- {"label":"K12 (D0,D7)", "x":2, "y":1},
- {"label":"K14 (D0,B3)", "x":4, "y":1},
- {"label":"K15 (D0,B2)", "x":5, "y":1},
- {"label":"K16 (D0,B6)", "x":6, "y":1},
- {"label":"K17 (D0,E6)", "x":7, "y":1},
- {"label":"K19 (D0,B5)", "x":9, "y":1},
- {"label":"K1A (D0,C4)", "x":10, "y":1},
- {"label":"K1B (D0,C5)", "x":11, "y":1}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1}
]
}
}
-
}
diff --git a/keyboards/handwired/consolekeyboard/27key/27key.h b/keyboards/handwired/consolekeyboard/27key/27key.h
deleted file mode 100644
index 2c68f1f03b..0000000000
--- a/keyboards/handwired/consolekeyboard/27key/27key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K004, K005, K006, K008, K009, K010, \
- K100, K101, K102, K104, K105, K106, K108, K109, K110, \
- K200, K201, K202, K204, K205, K206, K208, K209, K210 \
- ) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \
- { K200, K201, K202, KC_NO, K204, K205, K206, KC_NO, K208, K209, K210 }, \
-}
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
index 854fe37e30..86682eb0f4 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -21,36 +21,42 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,C6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K04 (D1,B3)", "x":4, "y":0},
- {"label":"K05 (D1,B2)", "x":5, "y":0},
- {"label":"K06 (D1,B6)", "x":6, "y":0},
- {"label":"K08 (D1,E6)", "x":8, "y":0},
- {"label":"K09 (D1,C4)", "x":9, "y":0},
- {"label":"K0A (D1,C5)", "x":10, "y":0},
- {"label":"K10 (D0,D4)", "x":0, "y":1},
- {"label":"K11 (D0,C6)", "x":1, "y":1},
- {"label":"K12 (D0,D7)", "x":2, "y":1},
- {"label":"K14 (D0,B3)", "x":4, "y":1},
- {"label":"K15 (D0,B2)", "x":5, "y":1},
- {"label":"K16 (D0,B6)", "x":6, "y":1},
- {"label":"K18 (D0,E6)", "x":8, "y":1},
- {"label":"K19 (D0,C4)", "x":9, "y":1},
- {"label":"K1A (D0,C5)", "x":10, "y":1},
- {"label":"K20 (F7,D4)", "x":0, "y":2},
- {"label":"K21 (F7,C6)", "x":1, "y":2},
- {"label":"K22 (F7,D7)", "x":2, "y":2},
- {"label":"K24 (F7,B3)", "x":4, "y":2},
- {"label":"K25 (F7,B2)", "x":5, "y":2},
- {"label":"K26 (F7,B6)", "x":6, "y":2},
- {"label":"K27 (F7,E6)", "x":8, "y":2},
- {"label":"K29 (F7,C4)", "x":9, "y":2},
- {"label":"K2A (F7,C5)", "x":10, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2}
]
}
}
-
}
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.h b/keyboards/handwired/consolekeyboard/30key/30key.h
deleted file mode 100644
index 34008dcb00..0000000000
--- a/keyboards/handwired/consolekeyboard/30key/30key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K004, K005, K006, K007, K009, K010, K011, \
- K100, K101, K102, K104, K105, K106, K107, K109, K110, K111, \
- K200, K201, K202, K204, K205, K206, K207, K209, K210, K211 \
- ) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \
- { K200, K201, K202, KC_NO, K204, K205, K206, K207, KC_NO, K209, K210, K211 }, \
-}
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index fe08b20b28..e2bac91ab1 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -21,38 +21,45 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,C6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K04 (D1,B3)", "x":4, "y":0},
- {"label":"K05 (D1,B2)", "x":5, "y":0},
- {"label":"K06 (D1,B6)", "x":6, "y":0},
- {"label":"K07 (D1,E6)", "x":7, "y":0},
- {"label":"K09 (D1,B5)", "x":9, "y":0},
- {"label":"K0A (D1,C4)", "x":10, "y":0},
- {"label":"K0B (D1,C5)", "x":11, "y":0},
- {"label":"K10 (D0,D4)", "x":0, "y":1},
- {"label":"K11 (D0,C6)", "x":1, "y":1},
- {"label":"K12 (D0,D7)", "x":2, "y":1},
- {"label":"K14 (D0,B3)", "x":4, "y":1},
- {"label":"K15 (D0,B2)", "x":5, "y":1},
- {"label":"K16 (D0,B6)", "x":6, "y":1},
- {"label":"K17 (D0,E6)", "x":7, "y":1},
- {"label":"K19 (D0,B5)", "x":9, "y":1},
- {"label":"K1A (D0,C4)", "x":10, "y":1},
- {"label":"K1B (D0,C5)", "x":11, "y":1},
- {"label":"K20 (F7,D4)", "x":0, "y":2},
- {"label":"K21 (F7,C6)", "x":1, "y":2},
- {"label":"K22 (F7,D7)", "x":2, "y":2},
- {"label":"K24 (F7,B3)", "x":4, "y":2},
- {"label":"K25 (F7,B2)", "x":5, "y":2},
- {"label":"K26 (F7,B6)", "x":6, "y":2},
- {"label":"K27 (F7,E6)", "x":7, "y":2},
- {"label":"K29 (F7,B5)", "x":9, "y":2},
- {"label":"K2A (F7,C4)", "x":10, "y":2},
- {"label":"K2B (F7,C5)", "x":11, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2}
]
}
}
-
}
diff --git a/keyboards/handwired/croxsplit44/croxsplit44.h b/keyboards/handwired/croxsplit44/croxsplit44.h
deleted file mode 100644
index c94124f9ee..0000000000
--- a/keyboards/handwired/croxsplit44/croxsplit44.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Samux6146
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K302, K303, K304, K305, K306, K307, K308, K309 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 817f2fe85a..399dae6c33 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -21,57 +21,57 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.375},
- {"x":1, "y":0.375},
- {"x":2, "y":0.125},
- {"x":3, "y":0},
- {"x":4, "y":0.125},
- {"x":5, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"x":7, "y":0.25},
- {"x":8, "y":0.125},
- {"x":9, "y":0},
- {"x":10, "y":0.125},
- {"x":11, "y":0.375},
- {"x":12, "y":0.375},
+ {"matrix": [0, 6], "x": 7, "y": 0.25},
+ {"matrix": [0, 7], "x": 8, "y": 0.125},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0.125},
+ {"matrix": [0, 10], "x": 11, "y": 0.375},
+ {"matrix": [0, 11], "x": 12, "y": 0.375},
- {"x":0, "y":1.375},
- {"x":1, "y":1.375},
- {"x":2, "y":1.125},
- {"x":3, "y":1},
- {"x":4, "y":1.125},
- {"x":5, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.125},
- {"x":9, "y":1},
- {"x":10, "y":1.125},
- {"x":11, "y":1.375},
- {"x":12, "y":1.375},
+ {"matrix": [1, 6], "x": 7, "y": 1.25},
+ {"matrix": [1, 7], "x": 8, "y": 1.125},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1.125},
+ {"matrix": [1, 10], "x": 11, "y": 1.375},
+ {"matrix": [1, 11], "x": 12, "y": 1.375},
- {"x":0, "y":2.375},
- {"x":1, "y":2.375},
- {"x":2, "y":2.125},
- {"x":3, "y":2},
- {"x":4, "y":2.125},
- {"x":5, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"x":7, "y":2.25},
- {"x":8, "y":2.125},
- {"x":9, "y":2},
- {"x":10, "y":2.125},
- {"x":11, "y":2.375},
- {"x":12, "y":2.375},
+ {"matrix": [2, 6], "x": 7, "y": 2.25},
+ {"matrix": [2, 7], "x": 8, "y": 2.125},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2.125},
+ {"matrix": [2, 10], "x": 11, "y": 2.375},
+ {"matrix": [2, 11], "x": 12, "y": 2.375},
- {"x":2, "y":3.125},
- {"x":3, "y":3},
- {"x":4, "y":3.5},
- {"x":5, "y":3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.5},
+ {"matrix": [3, 5], "x": 5, "y": 3.75},
- {"x":7, "y":3.75},
- {"x":8, "y":3.5},
- {"x":9, "y":3},
- {"x":10, "y":3.125}
+ {"matrix": [3, 6], "x": 7, "y": 3.75},
+ {"matrix": [3, 7], "x": 8, "y": 3.5},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3.125}
]
}
}
diff --git a/keyboards/handwired/d48/d48.h b/keyboards/handwired/d48/d48.h
deleted file mode 100644
index b698ca187f..0000000000
--- a/keyboards/handwired/d48/d48.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- K08, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B \
-) { \
- { ___, ___, ___, ___, ___, ___, ___, ___, K08, ___, ___, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B } \
-}
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index 2c426cd9a5..db3f2bbacc 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -28,60 +28,61 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":8, "y":0},
- {"x":11, "y":0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
+ {"matrix": [0, 11], "x": 11, "y": 0},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":7, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4}
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/handwired/dactyl_left/dactyl_left.h b/keyboards/handwired/dactyl_left/dactyl_left.h
deleted file mode 100644
index 1babf3fe47..0000000000
--- a/keyboards/handwired/dactyl_left/dactyl_left.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 RedForty
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT(\
- k00, k01, k02, k03, k04, k05, \
- k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, \
- k30, k31, k32, k33, k34, k35, \
- k40, k41, k42, k43, k44, \
- k50, k51, k52, k53, k54, k55 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, KC_NO }, \
- { k50, k51, k52, k53, k54, k55 } \
-}
diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json
index e8ce55e001..69d9e9e24f 100644
--- a/keyboards/handwired/dactyl_left/info.json
+++ b/keyboards/handwired/dactyl_left/info.json
@@ -17,7 +17,48 @@
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, {"x":6, "y":4.75}, {"x":7, "y":4.75}, {"x":5, "y":5.75, "h":2}, {"x":6, "y":5.75, "h":2}, {"x":7, "y":5.75}, {"x":7, "y":6.75}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0.375},
+ {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3.375},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 4.375},
+ {"matrix": [4, 1], "x": 1.5, "y": 4.375},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+ {"matrix": [5, 0], "x": 6, "y": 4.75},
+ {"matrix": [5, 1], "x": 7, "y": 4.75},
+ {"matrix": [5, 2], "x": 5, "y": 5.75, "h": 2},
+ {"matrix": [5, 3], "x": 6, "y": 5.75, "h": 2},
+ {"matrix": [5, 4], "x": 7, "y": 5.75},
+ {"matrix": [5, 5], "x": 7, "y": 6.75}
+ ]
}
}
}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h
deleted file mode 100644
index d2790473b5..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 Shem Sedrick (@ssedrick)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-#define LAYOUT( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L31, L32, R32, R33, \
- L33, R31, \
- L34, L44, R40, R30, \
- L42, L43, R41, R42 \
-) { \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { XXX, L31, L32, L33, L34 }, \
- { XXX, XXX, L42, L43, L44 }, \
-\
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { R30, R31, R32, R33, XXX }, \
- { R40, R41, R42, XXX, XXX }, \
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
index e1f8ed4ccd..00bcdff990 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -21,63 +21,63 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
+ {"matrix": [5, 0], "x": 6, "y": 0},
+ {"matrix": [5, 1], "x": 7, "y": 0},
+ {"matrix": [5, 2], "x": 8, "y": 0},
+ {"matrix": [5, 3], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "y": 1},
- {"x": 8, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
+ {"matrix": [6, 0], "x": 6, "y": 1},
+ {"matrix": [6, 1], "x": 7, "y": 1},
+ {"matrix": [6, 2], "x": 8, "y": 1},
+ {"matrix": [6, 3], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
- {"x": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
+ {"matrix": [7, 0], "x": 6, "y": 2},
+ {"matrix": [7, 1], "x": 7, "y": 2},
+ {"matrix": [7, 2], "x": 8, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"x": 8, "y": 3},
- {"x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 8, "y": 3},
+ {"matrix": [8, 3], "x": 9, "y": 3},
- {"x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
- {"x": 7, "y": 4},
+ {"matrix": [8, 1], "x": 7, "y": 4},
- {"x": 3, "y": 5},
- {"x": 4, "y": 5},
+ {"matrix": [3, 4], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
+ {"matrix": [9, 0], "x": 6, "y": 5},
+ {"matrix": [8, 0], "x": 7, "y": 5},
- {"x": 3, "y": 6},
- {"x": 4, "y": 6},
+ {"matrix": [4, 2], "x": 3, "y": 6},
+ {"matrix": [4, 3], "x": 4, "y": 6},
- {"x": 6, "y": 6},
- {"x": 7, "y": 6}
+ {"matrix": [9, 1], "x": 6, "y": 6},
+ {"matrix": [9, 2], "x": 7, "y": 6}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
deleted file mode 100644
index 99b11a712a..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L32, L33, R32, R33, \
- L34, L35, R30, R31, \
- L44, L45, R40, R41, \
- L42, L43, R42, R43 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { XXX, XXX, L32, L33, L34, L35 }, \
- { XXX, XXX, L42, L43, L44, L45 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, XXX, XXX }, \
- { R40, R41, R42, R43, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 61d420c3a5..849d8b4e4e 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -24,72 +24,73 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
+ {"matrix": [8, 0], "x": 11, "y": 4},
+ {"matrix": [8, 1], "x": 12, "y": 4},
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
+ {"matrix": [4, 4], "x": 6, "y": 5},
+ {"matrix": [4, 5], "x": 7, "y": 5},
- {"x": 9, "y": 5},
- {"x": 10, "y": 5},
+ {"matrix": [9, 0], "x": 9, "y": 5},
+ {"matrix": [9, 1], "x": 10, "y": 5},
- {"x": 6, "y": 6},
- {"x": 7, "y": 6},
+ {"matrix": [4, 2], "x": 6, "y": 6},
+ {"matrix": [4, 3], "x": 7, "y": 6},
- {"x": 9, "y": 6},
- {"x": 10, "y": 6}
- ]
+ {"matrix": [9, 2], "x": 9, "y": 6},
+ {"matrix": [9, 3], "x": 10, "y": 6}
+ ]
}
}
+
}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
deleted file mode 100644
index df639cbf22..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L32, L33, R32, R33, \
- L34, L45, L43, R42, R40, R31, \
- L44, L42, R43, R41 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { XXX, XXX, L32, L33, L34, XXX }, \
- { XXX, XXX, L42, L43, L44, L45 }, \
-\
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { XXX, R31, R32, R33, XXX, XXX }, \
- { R40, R41, R42, R43, XXX, XXX } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index 871572c142..63edf390ae 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -24,67 +24,67 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0},
- {"x": 16, "y": 0},
+ {"matrix": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1},
+ {"matrix": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2},
+ {"matrix": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
- {"x": 4, "y": 4},
- {"x": 5, "y": 4},
- {"x": 6, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 3], "x": 6, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
- {"x": 12, "y": 4},
+ {"matrix": [9, 2], "x": 10, "y": 4},
+ {"matrix": [9, 0], "x": 11, "y": 4},
+ {"matrix": [8, 1], "x": 12, "y": 4},
- {"x": 5, "y": 5},
- {"x": 6, "y": 5},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 2], "x": 6, "y": 5},
- {"x": 10, "y": 5},
- {"x": 11, "y": 5}
+ {"matrix": [9, 3], "x": 10, "y": 5},
+ {"matrix": [9, 1], "x": 11, "y": 5}
]
}
}
diff --git a/keyboards/handwired/daishi/daishi.h b/keyboards/handwired/daishi/daishi.h
deleted file mode 100644
index 0d0c57ab20..0000000000
--- a/keyboards/handwired/daishi/daishi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5D, K5E, K5F, K5G, K5H, \
- K60, K61, K62, K65, K69, K6A, K6C, K6D, K6E, K6F, K6G \
-){ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E, K4F, K4G, K4H }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO, K5D, K5E, K5F, K5G, K5H }, \
- { K60, K61, K62, KC_NO, KC_NO, K65, KC_NO, KC_NO, KC_NO, K69, K6A, KC_NO, K6C, K6D, K6E, K6F, K6G, KC_NO } \
-}
diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json
index 7bd1c6dd8d..37d80633a7 100644
--- a/keyboards/handwired/daishi/info.json
+++ b/keyboards/handwired/daishi/info.json
@@ -23,129 +23,148 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.5, "y":0},
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":9.75, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4.33, "y":1.25},
- {"x":5.33, "y":1.25},
- {"x":6.33, "y":1.25},
- {"x":7.33, "y":1.25},
- {"x":8.67, "y":1.25},
- {"x":9.67, "y":1.25},
- {"x":10.67, "y":1.25},
- {"x":11.67, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14.25, "y":1.25},
- {"x":15.25, "y":1.25},
- {"x":16.25, "y":1.25},
- {"x":17.5, "y":1.25},
- {"x":18.5, "y":1.25},
-
- {"x":0, "y":2.5},
- {"x":1, "y":2.5},
- {"x":2, "y":2.5},
- {"x":3, "y":2.5},
- {"x":4, "y":2.5},
- {"x":5, "y":2.5},
- {"x":6, "y":2.5},
- {"x":7, "y":2.5},
- {"x":8, "y":2.5},
- {"x":9, "y":2.5},
- {"x":10, "y":2.5},
- {"x":11, "y":2.5},
- {"x":12, "y":2.5},
- {"x":13, "y":2.5, "w":2},
- {"x":15.25, "y":2.25},
- {"x":16.5, "y":2.5},
- {"x":17.5, "y":2.5},
- {"x":18.5, "y":2.5},
-
- {"x":0, "y":3.5, "w":1.5},
- {"x":1.5, "y":3.5},
- {"x":2.5, "y":3.5},
- {"x":3.5, "y":3.5},
- {"x":4.5, "y":3.5},
- {"x":5.5, "y":3.5},
- {"x":6.5, "y":3.5},
- {"x":7.5, "y":3.5},
- {"x":8.5, "y":3.5},
- {"x":9.5, "y":3.5},
- {"x":10.5, "y":3.5},
- {"x":11.5, "y":3.5},
- {"x":12.5, "y":3.5},
- {"x":13.5, "y":3.5, "w":1.5},
- {"x":15.5, "y":3.5},
- {"x":16.5, "y":3.5},
- {"x":17.5, "y":3.5},
- {"x":18.5, "y":3.5},
-
- {"x":0, "y":4.5, "w":1.75},
- {"x":1.75, "y":4.5},
- {"x":2.75, "y":4.5},
- {"x":3.75, "y":4.5},
- {"x":4.75, "y":4.5},
- {"x":5.75, "y":4.5},
- {"x":6.75, "y":4.5},
- {"x":7.75, "y":4.5},
- {"x":8.75, "y":4.5},
- {"x":9.75, "y":4.5},
- {"x":10.75, "y":4.5},
- {"x":11.75, "y":4.5},
- {"x":12.75, "y":4.5, "w":2.25},
- {"x":15.5, "y":4.5},
- {"x":16.5, "y":4.5},
- {"x":17.5, "y":4.5},
- {"x":18.5, "y":4.5},
-
- {"x":0, "y":5.5, "w":2.25},
- {"x":2.25, "y":5.5},
- {"x":3.25, "y":5.5},
- {"x":4.25, "y":5.5},
- {"x":5.25, "y":5.5},
- {"x":6.25, "y":5.5},
- {"x":7.25, "y":5.5},
- {"x":8.25, "y":5.5},
- {"x":9.25, "y":5.5},
- {"x":10.25, "y":5.5},
- {"x":11.25, "y":5.5},
- {"x":12.25, "y":5.5, "w":1.75},
- {"x":14.25, "y":5.75},
- {"x":15.5, "y":5.5},
- {"x":16.5, "y":5.5},
- {"x":17.5, "y":5.5},
- {"x":18.5, "y":5.5, "h":2},
-
- {"x":0, "y":6.5, "w":1.25},
- {"x":1.25, "y":6.5, "w":1.25},
- {"x":2.5, "y":6.5, "w":1.25},
- {"x":3.75, "y":6.5, "w":6.25},
- {"x":10, "y":6.5, "w":1.5},
- {"x":11.5, "y":6.5, "w":1.5},
- {"x":13.25, "y":6.75},
- {"x":14.25, "y":6.75},
- {"x":15.25, "y":6.75},
- {"x":16.5, "y":6.5},
- {"x":17.5, "y":6.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+
+ {"matrix": [0, 13], "x": 14.25, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+ {"matrix": [1, 4], "x": 4.33, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.33, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.33, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.33, "y": 1.25},
+
+ {"matrix": [1, 8], "x": 8.67, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.67, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.67, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.67, "y": 1.25},
+
+ {"matrix": [1, 12], "x": 13, "y": 1.25},
+
+ {"matrix": [1, 13], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+ {"matrix": [2, 7], "x": 7, "y": 2.5},
+ {"matrix": [2, 8], "x": 8, "y": 2.5},
+ {"matrix": [2, 9], "x": 9, "y": 2.5},
+ {"matrix": [2, 10], "x": 10, "y": 2.5},
+ {"matrix": [2, 11], "x": 11, "y": 2.5},
+ {"matrix": [2, 12], "x": 12, "y": 2.5},
+ {"matrix": [2, 13], "x": 13, "y": 2.5, "w": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+ {"matrix": [3, 13], "x": 13.5, "y": 3.5, "w": 1.5},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.75, "y": 4.5, "w": 2.25},
+
+ {"matrix": [4, 14], "x": 15.5, "y": 4.5},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2.25},
+ {"matrix": [5, 1], "x": 2.25, "y": 5.5},
+ {"matrix": [5, 2], "x": 3.25, "y": 5.5},
+ {"matrix": [5, 3], "x": 4.25, "y": 5.5},
+ {"matrix": [5, 4], "x": 5.25, "y": 5.5},
+ {"matrix": [5, 5], "x": 6.25, "y": 5.5},
+ {"matrix": [5, 6], "x": 7.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 9.25, "y": 5.5},
+ {"matrix": [5, 9], "x": 10.25, "y": 5.5},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5},
+ {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.75},
+
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+
+ {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 6.5, "w": 1.25},
+ {"matrix": [6, 1], "x": 1.25, "y": 6.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 6.5, "w": 1.25},
+ {"matrix": [6, 5], "x": 3.75, "y": 6.5, "w": 6.25},
+ {"matrix": [6, 9], "x": 10, "y": 6.5, "w": 1.5},
+ {"matrix": [6, 10], "x": 11.5, "y": 6.5, "w": 1.5},
+
+ {"matrix": [6, 12], "x": 13.25, "y": 6.75},
+ {"matrix": [6, 13], "x": 14.25, "y": 6.75},
+ {"matrix": [6, 14], "x": 15.25, "y": 6.75},
+
+ {"matrix": [6, 15], "x": 16.5, "y": 6.5},
+ {"matrix": [6, 16], "x": 17.5, "y": 6.5}
]
}
}
diff --git a/keyboards/handwired/datahand/datahand.h b/keyboards/handwired/datahand/datahand.h
index cb9a4d3e3b..bd759be343 100644
--- a/keyboards/handwired/datahand/datahand.h
+++ b/keyboards/handwired/datahand/datahand.h
@@ -17,40 +17,6 @@
#include "quantum.h"
-/* This a shortcut to help you visually see your layout.
- * The first section contains all of the arguements; the second converts the arguments into a two-dimensional array.
- */
-
-/* Each code is three letters
- * l or r - left or right hand
- * p, r, m, i, t - pinky, ring finger, middle finger, index finger, thumb
- * fingers: n, s, e, w, c - north, south, east, west, and center (manual calls this "well" but we already have "west")
- * thumb: p, n, c, l, u, k - pad, nail, center, lock (harder center), up, knuckle
- */
-#define LAYOUT( \
- lpn, lrn, lmn, lin, rin, rmn, rrn, rpn, \
-lpw, lpc, lpe, lrw, lrc, lre, lmw, lmc, lme, liw, lic, lie, riw, ric, rie, rmw, rmc, rme, rrw, rrc, rre, rpw, rpc, rpe, \
- lps, lrs, lms, lis, ris, rms, rrs, rps, \
- ltp, ltn, rtn, rtp, \
- ltc, rtc, \
- ltl, rtl, \
- ltu, ltk, rtk, rtu) \
-{ \
- {riw, rin, lpw, lpn},\
- {ric, rie, lpc, lpe},\
- {ris, rms, lps, lrs},\
- {rmw, rmn, lrw, lrn},\
- {rmc, rme, lrc, lre},\
- {rrw, rrn, lmw, lmn},\
- {rrc, rre, lmc, lme},\
- {rrs, rps, lms, lis},\
- {rpw, rpn, liw, lin},\
- {rpc, rpe, lic, lie},\
- {rtk, rtn, ltk, ltn},\
- {rtc, rtl, ltc, ltl},\
- {rtp, rtu, ltp, ltu},\
-}
-
/* Mode LEDs are active-low on Port B on the Teensy. */
#define LED_MODE_PORT PORTB
#define LED_TENKEY (1<<3)
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json
index 61d95aa12a..590eb090bd 100644
--- a/keyboards/handwired/datahand/info.json
+++ b/keyboards/handwired/datahand/info.json
@@ -14,89 +14,77 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"lpn", "x":1, "y":2.75},
+ {"matrix": [0, 3], "x": 1, "y": 2.75},
+ {"matrix": [3, 3], "x": 3.25, "y": 1.25},
- {"label":"lrn", "x":3.25, "y":1.25},
+ {"matrix": [5, 3], "x": 5.75, "y": 0},
+ {"matrix": [8, 3], "x": 9, "y": 0.75},
- {"label":"lmn", "x":5.75, "y":0},
+ {"matrix": [0, 1], "x": 13, "y": 0.75},
+ {"matrix": [3, 1], "x": 16.25, "y": 0},
- {"label":"lin", "x":9, "y":0.75},
+ {"matrix": [5, 1], "x": 18.75, "y": 1.25},
+ {"matrix": [8, 1], "x": 21, "y": 2.75},
- {"label":"rin", "x":13, "y":0.75},
+ {"matrix": [0, 2], "x": 0, "y": 3.75},
+ {"matrix": [1, 2], "x": 1, "y": 3.75},
+ {"matrix": [1, 3], "x": 2, "y": 3.75},
- {"label":"rmn", "x":16.25, "y":0},
+ {"matrix": [3, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 2.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 2.25},
- {"label":"rrn", "x":18.75, "y":1.25},
+ {"matrix": [5, 2], "x": 4.75, "y": 1},
+ {"matrix": [6, 2], "x": 5.75, "y": 1},
+ {"matrix": [6, 3], "x": 6.75, "y": 1},
- {"label":"rpn", "x":21, "y":2.75},
+ {"matrix": [8, 2], "x": 8, "y": 1.75},
+ {"matrix": [9, 2], "x": 9, "y": 1.75},
+ {"matrix": [9, 3], "x": 10, "y": 1.75},
- {"label":"lpw", "x":0, "y":3.75},
- {"label":"lpc", "x":1, "y":3.75},
- {"label":"lpe", "x":2, "y":3.75},
+ {"matrix": [0, 0], "x": 12, "y": 1.75},
+ {"matrix": [1, 0], "x": 13, "y": 1.75},
+ {"matrix": [1, 1], "x": 14, "y": 1.75},
- {"label":"lrw", "x":2.25, "y":2.25},
- {"label":"lrc", "x":3.25, "y":2.25},
- {"label":"lre", "x":4.25, "y":2.25},
+ {"matrix": [3, 0], "x": 15.25, "y": 1},
+ {"matrix": [4, 0], "x": 16.25, "y": 1},
+ {"matrix": [4, 1], "x": 17.25, "y": 1},
- {"label":"lmw", "x":4.75, "y":1},
- {"label":"lmc", "x":5.75, "y":1},
- {"label":"lme", "x":6.75, "y":1},
+ {"matrix": [5, 0], "x": 17.75, "y": 2.25},
+ {"matrix": [6, 0], "x": 18.75, "y": 2.25},
+ {"matrix": [6, 1], "x": 19.75, "y": 2.25},
- {"label":"liw", "x":8, "y":1.75},
- {"label":"lic", "x":9, "y":1.75},
- {"label":"lie", "x":10, "y":1.75},
+ {"matrix": [8, 0], "x": 20, "y": 3.75},
+ {"matrix": [9, 0], "x": 21, "y": 3.75},
+ {"matrix": [9, 1], "x": 22, "y": 3.75},
- {"label":"riw", "x":12, "y":1.75},
- {"label":"ric", "x":13, "y":1.75},
- {"label":"rie", "x":14, "y":1.75},
+ {"matrix": [2, 2], "x": 1, "y": 4.75},
+ {"matrix": [2, 3], "x": 3.25, "y": 3.25},
- {"label":"rmw", "x":15.25, "y":1},
- {"label":"rmc", "x":16.25, "y":1},
- {"label":"rme", "x":17.25, "y":1},
+ {"matrix": [7, 2], "x": 5.75, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2.75},
- {"label":"rrw", "x":17.75, "y":2.25},
- {"label":"rrc", "x":18.75, "y":2.25},
- {"label":"rre", "x":19.75, "y":2.25},
+ {"matrix": [2, 0], "x": 13, "y": 2.75},
+ {"matrix": [2, 1], "x": 16.25, "y": 2},
- {"label":"rpw", "x":20, "y":3.75},
- {"label":"rpc", "x":21, "y":3.75},
- {"label":"rpe", "x":22, "y":3.75},
+ {"matrix": [7, 0], "x": 18.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 21, "y": 4.75},
- {"label":"lps", "x":1, "y":4.75},
+ {"matrix": [12, 2], "x": 8, "y": 4.75},
+ {"matrix": [10, 3], "x": 10, "y": 4.75},
+ {"matrix": [10, 1], "x": 12, "y": 4.75},
+ {"matrix": [12, 0], "x": 14, "y": 4.75},
- {"label":"lrs", "x":3.25, "y":3.25},
+ {"matrix": [11, 2], "x": 9, "y": 5.25},
+ {"matrix": [11, 0], "x": 13, "y": 5.25},
- {"label":"lms", "x":5.75, "y":2},
+ {"matrix": [11, 3], "x": 9, "y": 6.25},
+ {"matrix": [11, 1], "x": 13, "y": 6.25},
- {"label":"lis", "x":9, "y":2.75},
-
- {"label":"ris", "x":13, "y":2.75},
-
- {"label":"rms", "x":16.25, "y":2},
-
- {"label":"rrs", "x":18.75, "y":3.25},
-
- {"label":"rps", "x":21, "y":4.75},
-
- {"label":"ltp", "x":8, "y":4.75},
- {"label":"ltn", "x":10, "y":4.75},
-
- {"label":"rtn", "x":12, "y":4.75},
- {"label":"rtp", "x":14, "y":4.75},
-
- {"label":"ltc", "x":9, "y":5.25},
-
- {"label":"rtc", "x":13, "y":5.25},
-
- {"label":"ltl", "x":9, "y":6.25},
-
- {"label":"rtl", "x":13, "y":6.25},
-
- {"label":"ltu", "x":8, "y":6.75},
- {"label":"ltk", "x":10, "y":6.75},
-
- {"label":"rtk", "x":12, "y":6.75},
- {"label":"rtu", "x":14, "y":6.75}
+ {"matrix": [12, 3], "x": 8, "y": 6.75},
+ {"matrix": [10, 2], "x": 10, "y": 6.75},
+ {"matrix": [10, 0], "x": 12, "y": 6.75},
+ {"matrix": [12, 1], "x": 14, "y": 6.75}
]
}
}
diff --git a/keyboards/handwired/dqz11n1g/dqz11n1g.h b/keyboards/handwired/dqz11n1g/dqz11n1g.h
deleted file mode 100644
index f5c55bd6d5..0000000000
--- a/keyboards/handwired/dqz11n1g/dqz11n1g.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2022 David Kuehling <dvdkhlng TA posteo TOD 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* Fill actually existing keys into the 7x19 keyboard matrix */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J, \
- k40, k41, k42, k43, k44, k45, k4D, k4E, k4F, k4G, k4H, k4J, \
- k51, k52, k53, k54, k5E, k5F, k5G, k5H, \
- k46, k47, k48, k4A, k4B, k4C, \
- k56, k57, k58, k5A, k5B, k5C, \
- k68, k6A \
-) { \
- /* left hand */ /* middle/thumb block */ /* right hand */ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4J }, \
- { XXX, k51, k52, k53, k54, XXX, k56, k57, k58, XXX, k5A, k5B, k5C, XXX, k5E, k5F, k5G, k5H, XXX }, \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, XXX, k6A, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-}
-
-/*
- * Local Variables:
- * c-basic-offset:4
- * fill-column: 76
- * End:
- */
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
index c72310a1e8..4df4185010 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/info.json
@@ -18,136 +18,137 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "matrix": [0, 0] },
- {"x": 1, "y": 0, "matrix": [0, 1] },
- {"x": 2, "y": 0, "matrix": [0, 2] },
- {"x": 3, "y": 0, "matrix": [0, 3] },
- {"x": 4, "y": 0, "matrix": [0, 4] },
- {"x": 5, "y": 0, "matrix": [0, 5] },
-
- {"x": 7, "y": 0, "matrix": [0, 6] },
- {"x": 8, "y": 0, "matrix": [0, 7] },
- {"x": 9, "y": 0, "matrix": [0, 8] },
- {"x": 10, "y": 0, "matrix": [0, 9] },
- {"x": 11, "y": 0, "matrix": [0, 10] },
- {"x": 12, "y": 0, "matrix": [0, 11] },
- {"x": 13, "y": 0, "matrix": [0, 12] },
-
- {"x": 15, "y": 0, "matrix": [0, 13] },
- {"x": 16, "y": 0, "matrix": [0, 14] },
- {"x": 17, "y": 0, "matrix": [0, 15] },
- {"x": 18, "y": 0, "matrix": [0, 16] },
- {"x": 19, "y": 0, "matrix": [0, 17] },
- {"x": 20, "y": 0, "matrix": [0, 18] },
-
- {"x": 0, "y": 1, "matrix": [1, 0] },
- {"x": 1, "y": 1, "matrix": [1, 1] },
- {"x": 2, "y": 1, "matrix": [1, 2] },
- {"x": 3, "y": 1, "matrix": [1, 3] },
- {"x": 4, "y": 1, "matrix": [1, 4] },
- {"x": 5, "y": 1, "matrix": [1, 5] },
-
- {"x": 7, "y": 1, "matrix": [1, 6] },
- {"x": 8, "y": 1, "matrix": [1, 7] },
- {"x": 9, "y": 1, "matrix": [1, 8] },
- {"x": 10, "y": 1, "matrix": [1, 9] },
- {"x": 11, "y": 1, "matrix": [1, 10] },
- {"x": 12, "y": 1, "matrix": [1, 11] },
- {"x": 13, "y": 1, "matrix": [1, 12] },
-
- {"x": 15, "y": 1, "matrix": [1, 13] },
- {"x": 16, "y": 1, "matrix": [1, 14] },
- {"x": 17, "y": 1, "matrix": [1, 15] },
- {"x": 18, "y": 1, "matrix": [1, 16] },
- {"x": 19, "y": 1, "matrix": [1, 17] },
- {"x": 20, "y": 1, "matrix": [1, 18] },
-
- {"x": 0, "y": 2, "matrix": [2, 0] },
- {"x": 1, "y": 2, "matrix": [2, 1] },
- {"x": 2, "y": 2, "matrix": [2, 2] },
- {"x": 3, "y": 2, "matrix": [2, 3] },
- {"x": 4, "y": 2, "matrix": [2, 4] },
- {"x": 5, "y": 2, "matrix": [2, 5] },
-
- {"x": 7, "y": 2, "matrix": [2, 6] },
- {"x": 8, "y": 2, "matrix": [2, 7] },
- {"x": 9, "y": 2, "matrix": [2, 8] },
- {"x": 10, "y": 2, "matrix": [2, 9] },
- {"x": 11, "y": 2, "matrix": [2, 10] },
- {"x": 12, "y": 2, "matrix": [2, 11] },
- {"x": 13, "y": 2, "matrix": [2, 12] },
-
- {"x": 15, "y": 2, "matrix": [2, 13] },
- {"x": 16, "y": 2, "matrix": [2, 14] },
- {"x": 17, "y": 2, "matrix": [2, 15] },
- {"x": 18, "y": 2, "matrix": [2, 16] },
- {"x": 19, "y": 2, "matrix": [2, 17] },
- {"x": 20, "y": 2, "matrix": [2, 18] },
-
- {"x": 0, "y": 3, "matrix": [3, 0] },
- {"x": 1, "y": 3, "matrix": [3, 1] },
- {"x": 2, "y": 3, "matrix": [3, 2] },
- {"x": 3, "y": 3, "matrix": [3, 3] },
- {"x": 4, "y": 3, "matrix": [3, 4] },
- {"x": 5, "y": 3, "matrix": [3, 5] },
-
- {"x": 7, "y": 3, "matrix": [3, 6] },
- {"x": 8, "y": 3, "matrix": [3, 7] },
- {"x": 9, "y": 3, "matrix": [3, 8] },
- {"x": 10, "y": 3, "matrix": [3, 9] },
- {"x": 11, "y": 3, "matrix": [3, 10] },
- {"x": 12, "y": 3, "matrix": [3, 11] },
- {"x": 13, "y": 3, "matrix": [3, 12] },
-
- {"x": 15, "y": 3, "matrix": [3, 13] },
- {"x": 16, "y": 3, "matrix": [3, 14] },
- {"x": 17, "y": 3, "matrix": [3, 15] },
- {"x": 18, "y": 3, "matrix": [3, 16] },
- {"x": 19, "y": 3, "matrix": [3, 17] },
- {"x": 20, "y": 3, "matrix": [3, 18] },
-
- {"x": 0, "y": 4, "h": 2, "matrix": [4, 0] },
- {"x": 1, "y": 4, "matrix": [4, 1] },
- {"x": 2, "y": 4, "matrix": [4, 2] },
- {"x": 3, "y": 4, "matrix": [4, 3] },
- {"x": 4, "y": 4, "matrix": [4, 4] },
- {"x": 5, "y": 4, "matrix": [4, 5] },
-
- {"x": 15, "y": 4, "matrix": [4, 13] },
- {"x": 16, "y": 4, "matrix": [4, 14] },
- {"x": 17, "y": 4, "matrix": [4, 15] },
- {"x": 18, "y": 4, "matrix": [4, 16] },
- {"x": 19, "y": 4, "matrix": [4, 17] },
- {"x": 20, "y": 4, "h": 2, "matrix": [4, 18] },
-
- {"x": 1, "y": 5, "matrix": [5, 1] },
- {"x": 2, "y": 5, "matrix": [5, 2] },
- {"x": 3, "y": 5, "matrix": [5, 3] },
- {"x": 4, "y": 5, "matrix": [5, 4] },
-
- {"x": 16, "y": 5, "matrix": [5, 14] },
- {"x": 17, "y": 5, "matrix": [5, 15] },
- {"x": 18, "y": 5, "matrix": [5, 16] },
- {"x": 19, "y": 5, "matrix": [5, 17] },
-
- {"x": 5, "y": 7, "matrix": [4, 6] },
- {"x": 6, "y": 7, "matrix": [4, 7] },
- {"x": 7, "y": 7, "matrix": [4, 8] },
-
- {"x": 13, "y": 7, "matrix": [4, 10] },
- {"x": 14, "y": 7, "matrix": [4, 11] },
- {"x": 15, "y": 7, "matrix": [4, 12] },
-
- {"x": 5, "y": 8, "h": 2, "matrix": [5, 6] },
- {"x": 6, "y": 8, "h": 2, "matrix": [5, 7] },
- {"x": 7, "y": 8, "matrix": [5, 8] },
-
- {"x": 13, "y": 8, "matrix": [5, 10] },
- {"x": 14, "y": 8, "h": 2, "matrix": [5, 11] },
- {"x": 15, "y": 8, "h": 2, "matrix": [5, 12] },
-
- {"x": 7, "y": 9, "matrix": [6, 8] },
- {"x": 13, "y": 9, "matrix": [6, 10] }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
+ {"matrix": [0, 15], "x": 17, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+ {"matrix": [0, 18], "x": 20, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+
+ {"matrix": [1, 13], "x": 15, "y": 1},
+ {"matrix": [1, 14], "x": 16, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1},
+ {"matrix": [1, 16], "x": 18, "y": 1},
+ {"matrix": [1, 17], "x": 19, "y": 1},
+ {"matrix": [1, 18], "x": 20, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+
+ {"matrix": [2, 13], "x": 15, "y": 2},
+ {"matrix": [2, 14], "x": 16, "y": 2},
+ {"matrix": [2, 15], "x": 17, "y": 2},
+ {"matrix": [2, 16], "x": 18, "y": 2},
+ {"matrix": [2, 17], "x": 19, "y": 2},
+ {"matrix": [2, 18], "x": 20, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+
+ {"matrix": [3, 13], "x": 15, "y": 3},
+ {"matrix": [3, 14], "x": 16, "y": 3},
+ {"matrix": [3, 15], "x": 17, "y": 3},
+ {"matrix": [3, 16], "x": 18, "y": 3},
+ {"matrix": [3, 17], "x": 19, "y": 3},
+ {"matrix": [3, 18], "x": 20, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [4, 13], "x": 15, "y": 4},
+ {"matrix": [4, 14], "x": 16, "y": 4},
+ {"matrix": [4, 15], "x": 17, "y": 4},
+ {"matrix": [4, 16], "x": 18, "y": 4},
+ {"matrix": [4, 17], "x": 19, "y": 4},
+ {"matrix": [4, 18], "x": 20, "y": 4, "h": 2},
+
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+
+ {"matrix": [5, 14], "x": 16, "y": 5},
+ {"matrix": [5, 15], "x": 17, "y": 5},
+ {"matrix": [5, 16], "x": 18, "y": 5},
+ {"matrix": [5, 17], "x": 19, "y": 5},
+
+ {"matrix": [4, 6], "x": 5, "y": 7},
+ {"matrix": [4, 7], "x": 6, "y": 7},
+ {"matrix": [4, 8], "x": 7, "y": 7},
+
+ {"matrix": [4, 10], "x": 13, "y": 7},
+ {"matrix": [4, 11], "x": 14, "y": 7},
+ {"matrix": [4, 12], "x": 15, "y": 7},
+
+ {"matrix": [5, 6], "x": 5, "y": 8, "h": 2},
+ {"matrix": [5, 7], "x": 6, "y": 8, "h": 2},
+ {"matrix": [5, 8], "x": 7, "y": 8},
+
+ {"matrix": [5, 10], "x": 13, "y": 8},
+ {"matrix": [5, 11], "x": 14, "y": 8, "h": 2},
+ {"matrix": [5, 12], "x": 15, "y": 8, "h": 2},
+
+ {"matrix": [6, 8], "x": 7, "y": 9},
+
+ {"matrix": [6, 10], "x": 13, "y": 9}
]
}
}
diff --git a/keyboards/handwired/eagleii/eagleii.h b/keyboards/handwired/eagleii/eagleii.h
deleted file mode 100644
index 5f3acac798..0000000000
--- a/keyboards/handwired/eagleii/eagleii.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K47, K27, K37, K38, K28, K39, K29, K34, K24, K31, K21, K32, K22, K33, K23, K0A, K0B, K46, K44, \
- K17, K97, K18, K98, K19, K99, K14, K94, K11, K91, K12, K92, K13, K83, K8A, K8B, K43, K4A, \
- KA0, K77, K88, K78, K89, K79, K84, K74, K81, K71, K82, K72, K93, K1A, K1B, K42, K6B, \
- K50, K87, K08, K68, K09, K69, K04, K61, K01, K62, K02, K70, K6A, K41, \
- KB5, K66, K07, K64, K76, K03 \
-) { \
- { KC_NO, K01, K02, K03, K04, KC_NO, KC_NO, K07, K08, K09, K0A, K0B }, \
- { KC_NO, K11, K12, K13, K14, KC_NO, KC_NO, K17, K18, K19, K1A, K1B }, \
- { KC_NO, K21, K22, K23, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, KC_NO }, \
- { KC_NO, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, KC_NO }, \
- { KC_NO, K41, K42, K43, K44, KC_NO, K46, K47, KC_NO, KC_NO, K4A, KC_NO }, \
- { K50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, K61, K62, KC_NO, K64, KC_NO, K66, KC_NO, K68, K69, K6A, K6B }, \
- { K70, K71, K72, KC_NO, K74, KC_NO, K76, K77, K78, K79, KC_NO, KC_NO }, \
- { KC_NO, K81, K82, K83, K84, KC_NO, KC_NO, K87, K88, K89, K8A, K8B }, \
- { KC_NO, K91, K92, K93, K94, KC_NO, KC_NO, K97, K98, K99, KC_NO, KC_NO }, \
- { KA0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json
index e84808c71d..a321bf8ed1 100644
--- a/keyboards/handwired/eagleii/info.json
+++ b/keyboards/handwired/eagleii/info.json
@@ -18,80 +18,91 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K47 (F7,C7)", "x":0, "y":0, "w":1.5},
- {"label":"K27 (F1,C7)", "x":1.5, "y":0},
- {"label":"K37 (B2,C7)", "x":2.5, "y":0},
- {"label":"K38 (B2,F0)", "x":3.5, "y":0},
- {"label":"K28 (F1,F0)", "x":4.5, "y":0},
- {"label":"K39 (B2,B6)", "x":5.5, "y":0},
- {"label":"K29 (F1,B6)", "x":6.5, "y":0},
- {"label":"K34 (B2,B3)", "x":7.5, "y":0},
- {"label":"K24 (F1,B3)", "x":8.5, "y":0},
- {"label":"K31 (B2,C6)", "x":9.5, "y":0},
- {"label":"K21 (F1,C6)", "x":10.5, "y":0},
- {"label":"K32 (B2,E6)", "x":11.5, "y":0},
- {"label":"K22 (F1,E6)", "x":12.5, "y":0},
- {"label":"K33 (B2,D5)", "x":13.5, "y":0},
- {"label":"K23 (F1,D5)", "x":14.5, "y":0},
- {"label":"K0A (D0,B1)", "x":16.5, "y":0},
- {"label":"K0B (D0,F4)", "x":17.5, "y":0},
- {"label":"K46 (F7,D1)", "x":18.5, "y":0},
- {"label":"K44 (F7,B3)", "x":20.5, "y":0},
- {"label":"K17 (B5,C7)", "x":0, "y":1, "w":2},
- {"label":"K97 (B7,C7)", "x":2, "y":1},
- {"label":"K18 (B5,F0)", "x":3, "y":1},
- {"label":"K98 (B7,F0)", "x":4, "y":1},
- {"label":"K19 (B5,B6)", "x":5, "y":1},
- {"label":"K99 (B7,B6)", "x":6, "y":1},
- {"label":"K14 (B5,B3)", "x":7, "y":1},
- {"label":"K94 (B7,B3)", "x":8, "y":1},
- {"label":"K11 (B5,C6)", "x":9, "y":1},
- {"label":"K91 (B7,C6)", "x":10, "y":1},
- {"label":"K12 (B5,E6)", "x":11, "y":1},
- {"label":"K92 (B7,E6)", "x":12, "y":1},
- {"label":"K13 (B5,D5)", "x":13, "y":1},
- {"label":"K83 (B4,D5)", "x":14, "y":1, "w":1.5},
- {"label":"K8A (B4,B1)", "x":16.5, "y":1},
- {"label":"K8B (B4,F4)", "x":17.5, "y":1},
- {"label":"K43 (F7,D5)", "x":18.5, "y":1},
- {"label":"K4A (F7,B1)", "x":20.5, "y":1},
- {"label":"KA0 (F5,D2)", "x":0.25, "y":2, "w":2},
- {"label":"K77 (D7,C7)", "x":2.25, "y":2},
- {"label":"K88 (B4,F0)", "x":3.25, "y":2},
- {"label":"K78 (D7,F0)", "x":4.25, "y":2},
- {"label":"K89 (B4,B6)", "x":5.25, "y":2},
- {"label":"K79 (D7,B6)", "x":6.25, "y":2},
- {"label":"K84 (B4,B3)", "x":7.25, "y":2},
- {"label":"K74 (D7,B3)", "x":8.25, "y":2},
- {"label":"K81 (B4,C6)", "x":9.25, "y":2},
- {"label":"K71 (D7,C6)", "x":10.25, "y":2},
- {"label":"K82 (B4,E6)", "x":11.25, "y":2},
- {"label":"K72 (D7,E6)", "x":12.25, "y":2},
- {"label":"K93 (B7,D5)", "x":13.25, "y":2, "w":2},
- {"label":"K1A (B5,B1)", "x":16.5, "y":2},
- {"label":"K1B (B5,F4)", "x":17.5, "y":2},
- {"label":"K42 (F7,E6)", "x":18.5, "y":2},
- {"label":"K6B (D4,F4)", "x":20.5, "y":2, "h":2},
- {"label":"K50 (F6,D2)", "x":0.75, "y":3, "w":2},
- {"label":"K87 (B4,C7)", "x":2.75, "y":3},
- {"label":"K08 (D0,F0)", "x":3.75, "y":3},
- {"label":"K68 (D4,F0)", "x":4.75, "y":3},
- {"label":"K09 (D0,B6)", "x":5.75, "y":3},
- {"label":"K69 (D4,B6)", "x":6.75, "y":3},
- {"label":"K04 (D0,B3)", "x":7.75, "y":3},
- {"label":"K61 (D4,C6)", "x":8.75, "y":3},
- {"label":"K01 (D0,C6)", "x":9.75, "y":3},
- {"label":"K62 (D4,E6)", "x":10.75, "y":3},
- {"label":"K02 (D0,E6)", "x":11.75, "y":3},
- {"label":"K70 (D7,D2)", "x":12.75, "y":3, "w":2},
- {"label":"K6A (D4,B1)", "x":16.5, "y":3, "w":2},
- {"label":"K41 (F7,C6)", "x":18.5, "y":3},
- {"label":"KB5 (B0,D3)", "x":0.75, "y":4},
- {"label":"K66 (D4,D1)", "x":1.75, "y":4},
- {"label":"K07 (D0,C7)", "x":2.75, "y":4},
- {"label":"K64 (D4,B3)", "x":3.75, "y":4, "w":8},
- {"label":"K76 (D7,D1)", "x":11.75, "y":4},
- {"label":"K03 (D0,D5)", "x":12.75, "y":4, "w":2}
+ {"matrix": [4, 7], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [2, 7], "x": 1.5, "y": 0},
+ {"matrix": [3, 7], "x": 2.5, "y": 0},
+ {"matrix": [3, 8], "x": 3.5, "y": 0},
+ {"matrix": [2, 8], "x": 4.5, "y": 0},
+ {"matrix": [3, 9], "x": 5.5, "y": 0},
+ {"matrix": [2, 9], "x": 6.5, "y": 0},
+ {"matrix": [3, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 4], "x": 8.5, "y": 0},
+ {"matrix": [3, 1], "x": 9.5, "y": 0},
+ {"matrix": [2, 1], "x": 10.5, "y": 0},
+ {"matrix": [3, 2], "x": 11.5, "y": 0},
+ {"matrix": [2, 2], "x": 12.5, "y": 0},
+ {"matrix": [3, 3], "x": 13.5, "y": 0},
+ {"matrix": [2, 3], "x": 14.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 16.5, "y": 0},
+ {"matrix": [0, 11], "x": 17.5, "y": 0},
+ {"matrix": [4, 6], "x": 18.5, "y": 0},
+
+ {"matrix": [4, 4], "x": 20.5, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1, "w": 2},
+ {"matrix": [9, 7], "x": 2, "y": 1},
+ {"matrix": [1, 8], "x": 3, "y": 1},
+ {"matrix": [9, 8], "x": 4, "y": 1},
+ {"matrix": [1, 9], "x": 5, "y": 1},
+ {"matrix": [9, 9], "x": 6, "y": 1},
+ {"matrix": [1, 4], "x": 7, "y": 1},
+ {"matrix": [9, 4], "x": 8, "y": 1},
+ {"matrix": [1, 1], "x": 9, "y": 1},
+ {"matrix": [9, 1], "x": 10, "y": 1},
+ {"matrix": [1, 2], "x": 11, "y": 1},
+ {"matrix": [9, 2], "x": 12, "y": 1},
+ {"matrix": [1, 3], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 10], "x": 16.5, "y": 1},
+ {"matrix": [8, 11], "x": 17.5, "y": 1},
+ {"matrix": [4, 3], "x": 18.5, "y": 1},
+
+ {"matrix": [4, 10], "x": 20.5, "y": 1},
+
+ {"matrix": [10, 0], "x": 0.25, "y": 2, "w": 2},
+ {"matrix": [7, 7], "x": 2.25, "y": 2},
+ {"matrix": [8, 8], "x": 3.25, "y": 2},
+ {"matrix": [7, 8], "x": 4.25, "y": 2},
+ {"matrix": [8, 9], "x": 5.25, "y": 2},
+ {"matrix": [7, 9], "x": 6.25, "y": 2},
+ {"matrix": [8, 4], "x": 7.25, "y": 2},
+ {"matrix": [7, 4], "x": 8.25, "y": 2},
+ {"matrix": [8, 1], "x": 9.25, "y": 2},
+ {"matrix": [7, 1], "x": 10.25, "y": 2},
+ {"matrix": [8, 2], "x": 11.25, "y": 2},
+ {"matrix": [7, 2], "x": 12.25, "y": 2},
+ {"matrix": [9, 3], "x": 13.25, "y": 2, "w": 2},
+
+ {"matrix": [1, 10], "x": 16.5, "y": 2},
+ {"matrix": [1, 11], "x": 17.5, "y": 2},
+ {"matrix": [4, 2], "x": 18.5, "y": 2},
+
+ {"matrix": [6, 11], "x": 20.5, "y": 2, "h": 2},
+
+ {"matrix": [5, 0], "x": 0.75, "y": 3, "w": 2},
+ {"matrix": [8, 7], "x": 2.75, "y": 3},
+ {"matrix": [0, 8], "x": 3.75, "y": 3},
+ {"matrix": [6, 8], "x": 4.75, "y": 3},
+ {"matrix": [0, 9], "x": 5.75, "y": 3},
+ {"matrix": [6, 9], "x": 6.75, "y": 3},
+ {"matrix": [0, 4], "x": 7.75, "y": 3},
+ {"matrix": [6, 1], "x": 8.75, "y": 3},
+ {"matrix": [0, 1], "x": 9.75, "y": 3},
+ {"matrix": [6, 2], "x": 10.75, "y": 3},
+ {"matrix": [0, 2], "x": 11.75, "y": 3},
+ {"matrix": [7, 0], "x": 12.75, "y": 3, "w": 2},
+
+ {"matrix": [6, 10], "x": 16.5, "y": 3, "w": 2},
+ {"matrix": [4, 1], "x": 18.5, "y": 3},
+
+ {"matrix": [11, 5], "x": 0.75, "y": 4},
+ {"matrix": [6, 6], "x": 1.75, "y": 4},
+ {"matrix": [0, 7], "x": 2.75, "y": 4},
+ {"matrix": [6, 4], "x": 3.75, "y": 4, "w": 8},
+ {"matrix": [7, 6], "x": 11.75, "y": 4},
+ {"matrix": [0, 3], "x": 12.75, "y": 4, "w": 2}
]
}
}
diff --git a/keyboards/handwired/ergocheap/ergocheap.h b/keyboards/handwired/ergocheap/ergocheap.h
deleted file mode 100644
index 106fa45328..0000000000
--- a/keyboards/handwired/ergocheap/ergocheap.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 xSteins <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General 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"
-
-/*
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
-*/
-
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0D, K0E, K0F, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2D, K2E, K2F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K3E, K3F, \
- K40, K42, K44, K45, K46, K47, K48, K4B, K4D, K4E, K4F \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B, K2D, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B, K3D, K3E, K3F }, \
- { K40, KC_NO, K42, KC_NO, K44, K45, K46, K47, K48, KC_NO, KC_NO, K4B, K4D, K4E, K4F } \
-}
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json
index 097a4e6278..12bff57b3e 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/info.json
@@ -18,75 +18,84 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESC", "x":0.75, "y":0},
- {"label":"1", "x":1.75, "y":0},
- {"label":"2", "x":2.75, "y":0},
- {"label":"3", "x":4.25, "y":0},
- {"label":"4", "x":5.25, "y":0},
- {"label":"5", "x":6.25, "y":0},
- {"label":"6", "x":7.25, "y":0},
- {"label":"7", "x":10.5, "y":0},
- {"label":"8", "x":11.5, "y":0},
- {"label":"9", "x":12.5, "y":0},
- {"label":"0", "x":13.5, "y":0},
- {"label":"MINS", "x":14.5, "y":0},
- {"label":"EQL", "x":16, "y":0},
- {"label":"BSPC", "x":17, "y":0, "w":2},
- {"label":"GRV", "x":19, "y":0},
- {"label":"TAB", "x":0.5, "y":1, "w":1.5},
- {"label":"Q", "x":2, "y":1},
- {"label":"W", "x":3.75, "y":1},
- {"label":"E", "x":4.75, "y":1},
- {"label":"R", "x":5.75, "y":1},
- {"label":"T", "x":6.75, "y":1},
- {"label":"Y", "x":10, "y":1},
- {"label":"U", "x":11, "y":1},
- {"label":"I", "x":12, "y":1},
- {"label":"O", "x":13, "y":1},
- {"label":"P", "x":14, "y":1},
- {"label":"LBRC", "x":16, "y":1},
- {"label":"RBRC", "x":17, "y":1},
- {"label":"BSLS", "x":18, "y":1, "w":1.5},
- {"label":"DEL", "x":19.5, "y":1},
- {"label":"CAPS", "x":0.25, "y":2, "w":1.75},
- {"label":"A", "x":2, "y":2},
- {"label":"S", "x":4, "y":2},
- {"label":"D", "x":5, "y":2},
- {"label":"F", "x":6, "y":2},
- {"label":"G", "x":7, "y":2},
- {"label":"H", "x":10.25, "y":2},
- {"label":"J", "x":11.25, "y":2},
- {"label":"K", "x":12.25, "y":2},
- {"label":"L", "x":13.25, "y":2},
- {"label":"SCLN", "x":15.5, "y":2},
- {"label":"QUOT", "x":16.5, "y":2},
- {"label":"ENT", "x":17.5, "y":2, "w":2.25},
- {"label":"HOME", "x":19.75, "y":2},
- {"label":"LSFT", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":4.5, "y":3},
- {"label":"C", "x":5.5, "y":3},
- {"label":"V", "x":6.5, "y":3},
- {"label":"B", "x":7.5, "y":3},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":"COMM", "x":12.5, "y":3},
- {"label":"DOT", "x":13.5, "y":3},
- {"label":"SLSH", "x":15.75, "y":3},
- {"label":"TO(_FN1)", "x":16.75, "y":3, "w":1.25},
- {"label":"UP", "x":18, "y":3},
- {"label":"END", "x":19.5, "y":3},
- {"label":"LCTL", "x":0, "y":4, "w":1.25},
- {"label":"LALT", "x":4.5, "y":4, "w":1.25},
- {"label":"SPC", "x":5.75, "y":4, "w":2},
- {"label":"MO(_FN1)", "x":7.75, "y":4, "w":1.25},
- {"label":"SPC", "x":10, "y":4, "w":1.75},
- {"label":"SPC", "x":11.75, "y":4},
- {"label":"MO(_FN1)", "x":12.75, "y":4, "w":1.25},
- {"label":"LGUI", "x":15.5, "y":4, "w":1.25},
- {"label":"LEFT", "x":17, "y":4},
- {"label":"DOWN", "x":18, "y":4},
- {"label":"RGHT", "x":19, "y":4}
+ {"matrix": [0, 0], "x": 0.75, "y": 0},
+ {"matrix": [0, 1], "x": 1.75, "y": 0},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 7], "x": 10.5, "y": 0},
+ {"matrix": [0, 8], "x": 11.5, "y": 0},
+ {"matrix": [0, 9], "x": 12.5, "y": 0},
+ {"matrix": [0, 10], "x": 13.5, "y": 0},
+ {"matrix": [0, 11], "x": 14.5, "y": 0},
+ {"matrix": [0, 12], "x": 16, "y": 0},
+ {"matrix": [0, 13], "x": 17, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 19, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3.75, "y": 1},
+ {"matrix": [1, 3], "x": 4.75, "y": 1},
+ {"matrix": [1, 4], "x": 5.75, "y": 1},
+ {"matrix": [1, 5], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 7], "x": 11, "y": 1},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1},
+ {"matrix": [1, 10], "x": 14, "y": 1},
+ {"matrix": [1, 11], "x": 16, "y": 1},
+ {"matrix": [1, 12], "x": 17, "y": 1},
+ {"matrix": [1, 13], "x": 18, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 19.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 3], "x": 5, "y": 2},
+ {"matrix": [2, 4], "x": 6, "y": 2},
+ {"matrix": [2, 5], "x": 7, "y": 2},
+
+ {"matrix": [2, 6], "x": 10.25, "y": 2},
+ {"matrix": [2, 7], "x": 11.25, "y": 2},
+ {"matrix": [2, 8], "x": 12.25, "y": 2},
+ {"matrix": [2, 9], "x": 13.25, "y": 2},
+ {"matrix": [2, 11], "x": 15.5, "y": 2},
+ {"matrix": [2, 12], "x": 16.5, "y": 2},
+ {"matrix": [2, 13], "x": 17.5, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 19.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 4.5, "y": 3},
+ {"matrix": [3, 3], "x": 5.5, "y": 3},
+ {"matrix": [3, 4], "x": 6.5, "y": 3},
+ {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 6], "x": 10.5, "y": 3},
+ {"matrix": [3, 7], "x": 11.5, "y": 3},
+ {"matrix": [3, 8], "x": 12.5, "y": 3},
+ {"matrix": [3, 9], "x": 13.5, "y": 3},
+ {"matrix": [3, 11], "x": 15.75, "y": 3},
+ {"matrix": [3, 12], "x": 16.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 13], "x": 18, "y": 3},
+ {"matrix": [3, 14], "x": 19.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.75},
+ {"matrix": [4, 7], "x": 11.75, "y": 4},
+ {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 15.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 17, "y": 4},
+ {"matrix": [4, 13], "x": 18, "y": 4},
+ {"matrix": [4, 14], "x": 19, "y": 4}
]
}
}
diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json
index 10564bb2a7..7e3baab9ad 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/info.json
@@ -21,101 +21,117 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k0A", "x":0, "y":0.4},
- {"label":"k0B", "x":1, "y":0.2},
- {"label":"k0C", "x":2, "y":0},
- {"label":"k0D", "x":3, "y":0.2},
- {"label":"k0E", "x":4, "y":0.2},
- {"label":"k0F", "x":5, "y":0.2},
- {"label":"k0G", "x":7, "y":0.2},
- {"label":"k0H", "x":8, "y":0.2},
- {"label":"k0I", "x":9, "y":0.2},
- {"label":"k0J", "x":10, "y":0.2},
- {"label":"k0K", "x":12.2, "y":0.2},
- {"label":"k0L", "x":13.2, "y":0.2},
- {"label":"k0M", "x":14.2, "y":0.2},
- {"label":"k0N", "x":15.2, "y":0},
- {"label":"k0O", "x":16.2, "y":0.2},
- {"label":"k0P", "x":17.2, "y":0.4},
-
- {"label":"k1A", "x":0, "y":1.4},
- {"label":"k1B", "x":1, "y":1.2},
- {"label":"k1C", "x":2, "y":1},
- {"label":"k1D", "x":3, "y":1.2},
- {"label":"k1E", "x":4, "y":1.2},
- {"label":"k1F", "x":5, "y":1.2},
- {"label":"k1G", "x":7, "y":1.2},
- {"label":"k1H", "x":8, "y":1.2},
- {"label":"k1I", "x":9, "y":1.2},
- {"label":"k1J", "x":10, "y":1.2},
- {"label":"k1K", "x":12.2, "y":1.2},
- {"label":"k1L", "x":13.2, "y":1.2},
- {"label":"k1M", "x":14.2, "y":1.2},
- {"label":"k1N", "x":15.2, "y":1},
- {"label":"k1O", "x":16.2, "y":1.2},
- {"label":"k1P", "x":17.2, "y":1.4},
-
- {"label":"k2A", "x":0, "y":2.4},
- {"label":"k2B", "x":1, "y":2.2},
- {"label":"k2C", "x":2, "y":2},
- {"label":"k2D", "x":3, "y":2.2},
- {"label":"k2E", "x":4, "y":2.2},
- {"label":"k2F", "x":5, "y":2.2},
- {"label":"k2G", "x":7, "y":2.2},
- {"label":"k2H", "x":8, "y":2.2},
- {"label":"k2I", "x":9, "y":2.2},
- {"label":"k2J", "x":10, "y":2.2},
- {"label":"k2K", "x":12.2, "y":2.2},
- {"label":"k2L", "x":13.2, "y":2.2},
- {"label":"k2M", "x":14.2, "y":2.2},
- {"label":"k2N", "x":15.2, "y":2},
- {"label":"k2O", "x":16.2, "y":2.2},
- {"label":"k2P", "x":17.2, "y":2.4},
-
- {"label":"k3A", "x":0, "y":3.4},
- {"label":"k3B", "x":1, "y":3.2},
- {"label":"k3C", "x":2, "y":3},
- {"label":"k3D", "x":3, "y":3.2},
- {"label":"k3E", "x":4, "y":3.2},
- {"label":"k3G", "x":7, "y":3.2},
- {"label":"k3H", "x":8, "y":3.2},
- {"label":"k3I", "x":9, "y":3.2},
- {"label":"k3J", "x":10, "y":3.2},
- {"label":"k3L", "x":13.2, "y":3.2},
- {"label":"k3M", "x":14.2, "y":3.2},
- {"label":"k3N", "x":15.2, "y":3},
- {"label":"k3O", "x":16.2, "y":3.2},
- {"label":"k3P", "x":17.2, "y":3.4},
-
- {"label":"k4A", "x":0, "y":4.4},
- {"label":"k4B", "x":1, "y":4.2},
- {"label":"k4C", "x":2, "y":4},
- {"label":"k4D", "x":3, "y":4.2},
- {"label":"k4E", "x":4, "y":4.2},
- {"label":"k4F", "x":5.2, "y":4.4},
- {"label":"k4G", "x":7, "y":4.2},
- {"label":"k4H", "x":8, "y":4.2},
- {"label":"k4I", "x":9, "y":4.2},
- {"label":"k4J", "x":10, "y":4.2},
- {"label":"k4K", "x":12, "y":4.4},
- {"label":"k4L", "x":13.2, "y":4.2},
- {"label":"k4M", "x":14.2, "y":4.2},
- {"label":"k4N", "x":15.2, "y":4},
- {"label":"k4O", "x":16.2, "y":4.2},
- {"label":"k4P", "x":17.2, "y":4.4},
-
- {"label":"k5B", "x":1, "y":5.2},
- {"label":"k5C", "x":2, "y":5},
- {"label":"k5E", "x":4.2, "y":5.4},
- {"label":"k5F", "x":5.24, "y":5.4},
- {"label":"k5G", "x":7, "y":5.2},
- {"label":"k5H", "x":8, "y":5.2},
- {"label":"k5I", "x":9, "y":5.2},
- {"label":"k5J", "x":10, "y":5.2},
- {"label":"k5K", "x":12, "y":5.4},
- {"label":"k5L", "x":13, "y":5.4},
- {"label":"k5N", "x":15.2, "y":5},
- {"label":"k5O", "x":16.2, "y":5.2}
+ {"matrix": [0, 0], "x": 0, "y": 0.4},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.2},
+ {"matrix": [0, 4], "x": 4, "y": 0.2},
+ {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+ {"matrix": [0, 6], "x": 7, "y": 0.2},
+ {"matrix": [0, 7], "x": 8, "y": 0.2},
+ {"matrix": [0, 8], "x": 9, "y": 0.2},
+ {"matrix": [0, 9], "x": 10, "y": 0.2},
+
+ {"matrix": [0, 10], "x": 12.2, "y": 0.2},
+ {"matrix": [0, 11], "x": 13.2, "y": 0.2},
+ {"matrix": [0, 12], "x": 14.2, "y": 0.2},
+ {"matrix": [0, 13], "x": 15.2, "y": 0},
+ {"matrix": [0, 14], "x": 16.2, "y": 0.2},
+ {"matrix": [0, 15], "x": 17.2, "y": 0.4},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.4},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.2},
+ {"matrix": [1, 4], "x": 4, "y": 1.2},
+ {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+ {"matrix": [1, 6], "x": 7, "y": 1.2},
+ {"matrix": [1, 7], "x": 8, "y": 1.2},
+ {"matrix": [1, 8], "x": 9, "y": 1.2},
+ {"matrix": [1, 9], "x": 10, "y": 1.2},
+
+ {"matrix": [1, 10], "x": 12.2, "y": 1.2},
+ {"matrix": [1, 11], "x": 13.2, "y": 1.2},
+ {"matrix": [1, 12], "x": 14.2, "y": 1.2},
+ {"matrix": [1, 13], "x": 15.2, "y": 1},
+ {"matrix": [1, 14], "x": 16.2, "y": 1.2},
+ {"matrix": [1, 15], "x": 17.2, "y": 1.4},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.4},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.2},
+ {"matrix": [2, 4], "x": 4, "y": 2.2},
+ {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+ {"matrix": [2, 6], "x": 7, "y": 2.2},
+ {"matrix": [2, 7], "x": 8, "y": 2.2},
+ {"matrix": [2, 8], "x": 9, "y": 2.2},
+ {"matrix": [2, 9], "x": 10, "y": 2.2},
+
+ {"matrix": [2, 10], "x": 12.2, "y": 2.2},
+ {"matrix": [2, 11], "x": 13.2, "y": 2.2},
+ {"matrix": [2, 12], "x": 14.2, "y": 2.2},
+ {"matrix": [2, 13], "x": 15.2, "y": 2},
+ {"matrix": [2, 14], "x": 16.2, "y": 2.2},
+ {"matrix": [2, 15], "x": 17.2, "y": 2.4},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.4},
+ {"matrix": [3, 1], "x": 1, "y": 3.2},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.2},
+ {"matrix": [3, 4], "x": 4, "y": 3.2},
+
+ {"matrix": [3, 6], "x": 7, "y": 3.2},
+ {"matrix": [3, 7], "x": 8, "y": 3.2},
+ {"matrix": [3, 8], "x": 9, "y": 3.2},
+ {"matrix": [3, 9], "x": 10, "y": 3.2},
+
+ {"matrix": [3, 11], "x": 13.2, "y": 3.2},
+ {"matrix": [3, 12], "x": 14.2, "y": 3.2},
+ {"matrix": [3, 13], "x": 15.2, "y": 3},
+ {"matrix": [3, 14], "x": 16.2, "y": 3.2},
+ {"matrix": [3, 15], "x": 17.2, "y": 3.4},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.4},
+ {"matrix": [4, 1], "x": 1, "y": 4.2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4.2},
+ {"matrix": [4, 4], "x": 4, "y": 4.2},
+
+ {"matrix": [4, 5], "x": 5.2, "y": 4.4},
+
+ {"matrix": [4, 6], "x": 7, "y": 4.2},
+ {"matrix": [4, 7], "x": 8, "y": 4.2},
+ {"matrix": [4, 8], "x": 9, "y": 4.2},
+ {"matrix": [4, 9], "x": 10, "y": 4.2},
+
+ {"matrix": [4, 10], "x": 12, "y": 4.4},
+
+ {"matrix": [4, 11], "x": 13.2, "y": 4.2},
+ {"matrix": [4, 12], "x": 14.2, "y": 4.2},
+ {"matrix": [4, 13], "x": 15.2, "y": 4},
+ {"matrix": [4, 14], "x": 16.2, "y": 4.2},
+ {"matrix": [4, 15], "x": 17.2, "y": 4.4},
+
+ {"matrix": [5, 1], "x": 1, "y": 5.2},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+
+ {"matrix": [5, 4], "x": 4.2, "y": 5.4},
+ {"matrix": [5, 5], "x": 5.24, "y": 5.4},
+
+ {"matrix": [5, 6], "x": 7, "y": 5.2},
+ {"matrix": [5, 7], "x": 8, "y": 5.2},
+ {"matrix": [5, 8], "x": 9, "y": 5.2},
+ {"matrix": [5, 9], "x": 10, "y": 5.2},
+
+ {"matrix": [5, 10], "x": 12, "y": 5.4},
+ {"matrix": [5, 11], "x": 13, "y": 5.4},
+
+ {"matrix": [5, 13], "x": 15.2, "y": 5},
+ {"matrix": [5, 14], "x": 16.2, "y": 5.2}
]
}
}
diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c
index 718a336122..7c68893968 100644
--- a/keyboards/handwired/evk/v1_3/v1_3.c
+++ b/keyboards/handwired/evk/v1_3/v1_3.c
@@ -12,7 +12,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "v1_3.h"
+#include "quantum.h"
// Optional override functions below.
// You can leave any or all of these undefined.
diff --git a/keyboards/handwired/evk/v1_3/v1_3.h b/keyboards/handwired/evk/v1_3/v1_3.h
deleted file mode 100644
index da02b806f8..0000000000
--- a/keyboards/handwired/evk/v1_3/v1_3.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT(\
- k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P, \
- k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P, \
- k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P, \
- k3A, k3B, k3C, k3D, k3E, k3G, k3H, k3I, k3J, k3L, k3M, k3N, k3O, k3P, \
- k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P, \
- k5B, k5C, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, k5N, k5O \
-) { \
- { k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P }, \
- { k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P }, \
- { k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P }, \
- { k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H, k3I, k3J, XXX, k3L, k3M, k3N, k3O, k3P }, \
- { k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P }, \
- { XXX, k5B, k5C, XXX, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, XXX, k5N, k5O, XXX } \
-}
diff --git a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h
deleted file mode 100644
index f9abbf3835..0000000000
--- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 NaCly
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k31, k62, k63, k13, k33, k70, k36, k17, k67, k6A, k7A, k3A, k5A, k79, k09, k00, \
- k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66, k1A, k6C, k6E, k6D, \
- k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16, k2A, k6B, k7E, k7D, \
- k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38, k4A, \
- k1F, k41, k42, k43, k44, k54, k55, k45, k46, k47, k58, k2F, k3E, \
- k60, k10, k39, k3B, k59, k29, k57, k40, k5E, k5B, k5C \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, k1A, KC_NO, KC_NO, KC_NO, KC_NO, k1F }, \
- { KC_NO, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, KC_NO, KC_NO, KC_NO, KC_NO, k2F }, \
- { KC_NO, k31, KC_NO, k33, k34, k35, k36, KC_NO, k38, k39, k3A, k3B, KC_NO, KC_NO, k3E, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, KC_NO, KC_NO, k4A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, k54, k55, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, KC_NO, k6A, k6B, k6C, k6D, k6E, KC_NO }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, KC_NO, KC_NO, k7D, k7E, KC_NO }, \
-}
diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json
index 395b42bcc8..8528b0abc2 100644
--- a/keyboards/handwired/fc200rt_qmk/info.json
+++ b/keyboards/handwired/fc200rt_qmk/info.json
@@ -17,7 +17,109 @@
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+ "layout": [
+ {"matrix": [3, 1], "x": 0, "y": 0},
+
+ {"matrix": [6, 2], "x": 2, "y": 0},
+ {"matrix": [6, 3], "x": 3, "y": 0},
+ {"matrix": [1, 3], "x": 4, "y": 0},
+ {"matrix": [3, 3], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [3, 6], "x": 7.5, "y": 0},
+ {"matrix": [1, 7], "x": 8.5, "y": 0},
+ {"matrix": [6, 7], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 10], "x": 11, "y": 0},
+ {"matrix": [7, 10], "x": 12, "y": 0},
+ {"matrix": [3, 10], "x": 13, "y": 0},
+ {"matrix": [5, 10], "x": 14, "y": 0},
+
+ {"matrix": [7, 9], "x": 15.25, "y": 0},
+ {"matrix": [0, 9], "x": 16.25, "y": 0},
+ {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 1], "x": 0, "y": 1.5},
+ {"matrix": [7, 1], "x": 1, "y": 1.5},
+ {"matrix": [7, 2], "x": 2, "y": 1.5},
+ {"matrix": [7, 3], "x": 3, "y": 1.5},
+ {"matrix": [7, 4], "x": 4, "y": 1.5},
+ {"matrix": [6, 4], "x": 5, "y": 1.5},
+ {"matrix": [6, 5], "x": 6, "y": 1.5},
+ {"matrix": [7, 5], "x": 7, "y": 1.5},
+ {"matrix": [7, 6], "x": 8, "y": 1.5},
+ {"matrix": [7, 7], "x": 9, "y": 1.5},
+ {"matrix": [7, 8], "x": 10, "y": 1.5},
+ {"matrix": [6, 8], "x": 11, "y": 1.5},
+ {"matrix": [6, 6], "x": 12, "y": 1.5},
+ {"matrix": [1, 10], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [6, 12], "x": 15.25, "y": 1.5},
+ {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 13], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 1], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [0, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [0, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [0, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [1, 4], "x": 5.5, "y": 2.5},
+ {"matrix": [1, 5], "x": 6.5, "y": 2.5},
+ {"matrix": [0, 5], "x": 7.5, "y": 2.5},
+ {"matrix": [0, 6], "x": 8.5, "y": 2.5},
+ {"matrix": [0, 7], "x": 9.5, "y": 2.5},
+ {"matrix": [0, 8], "x": 10.5, "y": 2.5},
+ {"matrix": [1, 8], "x": 11.5, "y": 2.5},
+ {"matrix": [1, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [6, 11], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 13], "x": 17.25, "y": 2.5},
+
+ {"matrix": [1, 2], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [2, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [2, 6], "x": 8.75, "y": 3.5},
+ {"matrix": [2, 7], "x": 9.75, "y": 3.5},
+ {"matrix": [2, 8], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [1, 15], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 4], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 8], "x": 11.25, "y": 4.5},
+ {"matrix": [2, 15], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 9], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 11], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [4, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 11], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 12], "x": 17.25, "y": 5.5}
+ ]
}
}
+
}
diff --git a/keyboards/handwired/fivethirteen/fivethirteen.h b/keyboards/handwired/fivethirteen/fivethirteen.h
deleted file mode 100644
index ffa0bd59d5..0000000000
--- a/keyboards/handwired/fivethirteen/fivethirteen.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k40, k41, k42, k43, k44, k46, k47, k48, k49, k4A, k4B, k4C \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \
- { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, k4B, k4C } \
-}
diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json
index 66e51571e2..66d556f7ac 100644
--- a/keyboards/handwired/fivethirteen/info.json
+++ b/keyboards/handwired/fivethirteen/info.json
@@ -18,70 +18,74 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"[", "x":11, "y":1},
- {"label":"]", "x":12, "y":1},
- {"label":"Ctrl/Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Enter", "x":12, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Up", "x":11, "y":3},
- {"label":"\\", "x":12, "y":3},
- {"label":"MO(MOS)", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"GUI", "x":3, "y":4},
- {"label":"MO(HDN)", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4, "w":2},
- {"label":"Shift/Backspace", "x":7, "y":4},
- {"label":"MO(OSY)", "x":8, "y":4},
- {"label":"MO(HDN)", "x":9, "y":4},
- {"label":"Left", "x":10, "y":4},
- {"label":"Down", "x":11, "y":4},
- {"label":"Right", "x":12, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4}
]
}
}
diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h
index d608fe9f09..6bea49d87b 100644
--- a/keyboards/handwired/frenchdev/frenchdev.h
+++ b/keyboards/handwired/frenchdev/frenchdev.h
@@ -73,38 +73,3 @@ inline void frenchdev_led_all_set(uint8_t n)
frenchdev_led_2_set(n);
frenchdev_led_3_set(n);
}
-
-#define LAYOUT( \
- \
- k01, k02, k03, k04, k05, k06, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k31, k32, k33, k34, k35, k36, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k41, k42, k43, k44, k45, k46, k47, k37, k38, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \
- k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f, \
- \
- PL1, PL2, PL3, \
- PR1, PR2, PR3 \
- ) \
- \
- /* matrix positions, inverted left and right for I2C to be on row 0-7 */\
- { \
- \
- { k5f, k4f, k3f, k2f, k1f, KC_NO}, \
- { k5e, k4e, k3e, k2e, k1e, k0e }, \
- { k5d, k4d, k3d, k2d, k1d, k0d }, \
- { k5c, k4c, k3c, k2c, k1c, k0c }, \
- { k5b, k4b, k3b, k2b, k1b, k0b }, \
- { k5a, k4a, k3a, k2a, k1a, k0a }, \
- { k59, k49, k39, k29, k19, k09 }, \
- { k58, k48, k38, PR1, PR2, PR3 }, \
- \
- { k57, k47, k37, PL1, PL2, PL3 }, \
- { k56, k46, k36, k26, k16, k06 }, \
- { k55, k45, k35, k25, k15, k05 }, \
- { k54, k44, k34, k24, k14, k04 }, \
- { k53, k43, k33, k23, k13, k03 }, \
- { k52, k42, k32, k22, k12, k02 }, \
- { k51, k41, k31, k21, k11, k01 }, \
- { k50, k40, k30, k20, k10, KC_NO } \
- }
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index a179dde73f..d5981aebd4 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -12,106 +12,119 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"F1", "x":1, "y":0.9},
- {"label":"F2", "x":2, "y":0.3},
- {"label":"F3", "x":3, "y":0},
- {"label":"F4", "x":4, "y":0.4},
- {"label":"F5", "x":5, "y":0.5},
- {"label":"F6", "x":6, "y":0.5},
- {"label":"F7", "x":13, "y":0.5},
- {"label":"F8", "x":14, "y":0.5},
- {"label":"F9", "x":15, "y":0.4},
- {"label":"F10", "x":16, "y":0},
- {"label":"F11", "x":17, "y":0.3},
- {"label":"F12", "x":18, "y":0.9},
-
- {"label":"Esc", "x":0, "y":1.9},
- {"label":"\"", "x":1, "y":1.9},
- {"label":"\u00ab", "x":2, "y":1.3},
- {"label":"\u00bb", "x":3, "y":1},
- {"label":"(", "x":4, "y":1.4},
- {"label":")", "x":5, "y":1.5},
- {"label":"\u00a8", "x":6, "y":1.5},
- {"label":"^", "x":13, "y":1.5},
- {"label":"@", "x":14, "y":1.5},
- {"label":"+", "x":15, "y":1.4},
- {"label":"-", "x":16, "y":1},
- {"label":"/", "x":17, "y":1.3},
- {"label":"*", "x":18, "y":1.9},
- {"label":"Backspace", "x":19, "y":1.9},
-
- {"label":"Tab", "x":0, "y":2.9},
- {"label":"B", "x":1, "y":2.9},
- {"label":"&Eacute;", "x":2, "y":2.3},
- {"label":"P", "x":3, "y":2},
- {"label":"O", "x":4, "y":2.4},
- {"label":"&Egrave;", "x":5, "y":2.5},
- {"label":"_", "x":6, "y":2.5},
- {"label":"=", "x":13, "y":2.5},
- {"label":"K", "x":14, "y":2.5},
- {"label":"V", "x":15, "y":2.4},
- {"label":"D", "x":16, "y":2},
- {"label":"L", "x":17, "y":2.3},
- {"label":"J", "x":18, "y":2.9},
- {"label":"Enter", "x":19, "y":2.9},
-
- {"label":"`", "x":0, "y":3.9},
- {"label":"A", "x":1, "y":3.9},
- {"label":"U", "x":2, "y":3.3},
- {"label":"E", "x":3, "y":3},
- {"label":"I", "x":4, "y":3.4},
- {"label":"F", "x":5, "y":3.5},
- {"label":";", "x":6, "y":3.5},
- {"label":"!", "x":13, "y":3.5},
- {"label":"C", "x":14, "y":3.5},
- {"label":"T", "x":15, "y":3.4},
- {"label":"S", "x":16, "y":3},
- {"label":"R", "x":17, "y":3.3},
- {"label":"N", "x":18, "y":3.9},
- {"label":"'", "x":19, "y":3.9},
-
- {"label":"Shift", "x":0, "y":4.9},
- {"label":"Z", "x":1, "y":4.9},
- {"label":"&Agrave;", "x":2, "y":4.3},
- {"label":"Y", "x":3, "y":4},
- {"label":"X", "x":4, "y":4.4},
- {"label":"]", "x":5, "y":4.5},
- {"label":"Shift/Space", "x":6.5, "y":5},
- {"label":"Ctrl/Backspace", "x":7.5, "y":5},
- {"label":"Layer 2/Insert", "x":8.5, "y":5},
- {"label":"Layer 2 Lock", "x":10.5, "y":5},
- {"label":"Ctrl/Delete", "x":11.5, "y":5},
- {"label":"Shift/Space", "x":12.5, "y":5},
- {"label":"M", "x":14, "y":4.5},
- {"label":"G", "x":15, "y":4.4},
- {"label":"Up", "x":16, "y":4},
- {"label":"H", "x":17, "y":4.3},
- {"label":"Q", "x":18, "y":4.9},
- {"label":"Shift", "x":19, "y":4.9},
-
- {"label":"Ctrl", "x":0, "y":5.9},
- {"label":"GUI", "x":1, "y":5.9},
- {"label":"Keypad /", "x":2, "y":5.3},
- {"label":".", "x":3, "y":5},
- {"label":",", "x":4, "y":5.4},
- {"label":"Space", "x":5, "y":5.5},
- {"label":"Layer 1/Space", "x":6.5, "y":6},
- {"label":"Alt", "x":7.5, "y":6},
- {"label":"Caps Lock", "x":11.5, "y":6},
- {"label":"Layer 1/Space", "x":12.5, "y":6},
- {"label":"Space", "x":14, "y":5.5},
- {"label":"Left", "x":15, "y":5.4},
- {"label":"Down", "x":16, "y":5},
- {"label":"Right", "x":17, "y":5.3},
- {"label":":", "x":18, "y":5.9},
- {"label":"Ctrl", "x":19, "y":5.9},
-
- {"label":"Left Pedal 1", "x":2.25, "y":7.5, "w":1.5, "h":2},
- {"label":"Left Pedal 2", "x":3.75, "y":7.5, "w":1.5, "h":2},
- {"label":"Left Pedal 3", "x":5.25, "y":7.5, "w":1.5, "h":2},
- {"label":"Right Pedal 1", "x":13.25, "y":7.5, "w":1.5, "h":2},
- {"label":"Right Pedal 2", "x":14.75, "y":7.5, "w":1.5, "h":2},
- {"label":"Right Pedal 3", "x":16.25, "y":7.5, "w":1.5, "h":2}
+ {"matrix": [14, 5], "x": 1, "y": 0.9},
+ {"matrix": [13, 5], "x": 2, "y": 0.3},
+ {"matrix": [12, 5], "x": 3, "y": 0},
+ {"matrix": [11, 5], "x": 4, "y": 0.4},
+ {"matrix": [10, 5], "x": 5, "y": 0.5},
+ {"matrix": [9, 5], "x": 6, "y": 0.5},
+
+ {"matrix": [6, 5], "x": 13, "y": 0.5},
+ {"matrix": [5, 5], "x": 14, "y": 0.5},
+ {"matrix": [4, 5], "x": 15, "y": 0.4},
+ {"matrix": [3, 5], "x": 16, "y": 0},
+ {"matrix": [2, 5], "x": 17, "y": 0.3},
+ {"matrix": [1, 5], "x": 18, "y": 0.9},
+
+ {"matrix": [15, 4], "x": 0, "y": 1.9},
+ {"matrix": [14, 4], "x": 1, "y": 1.9},
+ {"matrix": [13, 4], "x": 2, "y": 1.3},
+ {"matrix": [12, 4], "x": 3, "y": 1},
+ {"matrix": [11, 4], "x": 4, "y": 1.4},
+ {"matrix": [10, 4], "x": 5, "y": 1.5},
+ {"matrix": [9, 4], "x": 6, "y": 1.5},
+
+ {"matrix": [6, 4], "x": 13, "y": 1.5},
+ {"matrix": [5, 4], "x": 14, "y": 1.5},
+ {"matrix": [4, 4], "x": 15, "y": 1.4},
+ {"matrix": [3, 4], "x": 16, "y": 1},
+ {"matrix": [2, 4], "x": 17, "y": 1.3},
+ {"matrix": [1, 4], "x": 18, "y": 1.9},
+ {"matrix": [0, 4], "x": 19, "y": 1.9},
+
+ {"matrix": [15, 3], "x": 0, "y": 2.9},
+ {"matrix": [14, 3], "x": 1, "y": 2.9},
+ {"matrix": [13, 3], "x": 2, "y": 2.3},
+ {"matrix": [12, 3], "x": 3, "y": 2},
+ {"matrix": [11, 3], "x": 4, "y": 2.4},
+ {"matrix": [10, 3], "x": 5, "y": 2.5},
+ {"matrix": [9, 3], "x": 6, "y": 2.5},
+
+ {"matrix": [6, 3], "x": 13, "y": 2.5},
+ {"matrix": [5, 3], "x": 14, "y": 2.5},
+ {"matrix": [4, 3], "x": 15, "y": 2.4},
+ {"matrix": [3, 3], "x": 16, "y": 2},
+ {"matrix": [2, 3], "x": 17, "y": 2.3},
+ {"matrix": [1, 3], "x": 18, "y": 2.9},
+ {"matrix": [0, 3], "x": 19, "y": 2.9},
+
+ {"matrix": [15, 2], "x": 0, "y": 3.9},
+ {"matrix": [14, 2], "x": 1, "y": 3.9},
+ {"matrix": [13, 2], "x": 2, "y": 3.3},
+ {"matrix": [12, 2], "x": 3, "y": 3},
+ {"matrix": [11, 2], "x": 4, "y": 3.4},
+ {"matrix": [10, 2], "x": 5, "y": 3.5},
+ {"matrix": [9, 2], "x": 6, "y": 3.5},
+
+ {"matrix": [6, 2], "x": 13, "y": 3.5},
+ {"matrix": [5, 2], "x": 14, "y": 3.5},
+ {"matrix": [4, 2], "x": 15, "y": 3.4},
+ {"matrix": [3, 2], "x": 16, "y": 3},
+ {"matrix": [2, 2], "x": 17, "y": 3.3},
+ {"matrix": [1, 2], "x": 18, "y": 3.9},
+ {"matrix": [0, 2], "x": 19, "y": 3.9},
+
+ {"matrix": [15, 1], "x": 0, "y": 4.9},
+ {"matrix": [14, 1], "x": 1, "y": 4.9},
+ {"matrix": [13, 1], "x": 2, "y": 4.3},
+ {"matrix": [12, 1], "x": 3, "y": 4},
+ {"matrix": [11, 1], "x": 4, "y": 4.4},
+ {"matrix": [10, 1], "x": 5, "y": 4.5},
+
+ {"matrix": [9, 1], "x": 6.5, "y": 5},
+ {"matrix": [8, 1], "x": 7.5, "y": 5},
+ {"matrix": [8, 2], "x": 8.5, "y": 5},
+
+ {"matrix": [7, 2], "x": 10.5, "y": 5},
+ {"matrix": [7, 1], "x": 11.5, "y": 5},
+ {"matrix": [6, 1], "x": 12.5, "y": 5},
+
+ {"matrix": [5, 1], "x": 14, "y": 4.5},
+ {"matrix": [4, 1], "x": 15, "y": 4.4},
+ {"matrix": [3, 1], "x": 16, "y": 4},
+ {"matrix": [2, 1], "x": 17, "y": 4.3},
+ {"matrix": [1, 1], "x": 18, "y": 4.9},
+ {"matrix": [0, 1], "x": 19, "y": 4.9},
+
+ {"matrix": [15, 0], "x": 0, "y": 5.9},
+ {"matrix": [14, 0], "x": 1, "y": 5.9},
+ {"matrix": [13, 0], "x": 2, "y": 5.3},
+ {"matrix": [12, 0], "x": 3, "y": 5},
+ {"matrix": [11, 0], "x": 4, "y": 5.4},
+ {"matrix": [10, 0], "x": 5, "y": 5.5},
+
+ {"matrix": [9, 0], "x": 6.5, "y": 6},
+ {"matrix": [8, 0], "x": 7.5, "y": 6},
+
+ {"matrix": [7, 0], "x": 11.5, "y": 6},
+ {"matrix": [6, 0], "x": 12.5, "y": 6},
+
+ {"matrix": [5, 0], "x": 14, "y": 5.5},
+ {"matrix": [4, 0], "x": 15, "y": 5.4},
+ {"matrix": [3, 0], "x": 16, "y": 5},
+ {"matrix": [2, 0], "x": 17, "y": 5.3},
+ {"matrix": [1, 0], "x": 18, "y": 5.9},
+ {"matrix": [0, 0], "x": 19, "y": 5.9},
+
+ {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.5, "h": 2},
+ {"matrix": [8, 4], "x": 3.75, "y": 7.5, "w": 1.5, "h": 2},
+
+ {"matrix": [8, 5], "x": 5.25, "y": 7.5, "w": 1.5, "h": 2},
+
+ {"matrix": [7, 3], "x": 13.25, "y": 7.5, "w": 1.5, "h": 2},
+ {"matrix": [7, 4], "x": 14.75, "y": 7.5, "w": 1.5, "h": 2},
+
+ {"matrix": [7, 5], "x": 16.25, "y": 7.5, "w": 1.5, "h": 2}
]
}
}
diff --git a/keyboards/handwired/freoduo/freoduo.h b/keyboards/handwired/freoduo/freoduo.h
deleted file mode 100644
index 3093a93627..0000000000
--- a/keyboards/handwired/freoduo/freoduo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Filip Paryż (@FilipParyz)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, KC_NO}, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { KC_NO, R41, R42, R43, R44, R45 } \
- }
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
index 90b34f29d4..5ddf21ee79 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/info.json
@@ -25,65 +25,74 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 7, "y": 1},
- {"x": 8, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
- {"x": 5, "y": 3},
- {"x": 7, "y": 3},
- {"x": 8, "y": 3},
- {"x": 9, "y": 3},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2, "y": 4},
- {"x": 3, "y": 4},
- {"x": 4, "y": 4, "w": 2},
- {"x": 7, "y": 4, "w": 2},
- {"x": 9, "y": 4},
- {"x": 10, "y": 4},
- {"x": 11, "y": 4},
- {"x": 12, "y": 4}
- ]
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
+
+ {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 4], "x": 11, "y": 4},
+ {"matrix": [9, 5], "x": 12, "y": 4}
+ ]
}
}
+}
diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h b/keyboards/handwired/hacked_motospeed/hacked_motospeed.h
deleted file mode 100644
index 1063fd2e62..0000000000
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2019 Vladislav Opara <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- EWR, DWR, CWR, BWR, AWR, FXR, FYL, AZL, BZL, CZL, DZL, \
- DXR, CXR, BXR, AXR, FZR, DVL, AYL, BYL, CYL, DYL, EZL, \
- EZR, DYR, CYR, BYR, AYR, DVR, FZL, AXL, BXL, CXL, DXL, \
- DZR, CZR, BZR, AZR, FYR, FXL, AWL, BWL, CWL, DWL, EWL \
-) \
-{ \
- { EWR, DWR, CWR, BWR, AWR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, DXR, CXR, BXR, AXR, FXR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, DYR, CYR, BYR, AYR, FYR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { EZR, DZR, CZR, AZR, BZR, FZR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, DVR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FZL, BZL, AZL, CZL, DZL, EZL }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FYL, AYL, BYL, CYL, DYL, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FXL, AXL, BXL, CXL, DXL, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AWL, BWL, CWL, DWL, EWL }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, DVL, KC_NO } \
-}
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
index c64931a74b..86736773ec 100644
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ b/keyboards/handwired/hacked_motospeed/info.json
@@ -20,7 +20,59 @@
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"ESC", "x":0, "y":0, "h":2}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Z", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0, "w":2}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":"(", "x":11, "y":1}, {"label":")", "x":12, "y":1}, {"label":"=", "x":0, "y":2}, {"label":"Y", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"Fn", "x":0, "y":3, "w":2}, {"label":"Num", "x":2, "y":3}, {"label":"Bksp", "x":3, "y":3}, {"label":"Enter", "x":4, "y":3}, {"label":"Spc", "x":5, "y":3}, {"label":"LShift", "x":7, "y":3}, {"label":"LCtrl", "x":8, "y":3}, {"label":"LAlt", "x":9, "y":3}, {"label":"RAlt", "x":10, "y":3}, {"label":"Meta", "x":11, "y":3}, {"label":"Fn", "x":12, "y":2, "h":2}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [1, 5], "x": 5, "y": 0},
+
+ {"matrix": [6, 6], "x": 7, "y": 0},
+ {"matrix": [5, 8], "x": 8, "y": 0},
+ {"matrix": [5, 7], "x": 9, "y": 0},
+ {"matrix": [5, 9], "x": 10, "y": 0},
+ {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
+
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+
+ {"matrix": [9, 10], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [6, 8], "x": 9, "y": 1},
+ {"matrix": [6, 9], "x": 10, "y": 1},
+ {"matrix": [6, 10], "x": 11, "y": 1},
+ {"matrix": [5, 11], "x": 12, "y": 1},
+
+ {"matrix": [3, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [4, 1], "x": 5, "y": 2},
+
+ {"matrix": [5, 6], "x": 7, "y": 2},
+ {"matrix": [7, 7], "x": 8, "y": 2},
+ {"matrix": [7, 8], "x": 9, "y": 2},
+ {"matrix": [7, 9], "x": 10, "y": 2},
+ {"matrix": [7, 10], "x": 11, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 6], "x": 7, "y": 3},
+ {"matrix": [8, 7], "x": 8, "y": 3},
+ {"matrix": [8, 8], "x": 9, "y": 3},
+ {"matrix": [8, 9], "x": 10, "y": 3},
+ {"matrix": [8, 10], "x": 11, "y": 3},
+ {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/hexon38/hexon38.h b/keyboards/handwired/hexon38/hexon38.h
deleted file mode 100644
index f98f460faf..0000000000
--- a/keyboards/handwired/hexon38/hexon38.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// see https://github.com/pepaslabs/hexon38
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K002, K003, K004, K005, K006, K007, K008, K009, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K207, K208, K209, K210, K211, \
- K302, K303, K304, K305, K306, K307, K308, K309 \
-) { \
- { KC_NO, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, KC_NO, KC_NO }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, KC_NO, KC_NO, K207, K208, K209, K210, K211 }, \
- { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json
index 2f22eeeaf8..5bb94b0c40 100644
--- a/keyboards/handwired/hexon38/info.json
+++ b/keyboards/handwired/hexon38/info.json
@@ -18,47 +18,51 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "y":1},
- {"x":15, "y":1},
- {"x":16, "y":1},
- {"x":17, "y":1},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [0, 8], "x": 14, "y": 0},
+ {"matrix": [0, 9], "x": 15, "y": 0},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
- {"x":16, "y":2},
- {"x":17, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3}
+ {"matrix": [1, 6], "x": 12, "y": 1},
+ {"matrix": [1, 7], "x": 13, "y": 1},
+ {"matrix": [1, 8], "x": 14, "y": 1},
+ {"matrix": [1, 9], "x": 15, "y": 1},
+ {"matrix": [1, 10], "x": 16, "y": 1},
+ {"matrix": [1, 11], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+
+ {"matrix": [2, 7], "x": 13, "y": 2},
+ {"matrix": [2, 8], "x": 14, "y": 2},
+ {"matrix": [2, 9], "x": 15, "y": 2},
+ {"matrix": [2, 10], "x": 16, "y": 2},
+ {"matrix": [2, 11], "x": 17, "y": 2},
+
+ {"matrix": [3, 2], "x": 4.5, "y": 3},
+ {"matrix": [3, 3], "x": 5.5, "y": 3},
+ {"matrix": [3, 4], "x": 6.5, "y": 3},
+ {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 6], "x": 9.5, "y": 3},
+ {"matrix": [3, 7], "x": 10.5, "y": 3},
+ {"matrix": [3, 8], "x": 11.5, "y": 3},
+ {"matrix": [3, 9], "x": 12.5, "y": 3}
]
}
}
diff --git a/keyboards/handwired/hnah40/hnah40.h b/keyboards/handwired/hnah40/hnah40.h
deleted file mode 100644
index 28e09f6683..0000000000
--- a/keyboards/handwired/hnah40/hnah40.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments representing the physical
-// layout of the board and position of the keys
-// The second converts the arguments into a two-dimensional array which
-// represents the switch matrix.
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k39, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, \
- k30, k31, k32, k33, k35, k37, k38, k3A\
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
- { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3A }, \
-}
diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json
index cd94929ea1..a4ed0756e7 100644
--- a/keyboards/handwired/hnah40/info.json
+++ b/keyboards/handwired/hnah40/info.json
@@ -18,48 +18,51 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"BSPC", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"A", "x":1.5, "y":1},
- {"label":"S", "x":2.5, "y":1},
- {"label":"D", "x":3.5, "y":1},
- {"label":"F", "x":4.5, "y":1},
- {"label":"G", "x":5.5, "y":1},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"Enter", "x":10.5, "y":1, "w":1.5},
- {"label":"Shift", "x":0, "y":2, "w":1.75},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":6.75, "y":2},
- {"label":"M", "x":7.75, "y":2},
- {"label":",", "x":8.75, "y":2},
- {"label":".", "x":9.75, "y":2},
- {"label":"Shift", "x":10.75, "y":2, "w":1.25},
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"Win", "x":1.25, "y":3, "w":1.5},
- {"label":"Alt", "x":2.75, "y":3, "w":1.25},
- {"label":"Space", "x":4, "y":3, "w":2},
- {"label":"Space", "x":6, "y":3, "w":2},
- {"label":"App", "x":8, "y":3, "w":1.25},
- {"label":"Fn", "x":9.25, "y":3, "w":1.5},
- {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [3, 9], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 9.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h
deleted file mode 100644
index 7de32eaa8c..0000000000
--- a/keyboards/handwired/hwpm87/hwpm87.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \
- K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H \
-) { \
- { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \
- { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \
- { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \
- { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \
-}
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index a719ba5ef2..88079c32ad 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -22,95 +22,107 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (B0,D3)", "x": 0, "y": 0 },
- { "label": "K02 (B0,D1)", "x": 2, "y": 0 },
- { "label": "K03 (B0,D0)", "x": 3, "y": 0 },
- { "label": "K04 (B0,D4)", "x": 4, "y": 0 },
- { "label": "K05 (B0,C6)", "x": 5, "y": 0 },
- { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 },
- { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 },
- { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 },
- { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 },
- { "label": "K0B (B0,D5)", "x": 11, "y": 0 },
- { "label": "K0C (B0,D6)", "x": 12, "y": 0 },
- { "label": "K0D (B0,C7)", "x": 13, "y": 0 },
- { "label": "K0E (B0,E2)", "x": 14, "y": 0 },
- { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 },
- { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 },
- { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 },
- { "label": "K10 (B1,D3)", "x": 0, "y": 1 },
- { "label": "K11 (B1,D2)", "x": 1, "y": 1 },
- { "label": "K12 (B1,D1)", "x": 2, "y": 1 },
- { "label": "K13 (B1,D0)", "x": 3, "y": 1 },
- { "label": "K14 (B1,D4)", "x": 4, "y": 1 },
- { "label": "K15 (B1,C6)", "x": 5, "y": 1 },
- { "label": "K16 (B1,D7)", "x": 6, "y": 1 },
- { "label": "K17 (B1,E6)", "x": 7, "y": 1 },
- { "label": "K18 (B1,B7)", "x": 8, "y": 1 },
- { "label": "K19 (B1,F0)", "x": 9, "y": 1 },
- { "label": "K1A (B1,F1)", "x": 10, "y": 1 },
- { "label": "K1B (B1,D5)", "x": 11, "y": 1 },
- { "label": "K1C (B1,D6)", "x": 12, "y": 1 },
- { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 },
- { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 },
- { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 },
- { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 },
- { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 },
- { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 },
- { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 },
- { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 },
- { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 },
- { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 },
- { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 },
- { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 },
- { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 },
- { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 },
- { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 },
- { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 },
- { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 },
- { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 },
- { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 },
- { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 },
- { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 },
- { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 },
- { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 },
- { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 },
- { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 },
- { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 },
- { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 },
- { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 },
- { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 },
- { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 },
- { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 },
- { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
- { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 },
- { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 },
- { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 },
- { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 },
- { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 },
- { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 },
- { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 },
- { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 },
- { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 },
- { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 },
- { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 },
- { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 },
- { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 },
- { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 },
- { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 },
- { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 },
- { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 },
- { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 },
- { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 },
- { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 },
- { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 },
- { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 },
- { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 },
- { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 },
- { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 },
- { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1},
+ {"matrix": [1, 16], "x": 16.25, "y": 1},
+ {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 2], "x": 1.5, "y": 2},
+ {"matrix": [2, 3], "x": 2.5, "y": 2},
+ {"matrix": [2, 4], "x": 3.5, "y": 2},
+ {"matrix": [2, 5], "x": 4.5, "y": 2},
+ {"matrix": [2, 6], "x": 5.5, "y": 2},
+ {"matrix": [2, 7], "x": 6.5, "y": 2},
+ {"matrix": [2, 8], "x": 7.5, "y": 2},
+ {"matrix": [2, 9], "x": 8.5, "y": 2},
+ {"matrix": [2, 10], "x": 9.5, "y": 2},
+ {"matrix": [2, 11], "x": 10.5, "y": 2},
+ {"matrix": [2, 12], "x": 11.5, "y": 2},
+ {"matrix": [2, 13], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2},
+ {"matrix": [2, 16], "x": 16.25, "y": 2},
+ {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3},
+ {"matrix": [3, 3], "x": 2.75, "y": 3},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3},
+ {"matrix": [3, 7], "x": 6.75, "y": 3},
+ {"matrix": [3, 8], "x": 7.75, "y": 3},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+ {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75},
+
+ {"matrix": [4, 16], "x": 16.25, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 14], "x": 13.75, "y": 5, "w": 1.25},
+
+ {"matrix": [5, 15], "x": 15.25, "y": 5},
+ {"matrix": [5, 16], "x": 16.25, "y": 5},
+ {"matrix": [5, 17], "x": 17.25, "y": 5}
]
}
}
-
}
diff --git a/keyboards/handwired/ibm122m/ibm122m.h b/keyboards/handwired/ibm122m/ibm122m.h
deleted file mode 100644
index a52bf4bc44..0000000000
--- a/keyboards/handwired/ibm122m/ibm122m.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k09, k19, k1A, k29, k39, k3A, k49, k59, k5A, k69, k79, k7A, \
- k0A, k0B, k1B, k2A, k2B, k3B, k4A, k4B, k5B, k6A, k6B, k7B, \
- k31, k32, k34, k24, k25, k26, k27, k37, k38, k28, k2C, k2D, k2E, k3E, k3C, k3F, k3G, k3H, k2G, k2F, k2H, k2I, k20, \
- k21, k41, k42, k44, k45, k46, k47, k57, k58, k48, k4C, k4D, k4E, k5E, k5C, k6F, k1G, k5G, k4G, k4F, k4H, k4I, k40, \
- k51, k52, k62, k14, k15, k16, k17, k07, k08, k18, k1C, k1D, k1E, k0E, k6E, k0G, k1F, k1H, k1I, k10, \
- k11, k12, k73, k74, k64, k65, k66, k67, k77, k78, k68, k6C, k6D, k7E, k63, k60, k0J, k1J, k61, k6H, k6I, k7J, \
- k02, k01, k00, k70, k71, k03, k72, k0F, k7H, k7I \
-) \
-{ \
- { k00, k01, k02, k03, KC_NO, KC_NO, KC_NO, k07, k08, k09, k0A, k0B, KC_NO, KC_NO, k0E, k0F, k0G, KC_NO, KC_NO, k0J }, \
- { k10, k11, k12, KC_NO, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J }, \
- { k20, k21, KC_NO, KC_NO, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, KC_NO }, \
- { KC_NO, k31, k32, KC_NO, k34, KC_NO, KC_NO, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E, k3F, k3G, k3H, KC_NO, KC_NO }, \
- { k40, k41, k42, KC_NO, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, KC_NO }, \
- { KC_NO, k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO, k5G, KC_NO, KC_NO, KC_NO }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, KC_NO, k6H, k6I, KC_NO }, \
- { k70, k71, k72, k73, k74, KC_NO, KC_NO, k77, k78, k79, k7A, k7B, KC_NO, KC_NO, k7E, KC_NO, KC_NO, k7H, k7I, k7J }, \
-}
diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json
index 6a157a8031..8dbdbb9fb5 100644
--- a/keyboards/handwired/ibm122m/info.json
+++ b/keyboards/handwired/ibm122m/info.json
@@ -18,128 +18,150 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"F13", "x":3.25, "y":0},
- {"label":"F14", "x":4.25, "y":0},
- {"label":"F15", "x":5.25, "y":0},
- {"label":"F16", "x":6.25, "y":0},
- {"label":"F17", "x":7.25, "y":0},
- {"label":"F18", "x":8.25, "y":0},
- {"label":"F19", "x":9.25, "y":0},
- {"label":"F20", "x":10.25, "y":0},
- {"label":"F21", "x":11.25, "y":0},
- {"label":"F22", "x":12.25, "y":0},
- {"label":"F23", "x":13.25, "y":0},
- {"label":"F24", "x":14.25, "y":0},
- {"label":"F1", "x":3.25, "y":1},
- {"label":"F2", "x":4.25, "y":1},
- {"label":"F3", "x":5.25, "y":1},
- {"label":"F4", "x":6.25, "y":1},
- {"label":"F5", "x":7.25, "y":1},
- {"label":"F6", "x":8.25, "y":1},
- {"label":"F7", "x":9.25, "y":1},
- {"label":"F8", "x":10.25, "y":1},
- {"label":"F9", "x":11.25, "y":1},
- {"label":"F10", "x":12.25, "y":1},
- {"label":"F11", "x":13.25, "y":1},
- {"label":"F12", "x":14.25, "y":1},
- {"label":"Esc", "x":0, "y":3},
- {"x":1, "y":3},
- {"label":"`", "x":2.25, "y":3},
- {"label":"1", "x":3.25, "y":3},
- {"label":"2", "x":4.25, "y":3},
- {"label":"3", "x":5.25, "y":3},
- {"label":"4", "x":6.25, "y":3},
- {"label":"5", "x":7.25, "y":3},
- {"label":"6", "x":8.25, "y":3},
- {"label":"7", "x":9.25, "y":3},
- {"label":"8", "x":10.25, "y":3},
- {"label":"9", "x":11.25, "y":3},
- {"label":"0", "x":12.25, "y":3},
- {"label":"-", "x":13.25, "y":3},
- {"label":"=", "x":14.25, "y":3},
- {"label":"Backspace", "x":15.25, "y":3, "w":2},
- {"label":"Insert", "x":17.5, "y":3},
- {"label":"Home", "x":18.5, "y":3},
- {"label":"Page Up", "x":19.5, "y":3},
- {"label":"Num Lock", "x":20.75, "y":3},
- {"label":"/", "x":21.75, "y":3},
- {"label":"*", "x":22.75, "y":3},
- {"label":"-", "x":23.75, "y":3},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"label":"Tab", "x":2.25, "y":4, "w":1.5},
- {"label":"Q", "x":3.75, "y":4},
- {"label":"W", "x":4.75, "y":4},
- {"label":"E", "x":5.75, "y":4},
- {"label":"R", "x":6.75, "y":4},
- {"label":"T", "x":7.75, "y":4},
- {"label":"Y", "x":8.75, "y":4},
- {"label":"U", "x":9.75, "y":4},
- {"label":"I", "x":10.75, "y":4},
- {"label":"O", "x":11.75, "y":4},
- {"label":"P", "x":12.75, "y":4},
- {"label":"[", "x":13.75, "y":4},
- {"label":"]", "x":14.75, "y":4},
- {"label":"Enter", "x":16, "y":4, "w":1.25, "h":2},
- {"label":"Delete", "x":17.5, "y":4},
- {"label":"End", "x":18.5, "y":4},
- {"label":"Page Down", "x":19.5, "y":4},
- {"label":"7", "x":20.75, "y":4},
- {"label":"8", "x":21.75, "y":4},
- {"label":"9", "x":22.75, "y":4},
- {"label":"+", "x":23.75, "y":4},
- {"x":0, "y":5},
- {"x":1, "y":5},
- {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75},
- {"label":"A", "x":4, "y":5},
- {"label":"S", "x":5, "y":5},
- {"label":"D", "x":6, "y":5},
- {"label":"F", "x":7, "y":5},
- {"label":"G", "x":8, "y":5},
- {"label":"H", "x":9, "y":5},
- {"label":"J", "x":10, "y":5},
- {"label":"K", "x":11, "y":5},
- {"label":"L", "x":12, "y":5},
- {"label":";", "x":13, "y":5},
- {"label":"'", "x":14, "y":5},
- {"label":"#", "x":15, "y":5},
- {"label":"Up", "x":18.5, "y":5},
- {"label":"4", "x":20.75, "y":5},
- {"label":"5", "x":21.75, "y":5},
- {"label":"6", "x":22.75, "y":5},
- {"x":23.75, "y":5},
- {"x":0, "y":6},
- {"x":1, "y":6},
- {"label":"Shift", "x":2.25, "y":6, "w":1.25},
- {"label":"\\", "x":3.5, "y":6},
- {"label":"Z", "x":4.5, "y":6},
- {"label":"X", "x":5.5, "y":6},
- {"label":"C", "x":6.5, "y":6},
- {"label":"V", "x":7.5, "y":6},
- {"label":"B", "x":8.5, "y":6},
- {"label":"N", "x":9.5, "y":6},
- {"label":"M", "x":10.5, "y":6},
- {"label":",", "x":11.5, "y":6},
- {"label":".", "x":12.5, "y":6},
- {"label":"/", "x":13.5, "y":6},
- {"label":"Shift", "x":14.5, "y":6, "w":2.75},
- {"label":"Left", "x":17.5, "y":6},
- {"x":18.5, "y":6},
- {"label":"Right", "x":19.5, "y":6},
- {"label":"1", "x":20.75, "y":6},
- {"label":"2", "x":21.75, "y":6},
- {"label":"3", "x":22.75, "y":6},
- {"label":"Enter", "x":23.75, "y":6, "h":2},
- {"x":0, "y":7},
- {"x":1, "y":7},
- {"label":"Ctrl", "x":2.25, "y":7, "w":1.5},
- {"label":"Alt", "x":4.75, "y":7, "w":1.5},
- {"x":6.25, "y":7, "w":7},
- {"label":"AltGr", "x":13.25, "y":7, "w":1.5},
- {"label":"Ctrl", "x":15.75, "y":7, "w":1.5},
- {"label":"Down", "x":18.5, "y":7},
- {"label":"0", "x":20.75, "y":7, "w":2},
- {"label":".", "x":22.75, "y":7}
+ {"matrix": [0, 9], "x": 3.25, "y": 0},
+ {"matrix": [1, 9], "x": 4.25, "y": 0},
+ {"matrix": [1, 10], "x": 5.25, "y": 0},
+ {"matrix": [2, 9], "x": 6.25, "y": 0},
+ {"matrix": [3, 9], "x": 7.25, "y": 0},
+ {"matrix": [3, 10], "x": 8.25, "y": 0},
+ {"matrix": [4, 9], "x": 9.25, "y": 0},
+ {"matrix": [5, 9], "x": 10.25, "y": 0},
+ {"matrix": [5, 10], "x": 11.25, "y": 0},
+ {"matrix": [6, 9], "x": 12.25, "y": 0},
+ {"matrix": [7, 9], "x": 13.25, "y": 0},
+ {"matrix": [7, 10], "x": 14.25, "y": 0},
+
+ {"matrix": [0, 10], "x": 3.25, "y": 1},
+ {"matrix": [0, 11], "x": 4.25, "y": 1},
+ {"matrix": [1, 11], "x": 5.25, "y": 1},
+ {"matrix": [2, 10], "x": 6.25, "y": 1},
+ {"matrix": [2, 11], "x": 7.25, "y": 1},
+ {"matrix": [3, 11], "x": 8.25, "y": 1},
+ {"matrix": [4, 10], "x": 9.25, "y": 1},
+ {"matrix": [4, 11], "x": 10.25, "y": 1},
+ {"matrix": [5, 11], "x": 11.25, "y": 1},
+ {"matrix": [6, 10], "x": 12.25, "y": 1},
+ {"matrix": [6, 11], "x": 13.25, "y": 1},
+ {"matrix": [7, 11], "x": 14.25, "y": 1},
+
+ {"matrix": [3, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 1, "y": 3},
+
+ {"matrix": [3, 4], "x": 2.25, "y": 3},
+ {"matrix": [2, 4], "x": 3.25, "y": 3},
+ {"matrix": [2, 5], "x": 4.25, "y": 3},
+ {"matrix": [2, 6], "x": 5.25, "y": 3},
+ {"matrix": [2, 7], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [2, 8], "x": 9.25, "y": 3},
+ {"matrix": [2, 12], "x": 10.25, "y": 3},
+ {"matrix": [2, 13], "x": 11.25, "y": 3},
+ {"matrix": [2, 14], "x": 12.25, "y": 3},
+ {"matrix": [3, 14], "x": 13.25, "y": 3},
+ {"matrix": [3, 12], "x": 14.25, "y": 3},
+ {"matrix": [3, 15], "x": 15.25, "y": 3, "w": 2},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+ {"matrix": [2, 16], "x": 19.5, "y": 3},
+
+ {"matrix": [2, 15], "x": 20.75, "y": 3},
+ {"matrix": [2, 17], "x": 21.75, "y": 3},
+ {"matrix": [2, 18], "x": 22.75, "y": 3},
+ {"matrix": [2, 0], "x": 23.75, "y": 3},
+
+ {"matrix": [2, 1], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 3.75, "y": 4},
+ {"matrix": [4, 5], "x": 4.75, "y": 4},
+ {"matrix": [4, 6], "x": 5.75, "y": 4},
+ {"matrix": [4, 7], "x": 6.75, "y": 4},
+ {"matrix": [5, 7], "x": 7.75, "y": 4},
+ {"matrix": [5, 8], "x": 8.75, "y": 4},
+ {"matrix": [4, 8], "x": 9.75, "y": 4},
+ {"matrix": [4, 12], "x": 10.75, "y": 4},
+ {"matrix": [4, 13], "x": 11.75, "y": 4},
+ {"matrix": [4, 14], "x": 12.75, "y": 4},
+ {"matrix": [5, 14], "x": 13.75, "y": 4},
+ {"matrix": [5, 12], "x": 14.75, "y": 4},
+ {"matrix": [6, 15], "x": 16, "y": 4, "w": 1.25, "h": 2},
+
+ {"matrix": [1, 16], "x": 17.5, "y": 4},
+ {"matrix": [5, 16], "x": 18.5, "y": 4},
+ {"matrix": [4, 16], "x": 19.5, "y": 4},
+
+ {"matrix": [4, 15], "x": 20.75, "y": 4},
+ {"matrix": [4, 17], "x": 21.75, "y": 4},
+ {"matrix": [4, 18], "x": 22.75, "y": 4},
+ {"matrix": [4, 0], "x": 23.75, "y": 4},
+
+ {"matrix": [5, 1], "x": 0, "y": 5},
+ {"matrix": [5, 2], "x": 1, "y": 5},
+
+ {"matrix": [6, 2], "x": 2.25, "y": 5, "w": 1.75},
+ {"matrix": [1, 4], "x": 4, "y": 5},
+ {"matrix": [1, 5], "x": 5, "y": 5},
+ {"matrix": [1, 6], "x": 6, "y": 5},
+ {"matrix": [1, 7], "x": 7, "y": 5},
+ {"matrix": [0, 7], "x": 8, "y": 5},
+ {"matrix": [0, 8], "x": 9, "y": 5},
+ {"matrix": [1, 8], "x": 10, "y": 5},
+ {"matrix": [1, 12], "x": 11, "y": 5},
+ {"matrix": [1, 13], "x": 12, "y": 5},
+ {"matrix": [1, 14], "x": 13, "y": 5},
+ {"matrix": [0, 14], "x": 14, "y": 5},
+ {"matrix": [6, 14], "x": 15, "y": 5},
+
+ {"matrix": [0, 16], "x": 18.5, "y": 5},
+
+ {"matrix": [1, 15], "x": 20.75, "y": 5},
+ {"matrix": [1, 17], "x": 21.75, "y": 5},
+ {"matrix": [1, 18], "x": 22.75, "y": 5},
+
+ {"matrix": [1, 0], "x": 23.75, "y": 5},
+
+ {"matrix": [1, 1], "x": 0, "y": 6},
+ {"matrix": [1, 2], "x": 1, "y": 6},
+
+ {"matrix": [7, 3], "x": 2.25, "y": 6, "w": 1.25},
+ {"matrix": [7, 4], "x": 3.5, "y": 6},
+ {"matrix": [6, 4], "x": 4.5, "y": 6},
+ {"matrix": [6, 5], "x": 5.5, "y": 6},
+ {"matrix": [6, 6], "x": 6.5, "y": 6},
+ {"matrix": [6, 7], "x": 7.5, "y": 6},
+ {"matrix": [7, 7], "x": 8.5, "y": 6},
+ {"matrix": [7, 8], "x": 9.5, "y": 6},
+ {"matrix": [6, 8], "x": 10.5, "y": 6},
+ {"matrix": [6, 12], "x": 11.5, "y": 6},
+ {"matrix": [6, 13], "x": 12.5, "y": 6},
+ {"matrix": [7, 14], "x": 13.5, "y": 6},
+ {"matrix": [6, 3], "x": 14.5, "y": 6, "w": 2.75},
+
+ {"matrix": [6, 0], "x": 17.5, "y": 6},
+ {"matrix": [0, 19], "x": 18.5, "y": 6},
+ {"matrix": [1, 19], "x": 19.5, "y": 6},
+
+ {"matrix": [6, 1], "x": 20.75, "y": 6},
+ {"matrix": [6, 17], "x": 21.75, "y": 6},
+ {"matrix": [6, 18], "x": 22.75, "y": 6},
+ {"matrix": [7, 19], "x": 23.75, "y": 6, "h": 2},
+
+ {"matrix": [0, 2], "x": 0, "y": 7},
+ {"matrix": [0, 1], "x": 1, "y": 7},
+
+ {"matrix": [0, 0], "x": 2.25, "y": 7, "w": 1.5},
+ {"matrix": [7, 0], "x": 4.75, "y": 7, "w": 1.5},
+ {"matrix": [7, 1], "x": 6.25, "y": 7, "w": 7},
+ {"matrix": [0, 3], "x": 13.25, "y": 7, "w": 1.5},
+ {"matrix": [7, 2], "x": 15.75, "y": 7, "w": 1.5},
+
+ {"matrix": [0, 15], "x": 18.5, "y": 7},
+
+ {"matrix": [7, 17], "x": 20.75, "y": 7, "w": 2},
+ {"matrix": [7, 18], "x": 22.75, "y": 7}
]
}
}
diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
deleted file mode 100644
index 55d54580aa..0000000000
--- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- \
- K22, K24, K34, K35, K36, K37, K27, K28, K38, K39, K3A, K3B, K2B, K29, K2C, K3C, \
- K41, K42, K44, K45, K46, K47, K57, K58, K48, K49, K4A, K4B, K5B, K59, K6C, K4C, \
- K52, K62, K14, K15, K16, K17, K07, K08, K18, K19, K1A, K1B, K0B, K6B, K1C, \
- K12, K73, K74, K64, K65, K66, K67, K77, K78, K68, K69, K6A, K7B, K61, \
- K01, K70, K71, K72, K7C \
- ) { \
- { KC_NO, K01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07, K08, KC_NO, KC_NO, K0B, KC_NO }, \
- { KC_NO, KC_NO, K12, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
- { KC_NO, KC_NO, K22, KC_NO, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, K2B, K2C }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
- { KC_NO, K41, K42, KC_NO, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \
- { KC_NO, KC_NO, K52, KC_NO, KC_NO, KC_NO, KC_NO, K57, K58, K59, KC_NO, K5B, KC_NO }, \
- { KC_NO, K61, K62, KC_NO, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \
- { K70, K71, K72, K73, K74, KC_NO, KC_NO, K77, K78, KC_NO, KC_NO, K7B, K7C }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json
index 792f6b8aea..4ec01887e1 100644
--- a/keyboards/handwired/ibm_wheelwriter/info.json
+++ b/keyboards/handwired/ibm_wheelwriter/info.json
@@ -18,87 +18,85 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0, "w":1.5},
+ {"matrix": [2, 2], "x": 0, "y": 0, "w": 1.5},
- {"x":1.75, "y":0},
- {"x":2.75, "y":0},
- {"x":3.75, "y":0},
- {"x":4.75, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
- {"x":13.75, "y":0},
- {"x":14.75, "y":0, "w":2},
+ {"matrix": [2, 4], "x": 1.75, "y": 0},
+ {"matrix": [3, 4], "x": 2.75, "y": 0},
+ {"matrix": [3, 5], "x": 3.75, "y": 0},
+ {"matrix": [3, 6], "x": 4.75, "y": 0},
+ {"matrix": [3, 7], "x": 5.75, "y": 0},
+ {"matrix": [2, 7], "x": 6.75, "y": 0},
+ {"matrix": [2, 8], "x": 7.75, "y": 0},
+ {"matrix": [3, 8], "x": 8.75, "y": 0},
+ {"matrix": [3, 9], "x": 9.75, "y": 0},
+ {"matrix": [3, 10], "x": 10.75, "y": 0},
+ {"matrix": [3, 11], "x": 11.75, "y": 0},
+ {"matrix": [2, 11], "x": 12.75, "y": 0},
+ {"matrix": [2, 9], "x": 13.75, "y": 0},
+ {"matrix": [2, 12], "x": 14.75, "y": 0, "w": 2},
- {"x":17, "y":0, "w":1.5},
+ {"matrix": [3, 12], "x": 17, "y": 0, "w": 1.5},
- {"x":0, "y":1, "w":1.5},
+ {"matrix": [4, 1], "x": 0, "y": 1, "w": 1.5},
- {"x":1.75, "y":1, "w":1.5},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1},
- {"x":11.25, "y":1},
- {"x":12.25, "y":1},
- {"x":13.25, "y":1},
- {"x":14.25, "y":1},
- {"x":15.5, "y":1, "w":1.25, "h":2},
+ {"matrix": [4, 2], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [4, 4], "x": 3.25, "y": 1},
+ {"matrix": [4, 5], "x": 4.25, "y": 1},
+ {"matrix": [4, 6], "x": 5.25, "y": 1},
+ {"matrix": [4, 7], "x": 6.25, "y": 1},
+ {"matrix": [5, 7], "x": 7.25, "y": 1},
+ {"matrix": [5, 8], "x": 8.25, "y": 1},
+ {"matrix": [4, 8], "x": 9.25, "y": 1},
+ {"matrix": [4, 9], "x": 10.25, "y": 1},
+ {"matrix": [4, 10], "x": 11.25, "y": 1},
+ {"matrix": [4, 11], "x": 12.25, "y": 1},
+ {"matrix": [5, 11], "x": 13.25, "y": 1},
+ {"matrix": [5, 9], "x": 14.25, "y": 1},
+ {"matrix": [6, 12], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
- {"x":17, "y":1, "w":1.5},
+ {"matrix": [4, 12], "x": 17, "y": 1, "w": 1.5},
- {"x":0, "y":2, "w":1.5},
+ {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.5},
- {"x":1.75, "y":2, "w":1.25},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2},
- {"x":5.5, "y":2},
- {"x":6.5, "y":2},
- {"x":7.5, "y":2},
- {"x":8.5, "y":2},
- {"x":9.5, "y":2},
- {"x":10.5, "y":2},
- {"x":11.5, "y":2},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2},
- {"x":14.5, "y":2},
+ {"matrix": [6, 2], "x": 1.75, "y": 2, "w": 1.25},
+ {"matrix": [1, 4], "x": 3.5, "y": 2},
+ {"matrix": [1, 5], "x": 4.5, "y": 2},
+ {"matrix": [1, 6], "x": 5.5, "y": 2},
+ {"matrix": [1, 7], "x": 6.5, "y": 2},
+ {"matrix": [0, 7], "x": 7.5, "y": 2},
+ {"matrix": [0, 8], "x": 8.5, "y": 2},
+ {"matrix": [1, 8], "x": 9.5, "y": 2},
+ {"matrix": [1, 9], "x": 10.5, "y": 2},
+ {"matrix": [1, 10], "x": 11.5, "y": 2},
+ {"matrix": [1, 11], "x": 12.5, "y": 2},
+ {"matrix": [0, 11], "x": 13.5, "y": 2},
+ {"matrix": [6, 11], "x": 14.5, "y": 2},
- {"x":17, "y":2, "w":1.5},
+ {"matrix": [1, 12], "x": 17, "y": 2, "w": 1.5},
- {"x":0, "y":3, "w":1.5},
+ {"matrix": [1, 2], "x": 0, "y": 3, "w": 1.5},
- {"x":1.75, "y":3, "w":1.25},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
+ {"matrix": [7, 3], "x": 1.75, "y": 3, "w": 1.25},
+ {"matrix": [7, 4], "x": 3, "y": 3},
+ {"matrix": [6, 4], "x": 4, "y": 3},
+ {"matrix": [6, 5], "x": 5, "y": 3},
+ {"matrix": [6, 6], "x": 6, "y": 3},
+ {"matrix": [6, 7], "x": 7, "y": 3},
+ {"matrix": [7, 7], "x": 8, "y": 3},
+ {"matrix": [7, 8], "x": 9, "y": 3},
+ {"matrix": [6, 8], "x": 10, "y": 3},
+ {"matrix": [6, 9], "x": 11, "y": 3},
+ {"matrix": [6, 10], "x": 12, "y": 3},
+ {"matrix": [7, 11], "x": 13, "y": 3},
+ {"matrix": [6, 1], "x": 17, "y": 3, "w": 1.5},
- {"x":17, "y":3, "w":1.5},
+ {"matrix": [0, 1], "x": 0, "y": 4, "w": 1.5},
- {"x":0, "y":4, "w":1.5},
+ {"matrix": [7, 0], "x": 4.25, "y": 4, "w": 2.75},
+ {"matrix": [7, 1], "x": 7, "y": 4, "w": 7.25},
+ {"matrix": [7, 2], "x": 15.25, "y": 4, "w": 1.5},
- {"x":4.25, "y":4, "w":2.75},
- {"x":7, "y":4, "w":7.25},
-
- {"x":15.25, "y":4, "w":1.5},
-
- {"x":17, "y":4, "w":1.5}
+ {"matrix": [7, 12], "x": 17, "y": 4, "w": 1.5}
]
}
}
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index 0dae7b010c..efebe52d0b 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -21,554 +21,130 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "MX_A0",
- "x": 0,
- "y": 0
- },
- {
- "label": "MX_B0",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "MX_C0",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "MX_D0",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "MX_E0",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "MX_F0",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "MX_G0",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "MX_H0",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "MX_I0",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "MX_J0",
- "x": 9.75,
- "y": 0
- },
- {
- "label": "MX_A6",
- "x": 10.75,
- "y": 0
- },
- {
- "label": "MX_B6",
- "x": 11.75,
- "y": 0
- },
- {
- "label": "MX_C6",
- "x": 12.75,
- "y": 0
- },
- {
- "label": "MX_D6",
- "x": 14,
- "y": 0
- },
- {
- "label": "MX_E6",
- "x": 15.25,
- "y": 0
- },
- {
- "label": "MX_F6",
- "x": 16.25,
- "y": 0
- },
- {
- "label": "MX_G6",
- "x": 17.25,
- "y": 0
- },
- {
- "label": "MX_H6",
- "x": 18.25,
- "y": 0
- },
- {
- "label": "MX_A1",
- "x": 0,
- "y": 1.25
- },
- {
- "label": "MX_B1",
- "x": 1,
- "y": 1.25
- },
- {
- "label": "MX_C1",
- "x": 2,
- "y": 1.25
- },
- {
- "label": "MX_D1",
- "x": 3,
- "y": 1.25
- },
- {
- "label": "MX_E1",
- "x": 4,
- "y": 1.25
- },
- {
- "label": "MX_F1",
- "x": 5,
- "y": 1.25
- },
- {
- "label": "MX_G1",
- "x": 6,
- "y": 1.25
- },
- {
- "label": "MX_H1",
- "x": 7,
- "y": 1.25
- },
- {
- "label": "MX_I1",
- "x": 8,
- "y": 1.25
- },
- {
- "label": "MX_J1",
- "x": 9,
- "y": 1.25
- },
- {
- "label": "MX_A7",
- "x": 10,
- "y": 1.25
- },
- {
- "label": "MX_B7",
- "x": 11,
- "y": 1.25
- },
- {
- "label": "MX_C7",
- "x": 12,
- "y": 1.25
- },
- {
- "label": "MX_D7",
- "x": 13,
- "y": 1.25,
- "w": 2
- },
- {
- "label": "MX_E7",
- "x": 15.25,
- "y": 1.25
- },
- {
- "label": "MX_F7",
- "x": 16.25,
- "y": 1.25
- },
- {
- "label": "MX_G7",
- "x": 17.25,
- "y": 1.25
- },
- {
- "label": "MX_H7",
- "x": 18.25,
- "y": 1.25
- },
- {
- "label": "MX_A2",
- "x": 0,
- "y": 2.25,
- "w": 1.5
- },
- {
- "label": "MX_B2",
- "x": 1.5,
- "y": 2.25
- },
- {
- "label": "MX_C2",
- "x": 2.5,
- "y": 2.25
- },
- {
- "label": "MX_D2",
- "x": 3.5,
- "y": 2.25
- },
- {
- "label": "MX_E2",
- "x": 4.5,
- "y": 2.25
- },
- {
- "label": "MX_F2",
- "x": 5.5,
- "y": 2.25
- },
- {
- "label": "MX_G2",
- "x": 6.5,
- "y": 2.25
- },
- {
- "label": "MX_H2",
- "x": 7.5,
- "y": 2.25
- },
- {
- "label": "MX_I2",
- "x": 8.5,
- "y": 2.25
- },
- {
- "label": "MX_J2",
- "x": 9.5,
- "y": 2.25
- },
- {
- "label": "MX_A8",
- "x": 10.5,
- "y": 2.25
- },
- {
- "label": "MX_B8",
- "x": 11.5,
- "y": 2.25
- },
- {
- "label": "MX_C8",
- "x": 12.5,
- "y": 2.25
- },
- {
- "label": "MX_D8",
- "x": 13.75,
- "y": 2.25,
- "w": 1.25,
- "h": 2
- },
- {
- "label": "MX_E8",
- "x": 15.25,
- "y": 2.25
- },
- {
- "label": "MX_F8",
- "x": 16.25,
- "y": 2.25
- },
- {
- "label": "MX_G8",
- "x": 17.25,
- "y": 2.25
- },
- {
- "label": "MX_H8",
- "x": 18.25,
- "y": 2.25,
- "h": 2
- },
- {
- "label": "MX_A3",
- "x": 0,
- "y": 3.25,
- "w": 1.75
- },
- {
- "label": "MX_B3",
- "x": 1.75,
- "y": 3.25
- },
- {
- "label": "MX_C3",
- "x": 2.75,
- "y": 3.25
- },
- {
- "label": "MX_D3",
- "x": 3.75,
- "y": 3.25
- },
- {
- "label": "MX_E3",
- "x": 4.75,
- "y": 3.25
- },
- {
- "label": "MX_F3",
- "x": 5.75,
- "y": 3.25
- },
- {
- "label": "MX_G3",
- "x": 6.75,
- "y": 3.25
- },
- {
- "label": "MX_H3",
- "x": 7.75,
- "y": 3.25
- },
- {
- "label": "MX_I3",
- "x": 8.75,
- "y": 3.25
- },
- {
- "label": "MX_J3",
- "x": 9.75,
- "y": 3.25
- },
- {
- "label": "MX_A9",
- "x": 10.75,
- "y": 3.25
- },
- {
- "label": "MX_B9",
- "x": 11.75,
- "y": 3.25
- },
- {
- "label": "MX_C9",
- "x": 12.75,
- "y": 3.25
- },
- {
- "label": "MX_E9",
- "x": 15.25,
- "y": 3.25
- },
- {
- "label": "MX_F9",
- "x": 16.25,
- "y": 3.25
- },
- {
- "label": "MX_G9",
- "x": 17.25,
- "y": 3.25
- },
- {
- "label": "MX_H9",
- "x": 19.5,
- "y": 3.25
- },
- {
- "label": "MX_K1",
- "x": 20.5,
- "y": 3.25
- },
- {
- "label": "MX_K0",
- "x": 21.5,
- "y": 3.25
- },
- {
- "label": "MX_A4",
- "x": 0,
- "y": 4.25,
- "w": 1.25
- },
- {
- "label": "MX_B4",
- "x": 1.25,
- "y": 4.25
- },
- {
- "label": "MX_C4",
- "x": 2.25,
- "y": 4.25
- },
- {
- "label": "MX_D4",
- "x": 3.25,
- "y": 4.25
- },
- {
- "label": "MX_E4",
- "x": 4.25,
- "y": 4.25
- },
- {
- "label": "MX_F4",
- "x": 5.25,
- "y": 4.25
- },
- {
- "label": "MX_G4",
- "x": 6.25,
- "y": 4.25
- },
- {
- "label": "MX_H4",
- "x": 7.25,
- "y": 4.25
- },
- {
- "label": "MX_I4",
- "x": 8.25,
- "y": 4.25
- },
- {
- "label": "MX_J4",
- "x": 9.25,
- "y": 4.25
- },
- {
- "label": "MX_I9",
- "x": 10.25,
- "y": 4.25
- },
- {
- "label": "MX_I8",
- "x": 11.25,
- "y": 4.25
- },
- {
- "label": "MX_I7",
- "x": 12.25,
- "y": 4.25,
- "w": 2.75
- },
- {
- "label": "MX_I6",
- "x": 15.25,
- "y": 4.25
- },
- {
- "label": "MX_J9",
- "x": 16.25,
- "y": 4.25
- },
- {
- "label": "MX_J8",
- "x": 17.25,
- "y": 4.25
- },
- {
- "label": "MX_J7",
- "x": 18.25,
- "y": 4.25,
- "h": 2
- },
- {
- "label": "MX_J6",
- "x": 19.5,
- "y": 4.25
- },
- {
- "label": "MX_K3",
- "x": 20.5,
- "y": 4.25
- },
- {
- "label": "MX_K2",
- "x": 21.5,
- "y": 4.25
- },
- {
- "label": "MX_A5",
- "x": 0,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_B5",
- "x": 1.25,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_C5",
- "x": 2.5,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_D5",
- "x": 3.75,
- "y": 5.25,
- "w": 6.25
- },
- {
- "label": "MX_J5",
- "x": 10,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_I5",
- "x": 11.25,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_K9",
- "x": 12.5,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_E5",
- "x": 13.75,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "MX_K8",
- "x": 15.25,
- "y": 5.25,
- "w": 2
- },
- {
- "label": "MX_K7",
- "x": 17.25,
- "y": 5.25
- },
- {
- "label": "MX_K6",
- "x": 19.5,
- "y": 5.25
- },
- {
- "label": "MX_K5",
- "x": 20.5,
- "y": 5.25
- },
- {
- "label": "MX_K4",
- "x": 21.5,
- "y": 5.25
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [6, 0], "x": 10.75, "y": 0},
+ {"matrix": [6, 1], "x": 11.75, "y": 0},
+ {"matrix": [6, 2], "x": 12.75, "y": 0},
+
+ {"matrix": [6, 3], "x": 14, "y": 0},
+
+ {"matrix": [6, 4], "x": 15.25, "y": 0},
+ {"matrix": [6, 5], "x": 16.25, "y": 0},
+ {"matrix": [6, 6], "x": 17.25, "y": 0},
+ {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [7, 0], "x": 10, "y": 1.25},
+ {"matrix": [7, 1], "x": 11, "y": 1.25},
+ {"matrix": [7, 2], "x": 12, "y": 1.25},
+ {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [7, 4], "x": 15.25, "y": 1.25},
+ {"matrix": [7, 5], "x": 16.25, "y": 1.25},
+ {"matrix": [7, 6], "x": 17.25, "y": 1.25},
+ {"matrix": [7, 7], "x": 18.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+ {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+ {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [8, 4], "x": 15.25, "y": 2.25},
+ {"matrix": [8, 5], "x": 16.25, "y": 2.25},
+ {"matrix": [8, 6], "x": 17.25, "y": 2.25},
+ {"matrix": [8, 7], "x": 18.25, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+ {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+ {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+
+ {"matrix": [9, 4], "x": 15.25, "y": 3.25},
+ {"matrix": [9, 5], "x": 16.25, "y": 3.25},
+ {"matrix": [9, 6], "x": 17.25, "y": 3.25},
+
+ {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+ {"matrix": [1, 10], "x": 20.5, "y": 3.25},
+ {"matrix": [0, 10], "x": 21.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 8], "x": 11.25, "y": 4.25},
+ {"matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [6, 8], "x": 15.25, "y": 4.25},
+ {"matrix": [9, 9], "x": 16.25, "y": 4.25},
+ {"matrix": [8, 9], "x": 17.25, "y": 4.25},
+ {"matrix": [7, 9], "x": 18.25, "y": 4.25, "h": 2},
+
+ {"matrix": [6, 9], "x": 19.5, "y": 4.25},
+ {"matrix": [3, 10], "x": 20.5, "y": 4.25},
+ {"matrix": [2, 10], "x": 21.5, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [9, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 4], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [8, 10], "x": 15.25, "y": 5.25, "w": 2},
+ {"matrix": [7, 10], "x": 17.25, "y": 5.25},
+
+ {"matrix": [6, 10], "x": 19.5, "y": 5.25},
+ {"matrix": [5, 10], "x": 20.5, "y": 5.25},
+ {"matrix": [4, 10], "x": 21.5, "y": 5.25}
]
}
}
diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c
index a337867dd1..e6d6f05dd2 100644
--- a/keyboards/handwired/jopr/jopr.c
+++ b/keyboards/handwired/jopr/jopr.c
@@ -1,4 +1,4 @@
-#include "jopr.h"
+#include "quantum.h"
void led_init_ports(void) {
setPinOutput(F0);
diff --git a/keyboards/handwired/jopr/jopr.h b/keyboards/handwired/jopr/jopr.h
deleted file mode 100644
index b79a8f2646..0000000000
--- a/keyboards/handwired/jopr/jopr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K600, K601, K602, K603, K604, K605, K606, K607, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K700, K701, K702, K703, K704, K705, K706, K707, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K800, K801, K802, K803, K804, K805, K806, K807, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K900, K901, K902, K904, K905, K906, K907, K110, K010, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K908, K808, K708, K608, K909, K809, K709, K609, K310, K210, \
- K500, K501, K502, K503, K509, K508, K910, K504, K810, K710, K610, K510, K410 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \
- { K500, K501, K502, K503, K504, KC_NO, KC_NO, KC_NO, K508, K509, K510 }, \
- { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \
- { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710 }, \
- { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \
- { K900, K901, K902, KC_NO, K904, K905, K906, K907, K908, K909, K910 } \
-}
diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json
index 4cb7713c7f..3ec5d1c36f 100644
--- a/keyboards/handwired/k8split/info.json
+++ b/keyboards/handwired/k8split/info.json
@@ -18,59 +18,59 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
- {"x":0, "y":2, "w":1.5},
- {"x":1.5, "y":2},
- {"x":2.5, "y":2},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2},
- {"x":5.5, "y":2},
- {"x":6.5, "y":2},
- {"x":7.5, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"x":0, "y":3, "w":1.75},
- {"x":1.75, "y":3},
- {"x":2.75, "y":3},
- {"x":3.75, "y":3},
- {"x":4.75, "y":3},
- {"x":5.75, "y":3},
- {"x":6.75, "y":3},
- {"x":7.75, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"x":0, "y":4, "w":2.25},
- {"x":2.25, "y":4},
- {"x":3.25, "y":4},
- {"x":4.25, "y":4},
- {"x":5.25, "y":4},
- {"x":6.25, "y":4},
- {"x":7.25, "y":4},
- {"x":8.25, "y":4},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [4, 6], "x": 7.25, "y": 4},
+ {"matrix": [4, 7], "x": 8.25, "y": 4},
- {"x":0, "y":5, "w":1.5},
- {"x":1.5, "y":5},
- {"x":2.5, "y":5},
- {"x":3.5, "y":5, "w":1.25},
- {"x":4.75, "y":5, "w":2.25},
- {"x":7, "y":5},
- {"x":8, "y":5},
- {"x":9, "y":5}
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5},
+ {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2.25},
+ {"matrix": [5, 5], "x": 7, "y": 5},
+ {"matrix": [5, 6], "x": 8, "y": 5},
+ {"matrix": [5, 7], "x": 9, "y": 5}
]
}
}
diff --git a/keyboards/handwired/k8split/k8split.h b/keyboards/handwired/k8split/k8split.h
deleted file mode 100644
index 247c0d775a..0000000000
--- a/keyboards/handwired/k8split/k8split.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Ckat <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k06, k12, k18, k24, k30, k36, k42, \
- k01, k07, k13, k19, k25, k31, k37, k43, \
- k02, k08, k14, k20, k26, k32, k38, k44, \
- k03, k09, k15, k21, k27, k33, k39, k45, \
- k04, k10, k16, k22, k28, k34, k40, k46, \
- k05, k11, k17, k23, k29, k35, k41, k47 \
-) \
-{ \
- { k00, k06, k12, k18, k24, k30, k36, k42 }, \
- { k01, k07, k13, k19, k25, k31, k37, k43 }, \
- { k02, k08, k14, k20, k26, k32, k38, k44 }, \
- { k03, k09, k15, k21, k27, k33, k39, k45 }, \
- { k04, k10, k16, k22, k28, k34, k40, k46 }, \
- { k05, k11, k17, k23, k29, k35, k41, k47 } \
-}
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json
index 667e53756e..6508b3d859 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/info.json
@@ -21,67 +21,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"GUI", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [1, 0], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [1, 3], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 3], "x": 3.5, "y": 1},
+ {"matrix": [2, 4], "x": 4.5, "y": 1},
+ {"matrix": [2, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.5, "y": 1},
+ {"matrix": [2, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 0], "x": 8.5, "y": 1},
+ {"matrix": [3, 1], "x": 9.5, "y": 1},
+ {"matrix": [3, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 3], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [4, 2], "x": 2.75, "y": 2},
+ {"matrix": [4, 3], "x": 3.75, "y": 2},
+ {"matrix": [4, 4], "x": 4.75, "y": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 2},
+ {"matrix": [4, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 7], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [5, 1], "x": 9.75, "y": 2},
+ {"matrix": [5, 2], "x": 10.75, "y": 2},
+ {"matrix": [5, 3], "x": 11.75, "y": 2},
+ {"matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [6, 2], "x": 3.25, "y": 3},
+ {"matrix": [6, 3], "x": 4.25, "y": 3},
+ {"matrix": [6, 4], "x": 5.25, "y": 3},
+ {"matrix": [6, 5], "x": 6.25, "y": 3},
+ {"matrix": [6, 6], "x": 7.25, "y": 3},
+ {"matrix": [6, 7], "x": 8.25, "y": 3},
+ {"matrix": [5, 5], "x": 9.25, "y": 3},
+ {"matrix": [5, 6], "x": 10.25, "y": 3},
+ {"matrix": [5, 7], "x": 11.25, "y": 3},
+ {"matrix": [3, 7], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [7, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [7, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [7, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [7, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [7, 7], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h
deleted file mode 100644
index 86ff0e8ead..0000000000
--- a/keyboards/handwired/kbod/kbod.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k10, k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, k26, k27, k30, k31, k32, k33, k34, k35, \
- k40, k41, k42, k43, k44, k45, k46, k47, k50, k51, k52, k53, k54, \
- k60, k61, k62, k63, k64, k65, k66, k67, k55, k56, k57, k37, \
- k70, k71, k72, k73, k74, k75, k76, k77 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, XXX, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, XXX, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json
index 8bb32c871d..6fcd1c12bb 100644
--- a/keyboards/handwired/ks63/info.json
+++ b/keyboards/handwired/ks63/info.json
@@ -21,338 +21,73 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "~",
- "x": 0,
- "y": 0
- },
- {
- "label": "!",
- "x": 1,
- "y": 0
- },
- {
- "label": "@",
- "x": 2,
- "y": 0
- },
- {
- "label": "#",
- "x": 3,
- "y": 0
- },
- {
- "label": "$",
- "x": 4,
- "y": 0
- },
- {
- "label": "%",
- "x": 5,
- "y": 0
- },
- {
- "label": "^",
- "x": 6,
- "y": 0
- },
- {
- "label": "&",
- "x": 7,
- "y": 0
- },
- {
- "label": "*",
- "x": 8,
- "y": 0
- },
- {
- "label": "(",
- "x": 9,
- "y": 0
- },
- {
- "label": ")",
- "x": 10,
- "y": 0
- },
- {
- "label": "_",
- "x": 11,
- "y": 0
- },
- {
- "label": "+",
- "x": 12,
- "y": 0
- },
- {
- "label": "Backspace",
- "x": 13,
- "y": 0,
- "w": 2
- },
- {
- "label": "Tab",
- "x": 0,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "Q",
- "x": 1.5,
- "y": 1
- },
- {
- "label": "W",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "E",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "R",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "T",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "Y",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "U",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "I",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "O",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "P",
- "x": 10.5,
- "y": 1
- },
- {
- "label": "{",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "}",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "|",
- "x": 13.5,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "Caps Lock",
- "x": 0,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "A",
- "x": 1.75,
- "y": 2
- },
- {
- "label": "S",
- "x": 2.75,
- "y": 2
- },
- {
- "label": "D",
- "x": 3.75,
- "y": 2
- },
- {
- "label": "F",
- "x": 4.75,
- "y": 2
- },
- {
- "label": "G",
- "x": 5.75,
- "y": 2
- },
- {
- "label": "H",
- "x": 6.75,
- "y": 2
- },
- {
- "label": "J",
- "x": 7.75,
- "y": 2
- },
- {
- "label": "K",
- "x": 8.75,
- "y": 2
- },
- {
- "label": "L",
- "x": 9.75,
- "y": 2
- },
- {
- "label": ":",
- "x": 10.75,
- "y": 2
- },
- {
- "label": "\"",
- "x": 11.75,
- "y": 2
- },
- {
- "label": "Enter",
- "x": 12.75,
- "y": 2,
- "w": 2.25
- },
- {
- "label": "Shift",
- "x": 0,
- "y": 3,
- "w": 2.25
- },
- {
- "label": "Z",
- "x": 2.25,
- "y": 3
- },
- {
- "label": "X",
- "x": 3.25,
- "y": 3
- },
- {
- "label": "C",
- "x": 4.25,
- "y": 3
- },
- {
- "label": "V",
- "x": 5.25,
- "y": 3
- },
- {
- "label": "B",
- "x": 6.25,
- "y": 3
- },
- {
- "label": "N",
- "x": 7.25,
- "y": 3
- },
- {
- "label": "M",
- "x": 8.25,
- "y": 3
- },
- {
- "label": "<",
- "x": 9.25,
- "y": 3
- },
- {
- "label": ">",
- "x": 10.25,
- "y": 3
- },
- {
- "label": "?",
- "x": 11.25,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 12.25,
- "y": 3,
- "w": 2.75
- },
- {
- "label": "Ctrl",
- "x": 0,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Win",
- "x": 1.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 2.5,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Space",
- "x": 3.75,
- "y": 4,
- "w": 2.25
- },
- {
- "label": "Esc",
- "x": 6,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Space",
- "x": 7.25,
- "y": 4,
- "w": 2.75
- },
- {
- "label": "\u2190",
- "x": 10,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "\u2193",
- "x": 11.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "\u2191",
- "x": 12.5,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "\u2192",
- "x": 13.75,
- "y": 4,
- "w": 1.25
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 7], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [6, 0], "x": 6.5, "y": 1},
+ {"matrix": [6, 1], "x": 7.5, "y": 1},
+ {"matrix": [6, 2], "x": 8.5, "y": 1},
+ {"matrix": [6, 3], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 5], "x": 11.5, "y": 1},
+ {"matrix": [6, 6], "x": 12.5, "y": 1},
+ {"matrix": [6, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [7, 0], "x": 6.75, "y": 2},
+ {"matrix": [7, 1], "x": 7.75, "y": 2},
+ {"matrix": [7, 2], "x": 8.75, "y": 2},
+ {"matrix": [7, 3], "x": 9.75, "y": 2},
+ {"matrix": [7, 4], "x": 10.75, "y": 2},
+ {"matrix": [7, 5], "x": 11.75, "y": 2},
+ {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 0], "x": 7.25, "y": 3},
+ {"matrix": [8, 1], "x": 8.25, "y": 3},
+ {"matrix": [8, 2], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/ks63/ks63.h b/keyboards/handwired/ks63/ks63.h
deleted file mode 100644
index 05006f593d..0000000000
--- a/keyboards/handwired/ks63/ks63.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \
- K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \
- K400, K401, K403, K404, K406, K408, K410, K411, K413, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006 }, \
- { K100, KC_NO, K102, K103, K104, K105, K106 }, \
- { K200, KC_NO, K202, K203, K204, K205, K206 }, \
- { KC_NO, K301, K302, K303, K304, K305, K306 }, \
- { K400, K401, KC_NO, K403, K404, KC_NO, K406 }, \
- \
- { K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \
- { K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K207, K208, K209, K210, K211, K212, K213, KC_NO }, \
- { K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \
- { KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, K414 } \
-}
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
index 1141183e18..243f9a5d7b 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/info.json
@@ -30,82 +30,89 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.75, "w":1.5},
- {"x":1.5, "y":0.75},
- {"x":2.5, "y":0.375},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0.5},
- {"x":5.5, "y":0.5},
- {"x":12.5, "y":0.5},
- {"x":13.5, "y":0.5},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0.375},
- {"x":16.5, "y":0.75},
- {"x":17.5, "y":0.75, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0.75},
+ {"matrix": [0, 2], "x": 2.5, "y": 0.375},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0.5},
+ {"matrix": [0, 5], "x": 5.5, "y": 0.5},
- {"x":0, "y":1.75, "w":1.5},
- {"x":1.5, "y":1.75},
- {"x":2.5, "y":1.375},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1.5},
- {"x":5.5, "y":1.5},
- {"x":12.5, "y":1.5},
- {"x":13.5, "y":1.5},
- {"x":14.5, "y":1},
- {"x":15.5, "y":1.375},
- {"x":16.5, "y":1.75},
- {"x":17.5, "y":1.75, "w":1.5},
+ {"matrix": [7, 5], "x": 12.5, "y": 0.5},
+ {"matrix": [7, 4], "x": 13.5, "y": 0.5},
+ {"matrix": [7, 3], "x": 14.5, "y": 0},
+ {"matrix": [7, 2], "x": 15.5, "y": 0.375},
+ {"matrix": [7, 1], "x": 16.5, "y": 0.75},
+ {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5},
- {"x":0, "y":2.75, "w":1.5},
- {"x":1.5, "y":2.75},
- {"x":2.5, "y":2.375},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2.5},
- {"x":5.5, "y":2.5},
- {"x":12.5, "y":2.5},
- {"x":13.5, "y":2.5},
- {"x":14.5, "y":2},
- {"x":15.5, "y":2.375},
- {"x":16.5, "y":2.75},
- {"x":17.5, "y":2.75, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.75},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.375},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"x":0, "y":3.75, "w":1.5},
- {"x":1.5, "y":3.75},
- {"x":2.5, "y":3.375},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3.5},
- {"x":5.5, "y":3.5},
- {"x":12.5, "y":3.5},
- {"x":13.5, "y":3.5},
- {"x":14.5, "y":3},
- {"x":15.5, "y":3.375},
- {"x":16.5, "y":3.75},
- {"x":17.5, "y":3.75, "w":1.5},
+ {"matrix": [8, 5], "x": 12.5, "y": 1.5},
+ {"matrix": [8, 4], "x": 13.5, "y": 1.5},
+ {"matrix": [8, 3], "x": 14.5, "y": 1},
+ {"matrix": [8, 2], "x": 15.5, "y": 1.375},
+ {"matrix": [8, 1], "x": 16.5, "y": 1.75},
+ {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5},
- {"x":0, "y":4.75, "w":1.5},
- {"x":2.5, "y":4.375},
- {"x":3.5, "y":4},
- {"x":5, "y":5, "h":1.25},
- {"x":6, "y":5, "h":1.5},
- {"x":7, "y":5, "h":1.5},
- {"x":8, "y":5.5},
- {"x":10, "y":5.5},
- {"x":11, "y":5, "h":1.5},
- {"x":12, "y":5, "h":1.5},
- {"x":13, "y":5, "h":1.25},
- {"x":14.5, "y":4},
- {"x":15.5, "y":4.5},
- {"x":17.5, "y":4.75, "w":1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.75},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.375},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"x":5, "y":7},
- {"x":6, "y":6.5},
- {"x":7, "y":7},
- {"x":11, "y":7},
- {"x":12, "y":6.5},
- {"x":13, "y":7},
+ {"matrix": [9, 5], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5},
+ {"matrix": [9, 3], "x": 14.5, "y": 2},
+ {"matrix": [9, 2], "x": 15.5, "y": 2.375},
+ {"matrix": [9, 1], "x": 16.5, "y": 2.75},
+ {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5},
- {"x":6, "y":7.5},
- {"x":12, "y":7.5}
+ {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3.75},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.375},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+
+ {"matrix": [10, 5], "x": 12.5, "y": 3.5},
+ {"matrix": [10, 4], "x": 13.5, "y": 3.5},
+ {"matrix": [10, 3], "x": 14.5, "y": 3},
+ {"matrix": [10, 2], "x": 15.5, "y": 3.375},
+ {"matrix": [10, 1], "x": 16.5, "y": 3.75},
+ {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.375},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5},
+ {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5},
+ {"matrix": [6, 5], "x": 8, "y": 5.5},
+
+ {"matrix": [13, 5], "x": 10, "y": 5.5},
+ {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5},
+ {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5},
+ {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25},
+ {"matrix": [11, 3], "x": 14.5, "y": 4},
+ {"matrix": [11, 2], "x": 15.5, "y": 4.5},
+ {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5},
+
+ {"matrix": [5, 3], "x": 5, "y": 7},
+ {"matrix": [5, 4], "x": 6, "y": 6.5},
+ {"matrix": [6, 4], "x": 7, "y": 7},
+
+ {"matrix": [13, 4], "x": 11, "y": 7},
+ {"matrix": [12, 4], "x": 12, "y": 6.5},
+ {"matrix": [12, 3], "x": 13, "y": 7},
+
+ {"matrix": [6, 3], "x": 6, "y": 7.5},
+
+ {"matrix": [13, 3], "x": 12, "y": 7.5}
]
}
}
diff --git a/keyboards/handwired/lagrange/lagrange.h b/keyboards/handwired/lagrange/lagrange.h
index 6f808ba8e4..60f82c11b2 100644
--- a/keyboards/handwired/lagrange/lagrange.h
+++ b/keyboards/handwired/lagrange/lagrange.h
@@ -25,29 +25,3 @@
#define SPI_SCK_PIN B1
#define SPI_MOSI_PIN B2
#define SPI_MISO_PIN B3
-
-#define LAYOUT( \
- l00, l01, l02, l03, l04, l05, r05, r04, r03, r02, r01, r00, \
- l10, l11, l12, l13, l14, l15, r15, r14, r13, r12, r11, r10, \
- l20, l21, l22, l23, l24, l25, r25, r24, r23, r22, r21, r20, \
- l30, l31, l32, l33, l34, l35, r35, r34, r33, r32, r31, r30, \
- l40, l42, l43, l44, l45, l46, l47, r47, r46, r45, r44, r43, r42, r40, \
- l50, l51, l52, r52, r51, r50, \
- l70, r70) \
- { \
- {l00, l01, l02, l03, l04, l05}, \
- {l10, l11, l12, l13, l14, l15}, \
- {l20, l21, l22, l23, l24, l25}, \
- {l30, l31, l32, l33, l34, l35}, \
- {l40, KC_NO, l42, l43, l44, l45}, \
- {KC_NO, KC_NO, KC_NO, l50, l51, l46}, \
- {KC_NO, KC_NO, KC_NO, l70, l52, l47}, \
- \
- {r00, r01, r02, r03, r04, r05}, \
- {r10, r11, r12, r13, r14, r15}, \
- {r20, r21, r22, r23, r24, r25}, \
- {r30, r31, r32, r33, r34, r35}, \
- {r40, KC_NO, r42, r43, r44, r45}, \
- {KC_NO, KC_NO, KC_NO, r50, r51, r46}, \
- {KC_NO, KC_NO, KC_NO, r70, r52, r47} \
- }
diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json
index fd457aba7e..9ec845614c 100644
--- a/keyboards/handwired/magicforce61/info.json
+++ b/keyboards/handwired/magicforce61/info.json
@@ -18,67 +18,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"GUI", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/magicforce61/magicforce61.h b/keyboards/handwired/magicforce61/magicforce61.h
deleted file mode 100644
index 37a32ed783..0000000000
--- a/keyboards/handwired/magicforce61/magicforce61.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, \
- K40, K41, K42, K45, K49, K4A, K4C, K4D \
- ) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D }, \
-}
diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json
index 4656394858..da77c2b91c 100644
--- a/keyboards/handwired/magicforce68/info.json
+++ b/keyboards/handwired/magicforce68/info.json
@@ -18,75 +18,84 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Insert", "x":15.25, "y":0},
- {"label":"Page Up", "x":16.25, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1},
- {"label":"Page Down", "x":16.25, "y":1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Up", "x":15.25, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Fn", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4},
- {"label":"Right", "x":16.25, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [2, 14], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [3, 14], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 13], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 14.25, "y": 4},
+ {"matrix": [4, 13], "x": 15.25, "y": 4},
+ {"matrix": [4, 14], "x": 16.25, "y": 4}
]
}
}
+
}
diff --git a/keyboards/handwired/magicforce68/magicforce68.h b/keyboards/handwired/magicforce68/magicforce68.h
deleted file mode 100644
index 829e5932b5..0000000000
--- a/keyboards/handwired/magicforce68/magicforce68.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k3E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3C, k3D, \
- k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, k3D, k3E }, \
- { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D, k4E } \
-}
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index eba81459ef..a4bab13284 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -21,100 +21,114 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D0,B6)", "x":0, "y":0},
- {"label":"K01 (D0,B2)", "x":2, "y":0},
- {"label":"K02 (D0,B3)", "x":3, "y":0},
- {"label":"K03 (D0,B1)", "x":4, "y":0},
- {"label":"K04 (D0,F7)", "x":5, "y":0},
- {"label":"K05 (D0,F6)", "x":6.5, "y":0},
- {"label":"K06 (D0,F5)", "x":7.5, "y":0},
- {"label":"K07 (D0,F4)", "x":8.5, "y":0},
- {"label":"K08 (D0,B0)", "x":9.5, "y":0},
- {"label":"K68 (B5,B0)", "x":11, "y":0},
- {"label":"K67 (B5,F4)", "x":12, "y":0},
- {"label":"K66 (B5,F5)", "x":13, "y":0},
- {"label":"K65 (B5,F6)", "x":14, "y":0},
- {"label":"K63 (B5,B1)", "x":15.25, "y":0},
- {"label":"K62 (B5,B3)", "x":16.25, "y":0},
- {"label":"K61 (B5,B2)", "x":17.25, "y":0},
- {"label":"K60 (B5,B6)", "x":18.25, "y":0},
- {"label":"K10 (D4,B6)", "x":0, "y":1.5},
- {"label":"K11 (D4,B2)", "x":1, "y":1.5},
- {"label":"K12 (D4,B3)", "x":2, "y":1.5},
- {"label":"K13 (D4,B1)", "x":3, "y":1.5},
- {"label":"K14 (D4,F7)", "x":4, "y":1.5},
- {"label":"K15 (D4,F6)", "x":5, "y":1.5},
- {"label":"K16 (D4,F5)", "x":6, "y":1.5},
- {"label":"K17 (D4,F4)", "x":7, "y":1.5},
- {"label":"K18 (D4,B0)", "x":8, "y":1.5},
- {"label":"K78 (B7,B0)", "x":9, "y":1.5},
- {"label":"K77 (B7,F4)", "x":10, "y":1.5},
- {"label":"K76 (B7,F5)", "x":11, "y":1.5},
- {"label":"K75 (B7,F6)", "x":12, "y":1.5},
- {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2},
- {"label":"K73 (B7,B1)", "x":15.25, "y":1.5},
- {"label":"K72 (B7,B3)", "x":16.25, "y":1.5},
- {"label":"K71 (B7,B2)", "x":17.25, "y":1.5},
- {"label":"K70 (B7,B6)", "x":18.25, "y":1.5},
- {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (C6,B2)", "x":1.5, "y":2.5},
- {"label":"K22 (C6,B3)", "x":2.5, "y":2.5},
- {"label":"K23 (C6,B1)", "x":3.5, "y":2.5},
- {"label":"K24 (C6,F7)", "x":4.5, "y":2.5},
- {"label":"K25 (C6,F6)", "x":5.5, "y":2.5},
- {"label":"K26 (C6,F5)", "x":6.5, "y":2.5},
- {"label":"K27 (C6,F4)", "x":7.5, "y":2.5},
- {"label":"K28 (C6,B0)", "x":8.5, "y":2.5},
- {"label":"K88 (D5,B0)", "x":9.5, "y":2.5},
- {"label":"K87 (D5,F4)", "x":10.5, "y":2.5},
- {"label":"K86 (D5,F5)", "x":11.5, "y":2.5},
- {"label":"K85 (D5,F6)", "x":12.5, "y":2.5},
- {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K83 (D5,B1)", "x":15.25, "y":2.5},
- {"label":"K82 (D5,B3)", "x":16.25, "y":2.5},
- {"label":"K81 (D5,B2)", "x":17.25, "y":2.5},
- {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2},
- {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (D7,B2)", "x":1.75, "y":3.5},
- {"label":"K32 (D7,B3)", "x":2.75, "y":3.5},
- {"label":"K33 (D7,B1)", "x":3.75, "y":3.5},
- {"label":"K34 (D7,F7)", "x":4.75, "y":3.5},
- {"label":"K35 (D7,F6)", "x":5.75, "y":3.5},
- {"label":"K36 (D7,F5)", "x":6.75, "y":3.5},
- {"label":"K37 (D7,F4)", "x":7.75, "y":3.5},
- {"label":"K38 (D7,B0)", "x":8.75, "y":3.5},
- {"label":"K98 (C7,B0)", "x":9.75, "y":3.5},
- {"label":"K97 (C7,F4)", "x":10.75, "y":3.5},
- {"label":"K96 (C7,F5)", "x":11.75, "y":3.5},
- {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K93 (C7,B1)", "x":15.25, "y":3.5},
- {"label":"K92 (C7,B3)", "x":16.25, "y":3.5},
- {"label":"K91 (C7,B2)", "x":17.25, "y":3.5},
- {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25},
- {"label":"K41 (E6,B2)", "x":2.25, "y":4.5},
- {"label":"K42 (E6,B3)", "x":3.25, "y":4.5},
- {"label":"K43 (E6,B1)", "x":4.25, "y":4.5},
- {"label":"K44 (E6,F7)", "x":5.25, "y":4.5},
- {"label":"K45 (E6,F6)", "x":6.25, "y":4.5},
- {"label":"K46 (E6,F5)", "x":7.25, "y":4.5},
- {"label":"K47 (E6,F4)", "x":8.25, "y":4.5},
- {"label":"K48 (E6,B0)", "x":9.25, "y":4.5},
- {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5},
- {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5},
- {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5},
- {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5},
- {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5},
- {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2},
- {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5},
- {"label":"K51 (B4,B2)", "x":1.5, "y":5.5},
- {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5},
- {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7},
- {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5},
- {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5},
- {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5},
- {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2},
- {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 8], "x": 11, "y": 0},
+ {"matrix": [6, 7], "x": 12, "y": 0},
+ {"matrix": [6, 6], "x": 13, "y": 0},
+ {"matrix": [6, 5], "x": 14, "y": 0},
+
+ {"matrix": [6, 3], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [6, 0], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 7], "x": 10, "y": 1.5},
+ {"matrix": [7, 6], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [7, 0], "x": 18.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 3], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [8, 0], "x": 18.25, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 6], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [9, 3], "x": 15.25, "y": 3.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 3.5},
+ {"matrix": [9, 1], "x": 17.25, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [10, 3], "x": 15.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 4.5},
+ {"matrix": [10, 0], "x": 18.25, "y": 4.5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [11, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [11, 6], "x": 12.5, "y": 5.5},
+ {"matrix": [11, 4], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"matrix": [11, 3], "x": 15.25, "y": 5.5, "w": 2},
+ {"matrix": [11, 1], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h
deleted file mode 100644
index a8201a8db8..0000000000
--- a/keyboards/handwired/marauder/marauder.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K66, K65, K63, K62, K61, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74, K73, K72, K71, K70, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84, K83, K82, K81, K80, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95, K93, K92, K91, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6, KA3, KA2, KA1, KA0, \
- K50, K51, K52, K56, KB7, KB6, KB4, KB3, KB1 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO }, \
- { K60, K61, K62, K63, KC_NO, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
- { K80, K81, K82, K83, K84, K85, K86, K87, K88 }, \
- { KC_NO, K91, K92, K93, KC_NO, K95, K96, K97, K98 }, \
- { KA0, KA1, KA2, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \
- { KC_NO, KB1, KC_NO, KB3, KB4, KC_NO, KB6, KB7, KC_NO }, \
-}
diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json
index c7b463f223..ba2b6d0ed5 100644
--- a/keyboards/handwired/minorca/info.json
+++ b/keyboards/handwired/minorca/info.json
@@ -18,48 +18,51 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K06", "x":6, "y":0},
- {"label":"K07", "x":7, "y":0},
- {"label":"K08", "x":8, "y":0},
- {"label":"K09", "x":9, "y":0},
- {"label":"K0A", "x":10, "y":0},
- {"label":"K0B", "x":11, "y":0},
- {"label":"K10", "x":0, "y":1, "w":1.25},
- {"label":"K11", "x":1.25, "y":1},
- {"label":"K12", "x":2.25, "y":1},
- {"label":"K13", "x":3.25, "y":1},
- {"label":"K14", "x":4.25, "y":1},
- {"label":"K15", "x":5.25, "y":1},
- {"label":"K16", "x":6.25, "y":1},
- {"label":"K17", "x":7.25, "y":1},
- {"label":"K18", "x":8.25, "y":1},
- {"label":"K19", "x":9.25, "y":1},
- {"label":"K1B", "x":10.25, "y":1, "w":1.75},
- {"label":"K20", "x":0, "y":2, "w":1.75},
- {"label":"K22", "x":1.75, "y":2},
- {"label":"K23", "x":2.75, "y":2},
- {"label":"K24", "x":3.75, "y":2},
- {"label":"K25", "x":4.75, "y":2},
- {"label":"K26", "x":5.75, "y":2},
- {"label":"K27", "x":6.75, "y":2},
- {"label":"K28", "x":7.75, "y":2},
- {"label":"K29", "x":8.75, "y":2},
- {"label":"K2A", "x":9.75, "y":2},
- {"label":"K2B", "x":10.75, "y":2, "w":1.25},
- {"label":"K30", "x":0, "y":3, "w":1.25},
- {"label":"K32", "x":1.25, "y":3, "w":1.25},
- {"label":"K33", "x":2.5, "y":3, "w":1.25},
- {"label":"K34", "x":3.75, "y":3, "w":2.25},
- {"label":"K37", "x":6, "y":3, "w":2.25},
- {"label":"K39", "x":8.25, "y":3, "w":1.25},
- {"label":"K3A", "x":9.5, "y":3},
- {"label":"K3B", "x":10.5, "y":3, "w":1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.25},
+ {"matrix": [3, 9], "x": 8.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 9.5, "y": 3},
+ {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
]
}
}
diff --git a/keyboards/handwired/minorca/minorca.h b/keyboards/handwired/minorca/minorca.h
deleted file mode 100644
index ca524caf59..0000000000
--- a/keyboards/handwired/minorca/minorca.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
- K30, K32, K33, K34, K37, K39, K3A, K3B \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
- { K30, KC_NO, K32, K33, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A, K3B } \
-}
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
index dee4d76c50..b5298dfae4 100644
--- a/keyboards/handwired/not_so_minidox/info.json
+++ b/keyboards/handwired/not_so_minidox/info.json
@@ -21,55 +21,55 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.375},
- {"x":1, "y":0.25},
- {"x":2, "y":0.125},
- {"x":3, "y":0},
- {"x":4, "y":0.125},
- {"x":5, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"x":8, "y":0.25},
- {"x":9, "y":0.125},
- {"x":10, "y":0},
- {"x":11, "y":0.125},
- {"x":12, "y":0.25},
- {"x":13, "y":0.375},
+ {"matrix": [4, 5], "x": 8, "y": 0.25},
+ {"matrix": [4, 4], "x": 9, "y": 0.125},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.125},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 0.375},
- {"x":0, "y":1.375},
- {"x":1, "y":1.25},
- {"x":2, "y":1.125},
- {"x":3, "y":1},
- {"x":4, "y":1.125},
- {"x":5, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.125},
- {"x":10, "y":1},
- {"x":11, "y":1.125},
- {"x":12, "y":1.25},
- {"x":13, "y":1.375},
+ {"matrix": [5, 5], "x": 8, "y": 1.25},
+ {"matrix": [5, 4], "x": 9, "y": 1.125},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.125},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 1.375},
- {"x":0, "y":2.375},
- {"x":1, "y":2.25},
- {"x":2, "y":2.125},
- {"x":3, "y":2},
- {"x":4, "y":2.125},
- {"x":5, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"x":8, "y":2.25},
- {"x":9, "y":2.125},
- {"x":10, "y":2},
- {"x":11, "y":2.125},
- {"x":12, "y":2.25},
- {"x":13, "y":2.375},
+ {"matrix": [6, 5], "x": 8, "y": 2.25},
+ {"matrix": [6, 4], "x": 9, "y": 2.125},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.125},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 2.375},
- {"x":3.5, "y":4.75},
- {"x":4.5, "y":4.75},
- {"x":5.5, "y":3.75, "h":2},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.75},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
- {"x":7.5, "y":3.75, "h":2},
- {"x":8.5, "y":4.75},
- {"x":9.5, "y":4.75}
+ {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
+ {"matrix": [7, 4], "x": 8.5, "y": 4.75},
+ {"matrix": [7, 3], "x": 9.5, "y": 4.75}
]
}
}
diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h
deleted file mode 100644
index 7c80dc9b3b..0000000000
--- a/keyboards/handwired/not_so_minidox/not_so_minidox.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
- LT1, LT2, LT3, RT3, RT2, RT1 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { XXX, XXX, XXX, LT1, LT2, LT3 }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { XXX, XXX, XXX, RT1, RT2, RT3 } \
-}
diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json
index 266d53ede2..e943b65643 100644
--- a/keyboards/handwired/oem_iso_fullsize/info.json
+++ b/keyboards/handwired/oem_iso_fullsize/info.json
@@ -18,111 +18,130 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (C0,C2)", "x":0, "y":0},
- {"label":"K01 (C0,C1)", "x":2, "y":0},
- {"label":"K02 (C0,E0)", "x":3, "y":0},
- {"label":"K03 (C0,D4)", "x":4, "y":0},
- {"label":"K04 (C0,D5)", "x":5, "y":0},
- {"label":"K05 (C0,A4)", "x":6.5, "y":0},
- {"label":"K06 (C0,A0)", "x":7.5, "y":0},
- {"label":"K07 (C0,B2)", "x":8.5, "y":0},
- {"label":"K08 (C0,B0)", "x":9.5, "y":0},
- {"label":"K09 (C0,E7)", "x":11, "y":0},
- {"label":"K0A (C0,E6)", "x":12, "y":0},
- {"label":"K0B (C0,D6)", "x":13, "y":0},
- {"label":"K0C (C0,B1)", "x":14, "y":0},
- {"label":"K0E (C0,D3)", "x":15.25, "y":0},
- {"label":"K0F (C0,D2)", "x":16.25, "y":0},
- {"label":"K0G (C0,B6)", "x":17.25, "y":0},
- {"label":"K10 (B4,C2)", "x":0, "y":1.5},
- {"label":"K11 (B4,C1)", "x":1, "y":1.5},
- {"label":"K12 (B4,E0)", "x":2, "y":1.5},
- {"label":"K13 (B4,D4)", "x":3, "y":1.5},
- {"label":"K14 (B4,D5)", "x":4, "y":1.5},
- {"label":"K15 (B4,A4)", "x":5, "y":1.5},
- {"label":"K16 (B4,A0)", "x":6, "y":1.5},
- {"label":"K17 (B4,B2)", "x":7, "y":1.5},
- {"label":"K18 (B4,B0)", "x":8, "y":1.5},
- {"label":"K19 (B4,E7)", "x":9, "y":1.5},
- {"label":"K1A (B4,E6)", "x":10, "y":1.5},
- {"label":"K1B (B4,D6)", "x":11, "y":1.5},
- {"label":"K1C (B4,B1)", "x":12, "y":1.5},
- {"label":"K1D (B4,B3)", "x":13, "y":1.5, "w":2},
- {"label":"K1E (B4,D3)", "x":15.25, "y":1.5},
- {"label":"K1F (B4,D2)", "x":16.25, "y":1.5},
- {"label":"K1G (B4,B6)", "x":17.25, "y":1.5},
- {"label":"K1H (B4,F7)", "x":18.5, "y":1.5},
- {"label":"K1I (B4,F0)", "x":19.5, "y":1.5},
- {"label":"K1J (B4,F1)", "x":20.5, "y":1.5},
- {"label":"K1K (B4,F2)", "x":21.5, "y":1.5},
- {"label":"K20 (F3,C2)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (F3,C1)", "x":1.5, "y":2.5},
- {"label":"K22 (F3,E0)", "x":2.5, "y":2.5},
- {"label":"K23 (F3,D4)", "x":3.5, "y":2.5},
- {"label":"K24 (F3,D5)", "x":4.5, "y":2.5},
- {"label":"K25 (F3,A4)", "x":5.5, "y":2.5},
- {"label":"K26 (F3,A0)", "x":6.5, "y":2.5},
- {"label":"K27 (F3,B2)", "x":7.5, "y":2.5},
- {"label":"K28 (F3,B0)", "x":8.5, "y":2.5},
- {"label":"K29 (F3,E7)", "x":9.5, "y":2.5},
- {"label":"K2A (F3,E6)", "x":10.5, "y":2.5},
- {"label":"K2B (F3,D6)", "x":11.5, "y":2.5},
- {"label":"K2C (F3,B1)", "x":12.5, "y":2.5},
- {"label":"K2D (F3,B3)", "x":13.75, "y":2.5, "w":1.25, "h":2},
- {"label":"K2E (F3,D3)", "x":15.25, "y":2.5},
- {"label":"K2F (F3,D2)", "x":16.25, "y":2.5},
- {"label":"K2G (F3,B6)", "x":17.25, "y":2.5},
- {"label":"K2H (F3,F7)", "x":18.5, "y":2.5},
- {"label":"K2I (F3,F0)", "x":19.5, "y":2.5},
- {"label":"K2J (F3,F1)", "x":20.5, "y":2.5},
- {"label":"K2K (F3,F2)", "x":21.5, "y":2.5, "h":2},
- {"label":"K30 (F4,C2)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (F4,C1)", "x":1.75, "y":3.5},
- {"label":"K32 (F4,E0)", "x":2.75, "y":3.5},
- {"label":"K33 (F4,D4)", "x":3.75, "y":3.5},
- {"label":"K34 (F4,D5)", "x":4.75, "y":3.5},
- {"label":"K35 (F4,A4)", "x":5.75, "y":3.5},
- {"label":"K36 (F4,A0)", "x":6.75, "y":3.5},
- {"label":"K37 (F4,B2)", "x":7.75, "y":3.5},
- {"label":"K38 (F4,B0)", "x":8.75, "y":3.5},
- {"label":"K39 (F4,E7)", "x":9.75, "y":3.5},
- {"label":"K3A (F4,E6)", "x":10.75, "y":3.5},
- {"label":"K3B (F4,D6)", "x":11.75, "y":3.5},
- {"label":"K3D (F4,B3)", "x":12.75, "y":3.5},
- {"label":"K3H (F4,F7)", "x":18.5, "y":3.5},
- {"label":"K3I (F4,F0)", "x":19.5, "y":3.5},
- {"label":"K3J (F4,F1)", "x":20.5, "y":3.5},
- {"label":"K40 (F5,C2)", "x":0, "y":4.5, "w":1.25},
- {"label":"K4E (F5,D3)", "x":1.25, "y":4.5},
- {"label":"K41 (F5,C1)", "x":2.25, "y":4.5},
- {"label":"K42 (F5,E0)", "x":3.25, "y":4.5},
- {"label":"K43 (F5,D4)", "x":4.25, "y":4.5},
- {"label":"K44 (F5,D5)", "x":5.25, "y":4.5},
- {"label":"K45 (F5,A4)", "x":6.25, "y":4.5},
- {"label":"K46 (F5,A0)", "x":7.25, "y":4.5},
- {"label":"K47 (F5,B2)", "x":8.25, "y":4.5},
- {"label":"K48 (F5,B0)", "x":9.25, "y":4.5},
- {"label":"K49 (F5,E7)", "x":10.25, "y":4.5},
- {"label":"K4A (F5,E6)", "x":11.25, "y":4.5},
- {"label":"K4B (F5,D6)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"K4F (F5,D2)", "x":16.25, "y":4.5},
- {"label":"K4H (F5,F7)", "x":18.5, "y":4.5},
- {"label":"K4I (F5,F0)", "x":19.5, "y":4.5},
- {"label":"K4J (F5,F1)", "x":20.5, "y":4.5},
- {"label":"K4K (F5,F2)", "x":21.5, "y":4.5, "h":2},
- {"label":"K50 (F6,C2)", "x":0, "y":5.5, "w":1.25},
- {"label":"K51 (F6,C1)", "x":1.25, "y":5.5, "w":1.25},
- {"label":"K52 (F6,E0)", "x":2.5, "y":5.5, "w":1.25},
- {"label":"K53 (F6,D4)", "x":3.75, "y":5.5, "w":6.25},
- {"label":"K54 (F6,D5)", "x":10, "y":5.5, "w":1.25},
- {"label":"K55 (F6,A4)", "x":11.25, "y":5.5, "w":1.25},
- {"label":"K56 (F6,A0)", "x":12.5, "y":5.5, "w":1.25},
- {"label":"K58 (F6,B0)", "x":13.75, "y":5.5, "w":1.25},
- {"label":"K5E (F6,D3)", "x":15.25, "y":5.5},
- {"label":"K5F (F6,D2)", "x":16.25, "y":5.5},
- {"label":"K5G (F6,B6)", "x":17.25, "y":5.5},
- {"label":"K5I (F6,F0)", "x":18.5, "y":5.5, "w":2},
- {"label":"K5J (F6,F1)", "x":20.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 19], "x": 20.5, "y": 1.5},
+ {"matrix": [1, 20], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [2, 19], "x": 20.5, "y": 2.5},
+ {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5},
+
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [3, 19], "x": 20.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 14], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [4, 19], "x": 20.5, "y": 4.5},
+ {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 8], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5},
+
+ {"matrix": [5, 18], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [5, 19], "x": 20.5, "y": 5.5}
]
}
}
diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h
deleted file mode 100644
index 4f8c898038..0000000000
--- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3H, K3I, K3J, \
- K40, K4E, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4F, K4H, K4I, K4J, K4K, \
- K50, K51, K52, K53, K54, K55, K56, K58, K5E, K5F, K5G, K5I, K5J \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO, K3H, K3I, K3J, KC_NO }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, KC_NO, K4E, K4F, KC_NO, K4H, K4I, K4J, K4K }, \
- { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F, K5G, KC_NO, K5I, K5J, KC_NO }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json
index b15b3fa61b..3fed9e2460 100644
--- a/keyboards/handwired/ortho5x13/info.json
+++ b/keyboards/handwired/ortho5x13/info.json
@@ -18,70 +18,74 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"[", "x":11, "y":1},
- {"label":"]", "x":12, "y":1},
- {"label":"`", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":",", "x":11, "y":2},
- {"label":"\\", "x":12, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Up", "x":12, "y":3},
- {"label":"Hyper", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"GUI", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4, "w":2},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Backspace", "x":8, "y":4},
- {"label":"Shift", "x":9, "y":4},
- {"label":"Left", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4},
- {"label":"Down", "x":12, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4}
]
}
}
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h
deleted file mode 100644
index e946bea9c1..0000000000
--- a/keyboards/handwired/ortho5x13/ortho5x13.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \
-}
diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json
index 5faccec8af..67b4cc4c2e 100644
--- a/keyboards/handwired/ortho5x14/info.json
+++ b/keyboards/handwired/ortho5x14/info.json
@@ -18,80 +18,78 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Delete", "x":0, "y":0},
- {"label":"Bkspc", "x":1, "y":0},
- {"label":"1", "x":2, "y":0},
- {"label":"2", "x":3, "y":0},
- {"label":"3", "x":4, "y":0},
- {"label":"4", "x":5, "y":0},
- {"label":"5", "x":6, "y":0},
- {"label":"6", "x":7, "y":0},
- {"label":"7", "x":8, "y":0},
- {"label":"8", "x":9, "y":0},
- {"label":"9", "x":10, "y":0},
- {"label":"0", "x":11, "y":0},
- {"label":"-", "x":12, "y":0},
- {"label":"=", "x":13, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
- {"label":"Home", "x":0, "y":1},
- {"label":"Tab", "x":1, "y":1},
- {"label":"Q", "x":2, "y":1},
- {"label":"W", "x":3, "y":1},
- {"label":"E", "x":4, "y":1},
- {"label":"R", "x":5, "y":1},
- {"label":"T", "x":6, "y":1},
- {"label":"Y", "x":7, "y":1},
- {"label":"U", "x":8, "y":1},
- {"label":"I", "x":9, "y":1},
- {"label":"O", "x":10, "y":1},
- {"label":"P", "x":11, "y":1},
- {"label":"[", "x":12, "y":1},
- {"label":"]", "x":13, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
- {"label":"PgUp", "x":0, "y":2},
- {"label":"Caps", "x":1, "y":2},
- {"label":"A", "x":2, "y":2},
- {"label":"S", "x":3, "y":2},
- {"label":"D", "x":4, "y":2},
- {"label":"F", "x":5, "y":2},
- {"label":"G", "x":6, "y":2},
- {"label":"H", "x":7, "y":2},
- {"label":"J", "x":8, "y":2},
- {"label":"K", "x":9, "y":2},
- {"label":"L", "x":10, "y":2},
- {"label":";", "x":11, "y":2},
- {"label":"'", "x":12, "y":2},
- {"label":"Enter", "x":13, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
-
- {"label":"PgDn", "x":0, "y":3},
- {"label":"Shift", "x":1, "y":3},
- {"label":"Z", "x":2, "y":3},
- {"label":"X", "x":3, "y":3},
- {"label":"C", "x":4, "y":3},
- {"label":"V", "x":5, "y":3},
- {"label":"B", "x":6, "y":3},
- {"label":"N", "x":7, "y":3},
- {"label":"M", "x":8, "y":3},
- {"label":",", "x":9, "y":3},
- {"label":".", "x":10, "y":3},
- {"label":"/", "x":11, "y":3},
- {"label":"\\", "x":12, "y":3},
- {"label":"Shift", "x":13, "y":3},
-
- {"label":"End", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Hyper", "x":2, "y":4},
- {"label":"Alt", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4, "w":2},
- {"label":"Space", "x":7, "y":4, "w":2},
- {"label":"Raise", "x":9, "y":4},
- {"label":"Alt", "x":10, "y":4},
- {"label":"Prop", "x":11, "y":4},
- {"label":"Ctrl", "x":12, "y":4},
- {"label":"Esc", "x":13, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 8], "x": 7, "y": 4, "w": 2},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4}
]
}
}
diff --git a/keyboards/handwired/ortho5x14/ortho5x14.h b/keyboards/handwired/ortho5x14/ortho5x14.h
deleted file mode 100644
index 0c3d5b861e..0000000000
--- a/keyboards/handwired/ortho5x14/ortho5x14.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Richard Nunez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d } \
-}
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index c752501362..cd5ae0243b 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -28,75 +28,80 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"~", "x":13, "y":0},
- {"label":"|", "x":14, "y":0},
- {"label":"Delete", "x":15, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"Backspace", "x":13.5, "y":1, "w":1.5},
- {"label":"PgUp", "x":15, "y":1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":1.25},
- {"label":"PgDn", "x":15, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"Up", "x":14, "y":3},
- {"label":"Fn", "x":15, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"label":"Fn", "x":10, "y":4, "w":1.25},
- {"label":"Menu", "x":11.25, "y":4, "w":1.25},
- {"label":"Left", "x":13, "y":4},
- {"label":"Down", "x":14, "y":4},
- {"label":"Right", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/handwired/p65rgb/p65rgb.c b/keyboards/handwired/p65rgb/p65rgb.c
index 5c045c2fc1..86bca2a7f9 100644
--- a/keyboards/handwired/p65rgb/p65rgb.c
+++ b/keyboards/handwired/p65rgb/p65rgb.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "p65rgb.h"
+#include "quantum.h"
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 },
diff --git a/keyboards/handwired/p65rgb/p65rgb.h b/keyboards/handwired/p65rgb/p65rgb.h
deleted file mode 100644
index fd7e216d13..0000000000
--- a/keyboards/handwired/p65rgb/p65rgb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, k2f, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3e, k3f, \
- k40, k41, k42, k45, k49, k4a, k4c, k4e, k4f \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, k1f, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, k2f, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, KC_NO, k3e, k3f, KC_NO }, \
- { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, KC_NO, k4e, k4f, KC_NO }, \
-}
-
diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json
index 28bb690c3c..0a826c6ba8 100644
--- a/keyboards/handwired/pilcrow/info.json
+++ b/keyboards/handwired/pilcrow/info.json
@@ -18,46 +18,49 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Q", "x":0, "y":0},
- {"label":"W", "x":1, "y":0},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0},
- {"label":"T", "x":4, "y":0},
- {"label":"Y", "x":5, "y":0},
- {"label":"U", "x":6, "y":0},
- {"label":"I", "x":7, "y":0},
- {"label":"O", "x":8, "y":0},
- {"label":"P", "x":9, "y":0},
- {"label":"A", "x":0, "y":1},
- {"label":"S", "x":1, "y":1},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1},
- {"label":"G", "x":4, "y":1},
- {"label":"H", "x":5, "y":1},
- {"label":"J", "x":6, "y":1},
- {"label":"K", "x":7, "y":1},
- {"label":"L", "x":8, "y":1},
- {"label":";", "x":9, "y":1},
- {"label":"Z", "x":0, "y":2},
- {"label":"X", "x":1, "y":2},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2},
- {"label":"B", "x":4, "y":2},
- {"label":"N", "x":5, "y":2},
- {"label":"M", "x":6, "y":2},
- {"label":",", "x":7, "y":2},
- {"label":".", "x":8, "y":2},
- {"label":"/", "x":9, "y":2},
- {"label":"Ctrl", "x":0, "y":3},
- {"label":"Alt", "x":1, "y":3},
- {"label":"GUI", "x":2, "y":3},
- {"label":"MO(1)", "x":3, "y":3},
- {"label":"Space", "x":4, "y":3},
- {"label":"Shift / Space", "x":5, "y":3},
- {"label":"MO(2)", "x":6, "y":3},
- {"label":"MO(3)", "x":7, "y":3},
- {"label":"Delete", "x":8, "y":3},
- {"label":"Esc", "x":9, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3}
]
}
}
diff --git a/keyboards/handwired/pilcrow/pilcrow.h b/keyboards/handwired/pilcrow/pilcrow.h
deleted file mode 100644
index 30576e85c0..0000000000
--- a/keyboards/handwired/pilcrow/pilcrow.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 } \
-}
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index 0c8f353bff..6cc337f8ee 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -22,75 +22,75 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "Enc", "x": 0, "y": 0},
+ {"matrix": [4, 3], "x": 0, "y": 0},
- {"label": "Esc", "x": 0, "y": 1},
- {"label": "1","x": 1, "y": 1},
- {"label": "2","x": 2, "y": 1},
- {"label": "3","x": 3, "y": 1},
- {"label": "4","x": 4, "y": 1},
- {"label": "5","x": 5, "y": 1},
- {"label": "6","x": 6, "y": 1},
- {"label": "7","x": 7, "y": 1},
- {"label": "8","x": 8, "y": 1},
- {"label": "9","x": 9, "y": 1},
- {"label": "0","x": 10, "y": 1},
- {"label": "-","x": 11, "y": 1},
- {"label": "=","x": 12, "y": 1},
- {"label": "\\","x": 13, "y": 1},
- {"label": "Del","x": 14, "y": 1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1},
+ {"matrix": [2, 13], "x": 14, "y": 1},
- {"label": "Tab","x": 0, "y": 2, "w": 1.5},
- {"label": "Q","x": 1.5, "y": 2},
- {"label": "W","x": 2.5, "y": 2},
- {"label": "E","x": 3.5, "y": 2},
- {"label": "R","x": 4.5, "y": 2},
- {"label": "T","x": 5.5, "y": 2},
- {"label": "Y","x": 6.5, "y": 2},
- {"label": "U","x": 7.5, "y": 2},
- {"label": "I","x": 8.5, "y": 2},
- {"label": "O","x": 9.5, "y": 2},
- {"label": "P","x": 10.5, "y": 2},
- {"label": "[","x": 11.5, "y": 2},
- {"label": "]","x": 12.5, "y": 2},
- {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [1, 7], "x": 7.5, "y": 2},
+ {"matrix": [1, 8], "x": 8.5, "y": 2},
+ {"matrix": [1, 9], "x": 9.5, "y": 2},
+ {"matrix": [1, 10], "x": 10.5, "y": 2},
+ {"matrix": [1, 11], "x": 11.5, "y": 2},
+ {"matrix": [1, 12], "x": 12.5, "y": 2},
+ {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Caps","x": 0, "y": 3, "w": 1.75},
- {"label": "A","x": 1.75, "y": 3},
- {"label": "S","x": 2.75, "y": 3},
- {"label": "D","x": 3.75, "y": 3},
- {"label": "F","x": 4.75, "y": 3},
- {"label": "G","x": 5.75, "y": 3},
- {"label": "H","x": 6.75, "y": 3},
- {"label": "J","x": 7.75, "y": 3},
- {"label": "K","x": 8.75, "y": 3},
- {"label": "L","x": 9.75, "y": 3},
- {"label": ";","x": 10.75, "y": 3},
- {"label": "'","x": 11.75, "y": 3},
- {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 3},
+ {"matrix": [2, 2], "x": 2.75, "y": 3},
+ {"matrix": [2, 3], "x": 3.75, "y": 3},
+ {"matrix": [2, 4], "x": 4.75, "y": 3},
+ {"matrix": [2, 5], "x": 5.75, "y": 3},
+ {"matrix": [2, 6], "x": 6.75, "y": 3},
+ {"matrix": [2, 7], "x": 7.75, "y": 3},
+ {"matrix": [2, 8], "x": 8.75, "y": 3},
+ {"matrix": [2, 9], "x": 9.75, "y": 3},
+ {"matrix": [2, 10], "x": 10.75, "y": 3},
+ {"matrix": [2, 11], "x": 11.75, "y": 3},
+ {"matrix": [2, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
- {"label": "Z","x": 2.25, "y": 4},
- {"label": "X","x": 3.25, "y": 4},
- {"label": "C","x": 4.25, "y": 4},
- {"label": "V","x": 5.25, "y": 4},
- {"label": "B","x": 6.25, "y": 4},
- {"label": "N","x": 7.25, "y": 4},
- {"label": "M","x": 8.25, "y": 4},
- {"label": ",","x": 9.25, "y": 4},
- {"label": ".","x": 10.25, "y": 4},
- {"label": "/","x": 11.25, "y": 4},
- {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
- {"label": "FN","x": 14, "y": 4},
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 4},
+ {"matrix": [3, 2], "x": 3.25, "y": 4},
+ {"matrix": [3, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 4], "x": 5.25, "y": 4},
+ {"matrix": [3, 5], "x": 6.25, "y": 4},
+ {"matrix": [3, 6], "x": 7.25, "y": 4},
+ {"matrix": [3, 7], "x": 8.25, "y": 4},
+ {"matrix": [3, 8], "x": 9.25, "y": 4},
+ {"matrix": [3, 9], "x": 10.25, "y": 4},
+ {"matrix": [3, 10], "x": 11.25, "y": 4},
+ {"matrix": [3, 11], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 4},
- {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
- {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
- {"label": "L ALT","x": 2.5, "y": 5, "w": 1.25},
- {"label": "Space","x": 3.75, "y": 5, "w": 6.25},
- {"label": "R ALT","x": 10, "y": 5, "w": 1.25},
- {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25},
- {"label": "FN","x": 12.5, "y": 5, "w": 1.25},
- {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25}
+ {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 5, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 5, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 5, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/pill60/pill60.h b/keyboards/handwired/pill60/pill60.h
deleted file mode 100644
index e020f1eb75..0000000000
--- a/keyboards/handwired/pill60/pill60.h
+++ /dev/null
@@ -1,42 +0,0 @@
- /* Copyright 2020 Imam Rafii
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* LAYOUT
- ENCODER
- ESC| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |BCKS | DEL
- TAB| Q | W | E | R | T | Y | U | I | O | P | [ | ] | \
- CAP| A | S | D | F | G | H | J | K | L | ; | ' | ENTER
- LSHFT| Z | X | C | V | B | N | M | , | . | / | RSHIF | FN
- LCT| WIN| ALT| ESPACE | ALT| WIN | MN| RCT|
-*/
-
-#define LAYOUT( \
- e00, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \
- k40, k41, k42, k47, k4a, k4b, k4c, k4e \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k0e }, \
- { k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, KC_NO }, \
- { k40, k41, k42, e00, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4e }\
-}
diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json
index 01516ed006..9a4d4b9636 100644
--- a/keyboards/handwired/prime_exl/info.json
+++ b/keyboards/handwired/prime_exl/info.json
@@ -20,8 +20,98 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT": {
- "layout": [{"x":0,"y":0}, {"x":1,"y":0}, {"x":2,"y":0}, {"x":3,"y":0}, {"x":4,"y":0}, {"x":5,"y":0}, {"x":6.5,"y":0}, {"x":7.5,"y":0}, {"x":8.5,"y":0}, {"x":9.5,"y":0}, {"x":10.5,"y":0}, {"x":11.5,"y":0}, {"x":13.75,"y":0}, {"x":14.75,"y":0}, {"x":15.75,"y":0}, {"x":16.75,"y":0}, {"x":17.75,"y":0}, {"x":18.75,"y":0,"w":2}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":4,"y":1}, {"x":5,"y":1}, {"x":6.5,"y":1,"w":1.25}, {"x":7.75,"y":1}, {"x":8.75,"y":1}, {"x":9.75,"y":1}, {"x":10.75,"y":1}, {"x":11.75,"y":1}, {"x":14,"y":1}, {"x":15,"y":1}, {"x":16,"y":1}, {"x":17,"y":1}, {"x":18,"y":1}, {"x":19,"y":1,"w":1.75}, {"x":0,"y":2}, {"x":1,"y":2}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":5,"y":2}, {"x":6.5,"y":2,"w":1.75}, {"x":8.25,"y":2}, {"x":9.25,"y":2}, {"x":10.25,"y":2}, {"x":11.25,"y":2}, {"x":12.25,"y":2}, {"x":13.5,"y":2}, {"x":14.5,"y":2}, {"x":15.5,"y":2}, {"x":16.5,"y":2}, {"x":17.5,"y":2}, {"x":18.5,"y":2}, {"x":19.5,"y":2,"w":1.25}, {"x":0,"y":3}, {"x":1,"y":3}, {"x":2,"y":3}, {"x":3,"y":3}, {"x":4,"y":3}, {"x":5,"y":3}, {"x":6.5,"y":3,"w":1.25}, {"x":7.75,"y":3,"w":1.25}, {"x":9,"y":3}, {"x":10,"y":3}, {"x":11,"y":3,"w":2}, {"x":13.5,"y":3,"w":2}, {"x":15.5,"y":3}, {"x":16.5,"y":3}, {"x":17.5,"y":3,"w":1.5}, {"x":19,"y":3,"w":1.5}, {"x":0,"y":4}, {"x":1,"y":4}, {"x":2,"y":4}, {"x":3,"y":4}, {"x":4,"y":4}, {"x":5,"y":4}]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [5, 0], "x": 1, "y": 0},
+ {"matrix": [4, 1], "x": 2, "y": 0},
+ {"matrix": [5, 1], "x": 3, "y": 0},
+ {"matrix": [4, 2], "x": 4, "y": 0},
+ {"matrix": [5, 2], "x": 5, "y": 0},
+
+ {"matrix": [4, 3], "x": 6.5, "y": 0},
+ {"matrix": [5, 3], "x": 7.5, "y": 0},
+ {"matrix": [4, 4], "x": 8.5, "y": 0},
+ {"matrix": [5, 4], "x": 9.5, "y": 0},
+ {"matrix": [4, 5], "x": 10.5, "y": 0},
+ {"matrix": [5, 5], "x": 11.5, "y": 0},
+
+ {"matrix": [4, 6], "x": 13.75, "y": 0},
+ {"matrix": [5, 6], "x": 14.75, "y": 0},
+ {"matrix": [4, 7], "x": 15.75, "y": 0},
+ {"matrix": [5, 7], "x": 16.75, "y": 0},
+ {"matrix": [4, 8], "x": 17.75, "y": 0},
+ {"matrix": [5, 8], "x": 18.75, "y": 0, "w": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [6, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [6, 1], "x": 3, "y": 1},
+ {"matrix": [3, 2], "x": 4, "y": 1},
+ {"matrix": [6, 2], "x": 5, "y": 1},
+
+ {"matrix": [3, 3], "x": 6.5, "y": 1, "w": 1.25},
+ {"matrix": [6, 3], "x": 7.75, "y": 1},
+ {"matrix": [3, 4], "x": 8.75, "y": 1},
+ {"matrix": [6, 4], "x": 9.75, "y": 1},
+ {"matrix": [3, 5], "x": 10.75, "y": 1},
+ {"matrix": [6, 5], "x": 11.75, "y": 1},
+
+ {"matrix": [3, 6], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15, "y": 1},
+ {"matrix": [3, 7], "x": 16, "y": 1},
+ {"matrix": [6, 7], "x": 17, "y": 1},
+ {"matrix": [3, 8], "x": 18, "y": 1},
+ {"matrix": [6, 8], "x": 19, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [7, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [7, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [7, 2], "x": 5, "y": 2},
+
+ {"matrix": [2, 3], "x": 6.5, "y": 2, "w": 1.75},
+ {"matrix": [7, 3], "x": 8.25, "y": 2},
+ {"matrix": [2, 4], "x": 9.25, "y": 2},
+ {"matrix": [7, 4], "x": 10.25, "y": 2},
+ {"matrix": [2, 5], "x": 11.25, "y": 2},
+ {"matrix": [7, 5], "x": 12.25, "y": 2},
+
+ {"matrix": [8, 5], "x": 13.5, "y": 2},
+ {"matrix": [2, 6], "x": 14.5, "y": 2},
+ {"matrix": [7, 6], "x": 15.5, "y": 2},
+ {"matrix": [2, 7], "x": 16.5, "y": 2},
+ {"matrix": [7, 7], "x": 17.5, "y": 2},
+ {"matrix": [2, 8], "x": 18.5, "y": 2},
+ {"matrix": [7, 8], "x": 19.5, "y": 2, "w": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 3},
+ {"matrix": [8, 0], "x": 1, "y": 3},
+ {"matrix": [1, 1], "x": 2, "y": 3},
+ {"matrix": [8, 1], "x": 3, "y": 3},
+ {"matrix": [1, 2], "x": 4, "y": 3},
+ {"matrix": [8, 2], "x": 5, "y": 3},
+
+ {"matrix": [1, 3], "x": 6.5, "y": 3, "w": 1.25},
+ {"matrix": [8, 3], "x": 7.75, "y": 3, "w": 1.25},
+ {"matrix": [1, 4], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [1, 5], "x": 11, "y": 3, "w": 2},
+
+ {"matrix": [1, 6], "x": 13.5, "y": 3, "w": 2},
+ {"matrix": [8, 6], "x": 15.5, "y": 3},
+ {"matrix": [1, 7], "x": 16.5, "y": 3},
+ {"matrix": [8, 7], "x": 17.5, "y": 3, "w": 1.5},
+ {"matrix": [1, 8], "x": 19, "y": 3, "w": 1.5},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [9, 0], "x": 1, "y": 4},
+ {"matrix": [0, 1], "x": 2, "y": 4},
+ {"matrix": [9, 1], "x": 3, "y": 4},
+ {"matrix": [0, 2], "x": 4, "y": 4},
+ {"matrix": [9, 2], "x": 5, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/handwired/prime_exl/prime_exl.h b/keyboards/handwired/prime_exl/prime_exl.h
deleted file mode 100644
index 1c9a8060fc..0000000000
--- a/keyboards/handwired/prime_exl/prime_exl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \
- k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, k38, k68, \
- k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k85, k26, k76, k27, k77, k28, k78, \
- k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k16, k86, k17, k87, k18, \
- k00, k90, k01, k91, k02, k92 \
-) { \
- { k00, k01, k02, XXX, XXX, XXX, XXX, XXX, XXX }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, XXX }, \
- { k90, k91, k92, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index 83f2477b3e..6daf5dd0c6 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -16,61 +16,65 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k11", "x": 0, "y": 0.5 },
- { "label": "k12", "x": 1, "y": 0.3 },
- { "label": "k13", "x": 2, "y": 0.15 },
- { "label": "k14", "x": 3, "y": 0 },
- { "label": "k15", "x": 4, "y": 0.15 },
- { "label": "k16", "x": 5, "y": 0.15 },
- { "label": "k17", "x": 10, "y": 0.15 },
- { "label": "k18", "x": 11, "y": 0.15 },
- { "label": "k19", "x": 12, "y": 0 },
- { "label": "k1a", "x": 13, "y": 0.15 },
- { "label": "k1b", "x": 14, "y": 0.3 },
- { "label": "k1c", "x": 15, "y": 0.5 },
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.3},
+ {"matrix": [0, 2], "x": 2, "y": 0.15},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.15},
+ {"matrix": [0, 5], "x": 5, "y": 0.15},
- { "label": "k21", "x": 0, "y": 1.5 },
- { "label": "k22", "x": 1, "y": 1.3 },
- { "label": "k23", "x": 2, "y": 1.15 },
- { "label": "k24", "x": 3, "y": 1 },
- { "label": "k25", "x": 4, "y": 1.15 },
- { "label": "k26", "x": 5, "y": 1.15 },
- { "label": "k27", "x": 10, "y": 1.15 },
- { "label": "k28", "x": 11, "y": 1.15 },
- { "label": "k29", "x": 12, "y": 1 },
- { "label": "k2a", "x": 13, "y": 1.15 },
- { "label": "k2b", "x": 14, "y": 1.3 },
- { "label": "k2c", "x": 15, "y": 1.5 },
+ {"matrix": [4, 0], "x": 10, "y": 0.15},
+ {"matrix": [4, 1], "x": 11, "y": 0.15},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 3], "x": 13, "y": 0.15},
+ {"matrix": [4, 4], "x": 14, "y": 0.3},
+ {"matrix": [4, 5], "x": 15, "y": 0.5},
- { "label": "k31", "x": 0, "y": 2.5 },
- { "label": "k32", "x": 1, "y": 2.3 },
- { "label": "k33", "x": 2, "y": 2.15 },
- { "label": "k34", "x": 3, "y": 2 },
- { "label": "k35", "x": 4, "y": 2.15 },
- { "label": "k36", "x": 5, "y": 2.15 },
- { "label": "k37", "x": 10, "y": 2.15 },
- { "label": "k38", "x": 11, "y": 2.15 },
- { "label": "k39", "x": 12, "y": 2 },
- { "label": "k3a", "x": 13, "y": 2.15 },
- { "label": "k3b", "x": 14, "y": 2.3 },
- { "label": "k3c", "x": 15, "y": 2.5 },
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.3},
+ {"matrix": [1, 2], "x": 2, "y": 1.15},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.15},
+ {"matrix": [1, 5], "x": 5, "y": 1.15},
- { "label": "k41", "x": 0, "y": 3.5 },
- { "label": "k42", "x": 1, "y": 3.3 },
- { "label": "k43", "x": 2, "y": 3.15 },
- { "label": "k44", "x": 3, "y": 3 },
- { "label": "k45", "x": 4, "y": 3.15 },
- { "label": "k46", "x": 5, "y": 3.15 },
- { "label": "k47", "x": 10, "y": 3.15 },
- { "label": "k48", "x": 11, "y": 3.15 },
- { "label": "k49", "x": 12, "y": 3 },
- { "label": "k4a", "x": 13, "y": 3.15 },
- { "label": "k4b", "x": 14, "y": 3.3 },
- { "label": "k4c", "x": 15, "y": 3.5 },
+ {"matrix": [5, 0], "x": 10, "y": 1.15},
+ {"matrix": [5, 1], "x": 11, "y": 1.15},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 3], "x": 13, "y": 1.15},
+ {"matrix": [5, 4], "x": 14, "y": 1.3},
+ {"matrix": [5, 5], "x": 15, "y": 1.5},
- { "label": "tp1", "x": 6.5, "y": 3.15 },
- { "label": "tp2", "x": 7.5, "y": 3.15 },
- { "label": "tp3", "x": 8.5, "y": 3.15 }
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.3},
+ {"matrix": [2, 2], "x": 2, "y": 2.15},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.15},
+ {"matrix": [2, 5], "x": 5, "y": 2.15},
+
+ {"matrix": [6, 0], "x": 10, "y": 2.15},
+ {"matrix": [6, 1], "x": 11, "y": 2.15},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 3], "x": 13, "y": 2.15},
+ {"matrix": [6, 4], "x": 14, "y": 2.3},
+ {"matrix": [6, 5], "x": 15, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.3},
+ {"matrix": [3, 2], "x": 2, "y": 3.15},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.15},
+ {"matrix": [3, 5], "x": 5, "y": 3.15},
+
+ {"matrix": [7, 0], "x": 10, "y": 3.15},
+ {"matrix": [7, 1], "x": 11, "y": 3.15},
+ {"matrix": [7, 2], "x": 12, "y": 3},
+ {"matrix": [7, 3], "x": 13, "y": 3.15},
+ {"matrix": [7, 4], "x": 14, "y": 3.3},
+ {"matrix": [7, 5], "x": 15, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 6.5, "y": 3.15},
+ {"matrix": [8, 1], "x": 7.5, "y": 3.15},
+ {"matrix": [8, 2], "x": 8.5, "y": 3.15}
]
}
}
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 21dd99d95a..100db97678 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if defined(PRIYADI_PROMETHIUM)
- #include "promethium.h"
-#elif defined(PRIYADI_PLANCK)
- #include "planck.h"
-#else
- #error "no keyboard defined"
-#endif
+#include QMK_KEYBOARD_H
#include "action_layer.h"
#ifdef AUDIO_ENABLE
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 1ebf63037b..1d299c2299 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if defined(PRIYADI_PROMETHIUM)
- #include "promethium.h"
-#elif defined(PRIYADI_PLANCK)
- #include "planck.h"
-#else
- #error "no keyboard defined"
-#endif
+#include QMK_KEYBOARD_H
#include "action_layer.h"
#ifdef AUDIO_ENABLE
diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h
index 0d594a7942..b4dd2cd5ff 100644
--- a/keyboards/handwired/promethium/promethium.h
+++ b/keyboards/handwired/promethium/promethium.h
@@ -3,23 +3,3 @@
#include "quantum.h"
void battery_poll(uint8_t level);
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
- k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
- k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
- k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75, \
- tp1, tp2, tp3 \
-) { \
- { k00, k01, k02, k03, k04, k05 }, \
- { k10, k11, k12, k13, k14, k15 }, \
- { k20, k21, k22, k23, k24, k25 }, \
- { k30, k31, k32, k33, k34, k35 }, \
- { k40, k41, k42, k43, k44, k45 }, \
- { k50, k51, k52, k53, k54, k55 }, \
- { k60, k61, k62, k63, k64, k65 }, \
- { k70, k71, k72, k73, k74, k75 }, \
- { tp1, tp2, tp3, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json
index 94dbc9dcfc..c8b5e9d4d8 100644
--- a/keyboards/handwired/pteron/info.json
+++ b/keyboards/handwired/pteron/info.json
@@ -18,71 +18,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K000", "x":0, "y":0.75},
- {"label":"K001", "x":1, "y":0.75},
- {"label":"K002", "x":2, "y":0.25},
- {"label":"K003", "x":3, "y":0},
- {"label":"K004", "x":4, "y":0.35},
- {"label":"K005", "x":5, "y":0.45},
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.35},
+ {"matrix": [0, 5], "x": 5, "y": 0.45},
- {"label":"K006", "x":11, "y":0.45},
- {"label":"K007", "x":12, "y":0.35},
- {"label":"K008", "x":13, "y":0},
- {"label":"K009", "x":14, "y":0.25},
- {"label":"K010", "x":15, "y":0.75},
- {"label":"K011", "x":16, "y":0.75},
+ {"matrix": [0, 6], "x": 11, "y": 0.45},
+ {"matrix": [0, 7], "x": 12, "y": 0.35},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0.25},
+ {"matrix": [0, 10], "x": 15, "y": 0.75},
+ {"matrix": [0, 11], "x": 16, "y": 0.75},
- {"label":"K100", "x":0, "y":1.75},
- {"label":"K101", "x":1, "y":1.75},
- {"label":"K102", "x":2, "y":1.25},
- {"label":"K103", "x":3, "y":1},
- {"label":"K104", "x":4, "y":1.35},
- {"label":"K105", "x":5, "y":1.45},
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.35},
+ {"matrix": [1, 5], "x": 5, "y": 1.45},
- {"label":"K106", "x":11, "y":1.45},
- {"label":"K107", "x":12, "y":1.35},
- {"label":"K108", "x":13, "y":1},
- {"label":"K109", "x":14, "y":1.25},
- {"label":"K110", "x":15, "y":1.75},
- {"label":"K111", "x":16, "y":1.75},
+ {"matrix": [1, 6], "x": 11, "y": 1.45},
+ {"matrix": [1, 7], "x": 12, "y": 1.35},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "y": 1.25},
+ {"matrix": [1, 10], "x": 15, "y": 1.75},
+ {"matrix": [1, 11], "x": 16, "y": 1.75},
- {"label":"K200", "x":0, "y":2.75},
- {"label":"K201", "x":1, "y":2.75},
- {"label":"K202", "x":2, "y":2.25},
- {"label":"K203", "x":3, "y":2},
- {"label":"K204", "x":4, "y":2.35},
- {"label":"K205", "x":5, "y":2.45},
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.35},
+ {"matrix": [2, 5], "x": 5, "y": 2.45},
- {"label":"K206", "x":11, "y":2.45},
- {"label":"K207", "x":12, "y":2.35},
- {"label":"K208", "x":13, "y":2},
- {"label":"K209", "x":14, "y":2.25},
- {"label":"K210", "x":15, "y":2.75},
- {"label":"K211", "x":16, "y":2.75},
+ {"matrix": [2, 6], "x": 11, "y": 2.45},
+ {"matrix": [2, 7], "x": 12, "y": 2.35},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2.25},
+ {"matrix": [2, 10], "x": 15, "y": 2.75},
+ {"matrix": [2, 11], "x": 16, "y": 2.75},
- {"label":"K300", "x":0, "y":3.75},
- {"label":"K301", "x":1, "y":3.75},
- {"label":"K302", "x":2, "y":3.25},
- {"label":"K303", "x":3, "y":3},
- {"label":"K304", "x":4, "y":3.35},
- {"label":"K305", "x":5, "y":3.45},
+ {"matrix": [3, 0], "x": 0, "y": 3.75},
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.35},
+ {"matrix": [3, 5], "x": 5, "y": 3.45},
- {"label":"K306", "x":11, "y":3.45},
- {"label":"K307", "x":12, "y":3.35},
- {"label":"K308", "x":13, "y":3},
- {"label":"K309", "x":14, "y":3.25},
- {"label":"K310", "x":15, "y":3.75},
- {"label":"K311", "x":16, "y":3.75},
+ {"matrix": [3, 6], "x": 11, "y": 3.45},
+ {"matrix": [3, 7], "x": 12, "y": 3.35},
+ {"matrix": [3, 8], "x": 13, "y": 3},
+ {"matrix": [3, 9], "x": 14, "y": 3.25},
+ {"matrix": [3, 10], "x": 15, "y": 3.75},
+ {"matrix": [3, 11], "x": 16, "y": 3.75},
- {"label":"K402", "x":4, "y":4.35},
- {"label":"K403", "x":5, "y":4.45},
- {"label":"K404", "x":6, "y":4.65},
- {"label":"K405", "x":7, "y":4.95},
+ {"matrix": [4, 2], "x": 4, "y": 4.35},
+ {"matrix": [4, 3], "x": 5, "y": 4.45},
+ {"matrix": [4, 4], "x": 6, "y": 4.65},
+ {"matrix": [4, 5], "x": 7, "y": 4.95},
- {"label":"K406", "x":9, "y":4.95},
- {"label":"K407", "x":10, "y":4.65},
- {"label":"K408", "x":11, "y":4.45},
- {"label":"K409", "x":12, "y":4.35}
+ {"matrix": [4, 6], "x": 9, "y": 4.95},
+ {"matrix": [4, 7], "x": 10, "y": 4.65},
+ {"matrix": [4, 8], "x": 11, "y": 4.45},
+ {"matrix": [4, 9], "x": 12, "y": 4.35}
]
}
}
diff --git a/keyboards/handwired/pteron/pteron.h b/keyboards/handwired/pteron/pteron.h
deleted file mode 100644
index f29c2619af..0000000000
--- a/keyboards/handwired/pteron/pteron.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
- K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \
- { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json
index 3f89bef561..da32096bf1 100644
--- a/keyboards/handwired/pteron44/info.json
+++ b/keyboards/handwired/pteron44/info.json
@@ -18,57 +18,57 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.75},
- {"x":1, "y":0.75},
- {"x":2, "y":0.25},
- {"x":3, "y":0},
- {"x":4, "y":0.35},
- {"x":5, "y":0.45},
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.35},
+ {"matrix": [0, 5], "x": 5, "y": 0.45},
- {"x":11, "y":0.45},
- {"x":12, "y":0.35},
- {"x":13, "y":0},
- {"x":14, "y":0.25},
- {"x":15, "y":0.75},
- {"x":16, "y":0.75},
+ {"matrix": [0, 6], "x": 11, "y": 0.45},
+ {"matrix": [0, 7], "x": 12, "y": 0.35},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0.25},
+ {"matrix": [0, 10], "x": 15, "y": 0.75},
+ {"matrix": [0, 11], "x": 16, "y": 0.75},
- {"x":0, "y":1.75},
- {"x":1, "y":1.75},
- {"x":2, "y":1.25},
- {"x":3, "y":1},
- {"x":4, "y":1.35},
- {"x":5, "y":1.45},
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.35},
+ {"matrix": [1, 5], "x": 5, "y": 1.45},
- {"x":11, "y":1.45},
- {"x":12, "y":1.35},
- {"x":13, "y":1},
- {"x":14, "y":1.25},
- {"x":15, "y":1.75},
- {"x":16, "y":1.75},
+ {"matrix": [1, 6], "x": 11, "y": 1.45},
+ {"matrix": [1, 7], "x": 12, "y": 1.35},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "y": 1.25},
+ {"matrix": [1, 10], "x": 15, "y": 1.75},
+ {"matrix": [1, 11], "x": 16, "y": 1.75},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75},
- {"x":2, "y":2.25},
- {"x":3, "y":2},
- {"x":4, "y":2.35},
- {"x":5, "y":2.45},
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.35},
+ {"matrix": [2, 5], "x": 5, "y": 2.45},
- {"x":11, "y":2.45},
- {"x":12, "y":2.35},
- {"x":13, "y":2},
- {"x":14, "y":2.25},
- {"x":15, "y":2.75},
- {"x":16, "y":2.75},
+ {"matrix": [2, 6], "x": 11, "y": 2.45},
+ {"matrix": [2, 7], "x": 12, "y": 2.35},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2.25},
+ {"matrix": [2, 10], "x": 15, "y": 2.75},
+ {"matrix": [2, 11], "x": 16, "y": 2.75},
- {"x":4, "y":3.35},
- {"x":5, "y":3.45},
- {"x":6, "y":3.65},
- {"x":7, "y":3.95},
+ {"matrix": [3, 2], "x": 4, "y": 3.35},
+ {"matrix": [3, 3], "x": 5, "y": 3.45},
+ {"matrix": [3, 4], "x": 6, "y": 3.65},
+ {"matrix": [3, 5], "x": 7, "y": 3.95},
- {"x":9, "y":3.95},
- {"x":10, "y":3.65},
- {"x":11, "y":3.45},
- {"x":12, "y":3.35}
+ {"matrix": [3, 6], "x": 9, "y": 3.95},
+ {"matrix": [3, 7], "x": 10, "y": 3.65},
+ {"matrix": [3, 8], "x": 11, "y": 3.45},
+ {"matrix": [3, 9], "x": 12, "y": 3.35}
]
}
}
diff --git a/keyboards/handwired/pteron44/pteron44.h b/keyboards/handwired/pteron44/pteron44.h
deleted file mode 100644
index 9718223313..0000000000
--- a/keyboards/handwired/pteron44/pteron44.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 Fidel Coria
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
- K402, K403, K404, K405, K406, K407, K408, K409 \
-) { \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \
- { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json
index cd7e8c1115..c7cef78c19 100644
--- a/keyboards/handwired/retro_refit/info.json
+++ b/keyboards/handwired/retro_refit/info.json
@@ -18,87 +18,93 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":1, "y":0},
- {"label":"F2", "x":2, "y":0},
- {"label":"F3", "x":3, "y":0},
- {"label":"F4", "x":4, "y":0},
- {"label":"F5", "x":5, "y":0},
- {"label":"F6", "x":6, "y":0},
- {"label":"F7", "x":7, "y":0},
- {"label":"F8", "x":8, "y":0},
- {"label":"F9", "x":9, "y":0},
- {"label":"F10", "x":10, "y":0},
- {"label":"Num Lock", "x":11.5, "y":0},
- {"label":"Scroll Lock", "x":12.5, "y":0},
- {"label":"Print Screen", "x":13.5, "y":0},
- {"label":"Pause", "x":14.5, "y":0},
- {"label":"`", "x":0, "y":1.5},
- {"label":"1", "x":1, "y":1.5},
- {"label":"2", "x":2, "y":1.5},
- {"label":"3", "x":3, "y":1.5},
- {"label":"4", "x":4, "y":1.5},
- {"label":"5", "x":5, "y":1.5},
- {"label":"6", "x":6, "y":1.5},
- {"label":"7", "x":7, "y":1.5},
- {"label":"8", "x":8, "y":1.5},
- {"label":"9", "x":9, "y":1.5},
- {"label":"0", "x":10, "y":1.5},
- {"label":"-", "x":11, "y":1.5},
- {"label":"=", "x":12, "y":1.5},
- {"label":"Backspace", "x":13, "y":1.5, "w":1.5},
- {"label":"Home", "x":14.5, "y":1.5},
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"[", "x":11.5, "y":2.5},
- {"label":"]", "x":12.5, "y":2.5},
- {"label":"Page Up", "x":14.5, "y":2.5},
- {"label":"Ctrl", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":";", "x":10.75, "y":3.5},
- {"label":"'", "x":11.75, "y":3.5},
- {"label":"Enter", "x":12.75, "y":3.5, "w":1.75},
- {"label":"Page Down", "x":14.5, "y":3.5},
- {"label":"Shift", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":",", "x":9.25, "y":4.5},
- {"label":".", "x":10.25, "y":4.5},
- {"label":"/", "x":11.25, "y":4.5},
- {"label":"Shift", "x":12.25, "y":4.5, "w":1.25},
- {"label":"Up", "x":13.5, "y":4.5},
- {"label":"End", "x":14.5, "y":4.5},
- {"label":"Alt", "x":0, "y":5.5, "w":1.25},
- {"label":"Caps Lock", "x":1.25, "y":5.5, "w":1.25},
- {"label":"\\", "x":2.5, "y":5.5},
- {"label":"Space", "x":3.5, "y":5.5, "w":7},
- {"label":"Insert", "x":10.5, "y":5.5},
- {"label":"Delete", "x":11.5, "y":5.5},
- {"label":"Left", "x":12.5, "y":5.5},
- {"label":"Down", "x":13.5, "y":5.5},
- {"label":"Right", "x":14.5, "y":5.5}
+ {"matrix": [7, 7], "x": 0, "y": 0},
+ {"matrix": [0, 5], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 6, "y": 0},
+ {"matrix": [10, 7], "x": 7, "y": 0},
+ {"matrix": [10, 6], "x": 8, "y": 0},
+ {"matrix": [10, 5], "x": 9, "y": 0},
+ {"matrix": [10, 4], "x": 10, "y": 0},
+
+ {"matrix": [10, 3], "x": 11.5, "y": 0},
+ {"matrix": [10, 2], "x": 12.5, "y": 0},
+ {"matrix": [1, 1], "x": 13.5, "y": 0},
+ {"matrix": [9, 4], "x": 14.5, "y": 0},
+
+ {"matrix": [2, 7], "x": 0, "y": 1.5},
+ {"matrix": [7, 6], "x": 1, "y": 1.5},
+ {"matrix": [7, 5], "x": 2, "y": 1.5},
+ {"matrix": [7, 4], "x": 3, "y": 1.5},
+ {"matrix": [7, 3], "x": 4, "y": 1.5},
+ {"matrix": [7, 2], "x": 5, "y": 1.5},
+ {"matrix": [7, 1], "x": 6, "y": 1.5},
+ {"matrix": [7, 0], "x": 7, "y": 1.5},
+ {"matrix": [6, 7], "x": 8, "y": 1.5},
+ {"matrix": [6, 6], "x": 9, "y": 1.5},
+ {"matrix": [6, 5], "x": 10, "y": 1.5},
+ {"matrix": [6, 4], "x": 11, "y": 1.5},
+ {"matrix": [6, 3], "x": 12, "y": 1.5},
+ {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 1.5},
+ {"matrix": [10, 1], "x": 14.5, "y": 1.5},
+
+ {"matrix": [6, 1], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [6, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 5.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 0], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 7], "x": 14.5, "y": 2.5},
+
+ {"matrix": [4, 3], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+ {"matrix": [4, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [4, 0], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 1], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 0], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 4], "x": 12.75, "y": 3.5, "w": 1.75},
+ {"matrix": [8, 7], "x": 14.5, "y": 3.5},
+
+ {"matrix": [2, 6], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [2, 4], "x": 2.25, "y": 4.5},
+ {"matrix": [2, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [2, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [2, 1], "x": 5.25, "y": 4.5},
+ {"matrix": [2, 0], "x": 6.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 5], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 4], "x": 10.25, "y": 4.5},
+ {"matrix": [1, 3], "x": 11.25, "y": 4.5},
+ {"matrix": [1, 2], "x": 12.25, "y": 4.5, "w": 1.25},
+ {"matrix": [10, 0], "x": 13.5, "y": 4.5},
+ {"matrix": [9, 1], "x": 14.5, "y": 4.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 5], "x": 2.5, "y": 5.5},
+ {"matrix": [0, 7], "x": 3.5, "y": 5.5, "w": 7},
+ {"matrix": [8, 6], "x": 10.5, "y": 5.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 5.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 5.5},
+ {"matrix": [9, 0], "x": 13.5, "y": 5.5},
+ {"matrix": [9, 3], "x": 14.5, "y": 5.5}
]
}
}
diff --git a/keyboards/handwired/retro_refit/readme.md b/keyboards/handwired/retro_refit/readme.md
index 8dfca7b10b..6ecaa6e65e 100644
--- a/keyboards/handwired/retro_refit/readme.md
+++ b/keyboards/handwired/retro_refit/readme.md
@@ -4,34 +4,6 @@ The retro refit keyboard used a Teensy to replace the original controller on a 3
[Image Gallery](https://imgur.com/a/08Fyj)
-This keyboard uses a LAYOUT macro that is a great example of using a non-standard row-column matrix. The keyboard in question had 11 rows and 8 columns, but the rows were not all horizontal, and the columns were not all vertical. For example, row 2 contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and"Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", "Left Alt", "Up Arrow", and "Down Arrow".
-
-The macro makes programming the keys easier and in a more straight-forward manner because it realigns the keys into a 6x15 sensible keyboard layout instead of the obtuse 11x8 matrix. Each Kxy corresponds to a key in row x column y.
-
-```
-#define LAYOUT( \
- K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \
- K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \
- K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \
- K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \
- K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \
- K10, K06, K25, K07, K86, K85, K95, K90, K93 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \
- { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \
- { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \
-}
-```
-
-
Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
Hardware Supported: Leading Edge D3 386 keyboard, Teensy
diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c
index 2a5476e40c..b7e1ec03fa 100644
--- a/keyboards/handwired/retro_refit/retro_refit.c
+++ b/keyboards/handwired/retro_refit/retro_refit.c
@@ -1,4 +1,4 @@
-#include "retro_refit.h"
+#include "quantum.h"
#include "led.h"
void matrix_init_kb(void) {
diff --git a/keyboards/handwired/retro_refit/retro_refit.h b/keyboards/handwired/retro_refit/retro_refit.h
deleted file mode 100644
index ad1c567a84..0000000000
--- a/keyboards/handwired/retro_refit/retro_refit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This macro is an example of using a non-standard row-column matrix. The
-// keyboard in question had 11 rows and 8 columns, but the rows were not all
-// horizontal, and the columns were not all vertical. For example, row 2
-// contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and
-// "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B",
-// "Left Alt", "Up Arrow", and "Down Arrow".
-//
-// The macro makes programming the keys easier and in a more straight-forward
-// manner because it realigns the keys into a 6x15 sensible keyboard layout
-// instead of the obtuse 11x8 matrix.
-
-#define LAYOUT( \
- K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \
- K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \
- K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \
- K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \
- K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \
- K10, K06, K25, K07, K86, K85, K95, K90, K93 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \
- { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \
- { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \
-}
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index 8c617b015b..7f0f34555e 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -20,117 +20,137 @@
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
"layouts": {
- "LAYOUT": {
- "layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Print", "x":15.25, "y":0},
- {"label":"Scroll Lock", "x":16.25, "y":0},
- {"label":"Pause", "x":17.25, "y":0},
- {"label":"Out", "x":18.5, "y":0},
- {"label":"+", "x":19.5, "y":0},
- {"label":"-", "x":20.5, "y":0},
- {"label":"~", "x":21.5, "y":0},
- {"label":"~", "x":0, "y":1.5},
- {"label":"!", "x":1, "y":1.5},
- {"label":"@", "x":2, "y":1.5},
- {"label":"#", "x":3, "y":1.5},
- {"label":"$", "x":4, "y":1.5},
- {"label":"%", "x":5, "y":1.5},
- {"label":"^", "x":6, "y":1.5},
- {"label":"&", "x":7, "y":1.5},
- {"label":"*", "x":8, "y":1.5},
- {"label":"(", "x":9, "y":1.5},
- {"label":")", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label":"<i class=\"fa fa-long-arrow-left\"></i>", "x":13, "y":1.5, "w":2},
- {"label":"Insert", "x":15.25, "y":1.5},
- {"label":"Home", "x":16.25, "y":1.5},
- {"label":"Pg Up", "x":17.25, "y":1.5},
- {"label":"Num", "x":18.5, "y":1.5},
- {"label":"\u00f7", "x":19.5, "y":1.5},
- {"label":"\u00d7", "x":20.5, "y":1.5},
- {"label":"-", "x":21.5, "y":1.5},
- {"label":"<i class='kb kb-Line-Start-End'></i>", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"{", "x":11.5, "y":2.5},
- {"label":"}", "x":12.5, "y":2.5},
- {"label":"|", "x":13.5, "y":2.5, "w":1.5},
- {"label":"Delete", "x":15.25, "y":2.5},
- {"label":"End", "x":16.25, "y":2.5},
- {"label":"Pg Dn", "x":17.25, "y":2.5},
- {"label":"7", "x":18.5, "y":2.5},
- {"label":"8", "x":19.5, "y":2.5},
- {"label":"9", "x":20.5, "y":2.5},
- {"label":"+", "x":21.5, "y":2.5, "h":2},
- {"label":"\u21e9", "x":0, "y":3.5, "w":1.25},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":":", "x":10.75, "y":3.5},
- {"label":"\"", "x":11.75, "y":3.5},
- {"label":"<i class='kb kb-Return-2'></i>", "x":12.75, "y":3.5, "w":2.25},
- {"label":"4", "x":18.5, "y":3.5},
- {"label":"5", "x":19.5, "y":3.5},
- {"label":"6", "x":20.5, "y":3.5},
- {"label":"\u21e7", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"<", "x":9.25, "y":4.5},
- {"label":">", "x":10.25, "y":4.5},
- {"label":"?", "x":11.25, "y":4.5},
- {"label":"\u21e7", "x":12.25, "y":4.5, "w":2.75},
- {"label":"\u2191", "x":16.25, "y":4.5},
- {"label":"1", "x":18.5, "y":4.5},
- {"label":"2", "x":19.5, "y":4.5},
- {"label":"3", "x":20.5, "y":4.5},
- {"label":"<i class='kb kb-Return-2'></i>", "x":21.5, "y":4.5, "h":2},
- {"label":"Control", "x":0, "y":5.5, "w":1.25},
- {"label":"Super", "x":1.25, "y":5.5, "w":1.25},
- {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
- {"x":3.75, "y":5.5, "w":6.25},
- {"label":"Alt", "x":10, "y":5.5, "w":1.25},
- {"label":"Super", "x":11.25, "y":5.5, "w":1.25},
- {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
- {"label":"Control", "x":13.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":5.5},
- {"label":"\u2193", "x":16.25, "y":5.5},
- {"label":"\u2192", "x":17.25, "y":5.5},
- {"label":"0", "x":18.5, "y":5.5},
- {"label":"00", "x":19.5, "y":5.5},
- {"label":".", "x":20.5, "y":5.5}]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [0, 19], "x": 20.5, "y": 0},
+ {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 19], "x": 20.5, "y": 1.5},
+ {"matrix": [1, 20], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [2, 19], "x": 20.5, "y": 2.5},
+ {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [3, 19], "x": 20.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [4, 19], "x": 20.5, "y": 4.5},
+ {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5},
+
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+ {"matrix": [5, 19], "x": 20.5, "y": 5.5}
+ ]
+ }
}
}
diff --git a/keyboards/handwired/selene/selene.h b/keyboards/handwired/selene/selene.h
index 1cffc76c1b..bcd4215e36 100644
--- a/keyboards/handwired/selene/selene.h
+++ b/keyboards/handwired/selene/selene.h
@@ -21,19 +21,3 @@
#define NUM_LOCK_PIN A0
#define CAPS_LOCK_PIN A2
#define SCROLL_LOCK_PIN A1
-
-#define LAYOUT( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K317, K318, K319, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K415, K417, K418, K419, K420, \
- K500, K501, K502, K505, K509, K510, K511, K513, K514, K515, K516, K517, K518, K519 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO, K317, K318, K319, KC_NO }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, KC_NO, K415, KC_NO, K417, K418, K419, K420 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, KC_NO, K513, K514, K515, K516, K517, K518, K519, KC_NO } \
-}
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json
index ffd76babc1..070cbb2c75 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/info.json
@@ -18,67 +18,71 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"`", "x":1.75, "y":0},
- {"label":"1", "x":2.75, "y":0},
- {"label":"2", "x":3.75, "y":0},
- {"label":"3", "x":4.75, "y":0},
- {"label":"4", "x":5.75, "y":0},
- {"label":"5", "x":6.75, "y":0},
- {"label":"6", "x":7.75, "y":0},
- {"label":"7", "x":8.75, "y":0},
- {"label":"8", "x":9.75, "y":0},
- {"label":"9", "x":10.75, "y":0},
- {"label":"0", "x":11.75, "y":0},
- {"label":"-", "x":12.75, "y":0},
- {"label":"=", "x":13.75, "y":0},
- {"label":"Backspace", "x":14.75, "y":0, "w":2},
- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
- {"label":"Q", "x":2.75, "y":1},
- {"label":"W", "x":3.75, "y":1},
- {"label":"E", "x":4.75, "y":1},
- {"label":"R", "x":5.75, "y":1},
- {"label":"T", "x":6.75, "y":1},
- {"label":"Y", "x":7.75, "y":1},
- {"label":"U", "x":8.75, "y":1},
- {"label":"I", "x":9.75, "y":1},
- {"label":"O", "x":10.75, "y":1},
- {"label":"P", "x":11.75, "y":1},
- {"label":"[", "x":12.75, "y":1},
- {"label":"]", "x":13.75, "y":1},
- {"label":"\\", "x":14.75, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":1, "y":2, "w":1.75},
- {"label":"A", "x":2.75, "y":2},
- {"label":"S", "x":3.75, "y":2},
- {"label":"D", "x":4.75, "y":2},
- {"label":"F", "x":5.75, "y":2},
- {"label":"G", "x":6.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":";", "x":11.75, "y":2},
- {"label":"'", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0.5, "y":3, "w":2.25},
- {"label":"Z", "x":2.75, "y":3},
- {"label":"X", "x":3.75, "y":3},
- {"label":"C", "x":4.75, "y":3},
- {"label":"V", "x":5.75, "y":3},
- {"label":"B", "x":6.75, "y":3},
- {"label":"N", "x":7.75, "y":3},
- {"label":"M", "x":8.75, "y":3},
- {"label":",", "x":9.75, "y":3},
- {"label":".", "x":10.75, "y":3},
- {"label":"/", "x":11.75, "y":3},
- {"label":"Shift", "x":12.75, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"GUI", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":6.25},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"GUI", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 1.75, "y": 0},
+ {"matrix": [1, 0], "x": 2.75, "y": 0},
+ {"matrix": [0, 1], "x": 3.75, "y": 0},
+ {"matrix": [1, 1], "x": 4.75, "y": 0},
+ {"matrix": [0, 2], "x": 5.75, "y": 0},
+ {"matrix": [1, 2], "x": 6.75, "y": 0},
+ {"matrix": [0, 3], "x": 7.75, "y": 0},
+ {"matrix": [1, 3], "x": 8.75, "y": 0},
+ {"matrix": [0, 4], "x": 9.75, "y": 0},
+ {"matrix": [1, 4], "x": 10.75, "y": 0},
+ {"matrix": [0, 5], "x": 11.75, "y": 0},
+ {"matrix": [1, 5], "x": 12.75, "y": 0},
+ {"matrix": [0, 6], "x": 13.75, "y": 0},
+ {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 2.75, "y": 1},
+ {"matrix": [2, 1], "x": 3.75, "y": 1},
+ {"matrix": [3, 1], "x": 4.75, "y": 1},
+ {"matrix": [2, 2], "x": 5.75, "y": 1},
+ {"matrix": [3, 2], "x": 6.75, "y": 1},
+ {"matrix": [2, 3], "x": 7.75, "y": 1},
+ {"matrix": [3, 3], "x": 8.75, "y": 1},
+ {"matrix": [2, 4], "x": 9.75, "y": 1},
+ {"matrix": [3, 4], "x": 10.75, "y": 1},
+ {"matrix": [2, 5], "x": 11.75, "y": 1},
+ {"matrix": [3, 5], "x": 12.75, "y": 1},
+ {"matrix": [2, 6], "x": 13.75, "y": 1},
+ {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75},
+ {"matrix": [4, 0], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 1], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 2], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 3], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 4], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 5], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25},
+ {"matrix": [6, 0], "x": 2.75, "y": 3},
+ {"matrix": [7, 1], "x": 3.75, "y": 3},
+ {"matrix": [6, 1], "x": 4.75, "y": 3},
+ {"matrix": [7, 2], "x": 5.75, "y": 3},
+ {"matrix": [6, 2], "x": 6.75, "y": 3},
+ {"matrix": [7, 3], "x": 7.75, "y": 3},
+ {"matrix": [6, 3], "x": 8.75, "y": 3},
+ {"matrix": [7, 4], "x": 9.75, "y": 3},
+ {"matrix": [6, 4], "x": 10.75, "y": 3},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75},
+
+ {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/slash/slash.h b/keyboards/handwired/slash/slash.h
deleted file mode 100644
index 6c1342d6b2..0000000000
--- a/keyboards/handwired/slash/slash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 asdftemp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
- k40, k41, k42, k43, k44, k45, k46, k47 \
-) \
-{ \
- { k00, k02, k04, k06, k08, k0A, k0C, KC_NO }, \
- { k01, k03, k05, k07, k09, k0B, k0D, KC_NO }, \
- { k10, k12, k14, k16, k18, k1A, k1C, k45 }, \
- { k11, k13, k15, k17, k19, k1B, k1D, k44 }, \
- { k21, k23, k25, k27, k29, k2B, KC_NO, k42 }, \
- { k20, k22, k24, k26, k28, k2A, k2C, k43 }, \
- { k31, k33, k35, k37, k39, k3B, k47, k40 }, \
- { k30, k32, k34, k36, k38, k3A, k46, k41 } \
-}
diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json
index 48fe44be74..b0e72ccabd 100644
--- a/keyboards/handwired/space_oddity/info.json
+++ b/keyboards/handwired/space_oddity/info.json
@@ -18,71 +18,76 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Macro 0", "x":0, "y":0, "w":2},
- {"label":"Macro 1", "x":2, "y":0, "w":2},
- {"label":"Macro 2", "x":4, "y":0, "w":2},
- {"label":"Macro 3", "x":6, "y":0, "w":2},
- {"label":"Macro 4", "x":8, "y":0, "w":2},
- {"label":"Dynamic Macro 1", "x":10, "y":0, "w":2},
- {"label":"Dynamic Macro 2", "x":12, "y":0, "w":2},
- {"label":"~", "x":0, "y":1, "w":2},
- {"label":"!", "x":2, "y":1},
- {"label":"@", "x":3, "y":1},
- {"label":"#", "x":4, "y":1},
- {"label":"$", "x":5, "y":1},
- {"label":"%", "x":6, "y":1},
- {"label":"^", "x":7, "y":1},
- {"label":"&", "x":8, "y":1},
- {"label":"*", "x":9, "y":1},
- {"label":"(", "x":10, "y":1},
- {"label":")", "x":11, "y":1},
- {"label":"Backspace", "x":12, "y":1, "w":2},
- {"label":"Tab", "x":0, "y":2, "w":2},
- {"label":"Q", "x":2, "y":2},
- {"label":"W", "x":3, "y":2},
- {"label":"E", "x":4, "y":2},
- {"label":"R", "x":5, "y":2},
- {"label":"T", "x":6, "y":2},
- {"label":"Y", "x":7, "y":2},
- {"label":"U", "x":8, "y":2},
- {"label":"I", "x":9, "y":2},
- {"label":"O", "x":10, "y":2},
- {"label":"P", "x":11, "y":2},
- {"label":"_", "x":12, "y":2, "w":2},
- {"label":"Esc (Ctrl)", "x":0, "y":3, "w":2},
- {"label":"A", "x":2, "y":3},
- {"label":"S", "x":3, "y":3},
- {"label":"D", "x":4, "y":3},
- {"label":"F", "x":5, "y":3},
- {"label":"G", "x":6, "y":3},
- {"label":"H", "x":7, "y":3},
- {"label":"J", "x":8, "y":3},
- {"label":"K", "x":9, "y":3},
- {"label":"L", "x":10, "y":3},
- {"label":":", "x":11, "y":3},
- {"label":"\"", "x":12, "y":3, "w":2},
- {"label":"Caps Lock (Shift)", "x":0.25, "y":4, "w":1.75},
- {"label":"Z", "x":2, "y":4},
- {"label":"X", "x":3, "y":4},
- {"label":"C", "x":4, "y":4},
- {"label":"V", "x":5, "y":4},
- {"label":"B", "x":6, "y":4},
- {"label":"N", "x":7, "y":4},
- {"label":"M", "x":8, "y":4},
- {"label":"<", "x":9, "y":4},
- {"label":">", "x":10, "y":4},
- {"label":"?", "x":11, "y":4},
- {"label":"Enter (Shift)", "x":12, "y":4, "w":1.75},
- {"label":"MO(2)", "x":1, "y":5},
- {"label":"MO(1)", "x":2, "y":5},
- {"label":"GUI", "x":3, "y":5},
- {"label":"Alt", "x":4, "y":5},
- {"label":"Ctrl", "x":5, "y":5, "w":2},
- {"label":"Space", "x":7, "y":5, "w":2},
- {"label":"Left (Alt)", "x":9, "y":5},
- {"label":"Right (Hyper)", "x":10, "y":5},
- {"label":"Up (MO(1))", "x":11, "y":5},
- {"label":"Down (MO(2))", "x":12, "y":5}
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 2},
+ {"matrix": [0, 2], "x": 2, "y": 0, "w": 2},
+ {"matrix": [0, 4], "x": 4, "y": 0, "w": 2},
+ {"matrix": [0, 6], "x": 6, "y": 0, "w": 2},
+ {"matrix": [0, 8], "x": 8, "y": 0, "w": 2},
+ {"matrix": [0, 10], "x": 10, "y": 0, "w": 2},
+ {"matrix": [0, 11], "x": 12, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 2},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2, "w": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3, "w": 2},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4},
+ {"matrix": [4, 6], "x": 7, "y": 4},
+ {"matrix": [4, 7], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9, "y": 4},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4, "w": 1.75},
+
+ {"matrix": [5, 0], "x": 1, "y": 5},
+ {"matrix": [5, 1], "x": 2, "y": 5},
+ {"matrix": [5, 2], "x": 3, "y": 5},
+ {"matrix": [5, 3], "x": 4, "y": 5},
+ {"matrix": [5, 5], "x": 5, "y": 5, "w": 2},
+ {"matrix": [5, 7], "x": 7, "y": 5, "w": 2},
+ {"matrix": [5, 8], "x": 9, "y": 5},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5}
]
}
}
diff --git a/keyboards/handwired/space_oddity/space_oddity.h b/keyboards/handwired/space_oddity/space_oddity.h
deleted file mode 100644
index d35bfea587..0000000000
--- a/keyboards/handwired/space_oddity/space_oddity.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K002, K004, K006, K008, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, \
- K500, K501, K502, K503, K505, K507, K508, K509, K510, K511 \
-) { \
- { K000, KC_NO, K002, KC_NO, K004, KC_NO, K006, KC_NO, K008, KC_NO, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 }, \
- { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, K508, K509, K510, K511 } \
-}
diff --git a/keyboards/handwired/split65/info.json b/keyboards/handwired/split65/info.json
index c766f894e1..14b83bd47a 100644
--- a/keyboards/handwired/split65/info.json
+++ b/keyboards/handwired/split65/info.json
@@ -7,85 +7,5 @@
"vid": "0x4A57",
"pid": "0x0000",
"device_version": "0.0.1"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label":"`\u00ac", "x":0, "y":0},
- {"label":"1!", "x":1, "y":0},
- {"label":"2\"", "x":2, "y":0},
- {"label":"3\u00a3", "x":3, "y":0},
- {"label":"4$", "x":4, "y":0},
- {"label":"5%", "x":5, "y":0},
- {"label":"6^", "x":6, "y":0},
- {"label":"7&", "x":8, "y":0},
- {"label":"8*", "x":9, "y":0},
- {"label":"9(", "x":10, "y":0},
- {"label":"0)", "x":11, "y":0},
- {"label":"-_", "x":12, "y":0},
- {"label":"=+", "x":13, "y":0},
- {"label":"Backspace", "x":14, "y":0, "w":2},
- {"label":"Insert", "x":16, "y":0},
-
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.5, "y":1},
- {"label":"U", "x":8.5, "y":1},
- {"label":"I", "x":9.5, "y":1},
- {"label":"O", "x":10.5, "y":1},
- {"label":"P", "x":11.5, "y":1},
- {"label":"[{", "x":12.5, "y":1},
- {"label":"]}", "x":13.5, "y":1},
- {"label":"Delete", "x":16, "y":1},
-
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":";:", "x":11.75, "y":2},
- {"label":"'@", "x":12.75, "y":2},
- {"label":"#~", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
- {"label":"Page Up", "x":16, "y":2},
-
- {"label":"Shift", "x":0, "y":3, "w":1.25},
- {"label":"\\|", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8.25, "y":3},
- {"label":"M", "x":9.25, "y":3},
- {"label":",<", "x":10.25, "y":3},
- {"label":".>", "x":11.25, "y":3},
- {"label":"/?", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.75},
- {"label":"Up", "x":15, "y":3},
- {"label":"Page Down", "x":16, "y":3},
-
- {"label":"Ctrl", "x":0.25, "y":4, "w":1.25},
- {"label":"Win", "x":1.5, "y":4, "w":1.25},
- {"label":"Alt", "x":2.75, "y":4, "w":1.25},
- {"label":"Space", "x":4, "y":4, "w":2.75},
- {"label":"Enter", "x":8, "y":4, "w":2.25},
- {"label":"AltGr", "x":10.25, "y":4},
- {"label":"Lower", "x":11.25, "y":4},
- {"label":"Raise", "x":12.25, "y":4},
- {"label":"Left", "x":14, "y":4},
- {"label":"Down", "x":15, "y":4},
- {"label":"Right", "x":16, "y":4}
- ]
- }
}
}
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
index 56d2dcb9ab..e1540d99a2 100644
--- a/keyboards/handwired/split65/promicro/info.json
+++ b/keyboards/handwired/split65/promicro/info.json
@@ -8,5 +8,91 @@
"soft_serial_pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+ {"matrix": [5, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [9, 7], "x": 7.75, "y": 2},
+ {"matrix": [7, 7], "x": 8.75, "y": 2},
+ {"matrix": [7, 6], "x": 9.75, "y": 2},
+ {"matrix": [7, 5], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2},
+ {"matrix": [7, 2], "x": 13.75, "y": 2},
+ {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [7, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 7], "x": 8.25, "y": 3},
+ {"matrix": [8, 6], "x": 9.25, "y": 3},
+ {"matrix": [8, 5], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 3], "x": 12.25, "y": 3},
+ {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+ {"matrix": [9, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 4], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+ {"matrix": [9, 2], "x": 14, "y": 4},
+ {"matrix": [9, 1], "x": 15, "y": 4},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h
deleted file mode 100644
index 8c4e656cf2..0000000000
--- a/keyboards/handwired/split65/promicro/promicro.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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( \
- L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \
- ) \
- { \
- {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \
- {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \
- {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \
- {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \
- {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \
- {R00, R01, R02, R03, R04, R05, R06, R07}, \
- {R10, R11, R12, R13, R14, R15, R16, R17}, \
- {R20, R21, R22, R23, R24, R25, R26, R27}, \
- {R30, R31, R32, R33, R34, R35, R36, R37}, \
- {R40, R41, R42, R43, R44, R45, R46, R47} \
- }
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index e2c0a634f3..b9956ed7ab 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -9,5 +9,91 @@
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C"
+ "board": "QMK_PROTON_C",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+ {"matrix": [5, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [9, 7], "x": 7.75, "y": 2},
+ {"matrix": [7, 7], "x": 8.75, "y": 2},
+ {"matrix": [7, 6], "x": 9.75, "y": 2},
+ {"matrix": [7, 5], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2},
+ {"matrix": [7, 2], "x": 13.75, "y": 2},
+ {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [7, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 7], "x": 8.25, "y": 3},
+ {"matrix": [8, 6], "x": 9.25, "y": 3},
+ {"matrix": [8, 5], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 3], "x": 12.25, "y": 3},
+ {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+ {"matrix": [9, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 4], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+ {"matrix": [9, 2], "x": 14, "y": 4},
+ {"matrix": [9, 1], "x": 15, "y": 4},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h
deleted file mode 100644
index be3dd1639b..0000000000
--- a/keyboards/handwired/split65/stm32/stm32.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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( \
- L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \
- ) \
- { \
- {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \
- {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \
- {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \
- {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \
- {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \
- {R00, R01, R02, R03, R04, R05, R06, R07}, \
- {R10, R11, R12, R13, R14, R15, R16, R17}, \
- {R20, R21, R22, R23, R24, R25, R26, R27}, \
- {R30, R31, R32, R33, R34, R35, R36, R37}, \
- {R40, R41, R42, R43, R44, R45, R46, R47} \
- }
diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json
index 91b6cd39c5..f1471efe8e 100644
--- a/keyboards/handwired/stef9998/split_5x7/info.json
+++ b/keyboards/handwired/stef9998/split_5x7/info.json
@@ -27,86 +27,83 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"F1", "x":6, "y":0},
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"[", "x":6, "y":1},
+ {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1},
+ {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1},
+ {"label": "W", "matrix": [5, 4], "x": 2, "y": 1},
+ {"label": "E", "matrix": [5, 3], "x": 3, "y": 1},
+ {"label": "R", "matrix": [5, 2], "x": 4, "y": 1},
+ {"label": "T", "matrix": [5, 1], "x": 5, "y": 1},
+ {"label": "[", "matrix": [5, 0], "x": 6, "y": 1},
- {"label":"Caps Lock", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"=", "x":6, "y":2},
+ {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2},
+ {"label": "A", "matrix": [1, 1], "x": 1, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5, "y": 2},
+ {"label": "=", "matrix": [1, 6], "x": 6, "y": 2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"F3", "x":6, "y":3},
+ {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3},
+ {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3},
+ {"label": "X", "matrix": [6, 4], "x": 2, "y": 3},
+ {"label": "C", "matrix": [6, 3], "x": 3, "y": 3},
+ {"label": "V", "matrix": [6, 2], "x": 4, "y": 3},
+ {"label": "B", "matrix": [6, 1], "x": 5, "y": 3},
+ {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3},
- {"label":"Ctrl", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Gui", "x":2, "y":4, "w":1.25},
- {"label":"Alt", "x":3.25, "y":4, "w":1.25},
- {"label":"Space", "x":4.5, "y":4, "w":1.5},
- {"label":"F5", "x":6, "y":4},
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4},
+ {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5},
+ {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4},
+ {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0},
+ {"label": "6", "matrix": [7, 6], "x": 9, "y": 0},
+ {"label": "7", "matrix": [7, 5], "x": 10, "y": 0},
+ {"label": "8", "matrix": [7, 4], "x": 11, "y": 0},
+ {"label": "9", "matrix": [7, 3], "x": 12, "y": 0},
+ {"label": "0", "matrix": [7, 2], "x": 13, "y": 0},
+ {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0},
- {"label":"F2", "x":14, "y":0},
- {"label":"6", "x":9, "y":0},
- {"label":"7", "x":10, "y":0},
- {"label":"8", "x":11, "y":0},
- {"label":"9", "x":12, "y":0},
- {"label":"0", "x":13, "y":0},
- {"label":"Backspace", "x":14, "y":0},
+ {"label": "]", "matrix": [7, 0], "x": 8, "y": 1},
+ {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1},
+ {"label": "U", "matrix": [3, 1], "x": 10, "y": 1},
+ {"label": "I", "matrix": [3, 2], "x": 11, "y": 1},
+ {"label": "O", "matrix": [3, 3], "x": 12, "y": 1},
+ {"label": "P", "matrix": [3, 4], "x": 13, "y": 1},
+ {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1},
- {"label":"]", "x":8, "y":1},
- {"label":"Y", "x":9, "y":1},
- {"label":"U", "x":10, "y":1},
- {"label":"I", "x":11, "y":1},
- {"label":"O", "x":12, "y":1},
- {"label":"P", "x":13, "y":1},
- {"label":"\\", "x":14, "y":1},
-
- {"label":"-", "x":8, "y":2},
- {"label":"H", "x":9, "y":2},
- {"label":"J", "x":10, "y":2},
- {"label":"K", "x":11, "y":2},
- {"label":"L", "x":12, "y":2},
- {"label":";", "x":13, "y":2},
- {"label":"Enter", "x":14, "y":2},
-
- {"label":"F4", "x":8, "y":3},
- {"label":"N", "x":9, "y":3},
- {"label":"M", "x":10, "y":3},
- {"label":",", "x":11, "y":3},
- {"label":".", "x":12, "y":3},
- {"label":"/", "x":13, "y":3},
- {"label":"Shift", "x":14, "y":3},
-
- {"label":"F5", "x":8, "y":4},
- {"label":"Space", "x":9, "y":4, "w":1.5},
- {"label":"AltGr", "x":10.5, "y":4, "w":1.25},
- {"label":"Fn", "x":11.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13, "y":4},
- {"label":"Ctrl", "x":13, "y":4}
+ {"label": "-", "matrix": [3, 6], "x": 8, "y": 2},
+ {"label": "H", "matrix": [8, 6], "x": 9, "y": 2},
+ {"label": "J", "matrix": [8, 5], "x": 10, "y": 2},
+ {"label": "K", "matrix": [8, 4], "x": 11, "y": 2},
+ {"label": "L", "matrix": [8, 3], "x": 12, "y": 2},
+ {"label": ";", "matrix": [8, 2], "x": 13, "y": 2},
+ {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2},
+ {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3},
+ {"label": "N", "matrix": [4, 0], "x": 9, "y": 3},
+ {"label": "M", "matrix": [4, 1], "x": 10, "y": 3},
+ {"label": ",", "matrix": [4, 2], "x": 11, "y": 3},
+ {"label": ".", "matrix": [4, 3], "x": 12, "y": 3},
+ {"label": "/", "matrix": [4, 5], "x": 13, "y": 3},
+ {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3},
+ {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4},
+ {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5},
+ {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4},
+ {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4}
]
}
}
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
deleted file mode 100644
index 828c515484..0000000000
--- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2022 stef9998
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
- k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \
- k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, \
- k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, \
- k56, k57, k58, k59, k61, k62, k63, k64, k66, k67, k68, k69 \
-) \
-{ \
- { k00, k01, k02, k03, k04 , k05, k06 }, \
- { k14, k15, k16, k17, k18 , k19, k20 }, \
- { k28, k29, k30, k31, k32 , k33, k34 }, \
- { k42, k43, k44, k45, k46 , k47, k48 }, \
- { k56, k57, k58, k59, KC_NO, k61, k62 }, \
- { k13, k12, k11, k10, k09 , k08, k07 }, \
- { k27, k26, k25, k24, k23 , k22, k21 }, \
- { k41, k40, k39, k38, k37 , k36, k35 }, \
- { k55, k54, k53, k52, k51 , k50, k49 }, \
- { k69, k68, k67, k66, KC_NO, k64, k63 } \
-}
diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.h b/keyboards/handwired/swiftrax/beegboy/beegboy.h
deleted file mode 100644
index 0b95ddc2ce..0000000000
--- a/keyboards/handwired/swiftrax/beegboy/beegboy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k67, k77, k68, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k86, k96, k87, k97, k88, k98, \
- ka0, kb0, ka1, ka2, ka4, ka5, ka6, kb6, ka7, kb7, ka8 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
- { k90, k91, k92, k93, k94, XXX, k96, k97, k98 }, \
- { ka0, ka1, ka2, XXX, ka4, ka5, ka6, ka7, ka8 }, \
- { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7, XXX } \
-}
diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json
index 29fc7dddda..a8aecb81b4 100644
--- a/keyboards/handwired/swiftrax/beegboy/info.json
+++ b/keyboards/handwired/swiftrax/beegboy/info.json
@@ -18,109 +18,121 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"1,0", "x":1.25, "y":0},
- {"label":"0,1", "x":2.25, "y":0},
- {"label":"1,1", "x":3.25, "y":0},
- {"label":"0,2", "x":4.25, "y":0},
- {"label":"1,2", "x":5.5, "y":0},
- {"label":"0,3", "x":6.5, "y":0},
- {"label":"1,3", "x":7.5, "y":0},
- {"label":"0,4", "x":8.5, "y":0},
- {"label":"1,4", "x":9.75, "y":0},
- {"label":"0,5", "x":10.75, "y":0},
- {"label":"1,5", "x":11.75, "y":0},
- {"label":"0,6", "x":12.75, "y":0},
- {"label":"1,6", "x":14, "y":0},
- {"label":"0,7", "x":15.5, "y":0},
- {"label":"1,7", "x":16.5, "y":0},
- {"label":"0,8", "x":17.5, "y":0},
- {"label":"1,8", "x":18.5, "y":0},
-
- {"label":"2,0", "x":0, "y":1.25},
- {"label":"3,0", "x":1, "y":1.25},
- {"label":"2,1", "x":2, "y":1.25},
- {"label":"3,1", "x":3, "y":1.25},
- {"label":"2,2", "x":4, "y":1.25},
- {"label":"3,2", "x":5, "y":1.25},
- {"label":"2,3", "x":6, "y":1.25},
- {"label":"3,3", "x":7, "y":1.25},
- {"label":"2,4", "x":8, "y":1.25},
- {"label":"3,4", "x":9, "y":1.25},
- {"label":"2,5", "x":10, "y":1.25},
- {"label":"3,5", "x":11, "y":1.25},
- {"label":"2,6", "x":12, "y":1.25},
- {"label":"3,6", "x":13, "y":1.25, "w":2},
- {"label":"2,7", "x":15.5, "y":1.25},
- {"label":"3,7", "x":16.5, "y":1.25},
- {"label":"2,8", "x":17.5, "y":1.25},
- {"label":"3,8", "x":18.5, "y":1.25},
-
- {"label":"4,0", "x":0, "y":2.25, "w":1.5},
- {"label":"5,0", "x":1.5, "y":2.25},
- {"label":"4,1", "x":2.5, "y":2.25},
- {"label":"5,1", "x":3.5, "y":2.25},
- {"label":"4,2", "x":4.5, "y":2.25},
- {"label":"5,2", "x":5.5, "y":2.25},
- {"label":"4,3", "x":6.5, "y":2.25},
- {"label":"5,3", "x":7.5, "y":2.25},
- {"label":"4,4", "x":8.5, "y":2.25},
- {"label":"5,4", "x":9.5, "y":2.25},
- {"label":"4,5", "x":10.5, "y":2.25},
- {"label":"5,5", "x":11.5, "y":2.25},
- {"label":"4,6", "x":12.5, "y":2.25},
- {"label":"5,6", "x":13.5, "y":2.25, "w":1.5},
- {"label":"4,7", "x":15.5, "y":2.25},
- {"label":"5,7", "x":16.5, "y":2.25},
- {"label":"4,8", "x":17.5, "y":2.25},
- {"label":"5,8", "x":18.5, "y":2.25, "h":2},
-
- {"label":"6,0", "x":0, "y":3.25, "w":1.75},
- {"label":"7,0", "x":1.75, "y":3.25},
- {"label":"6,1", "x":2.75, "y":3.25},
- {"label":"7,1", "x":3.75, "y":3.25},
- {"label":"6,2", "x":4.75, "y":3.25},
- {"label":"7,2", "x":5.75, "y":3.25},
- {"label":"6,3", "x":6.75, "y":3.25},
- {"label":"7,3", "x":7.75, "y":3.25},
- {"label":"6,4", "x":8.75, "y":3.25},
- {"label":"7,4", "x":9.75, "y":3.25},
- {"label":"6,5", "x":10.75, "y":3.25},
- {"label":"7,5", "x":11.75, "y":3.25},
- {"label":"7,6", "x":12.75, "y":3.25, "w":2.25},
- {"label":"6,7", "x":15.5, "y":3.25},
- {"label":"7,7", "x":16.5, "y":3.25},
- {"label":"6,8", "x":17.5, "y":3.25},
-
- {"label":"8,0", "x":0, "y":4.25, "w":2.25},
- {"label":"9,0", "x":2.25, "y":4.25},
- {"label":"8,1", "x":3.25, "y":4.25},
- {"label":"9,1", "x":4.25, "y":4.25},
- {"label":"8,2", "x":5.25, "y":4.25},
- {"label":"9,2", "x":6.25, "y":4.25},
- {"label":"8,3", "x":7.25, "y":4.25},
- {"label":"9,3", "x":8.25, "y":4.25},
- {"label":"8,4", "x":9.25, "y":4.25},
- {"label":"9,4", "x":10.25, "y":4.25},
- {"label":"8,5", "x":11.25, "y":4.25},
- {"label":"8,6", "x":12.25, "y":4.25, "w":1.75},
- {"label":"9,6", "x":14.25, "y":4.5},
- {"label":"8,7", "x":15.5, "y":4.25},
- {"label":"9,7", "x":16.5, "y":4.25},
- {"label":"8,8", "x":17.5, "y":4.25},
- {"label":"9,8", "x":18.5, "y":4.25, "h":2},
-
- {"label":"10,0", "x":0, "y":5.25, "w":1.25},
- {"label":"11,0", "x":1.25, "y":5.25, "w":1.25},
- {"label":"10,1", "x":2.5, "y":5.25, "w":1.25},
- {"label":"10,2", "x":3.75, "y":5.25, "w":6.25},
- {"label":"10,4", "x":10, "y":5.25, "w":1.5},
- {"label":"10,5", "x":11.5, "y":5.25, "w":1.5},
- {"label":"10,6", "x":13.25, "y":5.5},
- {"label":"11,6", "x":14.25, "y":5.5},
- {"label":"10,7", "x":15.25, "y":5.5},
- {"label":"11,7", "x":16.5, "y":5.25},
- {"label":"10,8", "x":17.5, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [1, 7], "x": 16.5, "y": 0},
+ {"matrix": [0, 8], "x": 17.5, "y": 0},
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 1.25},
+ {"matrix": [3, 7], "x": 16.5, "y": 1.25},
+ {"matrix": [2, 8], "x": 17.5, "y": 1.25},
+ {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 2.25},
+ {"matrix": [5, 7], "x": 16.5, "y": 2.25},
+ {"matrix": [4, 8], "x": 17.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 18.5, "y": 2.25, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [6, 7], "x": 15.5, "y": 3.25},
+ {"matrix": [7, 7], "x": 16.5, "y": 3.25},
+ {"matrix": [6, 8], "x": 17.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [9, 6], "x": 14.25, "y": 4.5},
+
+ {"matrix": [8, 7], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 7], "x": 16.5, "y": 4.25},
+ {"matrix": [8, 8], "x": 17.5, "y": 4.25},
+ {"matrix": [9, 8], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 5], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [10, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [11, 6], "x": 14.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+
+ {"matrix": [11, 7], "x": 16.5, "y": 5.25},
+ {"matrix": [10, 8], "x": 17.5, "y": 5.25}
]
}
}
diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json
index 253e20b715..97ea8928cc 100644
--- a/keyboards/handwired/swiftrax/pandamic/info.json
+++ b/keyboards/handwired/swiftrax/pandamic/info.json
@@ -22,7 +22,110 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":18.25, "y":0}, {"x":19.75, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1, "h":2}, {"x":4.25, "y":1, "w":1.5}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":19.75, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":4.25, "y":2, "w":1.75}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2, "w":2.25}, {"x":19.75, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "h":2}, {"x":4.25, "y":3, "w":1.25}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3, "w":1.75}, {"x":18.5, "y":3.25}, {"x":19.75, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":1.25}, {"x":6.75, "y":4, "w":1.25}, {"x":8, "y":4, "w":6.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25}, {"x":19.5, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [1, 2], "x": 5.25, "y": 0},
+ {"matrix": [0, 3], "x": 6.25, "y": 0},
+ {"matrix": [1, 3], "x": 7.25, "y": 0},
+ {"matrix": [0, 4], "x": 8.25, "y": 0},
+ {"matrix": [1, 4], "x": 9.25, "y": 0},
+ {"matrix": [0, 5], "x": 10.25, "y": 0},
+ {"matrix": [1, 5], "x": 11.25, "y": 0},
+ {"matrix": [0, 6], "x": 12.25, "y": 0},
+ {"matrix": [1, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+ {"matrix": [0, 9], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 9], "x": 19.75, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [2, 6], "x": 12.75, "y": 1},
+ {"matrix": [3, 6], "x": 13.75, "y": 1},
+ {"matrix": [2, 7], "x": 14.75, "y": 1},
+ {"matrix": [3, 7], "x": 15.75, "y": 1},
+ {"matrix": [2, 8], "x": 16.75, "y": 1},
+ {"matrix": [3, 8], "x": 17.75, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 9], "x": 19.75, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+
+ {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
+ {"matrix": [4, 7], "x": 15, "y": 2},
+ {"matrix": [5, 7], "x": 16, "y": 2},
+ {"matrix": [5, 8], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [5, 9], "x": 19.75, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3, "h": 2},
+
+ {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25},
+ {"matrix": [7, 2], "x": 5.5, "y": 3},
+ {"matrix": [6, 3], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [6, 4], "x": 8.5, "y": 3},
+ {"matrix": [7, 4], "x": 9.5, "y": 3},
+ {"matrix": [6, 5], "x": 10.5, "y": 3},
+ {"matrix": [7, 5], "x": 11.5, "y": 3},
+ {"matrix": [6, 6], "x": 12.5, "y": 3},
+ {"matrix": [7, 6], "x": 13.5, "y": 3},
+ {"matrix": [6, 7], "x": 14.5, "y": 3},
+ {"matrix": [7, 7], "x": 15.5, "y": 3},
+ {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75},
+
+ {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+ {"matrix": [7, 9], "x": 19.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [8, 1], "x": 2, "y": 4},
+ {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4},
+ {"matrix": [9, 7], "x": 15.25, "y": 4},
+ {"matrix": [8, 8], "x": 16.25, "y": 4},
+
+ {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+ {"matrix": [9, 9], "x": 19.5, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.h b/keyboards/handwired/swiftrax/pandamic/pandamic.h
deleted file mode 100644
index 9fbb78427e..0000000000
--- a/keyboards/handwired/swiftrax/pandamic/pandamic.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 swiftrax
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, K109,\
- K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K309,\
- K400, K500, K401, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K508, K509,\
- K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707, K608, K609, K709,\
- K800, K801, K802, K902, K803, K805, K807, K907, K808, K908, K809, K909 \
-) { \
- {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009},\
- {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109},\
- {K200, K201, K202, K203, K204, K205, K206, K207, K208, XXX},\
- {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309},\
- {K400, K401, K402, K403, K404, K405, K406, K407, XXX, XXX},\
- {K500, XXX, K502, K503, K504, K505, K506, K507, K508, K509},\
- {K600, K601, K602, K603, K604, K605, K606, K607, K608, K609},\
- {K700, K701, K702, K703, K704, K705, K706, K707, XXX, K709},\
- {K800, K801, K802, K803, XXX, K805, XXX, K807, K808, K809},\
- { XXX, XXX, K902, XXX, XXX, XXX, XXX, K907, K908, K909} \
-}
diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json
index ea28d0d9c5..b651d29835 100644
--- a/keyboards/handwired/swiftrax/unsplit/info.json
+++ b/keyboards/handwired/swiftrax/unsplit/info.json
@@ -18,57 +18,57 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.75},
- {"x":1, "y":0.75},
- {"x":2, "y":0.25},
- {"x":3, "y":0},
- {"x":4, "y":0.25},
- {"x":5, "y":0.375},
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.375},
- {"x":11, "y":0.375},
- {"x":12, "y":0.25},
- {"x":13, "y":0},
- {"x":14, "y":0.25},
- {"x":15, "y":0.75},
- {"x":16, "y":0.75},
+ {"matrix": [0, 6], "x": 11, "y": 0.375},
+ {"matrix": [0, 7], "x": 12, "y": 0.25},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0.25},
+ {"matrix": [0, 10], "x": 15, "y": 0.75},
+ {"matrix": [0, 11], "x": 16, "y": 0.75},
- {"x":0, "y":1.75},
- {"x":1, "y":1.75},
- {"x":2, "y":1.25},
- {"x":3, "y":1},
- {"x":4, "y":1.25},
- {"x":5, "y":1.375},
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.375},
- {"x":11, "y":1.375},
- {"x":12, "y":1.25},
- {"x":13, "y":1},
- {"x":14, "y":1.25},
- {"x":15, "y":1.75},
- {"x":16, "y":1.75},
+ {"matrix": [1, 6], "x": 11, "y": 1.375},
+ {"matrix": [1, 7], "x": 12, "y": 1.25},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "y": 1.25},
+ {"matrix": [1, 10], "x": 15, "y": 1.75},
+ {"matrix": [1, 11], "x": 16, "y": 1.75},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75},
- {"x":2, "y":2.25},
- {"x":3, "y":2},
- {"x":4, "y":2.25},
- {"x":5, "y":2.375},
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.375},
- {"x":11, "y":2.375},
- {"x":12, "y":2.25},
- {"x":13, "y":2},
- {"x":14, "y":2.25},
- {"x":15, "y":2.75},
- {"x":16, "y":2.75},
+ {"matrix": [2, 6], "x": 11, "y": 2.375},
+ {"matrix": [2, 7], "x": 12, "y": 2.25},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2.25},
+ {"matrix": [2, 10], "x": 15, "y": 2.75},
+ {"matrix": [2, 11], "x": 16, "y": 2.75},
- {"x":2.5, "y":3.25},
- {"x":3.5, "y":3.25},
- {"x":4.5, "y":3.5},
- {"x":5.5, "y":3.75},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.75},
- {"x":10.5, "y":3.75},
- {"x":11.5, "y":3.5},
- {"x":12.5, "y":3.25},
- {"x":13.5, "y":3.25}
+ {"matrix": [3, 6], "x": 10.5, "y": 3.75},
+ {"matrix": [3, 7], "x": 11.5, "y": 3.5},
+ {"matrix": [3, 8], "x": 12.5, "y": 3.25},
+ {"matrix": [3, 9], "x": 13.5, "y": 3.25}
]
}
}
diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.h b/keyboards/handwired/swiftrax/unsplit/unsplit.h
deleted file mode 100644
index 79109edb7b..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/unsplit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Swiftrax <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General 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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016, \
- K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116, \
- K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216, \
- K402, K403, K404, K405, K411, K412, K413, K414 \
-) { \
- { K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016 }, \
- { K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116 }, \
- { K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216 }, \
- { XXX, XXX, K402, K403, K404, K405, K411, K412, K413, K414, XXX, XXX } \
-}
diff --git a/keyboards/handwired/symmetric70_proto/info.json b/keyboards/handwired/symmetric70_proto/info.json
index 36828784c4..9be776f41c 100644
--- a/keyboards/handwired/symmetric70_proto/info.json
+++ b/keyboards/handwired/symmetric70_proto/info.json
@@ -10,80 +10,85 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0, "w":1.25},
- {"label":"L01", "x":1.25, "y":0},
- {"label":"L02", "x":2.25, "y":0},
- {"label":"L03", "x":3.25, "y":0},
- {"label":"L04", "x":4.25, "y":0},
- {"label":"L05", "x":5.25, "y":0},
- {"label":"L06", "x":6.25, "y":0},
- {"label":"R06", "x":8.75, "y":0},
- {"label":"R05", "x":9.75, "y":0},
- {"label":"R04", "x":10.75, "y":0},
- {"label":"R03", "x":11.75, "y":0},
- {"label":"R02", "x":12.75, "y":0},
- {"label":"R01", "x":13.75, "y":0},
- {"label":"R00", "x":14.75, "y":0, "w":1.25},
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"label":"L10", "x":0, "y":1, "w":1.5},
- {"label":"L11", "x":1.5, "y":1},
- {"label":"L12", "x":2.5, "y":1},
- {"label":"L13", "x":3.5, "y":1},
- {"label":"L14", "x":4.5, "y":1},
- {"label":"L15", "x":5.5, "y":1},
- {"label":"L16", "x":6.5, "y":1},
- {"label":"R16", "x":8.5, "y":1},
- {"label":"R15", "x":9.5, "y":1},
- {"label":"R14", "x":10.5, "y":1},
- {"label":"R13", "x":11.5, "y":1},
- {"label":"R12", "x":12.5, "y":1},
- {"label":"R11", "x":13.5, "y":1},
- {"label":"R10", "x":14.5, "y":1, "w":1.5},
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [0, 14], "x": 13.75, "y": 0},
+ {"matrix": [0, 15], "x": 14.75, "y": 0, "w": 1.25},
- {"label":"L20", "x":0, "y":2, "w":1.25},
- {"label":"L21", "x":1.25, "y":2},
- {"label":"L22", "x":2.25, "y":2},
- {"label":"L23", "x":3.25, "y":2},
- {"label":"L24", "x":4.25, "y":2},
- {"label":"L25", "x":5.25, "y":2},
- {"label":"L26", "x":6.25, "y":2},
- {"label":"R26", "x":8.75, "y":2},
- {"label":"R25", "x":9.75, "y":2},
- {"label":"R24", "x":10.75, "y":2},
- {"label":"R23", "x":11.75, "y":2},
- {"label":"R22", "x":12.75, "y":2},
- {"label":"R21", "x":13.75, "y":2},
- {"label":"R20", "x":14.75, "y":2, "w":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3},
- {"label":"L35", "x":5, "y":3},
- {"label":"L36", "x":6, "y":3},
- {"label":"L37", "x":7, "y":3},
- {"label":"R37", "x":8, "y":3},
- {"label":"R36", "x":9, "y":3},
- {"label":"R35", "x":10, "y":3},
- {"label":"R34", "x":11, "y":3},
- {"label":"R33", "x":12, "y":3},
- {"label":"R32", "x":13, "y":3},
- {"label":"R31", "x":14, "y":3},
- {"label":"R30", "x":15, "y":3},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1},
+ {"matrix": [1, 15], "x": 14.5, "y": 1, "w": 1.5},
- {"label":"L40", "x":0, "y":4, "w":1.75},
- {"label":"L42", "x":1.75, "y":4, "w":1.25},
- {"label":"L43", "x":3, "y":4, "w":1.25},
- {"label":"L44", "x":4.25, "y":4},
- {"label":"L45", "x":5.25, "y":4, "w":1.25},
- {"label":"L47", "x":6.5, "y":4, "w":1.5},
- {"label":"R47", "x":8, "y":4, "w":1.5},
- {"label":"R45", "x":9.5, "y":4, "w":1.25},
- {"label":"R44", "x":10.75, "y":4},
- {"label":"R43", "x":11.75, "y":4, "w":1.25},
- {"label":"R42", "x":13, "y":4, "w":1.25},
- {"label":"R40", "x":14.25, "y":4, "w":1.75}
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 2},
+ {"matrix": [2, 15], "x": 14.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 6.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 8], "x": 8, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 10.75, "y": 4},
+ {"matrix": [4, 12], "x": 11.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.25},
+ {"matrix": [4, 15], "x": 14.25, "y": 4, "w": 1.75}
]
}
}
diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
index daab4f0993..f954a388b5 100644
--- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
+++ b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "symmetric70_proto.h"
+#include "quantum.h"
__attribute__((weak)) void keyboard_post_init_user(void) {
// Customise these values to desired behaviour
diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h b/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
deleted file mode 100644
index 4a8539b50c..0000000000
--- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 mtei
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30, \
- L40, L42, L43, L44, L45, L47, R47, R45, R44, R43, R42, R40 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, R06, R05, R04, R03, R02, R01, R00 }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, R16, R15, R14, R13, R12, R11, R10 }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, R26, R25, R24, R23, R22, R21, R20 }, \
- { L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30 }, \
- { L40, KC_NO, L42, L43, L44, L45, KC_NO, L47, R47, KC_NO, R45, R44, R43, R42, KC_NO, R40 } \
-}
diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json
index f232a0ea33..d3bc56857a 100644
--- a/keyboards/handwired/t111/info.json
+++ b/keyboards/handwired/t111/info.json
@@ -17,7 +17,128 @@
"bootloader": "stm32duino",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Break", "x":0, "y":0}, {"label":"PF1", "x":2, "y":0}, {"label":"PF2", "x":3, "y":0}, {"label":"PF3", "x":4, "y":0}, {"label":"PF4", "x":5, "y":0}, {"label":"PF5", "x":6, "y":0}, {"label":"PF6", "x":7, "y":0}, {"label":"PF7", "x":8, "y":0}, {"label":"PF8", "x":9, "y":0}, {"label":"PF9", "x":10, "y":0}, {"label":"PF10", "x":11, "y":0}, {"label":"PF11", "x":12, "y":0}, {"label":"PF12", "x":13, "y":0}, {"label":"PF13", "x":14, "y":0}, {"label":"PF14", "x":15, "y":0}, {"label":"PF15", "x":16, "y":0}, {"label":"PF16", "x":17, "y":0}, {"label":"Esc", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"~", "x":13, "y":1.5}, {"label":"bkspc", "x":14, "y":1.5, "w":1.25}, {"label":"Ins", "x":15.5, "y":1.5}, {"label":"Cls", "x":16.5, "y":1.5}, {"label":"*", "x":17.75, "y":1.5}, {"label":"/", "x":18.75, "y":1.5}, {"label":"+", "x":19.75, "y":1.5}, {"label":"-", "x":20.75, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"El", "x":15.5, "y":2.5}, {"label":"Dup", "x":16.5, "y":2.5}, {"label":"7", "x":17.75, "y":2.5}, {"label":"8", "x":18.75, "y":2.5}, {"label":"9", "x":19.75, "y":2.5}, {"label":"=", "x":20.75, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"|", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.5, "h":2}, {"label":"Del", "x":15.5, "y":3.5}, {"label":"Home", "x":16.5, "y":3.5}, {"label":"4", "x":17.75, "y":3.5}, {"label":"5", "x":18.75, "y":3.5}, {"label":"6", "x":19.75, "y":3.5}, {"label":",", "x":20.75, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"label":"Shift", "x":13.25, "y":4.5, "w":2}, {"label":"\u0432\u2020\u2018", "x":15.5, "y":4.5}, {"label":"\u0432\u2020\u201c", "x":16.5, "y":4.5}, {"label":"1", "x":17.75, "y":4.5}, {"label":"2", "x":18.75, "y":4.5}, {"label":"3", "x":19.75, "y":4.5}, {"label":"Enter", "x":20.75, "y":4.5, "h":2}, {"label":"Caps", "x":1.75, "y":5.5}, {"label":"Graph", "x":2.75, "y":5.5, "w":1.5}, {"x":4.25, "y":5.5, "w":8}, {"label":"Alt", "x":12.25, "y":5.5, "w":1.5}, {"label":"\u0432\u2020\u0452", "x":15.5, "y":5.5}, {"label":"\u0432\u2020\u2019", "x":16.5, "y":5.5}, {"label":"0", "x":17.75, "y":5.5, "w":2}, {"label":".", "x":19.75, "y":5.5}]
+ "layout": [
+ {"matrix": [3, 0], "x": 0, "y": 0},
+
+ {"matrix": [4, 0], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [2, 1], "x": 4, "y": 0},
+ {"matrix": [3, 1], "x": 5, "y": 0},
+ {"matrix": [4, 1], "x": 6, "y": 0},
+ {"matrix": [5, 1], "x": 7, "y": 0},
+ {"matrix": [6, 1], "x": 8, "y": 0},
+ {"matrix": [7, 1], "x": 9, "y": 0},
+ {"matrix": [0, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [2, 2], "x": 12, "y": 0},
+ {"matrix": [3, 2], "x": 13, "y": 0},
+ {"matrix": [4, 2], "x": 14, "y": 0},
+ {"matrix": [5, 2], "x": 15, "y": 0},
+ {"matrix": [6, 2], "x": 16, "y": 0},
+ {"matrix": [7, 2], "x": 17, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 3], "x": 1, "y": 1.5},
+ {"matrix": [2, 3], "x": 2, "y": 1.5},
+ {"matrix": [3, 3], "x": 3, "y": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 1.5},
+ {"matrix": [5, 3], "x": 5, "y": 1.5},
+ {"matrix": [6, 3], "x": 6, "y": 1.5},
+ {"matrix": [7, 3], "x": 7, "y": 1.5},
+ {"matrix": [0, 3], "x": 8, "y": 1.5},
+ {"matrix": [1, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 4], "x": 10, "y": 1.5},
+ {"matrix": [3, 4], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [5, 4], "x": 13, "y": 1.5},
+ {"matrix": [5, 8], "x": 14, "y": 1.5, "w": 1.25},
+
+ {"matrix": [6, 4], "x": 15.5, "y": 1.5},
+ {"matrix": [7, 4], "x": 16.5, "y": 1.5},
+
+ {"matrix": [1, 5], "x": 17.75, "y": 1.5},
+ {"matrix": [0, 6], "x": 18.75, "y": 1.5},
+ {"matrix": [7, 6], "x": 19.75, "y": 1.5},
+ {"matrix": [6, 6], "x": 20.75, "y": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [1, 7], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 2.5, "y": 2.5},
+ {"matrix": [3, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 7], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 5.5, "y": 2.5},
+ {"matrix": [6, 7], "x": 6.5, "y": 2.5},
+ {"matrix": [7, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [0, 7], "x": 8.5, "y": 2.5},
+ {"matrix": [1, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+ {"matrix": [3, 8], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 8], "x": 12.5, "y": 2.5},
+
+ {"matrix": [6, 8], "x": 15.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 16.5, "y": 2.5},
+
+ {"matrix": [1, 11], "x": 17.75, "y": 2.5},
+ {"matrix": [0, 0], "x": 18.75, "y": 2.5},
+ {"matrix": [7, 0], "x": 19.75, "y": 2.5},
+ {"matrix": [6, 0], "x": 20.75, "y": 2.5},
+
+ {"matrix": [0, 10], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [1, 9], "x": 1.75, "y": 3.5},
+ {"matrix": [2, 9], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 3.75, "y": 3.5},
+ {"matrix": [4, 9], "x": 4.75, "y": 3.5},
+ {"matrix": [5, 9], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 9], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 9], "x": 7.75, "y": 3.5},
+ {"matrix": [0, 9], "x": 8.75, "y": 3.5},
+ {"matrix": [1, 10], "x": 9.75, "y": 3.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 11.75, "y": 3.5},
+ {"matrix": [4, 10], "x": 12.75, "y": 3.5},
+ {"matrix": [5, 10], "x": 13.75, "y": 2.5, "w": 1.5, "h": 2},
+
+ {"matrix": [6, 10], "x": 15.5, "y": 3.5},
+ {"matrix": [7, 10], "x": 16.5, "y": 3.5},
+
+ {"matrix": [2, 11], "x": 17.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 18.75, "y": 3.5},
+ {"matrix": [4, 11], "x": 19.75, "y": 3.5},
+ {"matrix": [5, 11], "x": 20.75, "y": 3.5},
+
+ {"matrix": [0, 13], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [1, 12], "x": 2.25, "y": 4.5},
+ {"matrix": [2, 12], "x": 3.25, "y": 4.5},
+ {"matrix": [3, 12], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 12], "x": 6.25, "y": 4.5},
+ {"matrix": [6, 12], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 12], "x": 8.25, "y": 4.5},
+ {"matrix": [0, 12], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 13], "x": 10.25, "y": 4.5},
+ {"matrix": [2, 13], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.5},
+ {"matrix": [0, 4], "x": 13.25, "y": 4.5, "w": 2},
+
+ {"matrix": [6, 13], "x": 15.5, "y": 4.5},
+ {"matrix": [7, 13], "x": 16.5, "y": 4.5},
+
+ {"matrix": [2, 5], "x": 17.75, "y": 4.5},
+ {"matrix": [3, 5], "x": 18.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 19.75, "y": 4.5},
+ {"matrix": [5, 5], "x": 20.75, "y": 4.5, "h": 2},
+
+ {"matrix": [0, 8], "x": 1.75, "y": 5.5},
+ {"matrix": [0, 11], "x": 2.75, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 4.25, "y": 5.5, "w": 8},
+ {"matrix": [0, 5], "x": 12.25, "y": 5.5, "w": 1.5},
+
+ {"matrix": [6, 11], "x": 15.5, "y": 5.5},
+ {"matrix": [7, 11], "x": 16.5, "y": 5.5},
+
+ {"matrix": [6, 5], "x": 17.75, "y": 5.5, "w": 2},
+ {"matrix": [7, 5], "x": 19.75, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/handwired/t111/t111.h b/keyboards/handwired/t111/t111.h
deleted file mode 100644
index 35651f635d..0000000000
--- a/keyboards/handwired/t111/t111.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
-,-------------------------------------------------------------------------------------------------------------------------------------.
-|break| | PF1 | PF2 | PF3 | PF4 | PF5 | PF6 | PF7 | PF8 | PF9 | PF10| PF11| PF12| PF13| PF14| PF15| PF16| |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-| esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ~ |backspc| | ins | cls | | * | / | + | - |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-| tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | enter | el | dup | | 7 | 8 | 9 | = |
-|-------------------------------------------------------------------------------- |--------------------------------------|
-| ctrl | A | S | D | F | G | H | J | K | L | ;: | '" | |\ | | del | home| | 4 | 5 | 6 | , |
-|-------------------------------------------------------------------------------------------------------------------------------------|
-| shift | Z | X | C | V | B | N | M | , | . | /? |blank| shift | up | down| | 1 | 2 | 3 |enter|
-|-------------------------------------------------------------------------------------------------------------------------------| |
-| | caps| graph | Space | alt | | left|right| | 0 | . | |
-`-------------------------------------------------------------------------------------------------------------------------------------'
-*/
-
-#define LAYOUT( \
- K30, K40, K11, K21, K31, K41, K51, K61, K71, K01, K12, K22, K32, K42, K52, K62, K72, \
- K20, K13, K23, K33, K43, K53, K63, K73, K03, K14, K24, K34, K44, K54, K58, K64, K74, K15, K06, K76, K66, \
- K10, K17, K27, K37, K47, K57, K67, K77, K07, K18, K28, K38, K48, K68, K78, K1B, K00, K70, K60, \
- K0A, K19, K29, K39, K49, K59, K69, K79, K09, K1A, K2A, K3A, K4A, K5A, K6A, K7A, K2B, K3B, K4B, K5B, \
- K0D, K1C, K2C, K3C, K4C, K5C, K6C, K7C, K0C, K1D, K2D, K3D, K04, K6D, K7D, K25, K35, K45, K55, \
- K08, K0B, K50, K05, K6B, K7B, K65, K75 \
-) \
-{ \
-/* 0 */ { K00, K01, XXX, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-/* 1 */ { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-/* 2 */ { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-/* 3 */ { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-/* 4 */ { K40, K41, K42, K43, K44, K45, XXX, K47, K48, K49, K4A, K4B, K4C, XXX }, \
-/* 5 */ { K50, K51, K52, K53, K54, K55, XXX, K57, K58, K59, K5A, K5B, K5C, XXX }, \
-/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D }, \
-/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D } \
-}
-/* 0 1 2 3 4 5 6 7 8 9 A B C D */
diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json
index bb8214b97d..6948b13edc 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/info.json
@@ -18,52 +18,55 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Tab", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Del", "x":11, "y":0},
- {"label":"Backspace", "x":0, "y":1},
- {"label":"A", "x":1, "y":1},
- {"label":"S", "x":2, "y":1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1},
- {"label":"G", "x":5, "y":1},
- {"label":"H", "x":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";", "x":10, "y":1},
- {"label":"'", "x":11, "y":1},
- {"label":"Left Shift / (", "x":0, "y":2},
- {"label":"Z", "x":1, "y":2},
- {"label":"X", "x":2, "y":2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2},
- {"label":"B", "x":5, "y":2},
- {"label":"N", "x":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",", "x":8, "y":2},
- {"label":".", "x":9, "y":2},
- {"label":"/", "x":10, "y":2},
- {"label":"Right Shift / )", "x":11, "y":2},
- {"label":"LCtrl", "x":0, "y":3},
- {"label":"GUI", "x":1, "y":3},
- {"label":"Lower", "x":2, "y":3},
- {"label":"LAlt", "x":3, "y":3},
- {"label":"Space / Lower", "x":4, "y":3, "w":2},
- {"label":"Enter / Raise", "x":6, "y":3, "w":2},
- {"label":"MO(_FUNCTION)", "x":8, "y":3},
- {"label":"MO(_MOUSE)", "x":9, "y":3},
- {"label":"App", "x":10, "y":3},
- {"label":"RCtrl", "x":11, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 5], "x": 4, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/handwired/terminus_mini/terminus_mini.h b/keyboards/handwired/terminus_mini/terminus_mini.h
deleted file mode 100644
index f498313cbb..0000000000
--- a/keyboards/handwired/terminus_mini/terminus_mini.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2017 James Morgan <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General 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 XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Terminus Mini layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
- k30, k31, k32, k33, k35, k37, k38, k39, k3A, k3B \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
- { k30, k31, k32, k33, XXX, k35, XXX, k37, k38, k39, k3A, k3B } \
-}
-
-#define KC_ KC_TRNS
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index b6598be8e8..91fe9e1cf4 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -21,63 +21,63 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 1.2},
- {"x": 1, "y": 0.8},
- {"x": 2, "y": 0.4},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.4},
- {"x": 5, "y": 0.8},
+ {"matrix": [0, 0], "x": 0, "y": 1.2},
+ {"matrix": [0, 1], "x": 1, "y": 0.8},
+ {"matrix": [0, 2], "x": 2, "y": 0.4},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.4},
+ {"matrix": [0, 5], "x": 5, "y": 0.8},
- {"x": 9, "y": 0.8},
- {"x": 10, "y": 0.4},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0.4},
- {"x": 13, "y": 0.8},
- {"x": 14, "y": 1.2},
+ {"matrix": [0, 7], "x": 9, "y": 0.8},
+ {"matrix": [0, 8], "x": 10, "y": 0.4},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0.4},
+ {"matrix": [0, 11], "x": 13, "y": 0.8},
+ {"matrix": [0, 12], "x": 14, "y": 1.2},
- {"x": 0, "y": 2.2},
- {"x": 1, "y": 1.8},
- {"x": 2, "y": 1.4},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.4},
- {"x": 5, "y": 1.8},
+ {"matrix": [1, 0], "x": 0, "y": 2.2},
+ {"matrix": [1, 1], "x": 1, "y": 1.8},
+ {"matrix": [1, 2], "x": 2, "y": 1.4},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.4},
+ {"matrix": [1, 5], "x": 5, "y": 1.8},
- {"x": 9, "y": 1.8},
- {"x": 10, "y": 1.4},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1.4},
- {"x": 13, "y": 1.8},
- {"x": 14, "y": 2.2},
+ {"matrix": [1, 7], "x": 9, "y": 1.8},
+ {"matrix": [1, 8], "x": 10, "y": 1.4},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1.4},
+ {"matrix": [1, 11], "x": 13, "y": 1.8},
+ {"matrix": [1, 12], "x": 14, "y": 2.2},
- {"x": 0, "y": 3.2},
- {"x": 1, "y": 2.8},
- {"x": 2, "y": 2.4},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.4},
- {"x": 5, "y": 2.8},
+ {"matrix": [2, 0], "x": 0, "y": 3.2},
+ {"matrix": [2, 1], "x": 1, "y": 2.8},
+ {"matrix": [2, 2], "x": 2, "y": 2.4},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.4},
+ {"matrix": [2, 5], "x": 5, "y": 2.8},
- {"x": 9, "y": 2.8},
- {"x": 10, "y": 2.4},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2.4},
- {"x": 13, "y": 2.8},
- {"x": 14, "y": 3.2},
+ {"matrix": [2, 7], "x": 9, "y": 2.8},
+ {"matrix": [2, 8], "x": 10, "y": 2.4},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2.4},
+ {"matrix": [2, 11], "x": 13, "y": 2.8},
+ {"matrix": [2, 12], "x": 14, "y": 3.2},
- {"x": 0, "y": 4.2},
- {"x": 1, "y": 3.8},
- {"x": 2, "y": 3.4},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.4},
- {"x": 5, "y": 3.8},
- {"x": 6, "y": 3.05, "h": 1.5},
+ {"matrix": [3, 0], "x": 0, "y": 4.2},
+ {"matrix": [3, 1], "x": 1, "y": 3.8},
+ {"matrix": [3, 2], "x": 2, "y": 3.4},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.4},
+ {"matrix": [3, 5], "x": 5, "y": 3.8},
+ {"matrix": [2, 6], "x": 6, "y": 3.05, "h": 1.5},
- {"x": 8, "y": 3.05, "h": 1.5},
- {"x": 9, "y": 3.8},
- {"x": 10, "y": 3.4},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3.4},
- {"x": 13, "y": 3.8},
- {"x": 14, "y": 4.2}
+ {"matrix": [3, 6], "x": 8, "y": 3.05, "h": 1.5},
+ {"matrix": [3, 7], "x": 9, "y": 3.8},
+ {"matrix": [3, 8], "x": 10, "y": 3.4},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3.4},
+ {"matrix": [3, 11], "x": 13, "y": 3.8},
+ {"matrix": [3, 12], "x": 14, "y": 4.2}
]
}
}
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 409abe7d14..91c6f603b1 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -1,4 +1,4 @@
-#include "traveller.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h
deleted file mode 100644
index f78abe46aa..0000000000
--- a/keyboards/handwired/traveller/traveller.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0C, \
- k10, k11, k12, k13, k14, k15, k17, k18, k19, k1A, k1B, k1C, \
- k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k26, k36, k37, k38, k39, k3A, k3B, k3C \
-) { \
- { k00, k01, k02, k03, k04, k05, XXX, k07, k08, k09, k0A, k0B, k0C }, \
- { k10, k11, k12, k13, k14, k15, XXX, k17, k18, k19, k1A, k1B, k1C }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C } \
-}
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json
index c78a1532a7..351731a613 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/info.json
@@ -32,65 +32,74 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"!", "x":0.5, "y":0},
- {"label":"@", "x":1.5, "y":0},
- {"label":"#", "x":2.5, "y":0},
- {"label":"$", "x":3.5, "y":0},
- {"label":"%", "x":4.5, "y":0},
- {"label":"^", "x":5.5, "y":0},
- {"label":"&", "x":9.5, "y":0},
- {"label":"*", "x":10.5, "y":0},
- {"label":"(", "x":11.5, "y":0},
- {"label":")", "x":12.5, "y":0},
- {"label":"_", "x":13.5, "y":0},
- {"label":"+", "x":14.5, "y":0},
- {"label":"TAB", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":9, "y":1},
- {"label":"U", "x":10, "y":1},
- {"label":"I", "x":11, "y":1},
- {"label":"O", "x":12, "y":1},
- {"label":"P", "x":13, "y":1},
- {"label":"{", "x":14, "y":1},
- {"label":"Caps Lock", "x":0.25, "y":2},
- {"label":"A", "x":1.25, "y":2},
- {"label":"S", "x":2.25, "y":2},
- {"label":"D", "x":3.25, "y":2},
- {"label":"F", "x":4.25, "y":2},
- {"label":"G", "x":5.25, "y":2},
- {"label":"H", "x":9.25, "y":2},
- {"label":"J", "x":10.25, "y":2},
- {"label":"K", "x":11.25, "y":2},
- {"label":"L", "x":12.25, "y":2},
- {"label":":", "x":13.25, "y":2},
- {"label":"\"", "x":14.25, "y":2},
- {"label":"}", "x":15, "y":1},
- {"label":"SHIFT", "x":0.75, "y":3},
- {"label":"Z", "x":1.75, "y":3},
- {"label":"X", "x":2.75, "y":3},
- {"label":"C", "x":3.75, "y":3},
- {"label":"V", "x":4.75, "y":3},
- {"label":"B", "x":5.75, "y":3},
- {"label":"Encoder Mode", "x":8.75, "y":3},
- {"label":"N", "x":9.75, "y":3},
- {"label":"M", "x":10.75, "y":3},
- {"label":"<", "x":11.75, "y":3},
- {"label":">", "x":12.75, "y":3},
- {"label":"?", "x":13.75, "y":3},
- {"label":"Esc", "x":2.25, "y":4},
- {"label":"Super", "x":3.25, "y":4},
- {"label":"Alt", "x":4.25, "y":4.25},
- {"label":"Space", "x":5.25, "y":4.5},
- {"label":"Shift", "x":6.25, "y":4.75},
- {"label":"BS", "x":8.25, "y":4.75},
- {"label":"Enter", "x":9.25, "y":4.5},
- {"label":"Fn", "x":10.25, "y":4.25},
- {"label":"|", "x":11.25, "y":4},
- {"label":"~", "x":12.25, "y":4}
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.5, "y": 0},
+ {"matrix": [5, 1], "x": 10.5, "y": 0},
+ {"matrix": [5, 2], "x": 11.5, "y": 0},
+ {"matrix": [5, 3], "x": 12.5, "y": 0},
+ {"matrix": [5, 4], "x": 13.5, "y": 0},
+ {"matrix": [5, 5], "x": 14.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+
+ {"matrix": [8, 5], "x": 0.25, "y": 2},
+ {"matrix": [2, 0], "x": 1.25, "y": 2},
+ {"matrix": [2, 1], "x": 2.25, "y": 2},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+
+ {"matrix": [2, 5], "x": 9.25, "y": 2},
+ {"matrix": [7, 0], "x": 10.25, "y": 2},
+ {"matrix": [7, 1], "x": 11.25, "y": 2},
+ {"matrix": [7, 2], "x": 12.25, "y": 2},
+ {"matrix": [7, 3], "x": 13.25, "y": 2},
+ {"matrix": [7, 4], "x": 14.25, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 1},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+ {"matrix": [9, 0], "x": 8.75, "y": 3},
+ {"matrix": [8, 0], "x": 9.75, "y": 3},
+ {"matrix": [8, 1], "x": 10.75, "y": 3},
+ {"matrix": [8, 2], "x": 11.75, "y": 3},
+ {"matrix": [8, 3], "x": 12.75, "y": 3},
+ {"matrix": [8, 4], "x": 13.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 2.25, "y": 4},
+ {"matrix": [4, 1], "x": 3.25, "y": 4},
+ {"matrix": [4, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 6.25, "y": 4.75},
+
+ {"matrix": [9, 1], "x": 8.25, "y": 4.75},
+ {"matrix": [9, 2], "x": 9.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4},
+ {"matrix": [9, 5], "x": 12.25, "y": 4}
]
}
}
diff --git a/keyboards/handwired/tsubasa/tsubasa.c b/keyboards/handwired/tsubasa/tsubasa.c
index 78d27b57a8..75bb92dc17 100644
--- a/keyboards/handwired/tsubasa/tsubasa.c
+++ b/keyboards/handwired/tsubasa/tsubasa.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "tsubasa.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
static void render_scrl(void) {
diff --git a/keyboards/handwired/tsubasa/tsubasa.h b/keyboards/handwired/tsubasa/tsubasa.h
deleted file mode 100644
index ff7bfa75a4..0000000000
--- a/keyboards/handwired/tsubasa/tsubasa.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 @kuriatsu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R35, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R40, R30, R31, R32, R33, R34, \
- L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, L41, L42, L43, L44, KC_NO }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { R30, R31, R32, R33, R34, R35 }, \
- { R40, R41, R42, R43, R44, R45 } \
-}
-
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json
index 75c11c44c2..afd79a9bcc 100644
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ b/keyboards/handwired/twadlee/tp69/info.json
@@ -17,7 +17,81 @@
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [6, 0], "x": 7.5, "y": 1},
+ {"matrix": [6, 1], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 5], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1},
+ {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 7], "x": 5.75, "y": 2},
+ {"matrix": [7, 0], "x": 7.75, "y": 2},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [8, 1], "x": 8.25, "y": 3},
+ {"matrix": [8, 2], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 5], "x": 12.25, "y": 3},
+ {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 5.75, "y": 4},
+ {"matrix": [4, 7], "x": 6.75, "y": 4},
+ {"matrix": [9, 1], "x": 7.75, "y": 4},
+ {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/handwired/twadlee/tp69/tp69.h b/keyboards/handwired/twadlee/tp69/tp69.h
deleted file mode 100644
index 31c03eb70b..0000000000
--- a/keyboards/handwired/twadlee/tp69/tp69.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 Tracy Wadleigh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54, k55, k56, k57, \
- k10, k11, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, \
- k20, k21, k23, k24, k25, k27, /**/ k70, k71, k72, k73, k74, k75, k77, \
- k30, k32, k33, k34, k35, k36, k37, k81, k82, k83, k84, k85, k86, \
- k40, k41, k43, k44, k46, k47, k91, k92, k94, k95, k96, k97 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07}, \
- { k10, k11, KC_NO, k13, k14, k15, k16, k17}, \
- { k20, k21, KC_NO, k23, k24, k25, KC_NO, k27}, \
- { k30, KC_NO, k32, k33, k34, k35, k36, k37}, \
- { k40, k41, KC_NO, k43, k44, KC_NO, k46, k47}, \
- { k50, k51, k52, k53, k54, k55, k56, k57}, \
- { k60, k61, k62, k63, k64, k65, k66, k67}, \
- { k70, k71, k72, k73, k74, k75, KC_NO, k77}, \
- {KC_NO, k81, k82, k83, k84, k85, k86, KC_NO}, \
- {KC_NO, k91, k92, KC_NO, k94, k95, k96, k97} \
-}
diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json
index 9dd8d59b59..0b110c98bd 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/info.json
@@ -24,102 +24,110 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Pause / SysReq", "x":15.5, "y":0},
- {"label":"Scroll Lock / Num Lock", "x":16.5, "y":0},
- {"label":"Pause / Reset", "x":17.5, "y":0},
+ {"matrix": [0, 1], "x": 0, "y": 0},
- {"label":"`", "x":0, "y":2},
- {"label":"1", "x":1, "y":2},
- {"label":"2", "x":2, "y":2},
- {"label":"3", "x":3, "y":2},
- {"label":"4", "x":4, "y":2},
- {"label":"5", "x":5, "y":2},
- {"label":"6", "x":6, "y":2},
- {"label":"7", "x":7, "y":2},
- {"label":"8", "x":8, "y":2},
- {"label":"9", "x":9, "y":2},
- {"label":"0", "x":10, "y":2},
- {"label":"-", "x":11, "y":2},
- {"label":"=", "x":12, "y":2},
- {"label":"No", "x":13, "y":2},
- {"label":"Backspace", "x":14, "y":2},
- {"label":"Insert", "x":15.5, "y":2},
- {"label":"Home", "x":16.5, "y":2},
- {"label":"Page Up", "x":17.5, "y":2},
+ {"matrix": [2, 2], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 5], "x": 4, "y": 0},
+ {"matrix": [0, 6], "x": 5, "y": 0},
- {"label":"Tab", "x":0, "y":3, "w":1.5},
- {"label":"Q", "x":1.5, "y":3},
- {"label":"W", "x":2.5, "y":3},
- {"label":"E", "x":3.5, "y":3},
- {"label":"R", "x":4.5, "y":3},
- {"label":"T", "x":5.5, "y":3},
- {"label":"Y", "x":6.5, "y":3},
- {"label":"U", "x":7.5, "y":3},
- {"label":"I", "x":8.5, "y":3},
- {"label":"O", "x":9.5, "y":3},
- {"label":"P", "x":10.5, "y":3},
- {"label":"[", "x":11.5, "y":3},
- {"label":"]", "x":12.5, "y":3},
- {"label":"\\", "x":13.5, "y":3, "w":1.5},
- {"label":"Delete", "x":15.5, "y":3},
- {"label":"End", "x":16.5, "y":3},
- {"label":"Page Down", "x":17.5, "y":3},
+ {"matrix": [1, 8], "x": 6.5, "y": 0},
+ {"matrix": [3, 8], "x": 7.5, "y": 0},
+ {"matrix": [4, 8], "x": 8.5, "y": 0},
+ {"matrix": [5, 8], "x": 9.5, "y": 0},
- {"label":"Caps Lock", "x":0, "y":4, "w":1.75},
- {"label":"A", "x":1.75, "y":4},
- {"label":"S", "x":2.75, "y":4},
- {"label":"D", "x":3.75, "y":4},
- {"label":"F", "x":4.75, "y":4},
- {"label":"G", "x":5.75, "y":4},
- {"label":"H", "x":6.75, "y":4},
- {"label":"J", "x":7.75, "y":4},
- {"label":"K", "x":8.75, "y":4},
- {"label":"L", "x":9.75, "y":4},
- {"label":";", "x":10.75, "y":4},
- {"label":"'", "x":11.75, "y":4},
- {"label":"No", "x":12.75, "y":4},
- {"label":"Enter", "x":13.75, "y":4, "w":1.25},
+ {"matrix": [6, 8], "x": 11, "y": 0},
+ {"matrix": [6, 10], "x": 12, "y": 0},
+ {"matrix": [6, 11], "x": 13, "y": 0},
+ {"matrix": [7, 11], "x": 14, "y": 0},
- {"label":"Shift", "x":0, "y":5, "w":1.25},
- {"label":"No", "x":1.25, "y":5},
- {"label":"Z", "x":2.25, "y":5},
- {"label":"X", "x":3.25, "y":5},
- {"label":"C", "x":4.25, "y":5},
- {"label":"V", "x":5.25, "y":5},
- {"label":"B", "x":6.25, "y":5},
- {"label":"N", "x":7.25, "y":5},
- {"label":"M", "x":8.25, "y":5},
- {"label":",", "x":9.25, "y":5},
- {"label":".", "x":10.25, "y":5},
- {"label":"/", "x":11.25, "y":5},
- {"label":"No", "x":12.25, "y":5},
- {"label":"Shift", "x":13.25, "y":5, "w":1.75},
- {"label":"Up", "x":16.5, "y":5},
+ {"matrix": [6, 13], "x": 15.5, "y": 0},
+ {"matrix": [7, 13], "x": 16.5, "y": 0},
+ {"matrix": [11, 15], "x": 17.5, "y": 0},
- {"label":"Ctrl", "x":0, "y":6, "w":1.5},
- {"label":"GUI", "x":1.5, "y":6},
- {"label":"Alt", "x":2.5, "y":6, "w":1.5},
- {"label":"Space", "x":4, "y":6, "w":6},
- {"label":"Alt", "x":10, "y":6},
- {"label":"GUI", "x":11, "y":6, "w":1.5},
- {"label":"App", "x":12.5, "y":6},
- {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
- {"label":"Left", "x":15.5, "y":6},
- {"label":"Down", "x":16.5, "y":6},
- {"label":"Right", "x":17.5, "y":6}
+ {"matrix": [0, 0], "x": 0, "y": 2},
+ {"matrix": [3, 2], "x": 1, "y": 2},
+ {"matrix": [6, 2], "x": 2, "y": 2},
+ {"matrix": [7, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [0, 2], "x": 5, "y": 2},
+ {"matrix": [1, 7], "x": 6, "y": 2},
+ {"matrix": [5, 7], "x": 7, "y": 2},
+ {"matrix": [10, 7], "x": 8, "y": 2},
+ {"matrix": [9, 7], "x": 9, "y": 2},
+ {"matrix": [8, 7], "x": 10, "y": 2},
+ {"matrix": [6, 12], "x": 11, "y": 2},
+ {"matrix": [6, 9], "x": 12, "y": 2},
+ {"matrix": [7, 12], "x": 13, "y": 2},
+ {"matrix": [8, 9], "x": 14, "y": 2},
+
+ {"matrix": [8, 12], "x": 15.5, "y": 2},
+ {"matrix": [9, 13], "x": 16.5, "y": 2},
+ {"matrix": [10, 12], "x": 17.5, "y": 2},
+
+ {"matrix": [2, 12], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 3},
+ {"matrix": [5, 2], "x": 2.5, "y": 3},
+ {"matrix": [10, 2], "x": 3.5, "y": 3},
+ {"matrix": [9, 2], "x": 4.5, "y": 3},
+ {"matrix": [8, 2], "x": 5.5, "y": 3},
+ {"matrix": [3, 7], "x": 6.5, "y": 3},
+ {"matrix": [6, 7], "x": 7.5, "y": 3},
+ {"matrix": [7, 7], "x": 8.5, "y": 3},
+ {"matrix": [4, 7], "x": 9.5, "y": 3},
+ {"matrix": [0, 7], "x": 10.5, "y": 3},
+ {"matrix": [5, 9], "x": 11.5, "y": 3},
+ {"matrix": [10, 9], "x": 12.5, "y": 3},
+ {"matrix": [9, 9], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [11, 13], "x": 15.5, "y": 3},
+ {"matrix": [8, 11], "x": 16.5, "y": 3},
+ {"matrix": [10, 13], "x": 17.5, "y": 3},
+
+ {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [2, 11], "x": 1.75, "y": 4},
+ {"matrix": [2, 0], "x": 2.75, "y": 4},
+ {"matrix": [2, 1], "x": 3.75, "y": 4},
+ {"matrix": [2, 3], "x": 4.75, "y": 4},
+ {"matrix": [2, 4], "x": 5.75, "y": 4},
+ {"matrix": [11, 5], "x": 6.75, "y": 4},
+ {"matrix": [11, 8], "x": 7.75, "y": 4},
+ {"matrix": [11, 6], "x": 8.75, "y": 4},
+ {"matrix": [11, 9], "x": 9.75, "y": 4},
+ {"matrix": [11, 10], "x": 10.75, "y": 4},
+ {"matrix": [11, 12], "x": 11.75, "y": 4},
+ {"matrix": [1, 13], "x": 12.75, "y": 4},
+ {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 5},
+ {"matrix": [2, 5], "x": 2.25, "y": 5},
+ {"matrix": [2, 8], "x": 3.25, "y": 5},
+ {"matrix": [2, 6], "x": 4.25, "y": 5},
+ {"matrix": [2, 9], "x": 5.25, "y": 5},
+ {"matrix": [2, 10], "x": 6.25, "y": 5},
+ {"matrix": [11, 11], "x": 7.25, "y": 5},
+ {"matrix": [11, 0], "x": 8.25, "y": 5},
+ {"matrix": [11, 1], "x": 9.25, "y": 5},
+ {"matrix": [11, 3], "x": 10.25, "y": 5},
+ {"matrix": [11, 4], "x": 11.25, "y": 5},
+ {"matrix": [0, 3], "x": 12.25, "y": 5},
+ {"matrix": [1, 15], "x": 13.25, "y": 5, "w": 1.75},
+
+ {"matrix": [8, 10], "x": 16.5, "y": 5},
+
+ {"matrix": [4, 14], "x": 0, "y": 6, "w": 1.5},
+ {"matrix": [3, 11], "x": 1.5, "y": 6},
+ {"matrix": [0, 12], "x": 2.5, "y": 6, "w": 1.5},
+ {"matrix": [10, 0], "x": 4, "y": 6, "w": 6},
+ {"matrix": [9, 3], "x": 10, "y": 6},
+ {"matrix": [5, 10], "x": 11, "y": 6, "w": 1.5},
+ {"matrix": [10, 4], "x": 12.5, "y": 6},
+ {"matrix": [1, 14], "x": 13.5, "y": 6, "w": 1.5},
+
+ {"matrix": [9, 4], "x": 15.5, "y": 6},
+ {"matrix": [10, 11], "x": 16.5, "y": 6},
+ {"matrix": [10, 10], "x": 17.5, "y": 6}
]
}
}
diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h
deleted file mode 100644
index 8e426da051..0000000000
--- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 stevendlander
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- * The first section contains "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix
- * (where COLUMNS and ROWS crosses). */
-
-#define LAYOUT( \
- K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
- \
- K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, \
- K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \
- K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \
- K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, \
- K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K \
-) \
-{ \
-/* 00 */ { K4A, K5A, K4F, K1M, K5C, K5D, K5E, K3K, KC_NO, KC_NO, KC_NO, KC_NO, K0C, K2N, KC_NO, KC_NO }, \
-/* 01 */ { K2A, K1B, K3B, KC_NO, KC_NO, KC_NO, KC_NO, K4G, K5F, KC_NO, KC_NO, KC_NO, KC_NO, K2M, K0H, K1N, }, \
-/* 02 */ { K2C, K2D, K5B, K2E, K2F, K1C, K1E, KC_NO, K1D, K1F, K1G, K2B, K3A, KC_NO, KC_NO, KC_NO }, \
-/* 03 */ { KC_NO, KC_NO, K4B, KC_NO, KC_NO, KC_NO, KC_NO, K3G, K5G, KC_NO, KC_NO, K0B, KC_NO, KC_NO, KC_NO, KC_NO }, \
-/* 04 */ { KC_NO, KC_NO, K4E, KC_NO, KC_NO, KC_NO, KC_NO, K3J, K5H, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0A, K1A, }, \
-/* 05 */ { KC_NO, KC_NO, K3C, KC_NO, KC_NO, KC_NO, KC_NO, K4H, K5I, K3L, K0F, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-/* 06 */ { KC_NO, KC_NO, K4C, KC_NO, KC_NO, KC_NO, KC_NO, K3H, K5J, K4M, K5K, K5L, K4L, K5N, KC_NO, KC_NO }, \
-/* 07 */ { KC_NO, KC_NO, K4D, KC_NO, KC_NO, KC_NO, KC_NO, K3I, KC_NO, KC_NO, KC_NO, K5M, K4N, K5O, KC_NO, KC_NO }, \
-/* 08 */ { KC_NO, KC_NO, K3F, KC_NO, KC_NO, KC_NO, KC_NO, K4K, KC_NO, K4O, K1O, K3P, K4P, KC_NO, KC_NO, KC_NO }, \
-/* 09 */ { KC_NO, KC_NO, K3E, K0E, K0I, KC_NO, KC_NO, K4J, KC_NO, K3N, KC_NO, KC_NO, KC_NO, K4Q, KC_NO, KC_NO }, \
-/* 0A */ { K0D, KC_NO, K3D, KC_NO, K0G, KC_NO, KC_NO, K4I, KC_NO, K3M, K0K, K0J, K4R, K3Q, KC_NO, KC_NO }, \
-/* 0B */ { K1I, K1J, KC_NO, K1K, K1L, K2G, K2I, KC_NO, K2H, K2J, K2K, K1H, K2L, K3O, KC_NO, K5P, }, \
-}
-/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index da8c72203f..162faca32c 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -30,85 +30,85 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
- {"x": 15, "y": 0, "w": 2},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0, "w": 2},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1, "w": 1.5},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1, "w": 1.5},
+ {"matrix": [6, 0], "x": 8.5, "y": 1},
+ {"matrix": [6, 1], "x": 9.5, "y": 1},
+ {"matrix": [6, 2], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 4], "x": 12.5, "y": 1},
+ {"matrix": [6, 5], "x": 13.5, "y": 1},
+ {"matrix": [6, 6], "x": 14.5, "y": 1},
+ {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2, "w": 1.75},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2},
- {"x": 11.75, "y": 2},
- {"x": 12.75, "y": 2},
- {"x": 13.75, "y": 2},
- {"x": 14.75, "y": 2, "w": 2.25},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 2},
+ {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3, "w": 2.25},
- {"x": 3.25, "y": 3},
- {"x": 4.25, "y": 3},
- {"x": 5.25, "y": 3},
- {"x": 6.25, "y": 3},
- {"x": 7.25, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"x": 9.25, "y": 3},
- {"x": 10.25, "y": 3},
- {"x": 11.25, "y": 3},
- {"x": 12.25, "y": 3},
- {"x": 13.25, "y": 3},
- {"x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 1], "x": 9.25, "y": 3},
+ {"matrix": [8, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 4], "x": 12.25, "y": 3},
+ {"matrix": [8, 5], "x": 13.25, "y": 3},
+ {"matrix": [8, 6], "x": 14.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16, "y": 3},
- {"x": 16, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4, "w": 1.25},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 1.25},
- {"x": 4.75, "y": 4},
- {"x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
- {"x": 9, "y": 4, "w": 2.25},
- {"x": 11.25, "y": 4, "w": 1.25},
- {"x": 12.5, "y": 4, "w": 1.25},
- {"x": 13.75, "y": 4, "w": 1.25},
- {"x": 15, "y": 4},
- {"x": 16, "y": 4}
+ {"matrix": [9, 2], "x": 9, "y": 4, "w": 2.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 15, "y": 4},
+ {"matrix": [9, 7], "x": 16, "y": 4}
]
}
}
diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h
deleted file mode 100644
index 7f3992eebc..0000000000
--- a/keyboards/handwired/unk/rev1/rev1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K71, K72, K73, K74, K75, K76, K77, \
- K10, K11, K12, K13, K14, K15, K16, K80, K81, K82, K83, K84, K85, K86, K87, \
- K20, K21, K22, K23, K24, K25, K26, K91, K92, K93, K94, K95, K96, K97, \
- K30, K31, K32, K33, K34, K35, K36, K101, K102, K103, K104, K105, K106, K107, \
- K40, K41, K42, K43, K44, K45, K112, K113, K114, K115, K116, K117 \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07}, \
- { K10, K11, K12, K13, K14, K15, K16, KC_NO}, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO}, \
- { K30, K31, K32, K33, K34, K35, K36, KC_NO}, \
- { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO}, \
-\
- { KC_NO, K71, K72, K73, K74, K75, K76, K77}, \
- { K80, K81, K82, K83, K84, K85, K86, K87}, \
- { KC_NO, K91, K92, K93, K94, K95, K96, K97}, \
- { KC_NO, K101, K102, K103, K104, K105, K106, K107}, \
- { KC_NO, KC_NO, K112, K113, K114, K115, K116, K117} \
- }
-
-/*
-*/
-
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json
index bc04ac2b8a..14c33f399f 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/info.json
@@ -21,13 +21,89 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"menu", "x":1, "y":1, "h":0.75}, {"label":"print", "x":2, "y":1, "h":0.75}, {"label":"spell", "x":3, "y":1, "h":0.75}, {"label":"page", "x":4.5, "y":1, "h":0.75}, {"label":"center", "x":5.5, "y":1, "h":0.75}, {"label":"split", "x":6.5, "y":1, "h":0.75}, {"label":"find", "x":7.5, "y":1, "h":0.75}, {"label":"copy", "x":9, "y":1, "h":0.75}, {"label":"move", "x":10, "y":1, "h":0.75}, {"label":"go to", "x":11, "y":1, "h":0.75},
- {"label":"left", "x":13, "y":0.5}, {"label":"down", "x":14, "y":1}, {"label":"up", "x":14, "y":0}, {"label":"right", "x":15, "y":0.5},
- {"label":"del", "x":0, "y":2.5}, {"label":"1", "x":1, "y":2.5}, {"label":"2", "x":2, "y":2.5}, {"label":"3", "x":3, "y":2.5}, {"label":"4", "x":4, "y":2.5}, {"label":"5", "x":5, "y":2.5}, {"label":"6", "x":6, "y":2.5}, {"label":"7", "x":7, "y":2.5}, {"label":"8", "x":8, "y":2.5}, {"label":"9", "x":9, "y":2.5}, {"label":"0", "x":10, "y":2.5}, {"label":"-", "x":11, "y":2.5}, {"label":"=", "x":12, "y":2.5}, {"label":"backspace", "x":13, "y":2.5, "w":1.5}, {"label":"do", "x":15, "y":2.5, "h":1.33},
- {"label":"tab", "x":0, "y":3.5, "w":1.5}, {"label":"Q", "x":1.5, "y":3.5}, {"label":"W", "x":2.5, "y":3.5}, {"label":"E", "x":3.5, "y":3.5}, {"label":"R", "x":4.5, "y":3.5}, {"label":"T", "x":5.5, "y":3.5}, {"label":"Y", "x":6.5, "y":3.5}, {"label":"U", "x":7.5, "y":3.5}, {"label":"I", "x":8.5, "y":3.5}, {"label":"O", "x":9.5, "y":3.5}, {"label":"P", "x":10.5, "y":3.5}, {"label":"[", "x":11.5, "y":3.5}, {"label":"]", "x":12.5, "y":3.5}, {"label":"help", "x":15, "y":3.833, "h":1.33},
- {"label":"caps lock", "x":0, "y":4.5, "w":1.75}, {"label":"A", "x":1.75, "y":4.5}, {"label":"S", "x":2.75, "y":4.5}, {"label":"D", "x":3.75, "y":4.5}, {"label":"F", "x":4.75, "y":4.5}, {"label":"G", "x":5.75, "y":4.5}, {"label":"H", "x":6.75, "y":4.5}, {"label":"J", "x":7.75, "y":4.5}, {"label":"K", "x":8.75, "y":4.5}, {"label":"L", "x":9.75, "y":4.5}, {"label":";", "x":10.75, "y":4.5}, {"label":"'", "x":11.75, "y":4.5}, {"label":"return", "x":12.75, "y":4.5, "w":1.75}, {"label":"undo", "x":15, "y":5.167, "h":1.33},
- {"label":"shift", "x":0, "y":5.5, "w":2.25}, {"label":"Z", "x":2.25, "y":5.5}, {"label":"X", "x":3.25, "y":5.5}, {"label":"C", "x":4.25, "y":5.5}, {"label":"V", "x":5.25, "y":5.5}, {"label":"B", "x":6.25, "y":5.5}, {"label":"N", "x":7.25, "y":5.5}, {"label":"M", "x":8.25, "y":5.5}, {"label":"<", "x":9.25, "y":5.5}, {"label":">", "x":10.25, "y":5.5}, {"label":"?", "x":11.25, "y":5.5}, {"label":"shift", "x":12.25, "y":5.5, "w":2.25},
- {"label":"style", "x":1.25, "y":6.5, "w":1.5}, {"label":"space", "x":2.75, "y":6.5, "w":9}, {"label":"insert", "x":11.75, "y":6.5, "w":1.5}
+ {"matrix": [1, 7], "x": 1, "y": 1, "h": 0.75},
+ {"matrix": [1, 6], "x": 2, "y": 1, "h": 0.75},
+ {"matrix": [1, 5], "x": 3, "y": 1, "h": 0.75},
+
+ {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 0.75},
+ {"matrix": [1, 3], "x": 5.5, "y": 1, "h": 0.75},
+ {"matrix": [1, 2], "x": 6.5, "y": 1, "h": 0.75},
+ {"matrix": [1, 1], "x": 7.5, "y": 1, "h": 0.75},
+
+ {"matrix": [1, 0], "x": 9, "y": 1, "h": 0.75},
+ {"matrix": [2, 7], "x": 10, "y": 1, "h": 0.75},
+ {"matrix": [2, 6], "x": 11, "y": 1, "h": 0.75},
+
+ {"matrix": [8, 0], "x": 13, "y": 0.5},
+ {"matrix": [9, 7], "x": 14, "y": 1},
+ {"matrix": [8, 1], "x": 14, "y": 0},
+ {"matrix": [9, 6], "x": 15, "y": 0.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.5},
+ {"matrix": [2, 4], "x": 1, "y": 2.5},
+ {"matrix": [2, 3], "x": 2, "y": 2.5},
+ {"matrix": [2, 2], "x": 3, "y": 2.5},
+ {"matrix": [2, 1], "x": 4, "y": 2.5},
+ {"matrix": [2, 0], "x": 5, "y": 2.5},
+ {"matrix": [3, 7], "x": 6, "y": 2.5},
+ {"matrix": [3, 6], "x": 7, "y": 2.5},
+ {"matrix": [3, 5], "x": 8, "y": 2.5},
+ {"matrix": [3, 4], "x": 9, "y": 2.5},
+ {"matrix": [3, 3], "x": 10, "y": 2.5},
+ {"matrix": [3, 2], "x": 11, "y": 2.5},
+ {"matrix": [3, 1], "x": 12, "y": 2.5},
+ {"matrix": [3, 0], "x": 13, "y": 2.5, "w": 1.5},
+
+ {"matrix": [9, 5], "x": 15, "y": 2.5, "h": 1.33},
+
+ {"matrix": [4, 7], "x": 0, "y": 3.5, "w": 1.5},
+ {"matrix": [4, 6], "x": 1.5, "y": 3.5},
+ {"matrix": [4, 5], "x": 2.5, "y": 3.5},
+ {"matrix": [4, 4], "x": 3.5, "y": 3.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.5},
+ {"matrix": [4, 2], "x": 5.5, "y": 3.5},
+ {"matrix": [4, 1], "x": 6.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 7.5, "y": 3.5},
+ {"matrix": [5, 7], "x": 8.5, "y": 3.5},
+ {"matrix": [5, 6], "x": 9.5, "y": 3.5},
+ {"matrix": [5, 5], "x": 10.5, "y": 3.5},
+ {"matrix": [5, 4], "x": 11.5, "y": 3.5},
+ {"matrix": [5, 3], "x": 12.5, "y": 3.5},
+
+ {"matrix": [9, 4], "x": 15, "y": 3.833, "h": 1.33},
+
+ {"matrix": [0, 7], "x": 0, "y": 4.5, "w": 1.75},
+ {"matrix": [5, 1], "x": 1.75, "y": 4.5},
+ {"matrix": [5, 0], "x": 2.75, "y": 4.5},
+ {"matrix": [6, 7], "x": 3.75, "y": 4.5},
+ {"matrix": [6, 6], "x": 4.75, "y": 4.5},
+ {"matrix": [6, 5], "x": 5.75, "y": 4.5},
+ {"matrix": [6, 4], "x": 6.75, "y": 4.5},
+ {"matrix": [6, 3], "x": 7.75, "y": 4.5},
+ {"matrix": [6, 2], "x": 8.75, "y": 4.5},
+ {"matrix": [6, 1], "x": 9.75, "y": 4.5},
+ {"matrix": [6, 0], "x": 10.75, "y": 4.5},
+ {"matrix": [7, 7], "x": 11.75, "y": 4.5},
+ {"matrix": [5, 2], "x": 12.75, "y": 4.5, "w": 1.75},
+
+ {"matrix": [9, 3], "x": 15, "y": 5.167, "h": 1.33},
+
+ {"matrix": [0, 6], "x": 0, "y": 5.5, "w": 2.25},
+ {"matrix": [7, 6], "x": 2.25, "y": 5.5},
+ {"matrix": [7, 5], "x": 3.25, "y": 5.5},
+ {"matrix": [7, 4], "x": 4.25, "y": 5.5},
+ {"matrix": [7, 3], "x": 5.25, "y": 5.5},
+ {"matrix": [7, 2], "x": 6.25, "y": 5.5},
+ {"matrix": [7, 1], "x": 7.25, "y": 5.5},
+ {"matrix": [7, 0], "x": 8.25, "y": 5.5},
+ {"matrix": [8, 7], "x": 9.25, "y": 5.5},
+ {"matrix": [8, 6], "x": 10.25, "y": 5.5},
+ {"matrix": [8, 5], "x": 11.25, "y": 5.5},
+ {"matrix": [9, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+
+ {"matrix": [8, 4], "x": 1.25, "y": 6.5, "w": 1.5},
+ {"matrix": [8, 3], "x": 2.75, "y": 6.5, "w": 9},
+ {"matrix": [8, 2], "x": 11.75, "y": 6.5, "w": 1.5}
]
}
}
diff --git a/keyboards/handwired/videowriter/videowriter.h b/keyboards/handwired/videowriter/videowriter.h
deleted file mode 100644
index f06a5d50aa..0000000000
--- a/keyboards/handwired/videowriter/videowriter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ,---------------------------------------------------------------------------------------.
- * | ,----------------. ,-----------------------. ,--------------. | up | |
- * | |menu|print|spell| |page|center|split|find | |copy|move|goto| |left|down|right|
- * |---------------------------------------------------------------------------------------|
- * |del| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSp| do |
- * |---------------------------------------------------------------------------------------|
- * |Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | help|
- * |-----------------------------------------------------------------------------' |-----|
- * |Caps | A | S | D | F | G | H | J | K | L | ; | " | return | undo|
- * |---------------------------------------------------------------------------------------|
- * | Shift | Z | X | C | V | B | N | M | < | > | ? | Shift | |
- * '---------------------------------------------------------------------------------------'
- * | style| Space | insert|
- * '------------------------------------------------------------------'
- */
-
-#define LAYOUT( \
- K17, K16, K15, K14, K13, K12, K11, K10, K27, K26, K80, K97, K81, K96, \
- K25, K24, K23, K22, K21, K20, K37, K36, K35, K34, K33, K32, K31, K30, K95, \
- K47, K46, K45, K44, K43, K42, K41, K40, K57, K56, K55, K54, K53, K94, \
- K07, K51, K50, K67, K66, K65, K64, K63, K62, K61, K60, K77, K52, K93, \
- K06, K76, K75, K74, K73, K72, K71, K70, K87, K86, K85, K92, \
- K84, K83, K82 \
-) \
-{ \
- { XXX, XXX, XXX, XXX, XXX, XXX, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { K80, K81, K82, K83, K84, K85, K86, K87 }, \
- { XXX, XXX, K92, K93, K94, K95, K96, K97 } \
-}
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index 20840f3826..7401cb24c9 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/info.json
@@ -18,78 +18,73 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0, "w": 2},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Backspace", "x":13, "y":0, "w":2},
+ {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 6], "x": 1.5, "y": 1},
+ {"matrix": [1, 5], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 3], "x": 4.5, "y": 1},
+ {"matrix": [1, 2], "x": 5.5, "y": 1},
+ {"matrix": [6, 7], "x": 6.5, "y": 1},
+ {"matrix": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+ {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x": 4.5,"y":1},
- {"label":"T", "x":5.5, "y":1},
+ {"matrix": [2, 7], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 6], "x": 1.75, "y": 2},
+ {"matrix": [2, 5], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 3], "x": 4.75, "y": 2},
+ {"matrix": [2, 2], "x": 5.75, "y": 2},
+ {"matrix": [7, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 5], "x": 7.75, "y": 2},
+ {"matrix": [7, 4], "x": 8.75, "y": 2},
+ {"matrix": [7, 3], "x": 9.75, "y": 2},
+ {"matrix": [7, 2], "x": 10.75, "y": 2},
+ {"matrix": [7, 1], "x": 11.75, "y": 2},
+ {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [3, 7], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 2.25, "y": 3},
+ {"matrix": [3, 5], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 3], "x": 5.25, "y": 3},
+ {"matrix": [3, 2], "x": 6.25, "y": 3},
+ {"matrix": [8, 5], "x": 7.25, "y": 3},
+ {"matrix": [8, 4], "x": 8.25, "y": 3},
+ {"matrix": [8, 3], "x": 9.25, "y": 3},
+ {"matrix": [8, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 1], "x": 11.25, "y": 3},
+ {"matrix": [8, 0], "x": 12.25, "y": 3, "w": 2.75},
- {"label":"CapsLock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
-
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
-
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":1.25},
- {"x":5, "y":4, "w":2.25},
-
- {"x":7.25, "y":4, "w":2.75},
- {"label":"Alt", "x":10, "y":4, "w":1.25},
- {"label":"Win", "x":11.25, "y":4, "w":1.25},
- {"label":"Menu", "x":12.5, "y":4, "w":1.25},
- {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [4, 7], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 5, "y": 4, "w": 2.25},
+ {"matrix": [9, 4], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h
deleted file mode 100644
index ce8d68c2c1..0000000000
--- a/keyboards/handwired/xealous/rev1/rev1.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L43, L44, R44, R43, R42, R41, R40 \
-) { \
- { XXX, L06, L05, L04, L03, L02, L01, L00 }, \
- { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \
- { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \
- { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \
- { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \
- { R00, R01, R02, R03, R04, R05, R06, XXX }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, XXX }, \
- { R30, R31, R32, R33, R34, R35, XXX, XXX }, \
- { R40, R41, R42, R43, R44, XXX, XXX, XXX } \
-}
diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json
index 6b93b73e20..373c80ac7f 100644
--- a/keyboards/handwired/z150/info.json
+++ b/keyboards/handwired/z150/info.json
@@ -17,7 +17,101 @@
"bootloader": "stm32duino",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, {"label":"", "x":17.25, "y":0}, {"label":"", "x":18.25, "y":0, "w":1.5}, {"label":"", "x":19.75, "y":0, "w":1.5}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1, "w":1.25}, {"label":"7", "x":17.25, "y":1}, {"label":"8", "x":18.25, "y":1}, {"label":"9", "x":19.25, "y":1}, {"label":"PrtSc", "x":20.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2}, {"label":"4", "x":17.25, "y":2}, {"label":"5", "x":18.25, "y":2}, {"label":"6", "x":19.25, "y":2}, {"label":"\u0432\u0402\u201c", "x":20.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.5}, {"label":"|", "x":16.25, "y":3}, {"label":"1", "x":17.25, "y":3}, {"label":"2", "x":18.25, "y":3}, {"label":"6", "x":19.25, "y":3}, {"label":"+", "x":20.25, "y":3, "h":2}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.75}, {"label":"~", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":9}, {"label":"CapsLock", "x":14.25, "y":4, "w":2}, {"label":"0", "x":16.25, "y":4, "w":2}, {"label":".", "x":18.25, "y":4, "w":2}]
+ "layout": [
+ {"matrix": [3, 5], "x": 0, "y": 0},
+ {"matrix": [3, 4], "x": 1, "y": 0},
+
+ {"matrix": [10, 7], "x": 2.5, "y": 0},
+ {"matrix": [10, 6], "x": 3.5, "y": 0},
+ {"matrix": [10, 5], "x": 4.5, "y": 0},
+ {"matrix": [10, 4], "x": 5.5, "y": 0},
+ {"matrix": [10, 3], "x": 6.5, "y": 0},
+ {"matrix": [10, 2], "x": 7.5, "y": 0},
+ {"matrix": [10, 1], "x": 8.5, "y": 0},
+ {"matrix": [10, 0], "x": 9.5, "y": 0},
+ {"matrix": [9, 7], "x": 10.5, "y": 0},
+ {"matrix": [9, 6], "x": 11.5, "y": 0},
+ {"matrix": [9, 5], "x": 12.5, "y": 0},
+ {"matrix": [9, 4], "x": 13.5, "y": 0},
+ {"matrix": [9, 3], "x": 14.5, "y": 0},
+ {"matrix": [9, 2], "x": 15.5, "y": 0, "w": 1.75},
+ {"matrix": [5, 7], "x": 17.25, "y": 0},
+ {"matrix": [2, 3], "x": 18.25, "y": 0, "w": 1.5},
+ {"matrix": [2, 2], "x": 19.75, "y": 0, "w": 1.5},
+
+ {"matrix": [3, 3], "x": 0, "y": 1},
+ {"matrix": [3, 2], "x": 1, "y": 1},
+
+ {"matrix": [9, 1], "x": 2.5, "y": 1, "w": 1.5},
+ {"matrix": [9, 0], "x": 4, "y": 1},
+ {"matrix": [8, 7], "x": 5, "y": 1},
+ {"matrix": [8, 6], "x": 6, "y": 1},
+ {"matrix": [8, 5], "x": 7, "y": 1},
+ {"matrix": [8, 4], "x": 8, "y": 1},
+ {"matrix": [8, 3], "x": 9, "y": 1},
+ {"matrix": [8, 2], "x": 10, "y": 1},
+ {"matrix": [8, 1], "x": 11, "y": 1},
+ {"matrix": [8, 0], "x": 12, "y": 1},
+ {"matrix": [7, 7], "x": 13, "y": 1},
+ {"matrix": [7, 6], "x": 14, "y": 1},
+ {"matrix": [7, 5], "x": 15, "y": 1, "w": 1.25},
+ {"matrix": [2, 1], "x": 17.25, "y": 1},
+ {"matrix": [2, 0], "x": 18.25, "y": 1},
+ {"matrix": [1, 7], "x": 19.25, "y": 1},
+ {"matrix": [1, 6], "x": 20.25, "y": 1},
+
+ {"matrix": [3, 1], "x": 0, "y": 2},
+ {"matrix": [3, 0], "x": 1, "y": 2},
+
+ {"matrix": [7, 3], "x": 2.5, "y": 2, "w": 1.75},
+ {"matrix": [7, 2], "x": 4.25, "y": 2},
+ {"matrix": [7, 1], "x": 5.25, "y": 2},
+ {"matrix": [7, 0], "x": 6.25, "y": 2},
+ {"matrix": [6, 7], "x": 7.25, "y": 2},
+ {"matrix": [6, 6], "x": 8.25, "y": 2},
+ {"matrix": [6, 5], "x": 9.25, "y": 2},
+ {"matrix": [6, 4], "x": 10.25, "y": 2},
+ {"matrix": [6, 3], "x": 11.25, "y": 2},
+ {"matrix": [6, 2], "x": 12.25, "y": 2},
+ {"matrix": [6, 1], "x": 13.25, "y": 2},
+ {"matrix": [6, 0], "x": 14.25, "y": 2},
+ {"matrix": [7, 4], "x": 15.25, "y": 2, "w": 2},
+ {"matrix": [1, 5], "x": 17.25, "y": 2},
+ {"matrix": [1, 4], "x": 18.25, "y": 2},
+ {"matrix": [1, 3], "x": 19.25, "y": 2},
+ {"matrix": [1, 2], "x": 20.25, "y": 2},
+
+ {"matrix": [2, 6], "x": 0, "y": 3},
+ {"matrix": [2, 7], "x": 1, "y": 3},
+
+ {"matrix": [5, 6], "x": 2.5, "y": 3, "w": 2.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 3},
+ {"matrix": [5, 3], "x": 5.75, "y": 3},
+ {"matrix": [5, 2], "x": 6.75, "y": 3},
+ {"matrix": [5, 1], "x": 7.75, "y": 3},
+ {"matrix": [5, 0], "x": 8.75, "y": 3},
+ {"matrix": [4, 7], "x": 9.75, "y": 3},
+ {"matrix": [4, 6], "x": 10.75, "y": 3},
+ {"matrix": [4, 5], "x": 11.75, "y": 3},
+ {"matrix": [4, 4], "x": 12.75, "y": 3},
+ {"matrix": [4, 3], "x": 13.75, "y": 3},
+ {"matrix": [4, 2], "x": 14.75, "y": 3, "w": 1.5},
+ {"matrix": [4, 1], "x": 16.25, "y": 3},
+ {"matrix": [1, 1], "x": 17.25, "y": 3},
+ {"matrix": [1, 0], "x": 18.25, "y": 3},
+ {"matrix": [0, 7], "x": 19.25, "y": 3},
+ {"matrix": [0, 4], "x": 20.25, "y": 3, "h": 2},
+
+ {"matrix": [2, 4], "x": 0, "y": 4},
+ {"matrix": [2, 5], "x": 1, "y": 4},
+
+ {"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.75},
+ {"matrix": [5, 5], "x": 4.25, "y": 4},
+ {"matrix": [3, 7], "x": 5.25, "y": 4, "w": 9},
+ {"matrix": [3, 6], "x": 14.25, "y": 4, "w": 2},
+ {"matrix": [0, 6], "x": 16.25, "y": 4, "w": 2},
+ {"matrix": [0, 5], "x": 18.25, "y": 4, "w": 2}
+ ]
}
}
}
diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c
index cf49c87ef0..a887a95bfd 100644
--- a/keyboards/handwired/z150/z150.c
+++ b/keyboards/handwired/z150/z150.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "z150.h"
+#include "quantum.h"
void matrix_init_kb(void) {
setPinOutput(NUM_LOCK_LED_PIN);
diff --git a/keyboards/handwired/z150/z150.h b/keyboards/handwired/z150/z150.h
deleted file mode 100644
index 1a1c89f32b..0000000000
--- a/keyboards/handwired/z150/z150.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* readability */
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
- K35, K34, KA7, KA6, KA5, KA4, KA3, KA2, KA1, KA0, K97, K96, K95, K94, K93, K92, K57, K23, K22, \
- K33, K32, K91, K90, K87, K86, K85, K84, K83, K82, K81, K80, K77, K76, K75, K21, K20, K17, K16, \
- K31, K30, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, K61, K60, K74, K15, K14, K13, K12, \
- K26, K27, K56, K54, K53, K52, K51, K50, K47, K46, K45, K44, K43, K42, K41, K11, K10, K07, K04, \
- K24, K25, K40, K55, K37, K36, K06, K05 \
-) \
-{ \
-/* 0 */ { XXX, XXX, XXX, XXX, K04, K05, K06, K07 }, \
-/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77 }, \
-/* 8 */ { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-/* 9 */ { K90, K91, K92, K93, K94, K95, K96, K97 }, \
-/* A */ { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \
-}
-/* 0 1 2 3 4 5 6 7 */
-
diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json
index 6a472c3302..460428388b 100644
--- a/keyboards/handwired/zergo/info.json
+++ b/keyboards/handwired/zergo/info.json
@@ -18,87 +18,95 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Del", "x":0, "y":1.25},
- {"label":"`", "x":1, "y":1.25},
- {"label":"1", "x":2, "y":1.25},
- {"label":"2", "x":3, "y":1.25},
- {"label":"3", "x":4, "y":1.25},
- {"label":"4", "x":5, "y":1.25},
- {"label":"5", "x":6, "y":1.25},
- {"label":"6", "x":7, "y":1.25},
- {"label":"7", "x":8, "y":1.25},
- {"label":"8", "x":9, "y":1.25},
- {"label":"9", "x":10, "y":1.25},
- {"label":"0", "x":11, "y":1.25},
- {"label":"-", "x":12, "y":1.25},
- {"label":"=", "x":13, "y":1.25},
- {"label":"Backspace", "x":14, "y":1.25},
- {"label":"Tab", "x":0, "y":2.25, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.25},
- {"label":"W", "x":2.5, "y":2.25},
- {"label":"E", "x":3.5, "y":2.25},
- {"label":"R", "x":4.5, "y":2.25},
- {"label":"T", "x":5.5, "y":2.25},
- {"label":"modifier", "x":6.5, "y":2.25},
- {"label":"Y", "x":7.5, "y":2.25},
- {"label":"U", "x":8.5, "y":2.25},
- {"label":"I", "x":9.5, "y":2.25},
- {"label":"O", "x":10.5, "y":2.25},
- {"label":"P", "x":11.5, "y":2.25},
- {"label":"{", "x":12.5, "y":2.25},
- {"label":"|", "x":13.5, "y":2.25, "w":1.5},
- {"label":"modifier", "x":0, "y":3.25, "w":1.25},
- {"label":"A", "x":1.25, "y":3.25},
- {"label":"S", "x":2.25, "y":3.25},
- {"label":"D", "x":3.25, "y":3.25},
- {"label":"F", "x":4.25, "y":3.25},
- {"label":"G", "x":5.25, "y":3.25},
- {"label":"H", "x":7.75, "y":3.25},
- {"label":"J", "x":8.75, "y":3.25},
- {"label":"K", "x":9.75, "y":3.25},
- {"label":"L", "x":10.75, "y":3.25},
- {"label":":", "x":11.75, "y":3.25},
- {"label":"\"", "x":12.75, "y":3.25},
- {"label":"modifier", "x":13.75, "y":3.25, "w":1.25},
- {"label":"LShift", "x":0, "y":4.25},
- {"label":"Z", "x":1, "y":4.25},
- {"label":"X", "x":2, "y":4.25},
- {"label":"C", "x":3, "y":4.25},
- {"label":"V", "x":4, "y":4.25},
- {"label":"B", "x":5, "y":4.25},
- {"label":"Backspace", "x":6, "y":4.25, "w":2},
- {"label":"N", "x":8, "y":4.25},
- {"label":"M", "x":9, "y":4.25},
- {"label":"<", "x":10, "y":4.25},
- {"label":">", "x":11, "y":4.25},
- {"label":"?", "x":12, "y":4.25},
- {"label":"}", "x":13, "y":4.25},
- {"label":"Rshift", "x":14, "y":4.25},
- {"label":"LControl", "x":0, "y":5.25},
- {"label":"free-1", "x":1, "y":5.25},
- {"label":"free-2", "x":2, "y":5.25},
- {"label":"LAlt", "x":3, "y":5.25, "w":1.25},
- {"label":"Space", "x":4.25, "y":5.25, "w":2.25},
- {"label":"Enter", "x":6.5, "y":5.25},
- {"label":"Space", "x":7.5, "y":5.25, "w":2.75},
- {"label":"RAlt", "x":10.25, "y":5.25, "w":1.25},
- {"label":"Win", "x":11.5, "y":5.25, "w":1.25},
- {"label":"Menu", "x":12.75, "y":5.25, "w":1.25},
- {"label":"RControl", "x":14, "y":5.25}
- ]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [2, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 6], "x": 7, "y": 1.25},
+ {"matrix": [1, 7], "x": 8, "y": 1.25},
+ {"matrix": [1, 8], "x": 9, "y": 1.25},
+ {"matrix": [1, 9], "x": 10, "y": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 1.25},
+ {"matrix": [1, 11], "x": 12, "y": 1.25},
+ {"matrix": [1, 12], "x": 13, "y": 1.25},
+ {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+ {"matrix": [4, 4], "x": 4, "y": 4.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2},
+ {"matrix": [4, 7], "x": 8, "y": 4.25},
+ {"matrix": [4, 8], "x": 9, "y": 4.25},
+ {"matrix": [4, 9], "x": 10, "y": 4.25},
+ {"matrix": [4, 10], "x": 11, "y": 4.25},
+ {"matrix": [4, 11], "x": 12, "y": 4.25},
+ {"matrix": [4, 12], "x": 13, "y": 4.25},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "x": 4.25, "y": 5.25, "w": 2.25},
+ {"matrix": [5, 6], "x": 6.5, "y": 5.25},
+ {"matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 2.75},
+ {"matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 14, "y": 5.25}
+ ]
}
}
}
diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h
deleted file mode 100644
index ba6532164d..0000000000
--- a/keyboards/handwired/zergo/zergo.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 E.Zelianin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
- K100, K101, K102, K103, K104, K105, K206, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K306, K207, K208, K209, K210, K211, K212, K213, \
- K300, K301, K302, K303, K304, K305, K307, K308, K309, K310, K311, K312, K313, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
- K500, K501, K502, K503, K505, K506, K507, K509, K510, K512, K513 \
-) { \
- { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
- { K500, K501, K502, K503, KC_NO, K505, K506, K507, KC_NO, K509, K510, KC_NO, K512, K513 } \
-}