summaryrefslogtreecommitdiffstats
path: root/keyboards/adelheid
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/adelheid')
-rw-r--r--keyboards/adelheid/adelheid.c16
-rw-r--r--keyboards/adelheid/adelheid.h45
-rw-r--r--keyboards/adelheid/config.h17
-rw-r--r--keyboards/adelheid/info.json174
4 files changed, 92 insertions, 160 deletions
diff --git a/keyboards/adelheid/adelheid.c b/keyboards/adelheid/adelheid.c
deleted file mode 100644
index 35fd2cd1e5..0000000000
--- a/keyboards/adelheid/adelheid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 floookay
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "adelheid.h"
diff --git a/keyboards/adelheid/adelheid.h b/keyboards/adelheid/adelheid.h
deleted file mode 100644
index 48d315f30f..0000000000
--- a/keyboards/adelheid/adelheid.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 floookay
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <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, \
- \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k2E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k4E, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \
- k50, k52, k54, k55, k57, k59, k5C, k5D, k5E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { 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 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, k4E }, \
- { k50, KC_NO, k52, KC_NO, k54, k55, KC_NO, k57, KC_NO, k59, KC_NO, KC_NO, k5C, k5D, k5E } \
-}
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index e22e250f85..db23a53119 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D0, F4, D1, D2, D3, D5, F7 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, F6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json
index 19970b27cf..fa203432c1 100644
--- a/keyboards/adelheid/info.json
+++ b/keyboards/adelheid/info.json
@@ -8,6 +8,11 @@
"pid": "0xAD78",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "C6"
},
@@ -16,93 +21,98 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0, "y": 0 },
- { "label": "k01", "x": 1.25, "y": 0 },
- { "label": "k02", "x": 2.25, "y": 0 },
- { "label": "k03", "x": 3.5, "y": 0 },
- { "label": "k04", "x": 4.5, "y": 0 },
- { "label": "k05", "x": 5.75, "y": 0 },
- { "label": "k06", "x": 6.75, "y": 0 },
- { "label": "k07", "x": 9.75, "y": 0 },
- { "label": "k08", "x": 10.75, "y": 0 },
- { "label": "k09", "x": 12, "y": 0 },
- { "label": "k0A", "x": 13, "y": 0 },
- { "label": "k0B", "x": 14.25, "y": 0 },
- { "label": "k0C", "x": 15.25, "y": 0 },
- { "label": "k0D", "x": 16.5, "y": 0 },
- { "label": "k0E", "x": 17.75, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.75, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
+ {"matrix": [0, 7], "x": 9.75, "y": 0},
+ {"matrix": [0, 8], "x": 10.75, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0},
+ {"matrix": [0, 10], "x": 13, "y": 0},
+ {"matrix": [0, 11], "x": 14.25, "y": 0},
+ {"matrix": [0, 12], "x": 15.25, "y": 0},
+ {"matrix": [0, 13], "x": 16.5, "y": 0},
+ {"matrix": [0, 14], "x": 17.75, "y": 0},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 1.25},
+ {"matrix": [2, 1], "x": 1.75, "y": 1.25},
+ {"matrix": [2, 2], "x": 2.75, "y": 1.25},
+ {"matrix": [2, 3], "x": 4, "y": 1.25},
+ {"matrix": [2, 4], "x": 5, "y": 1.25},
+ {"matrix": [2, 5], "x": 6, "y": 1.25},
+ {"matrix": [2, 6], "x": 7, "y": 1.25},
+ {"matrix": [2, 7], "x": 9.5, "y": 1.25},
+ {"matrix": [2, 8], "x": 10.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 11.5, "y": 1.25},
+ {"matrix": [2, 10], "x": 12.5, "y": 1.25},
+ {"matrix": [2, 11], "x": 13.75, "y": 1.25},
+ {"matrix": [2, 12], "x": 14.75, "y": 1.25},
+ {"matrix": [2, 13], "x": 15.75, "y": 1.25},
+ {"matrix": [2, 14], "x": 16.75, "y": 1.25},
+
+ {"matrix": [3, 14], "x": 18, "y": 1},
+
+ {"matrix": [3, 0], "x": 0.5, "y": 2.25, "w": 1.5},
+ {"matrix": [3, 1], "x": 2, "y": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 2.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 4], "x": 5.5, "y": 2.25},
+ {"matrix": [3, 5], "x": 6.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 9, "y": 2.25},
+ {"matrix": [3, 7], "x": 10, "y": 2.25},
+ {"matrix": [3, 8], "x": 11, "y": 2.25},
+ {"matrix": [3, 9], "x": 12, "y": 2.25},
+ {"matrix": [3, 10], "x": 13, "y": 2.25},
+ {"matrix": [3, 11], "x": 14.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 15.5, "y": 2.25},
+ {"matrix": [3, 13], "x": 16.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 18.25, "y": 2},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 3.25, "w": 1.75},
+ {"matrix": [4, 1], "x": 2, "y": 3.25},
+ {"matrix": [4, 2], "x": 3.75, "y": 3.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 3.25},
+ {"matrix": [4, 5], "x": 6.75, "y": 3.25},
+ {"matrix": [4, 6], "x": 9.25, "y": 3.25},
+ {"matrix": [4, 7], "x": 10.25, "y": 3.25},
+ {"matrix": [4, 8], "x": 11.25, "y": 3.25},
+ {"matrix": [4, 9], "x": 12.25, "y": 3.25},
+ {"matrix": [4, 10], "x": 14, "y": 3.25},
+ {"matrix": [4, 11], "x": 15, "y": 3.25},
+ {"matrix": [4, 12], "x": 16, "y": 3.25, "w": 2.25},
- { "label": "k10", "x": 0.75, "y": 1.25 },
- { "label": "k11", "x": 1.75, "y": 1.25 },
- { "label": "k12", "x": 2.75, "y": 1.25 },
- { "label": "k13", "x": 4, "y": 1.25 },
- { "label": "k14", "x": 5, "y": 1.25 },
- { "label": "k15", "x": 6, "y": 1.25 },
- { "label": "k16", "x": 7, "y": 1.25 },
- { "label": "k17", "x": 9.5, "y": 1.25 },
- { "label": "k18", "x": 10.5, "y": 1.25 },
- { "label": "k19", "x": 11.5, "y": 1.25 },
- { "label": "k1A", "x": 12.5, "y": 1.25 },
- { "label": "k1B", "x": 13.75, "y": 1.25 },
- { "label": "k1C", "x": 14.75, "y": 1.25 },
- { "label": "k1D", "x": 15.75, "y": 1.25 },
- { "label": "k1E", "x": 16.75, "y": 1.25 },
- { "label": "k2E", "x": 18, "y": 1 },
+ {"matrix": [5, 14], "x": 18.5, "y": 3},
- { "label": "k20", "x": 0.5, "y": 2.25, "w": 1.5 },
- { "label": "k21", "x": 2, "y": 2.25 },
- { "label": "k22", "x": 3.5, "y": 2.25 },
- { "label": "k23", "x": 4.5, "y": 2.25 },
- { "label": "k24", "x": 5.5, "y": 2.25 },
- { "label": "k25", "x": 6.5, "y": 2.25 },
- { "label": "k26", "x": 9, "y": 2.25 },
- { "label": "k27", "x": 10, "y": 2.25 },
- { "label": "k28", "x": 11, "y": 2.25 },
- { "label": "k29", "x": 12, "y": 2.25 },
- { "label": "k2A", "x": 13, "y": 2.25 },
- { "label": "k2B", "x": 14.5, "y": 2.25 },
- { "label": "k2C", "x": 15.5, "y": 2.25 },
- { "label": "k2D", "x": 16.5, "y": 2.25, "w": 1.5 },
- { "label": "k3E", "x": 18.25, "y": 2 },
+ {"matrix": [5, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [5, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [5, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [5, 3], "x": 5.25, "y": 4.25},
+ {"matrix": [5, 4], "x": 6.25, "y": 4.25},
+ {"matrix": [5, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [5, 6], "x": 9.5, "y": 4.25},
+ {"matrix": [5, 7], "x": 10.5, "y": 4.25},
+ {"matrix": [5, 8], "x": 11.5, "y": 4.25},
+ {"matrix": [5, 9], "x": 12.5, "y": 4.25},
+ {"matrix": [5, 10], "x": 14.5, "y": 4.25},
+ {"matrix": [5, 11], "x": 15.5, "y": 4.25, "w": 1.75},
- { "label": "k30", "x": 0.25, "y": 3.25, "w": 1.75 },
- { "label": "k31", "x": 2, "y": 3.25 },
- { "label": "k32", "x": 3.75, "y": 3.25 },
- { "label": "k33", "x": 4.75, "y": 3.25 },
- { "label": "k34", "x": 5.75, "y": 3.25 },
- { "label": "k35", "x": 6.75, "y": 3.25 },
- { "label": "k36", "x": 9.25, "y": 3.25 },
- { "label": "k37", "x": 10.25, "y": 3.25 },
- { "label": "k38", "x": 11.25, "y": 3.25 },
- { "label": "k39", "x": 12.25, "y": 3.25 },
- { "label": "k3A", "x": 14, "y": 3.25 },
- { "label": "k3B", "x": 15, "y": 3.25 },
- { "label": "k3C", "x": 16, "y": 3.25, "w": 2.25 },
- { "label": "k4E", "x": 18.5, "y": 3 },
+ {"matrix": [5, 13], "x": 17.5, "y": 4.5},
- { "label": "k40", "x": 0, "y": 4.25, "w": 2.25 },
- { "label": "k41", "x": 2.25, "y": 4.25 },
- { "label": "k42", "x": 4.25, "y": 4.25 },
- { "label": "k43", "x": 5.25, "y": 4.25 },
- { "label": "k44", "x": 6.25, "y": 4.25 },
- { "label": "k45", "x": 7.25, "y": 4.25 },
- { "label": "k46", "x": 9.5, "y": 4.25 },
- { "label": "k47", "x": 10.5, "y": 4.25 },
- { "label": "k48", "x": 11.5, "y": 4.25 },
- { "label": "k49", "x": 12.5, "y": 4.25 },
- { "label": "k4A", "x": 14.5, "y": 4.25 },
- { "label": "k4B", "x": 15.5, "y": 4.25, "w": 1.75 },
- { "label": "k4D", "x": 17.5, "y": 4.5 },
+ {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [6, 2], "x": 4.25, "y": 5.25, "w": 1.5},
+ {"matrix": [6, 4], "x": 5.75, "y": 5.25, "w": 2},
+ {"matrix": [6, 5], "x": 7.75, "y": 5.25},
+ {"matrix": [6, 7], "x": 9, "y": 5.25, "w": 2.75},
+ {"matrix": [6, 9], "x": 11.75, "y": 5.25, "w": 1.5},
- { "label": "k50", "x": 0, "y": 5.25, "w": 1.5 },
- { "label": "k52", "x": 4.25, "y": 5.25, "w": 1.5 },
- { "label": "k54", "x": 5.75, "y": 5.25, "w": 2 },
- { "label": "k55", "x": 7.75, "y": 5.25 },
- { "label": "k57", "x": 9, "y": 5.25, "w": 2.75 },
- { "label": "k59", "x": 11.75, "y": 5.25, "w": 1.5 },
- { "label": "k5C", "x": 16.5, "y": 5.5 },
- { "label": "k5D", "x": 17.5, "y": 5.5 },
- { "label": "k5E", "x": 18.5, "y": 5.5 }
+ {"matrix": [6, 12], "x": 16.5, "y": 5.5},
+ {"matrix": [6, 13], "x": 17.5, "y": 5.5},
+ {"matrix": [6, 14], "x": 18.5, "y": 5.5}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 22:13:49 +0000