summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/aranck/aranck.h39
-rw-r--r--keyboards/handwired/aranck/info.json97
-rw-r--r--keyboards/handwired/concertina/64key/64key.h56
-rw-r--r--keyboards/handwired/concertina/64key/info.json88
-rw-r--r--keyboards/handwired/curiosity/curiosity.h41
-rw-r--r--keyboards/handwired/curiosity/info.json110
-rw-r--r--keyboards/handwired/dactyl/dactyl.h29
-rw-r--r--keyboards/handwired/dactyl/info.json89
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/5x6.h30
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/info.json128
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h44
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/info.json134
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h28
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/info.json126
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/5x7.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/info.json148
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/6x6.h62
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/info.json368
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/info.json194
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h37
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json194
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/6x7.h35
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/info.json206
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/62key.h44
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/info.json126
-rw-r--r--keyboards/handwired/dactyl_promicro/dactyl_promicro.h29
-rw-r--r--keyboards/handwired/dactyl_promicro/info.json153
-rw-r--r--keyboards/handwired/dactyl_rah/dactyl_rah.h44
-rw-r--r--keyboards/handwired/dactyl_rah/info.json163
-rw-r--r--keyboards/handwired/heisenberg/heisenberg.h39
-rw-r--r--keyboards/handwired/heisenberg/info.json107
-rw-r--r--keyboards/handwired/pterodactyl/info.json141
-rw-r--r--keyboards/handwired/pterodactyl/matrix.c1
-rw-r--r--keyboards/handwired/pterodactyl/pterodactyl.c2
-rw-r--r--keyboards/handwired/pterodactyl/pterodactyl.h38
-rw-r--r--keyboards/handwired/skakunm_dactyl/info.json88
-rw-r--r--keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h25
-rw-r--r--keyboards/handwired/steamvan/rev1/info.json217
-rw-r--r--keyboards/handwired/steamvan/rev1/rev1.h80
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h46
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/info.json113
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h49
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/info.json139
-rw-r--r--keyboards/handwired/tractyl_manuform/tractyl_manuform.h6
-rw-r--r--keyboards/handwired/twig/twig50/info.json66
-rw-r--r--keyboards/handwired/twig/twig50/twig50.h20
50 files changed, 1875 insertions, 2224 deletions
diff --git a/keyboards/handwired/aranck/aranck.h b/keyboards/handwired/aranck/aranck.h
deleted file mode 100644
index df887c2c56..0000000000
--- a/keyboards/handwired/aranck/aranck.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <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_planck_mit(\
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, KC_NO, k35, k36, k37, k38, k39, k3a } \
-}
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json
index 7d2ea6124b..d7bf45b884 100644
--- a/keyboards/handwired/aranck/info.json
+++ b/keyboards/handwired/aranck/info.json
@@ -19,53 +19,56 @@
"layouts": {
"LAYOUT_planck_mit": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 7, "y": 0 },
- { "x": 8, "y": 0 },
- { "x": 9, "y": 0 },
- { "x": 10, "y": 0 },
- { "x": 11, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3, "w": 2 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 6], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/handwired/concertina/64key/64key.h b/keyboards/handwired/concertina/64key/64key.h
deleted file mode 100644
index a9e557fc78..0000000000
--- a/keyboards/handwired/concertina/64key/64key.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020-2021 Viktor Eikman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/*
- * The matrix is constructed for ease of soldering and for density.
- * The nomenclature is <side><cluster>_<column><row>.
- *
- * L: Left hand.
- * R: Right hand.
- * T: Thumb cluster.
- * M: Main cluster.
- *
- * Numbers increase going to the right and away from the user on the
- * right-hand side of the keyboard, looking directly at each of the two
- * key clusters (main and thumb), one by one.
- * This coordinate system is mirrored for the left-hand side.
- */
-
-#define LAYOUT_64key( \
- LT_32, LT_22, LT_12, RT_12, RT_22, RT_32, \
- LT_31, LT_21, LT_11, LT_01, RT_01, RT_11, RT_21, RT_31, \
- LT_20, LT_10, LT_00, RT_00, RT_10, RT_20, \
- \
- LM_34, LM_24, LM_14, LM_04, RM_04, RM_14, RM_24, RM_34, \
- LM_53, LM_43, LM_33, LM_23, LM_13, LM_03, RM_03, RM_13, RM_23, RM_33, RM_43, RM_53, \
- LM_52, LM_42, LM_32, LM_22, LM_12, LM_02, RM_02, RM_12, RM_22, RM_32, RM_42, RM_52, \
- LM_51, LM_41, LM_31, LM_21, LM_11, RM_11, RM_21, RM_31, RM_41, RM_51, \
- LM_20, RM_20 \
- ) \
- { \
- { LT_00, LT_10, LT_20, LT_31, LM_20, LM_31, LM_41, LM_51 }, \
- { LT_01, LT_11, LT_21, LM_11, LM_21, LM_32, LM_42, LM_52 }, \
- { LT_12, LT_22, LT_32, LM_12, LM_22, LM_33, LM_43, LM_53 }, \
- { LM_02, LM_03, LM_04, LM_13, LM_23, LM_14, LM_24, LM_34 }, \
- { RT_00, RT_10, RT_20, RT_31, RM_20, RM_31, RM_41, RM_51 }, \
- { RT_01, RT_11, RT_21, RM_11, RM_21, RM_32, RM_42, RM_52 }, \
- { RT_12, RT_22, RT_32, RM_12, RM_22, RM_33, RM_43, RM_53 }, \
- { RM_02, RM_03, RM_04, RM_13, RM_23, RM_14, RM_24, RM_34 }, \
- }
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json
index 0e4542af9d..1bca5a6fa4 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/info.json
@@ -21,29 +21,85 @@
"layouts": {
"LAYOUT_64key": {
"layout": [
- {"x":2.5, "y":0.4}, {"x":3.5, "y":0}, {"x":4.5, "y":0.3},
- {"x":8.5, "y":0.3}, {"x":9.5, "y":0}, {"x":10.5, "y":0.4},
+ {"matrix": [2, 2], "x": 2.5, "y": 0.4},
+ {"matrix": [2, 1], "x": 3.5, "y": 0},
+ {"matrix": [2, 0], "x": 4.5, "y": 0.3},
- {"x":2.5, "y":1.4}, {"x":3.5, "y":1}, {"x":4.5, "y":1.3}, {"x":5.5, "y":0.9},
- {"x":7.5, "y":0.9}, {"x":8.5, "y":1.3}, {"x":9.5, "y":1}, {"x":10.5, "y":1.4},
+ {"matrix": [6, 0], "x": 8.5, "y": 0.3},
+ {"matrix": [6, 1], "x": 9.5, "y": 0},
+ {"matrix": [6, 2], "x": 10.5, "y": 0.4},
- {"x":3.5, "y":2}, {"x":4.5, "y":2.3}, {"x":5.5, "y":1.9},
- {"x":7.5, "y":1.9}, {"x":8.5, "y":2.3}, {"x":9.5, "y":2},
+ {"matrix": [0, 3], "x": 2.5, "y": 1.4},
+ {"matrix": [1, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 1], "x": 4.5, "y": 1.3},
+ {"matrix": [1, 0], "x": 5.5, "y": 0.9},
- {"x":2, "y":4}, {"x":3, "y":3.8}, {"x":4, "y":4}, {"x":5, "y":4.3},
- {"x":8, "y":4.3}, {"x":9, "y":4}, {"x":10, "y":3.8}, {"x":11, "y":4},
+ {"matrix": [5, 0], "x": 7.5, "y": 0.9},
+ {"matrix": [5, 1], "x": 8.5, "y": 1.3},
+ {"matrix": [5, 2], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1.4},
- {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":4.8}, {"x":4, "y":5}, {"x":5, "y":5.3},
- {"x":8, "y":5.3}, {"x":9, "y":5}, {"x":10, "y":4.8}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5},
+ {"matrix": [0, 2], "x": 3.5, "y": 2},
+ {"matrix": [0, 1], "x": 4.5, "y": 2.3},
+ {"matrix": [0, 0], "x": 5.5, "y": 1.9},
- {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":5.8}, {"x":4, "y":6}, {"x":5, "y":6.3},
- {"x":8, "y":6.3}, {"x":9, "y":6}, {"x":10, "y":5.8}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6},
+ {"matrix": [4, 0], "x": 7.5, "y": 1.9},
+ {"matrix": [4, 1], "x": 8.5, "y": 2.3},
+ {"matrix": [4, 2], "x": 9.5, "y": 2},
- {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":6.8}, {"x":4, "y":7},
- {"x":9, "y":7}, {"x":10, "y":6.8}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7},
+ {"matrix": [3, 7], "x": 2, "y": 4},
+ {"matrix": [3, 6], "x": 3, "y": 3.8},
+ {"matrix": [3, 5], "x": 4, "y": 4},
+ {"matrix": [3, 2], "x": 5, "y": 4.3},
- {"x":3, "y":7.8},
- {"x":10, "y":7.8}
+ {"matrix": [7, 2], "x": 8, "y": 4.3},
+ {"matrix": [7, 5], "x": 9, "y": 4},
+ {"matrix": [7, 6], "x": 10, "y": 3.8},
+ {"matrix": [7, 7], "x": 11, "y": 4},
+
+ {"matrix": [2, 7], "x": 0, "y": 5},
+ {"matrix": [2, 6], "x": 1, "y": 5},
+ {"matrix": [2, 5], "x": 2, "y": 5},
+ {"matrix": [3, 4], "x": 3, "y": 4.8},
+ {"matrix": [3, 3], "x": 4, "y": 5},
+ {"matrix": [3, 1], "x": 5, "y": 5.3},
+
+ {"matrix": [7, 1], "x": 8, "y": 5.3},
+ {"matrix": [7, 3], "x": 9, "y": 5},
+ {"matrix": [7, 4], "x": 10, "y": 4.8},
+ {"matrix": [6, 5], "x": 11, "y": 5},
+ {"matrix": [6, 6], "x": 12, "y": 5},
+ {"matrix": [6, 7], "x": 13, "y": 5},
+
+ {"matrix": [1, 7], "x": 0, "y": 6},
+ {"matrix": [1, 6], "x": 1, "y": 6},
+ {"matrix": [1, 5], "x": 2, "y": 6},
+ {"matrix": [2, 4], "x": 3, "y": 5.8},
+ {"matrix": [2, 3], "x": 4, "y": 6},
+ {"matrix": [3, 0], "x": 5, "y": 6.3},
+
+ {"matrix": [7, 0], "x": 8, "y": 6.3},
+ {"matrix": [6, 3], "x": 9, "y": 6},
+ {"matrix": [6, 4], "x": 10, "y": 5.8},
+ {"matrix": [5, 5], "x": 11, "y": 6},
+ {"matrix": [5, 6], "x": 12, "y": 6},
+ {"matrix": [5, 7], "x": 13, "y": 6},
+
+ {"matrix": [0, 7], "x": 0, "y": 7},
+ {"matrix": [0, 6], "x": 1, "y": 7},
+ {"matrix": [0, 5], "x": 2, "y": 7},
+ {"matrix": [1, 4], "x": 3, "y": 6.8},
+ {"matrix": [1, 3], "x": 4, "y": 7},
+
+ {"matrix": [5, 3], "x": 9, "y": 7},
+ {"matrix": [5, 4], "x": 10, "y": 6.8},
+ {"matrix": [4, 5], "x": 11, "y": 7},
+ {"matrix": [4, 6], "x": 12, "y": 7},
+ {"matrix": [4, 7], "x": 13, "y": 7},
+
+ {"matrix": [0, 4], "x": 3, "y": 7.8},
+
+ {"matrix": [4, 4], "x": 10, "y": 7.8}
]
}
}
diff --git a/keyboards/handwired/curiosity/curiosity.h b/keyboards/handwired/curiosity/curiosity.h
deleted file mode 100644
index a79bfa6633..0000000000
--- a/keyboards/handwired/curiosity/curiosity.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 Spaceman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_small_mods( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k3a, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k39, \
- k30, k31, k32, 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 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-}
-#define LAYOUT_large_mods( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \
- 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 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, k3b }, \
-}
diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json
index a9a22fc39c..37f66a8029 100644
--- a/keyboards/handwired/curiosity/info.json
+++ b/keyboards/handwired/curiosity/info.json
@@ -18,18 +18,110 @@
"layouts": {
"LAYOUT_small_mods": {
"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, "w":1.5},
- {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.25},
- {"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":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"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},
+ {"matrix": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1},
+ {"matrix": [3, 10], "x": 12.25, "y": 1, "w": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 9], "x": 12.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 8.75, "y": 3},
+ {"matrix": [3, 6], "x": 9.75, "y": 3},
+ {"matrix": [3, 7], "x": 10.75, "y": 3},
+ {"matrix": [3, 8], "x": 11.75, "y": 3}
]
- },
+ },
"LAYOUT_large_mods": {
"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, "w":1.5},
- {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":2.25},
- {"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, "w":2},
- {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"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},
+ {"matrix": [3, 11], "x": 12, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2, "w": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2},
+ {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 8.75, "y": 3},
+ {"matrix": [3, 6], "x": 9.75, "y": 3},
+ {"matrix": [3, 7], "x": 10.75, "y": 3},
+ {"matrix": [3, 8], "x": 11.75, "y": 3}
]
}
}
diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h
index b901b67673..575fcf7c01 100644
--- a/keyboards/handwired/dactyl/dactyl.h
+++ b/