summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-01 13:09:53 +1100
committerGitHub <noreply@github.com>2023-04-01 13:09:53 +1100
commite40b6ca3b05e50253c3f6bbc08673e1720ddd9be (patch)
tree28ff78699bb1ff96997be7d097eaad2ec4843785
parent297779385fd53e93c33861e2d3107cb88efbde81 (diff)
Move split layouts to data driven (#20290)
-rw-r--r--keyboards/alt34/rev1/info.json68
-rw-r--r--keyboards/alt34/rev1/rev1.h41
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/3x5_2.h37
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json75
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.c2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.h39
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/info.json79
-rw-r--r--keyboards/bastardkb/dilemma/dilemma.h10
-rw-r--r--keyboards/bastardkb/scylla/info.json127
-rw-r--r--keyboards/bastardkb/scylla/scylla.c2
-rw-r--r--keyboards/bastardkb/scylla/scylla.h44
-rw-r--r--keyboards/bastardkb/skeletyl/info.json79
-rw-r--r--keyboards/bastardkb/skeletyl/skeletyl.c2
-rw-r--r--keyboards/bastardkb/skeletyl/skeletyl.h40
-rw-r--r--keyboards/bastardkb/tbk/info.json116
-rw-r--r--keyboards/bastardkb/tbk/tbk.h43
-rw-r--r--keyboards/bastardkb/tbkmini/info.json91
-rw-r--r--keyboards/bastardkb/tbkmini/tbkmini.c2
-rw-r--r--keyboards/bastardkb/tbkmini/tbkmini.h40
-rw-r--r--keyboards/bluebell/swoop/info.json79
-rw-r--r--keyboards/bluebell/swoop/swoop.h36
-rw-r--r--keyboards/centromere/centromere.h36
-rw-r--r--keyboards/centromere/info.json173
-rw-r--r--keyboards/chocv/chocv.h43
-rw-r--r--keyboards/chocv/info.json72
-rw-r--r--keyboards/crkbd/info.json104
-rw-r--r--keyboards/crkbd/r2g/info.json107
-rw-r--r--keyboards/crkbd/r2g/r2g.c2
-rw-r--r--keyboards/crkbd/r2g/r2g.h59
-rw-r--r--keyboards/crkbd/rev1/info.json107
-rw-r--r--keyboards/crkbd/rev1/rev1.c2
-rw-r--r--keyboards/crkbd/rev1/rev1.h59
-rw-r--r--keyboards/dailycraft/wings42/rev1/info.json88
-rw-r--r--keyboards/dailycraft/wings42/rev1/rev1.h44
-rw-r--r--keyboards/dailycraft/wings42/rev2/info.json96
-rw-r--r--keyboards/dailycraft/wings42/rev2/rev2.h46
-rw-r--r--keyboards/dumbo/dumbo.h44
-rw-r--r--keyboards/dumbo/info.json88
-rw-r--r--keyboards/eek/silk_down/info.json51
-rw-r--r--keyboards/eek/silk_down/silk_down.h39
-rw-r--r--keyboards/eek/silk_up/info.json51
-rw-r--r--keyboards/eek/silk_up/silk_up.h39
-rw-r--r--keyboards/ferris/0_1/0_1.h44
-rw-r--r--keyboards/ferris/0_1/info.json71
-rw-r--r--keyboards/ferris/0_2/0_2.h44
-rw-r--r--keyboards/ferris/0_2/info.json71
-rw-r--r--keyboards/gboards/gergoplex/gergoplex.h18
-rw-r--r--keyboards/gboards/gergoplex/info.json76
-rw-r--r--keyboards/gummykey/gummykey.h28
-rw-r--r--keyboards/gummykey/info.json130
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c2
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h38
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/info.json72
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h47
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_6/info.json128
-rw-r--r--keyboards/handwired/elrgo_s/elrgo_s.h38
-rw-r--r--keyboards/handwired/elrgo_s/info.json101
-rw-r--r--keyboards/handwired/pteron38/info.json76
-rw-r--r--keyboards/handwired/pteron38/pteron38.h31
-rw-r--r--keyboards/ibnuda/squiggle/rev1/info.json407
-rw-r--r--keyboards/ibnuda/squiggle/rev1/rev1.h117
-rw-r--r--keyboards/ingrained/info.json337
-rw-r--r--keyboards/ingrained/ingrained.h47
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/alpha.h45
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/info.json54
-rw-r--r--keyboards/kakunpc/suihankey/split/info.json51
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/info.json54
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/rev1.h47
-rw-r--r--keyboards/maple_computing/minidox/rev1/info.json49
-rw-r--r--keyboards/maple_computing/minidox/rev1/rev1.h25
-rw-r--r--keyboards/obosob/arch_36/arch_36.h43
-rw-r--r--keyboards/obosob/arch_36/info.json76
-rw-r--r--keyboards/pierce/info.json75
-rw-r--r--keyboards/pierce/pierce.h31
-rw-r--r--keyboards/pinky/3/3.h22
-rw-r--r--keyboards/pinky/3/info.json107
-rw-r--r--keyboards/pinky/4/4.h25
-rw-r--r--keyboards/pinky/4/info.json136
-rw-r--r--keyboards/pisces/info.json46
-rw-r--r--keyboards/pisces/pisces.c2
-rw-r--r--keyboards/pisces/pisces.h41
-rw-r--r--keyboards/pteron36/info.json156
-rw-r--r--keyboards/pteron36/pteron36.c2
-rw-r--r--keyboards/pteron36/pteron36.h59
-rw-r--r--keyboards/splitkb/kyria/rev1/info.json173
-rw-r--r--keyboards/splitkb/kyria/rev1/rev1.c2
-rw-r--r--keyboards/splitkb/kyria/rev1/rev1.h67
-rw-r--r--keyboards/splitkb/kyria/rev2/info.json171
-rw-r--r--keyboards/splitkb/kyria/rev2/rev2.c2
-rw-r--r--keyboards/splitkb/kyria/rev2/rev2.h67
-rw-r--r--keyboards/torn/info.json95
-rw-r--r--keyboards/torn/torn.h16
-rw-r--r--keyboards/yanghu/unicorne/info.json88
-rw-r--r--keyboards/yanghu/unicorne/unicorne.h25
-rw-r--r--keyboards/yoichiro/lunakey_mini/info.json96
-rw-r--r--keyboards/yoichiro/lunakey_mini/lunakey_mini.h44
-rw-r--r--keyboards/yoichiro/lunakey_pico/info.json96
-rw-r--r--keyboards/yoichiro/lunakey_pico/lunakey_pico.h23
98 files changed, 2642 insertions, 3794 deletions
diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/info.json
index b49357c686..cf90324c14 100644
--- a/keyboards/alt34/rev1/info.json
+++ b/keyboards/alt34/rev1/info.json
@@ -19,47 +19,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
+ {"matrix": [0, 0], "x": 0, "y": 0.93},
+ {"matrix": [0, 1], "x": 1, "y": 0.31},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.28},
+ {"matrix": [0, 4], "x": 4, "y": 0.42},
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
+ {"matrix": [4, 4], "x": 7, "y": 0.42},
+ {"matrix": [4, 3], "x": 8, "y": 0.28},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0.31},
+ {"matrix": [4, 0], "x": 11, "y": 0.93},
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
+ {"matrix": [1, 0], "x": 0, "y": 1.93},
+ {"matrix": [1, 1], "x": 1, "y": 1.31},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.28},
+ {"matrix": [1, 4], "x": 4, "y": 1.42},
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
+ {"matrix": [5, 4], "x": 7, "y": 1.42},
+ {"matrix": [5, 3], "x": 8, "y": 1.28},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1.31},
+ {"matrix": [5, 0], "x": 11, "y": 1.93},
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
+ {"matrix": [2, 0], "x": 0, "y": 2.93},
+ {"matrix": [2, 1], "x": 1, "y": 2.31},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.28},
+ {"matrix": [2, 4], "x": 4, "y": 2.42},
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
+ {"matrix": [6, 4], "x": 7, "y": 2.42},
+ {"matrix": [6, 3], "x": 8, "y": 2.28},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2.31},
+ {"matrix": [6, 0], "x": 11, "y": 2.93},
- {"x": 3.5, "y": 3.45},
- {"x": 4.5, "y": 3.7},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.45},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.7},
- {"x": 6.5, "y": 3.7},
- {"x": 7.5, "y": 3.45}
+ {"matrix": [7, 4], "x": 6.5, "y": 3.7},
+ {"matrix": [7, 3], "x": 7.5, "y": 3.45}
]
}
}
diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h
deleted file mode 100644
index 115415bb5f..0000000000
--- a/keyboards/alt34/rev1/rev1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2022 Tommy Alatalo <@altosys>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-/* left hand right hand */
-#define LAYOUT_split_3x5_2(\
- K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\
- K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\
- K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\
- K3_2, K3_3, K3_4, K3_5 )\
-/* matrix positions */\
-{\
- {K0_0, K0_1, K0_2, K0_3, K0_4},\
- {K1_0, K1_1, K1_2, K1_3, K1_4},\
- {K2_0, K2_1, K2_2, K2_3, K2_4},\
- {____, ____, ____, K3_2, K3_3},\
- \
- {K0_9, K0_8, K0_7, K0_6, K0_5},\
- {K1_9, K1_8, K1_7, K1_6, K1_5},\
- {K2_9, K2_8, K2_7, K2_6, K2_5},\
- {____, ____, ____, K3_5, K3_4} \
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
deleted file mode 100644
index 7deb32d917..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-#define LAYOUT_split_3x5_2( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k30, k32, k72, k70 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, KC_NO, k32, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, KC_NO, k72, KC_NO, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index a758541149..bfd12e81d0 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -7,40 +7,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L30", "x": 4, "y": 3 },
- { "label": "L32", "x": 5, "y": 3 },
- { "label": "R32", "x": 10, "y": 3 },
- { "label": "R30", "x": 11, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 0], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0b6c657fda..b9787f473e 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/