summaryrefslogtreecommitdiff
path: root/keyboards/adkb96
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/adkb96')
-rw-r--r--keyboards/adkb96/adkb96.c2
-rw-r--r--keyboards/adkb96/adkb96.h7
-rw-r--r--keyboards/adkb96/info.json589
-rw-r--r--keyboards/adkb96/rev1/config.h6
-rw-r--r--keyboards/adkb96/rev1/rev1.c1
-rw-r--r--keyboards/adkb96/rev1/rev1.h39
6 files changed, 110 insertions, 534 deletions
diff --git a/keyboards/adkb96/adkb96.c b/keyboards/adkb96/adkb96.c
index 93230ee00c..591a17c082 100644
--- a/keyboards/adkb96/adkb96.c
+++ b/keyboards/adkb96/adkb96.c
@@ -1,4 +1,4 @@
-#include "adkb96.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/adkb96/adkb96.h b/keyboards/adkb96/adkb96.h
deleted file mode 100644
index 5a47f16aad..0000000000
--- a/keyboards/adkb96/adkb96.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_adkb96_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index e86480d7d7..b293e03f73 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,494 +8,123 @@
"pid": "0xAD96",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_6x16"
+ },
"layouts": {
"LAYOUT_ortho_6x16": {
"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": "L07",
- "x": 7,
- "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": "R07",
- "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": "L15",
- "x": 5,
- "y": 1
- },
- {
- "label": "L16",
- "x": 6,
- "y": 1
- },
- {
- "label": "L17",
- "x": 7,
- "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": "R17",
- "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": "L25",
- "x": 5,
- "y": 2
- },
- {
- "label": "L26",
- "x": 6,
- "y": 2
- },
- {
- "label": "L27",
- "x": 7,
- "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": "R27",
- "x": 15,
- "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": "L37",
- "x": 7,
- "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": "R37",
- "x": 15,
- "y": 3
- },
- {
- "label": "L40",
- "x": 0,
- "y": 4
- },
- {
- "label": "L41",
- "x": 1,
- "y": 4
- },
- {
- "label": "L42",
- "x": 2,
- "y": 4
- },
- {
- "label": "L43",
- "x": 3,
- "y": 4
- },
- {
- "label": "L44",
- "x": 4,
- "y": 4
- },
- {
- "label": "L45",
- "x": 5,
- "y": 4
- },
- {
- "label": "L46",
- "x": 6,
- "y": 4
- },
- {
- "label": "L47",
- "x": 7,
- "y": 4
- },
- {
- "label": "R40",
- "x": 8,
- "y": 4
- },
- {
- "label": "R41",
- "x": 9,
- "y": 4
- },
- {
- "label": "R42",
- "x": 10,
- "y": 4
- },
- {
- "label": "R43",
- "x": 11,
- "y": 4
- },
- {
- "label": "R44",
- "x": 12,
- "y": 4
- },
- {
- "label": "R45",
- "x": 13,
- "y": 4
- },
- {
- "label": "R46",
- "x": 14,
- "y": 4
- },
- {
- "label": "R47",
- "x": 15,
- "y": 4
- },
- {
- "label": "L50",
- "x": 0,
- "y": 5
- },
- {
- "label": "L51",
- "x": 1,
- "y": 5
- },
- {
- "label": "L52",
- "x": 2,
- "y": 5
- },
- {
- "label": "L53",
- "x": 3,
- "y": 5
- },
- {
- "label": "L54",
- "x": 4,
- "y": 5
- },
- {
- "label": "L55",
- "x": 5,
- "y": 5
- },
- {
- "label": "L56",
- "x": 6,
- "y": 5
- },
- {
- "label": "L57",
- "x": 7,
- "y": 5
- },
- {
- "label": "R50",
- "x": 8,
- "y": 5
- },
- {
- "label": "R51",
- "x": 9,
- "y": 5
- },
- {
- "label": "R52",
- "x": 10,
- "y": 5
- },
- {
- "label": "R53",
- "x": 11,
- "y": 5
- },
- {
- "label": "R54",
- "x": 12,
- "y": 5
- },
- {
- "label": "R55",
- "x": 13,
- "y": 5
- },
- {
- "label": "R56",
- "x": 14,
- "y": 5
- },
- {
- "label": "R57",
- "x": 15,
- "y": 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": [6, 0], "x": 8, "y": 0},
+ {"matrix": [6, 1], "x": 9, "y": 0},
+ {"matrix": [6, 2], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 4], "x": 12, "y": 0},
+ {"matrix": [6, 5], "x": 13, "y": 0},
+ {"matrix": [6, 6], "x": 14, "y": 0},
+ {"matrix": [6, 7], "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": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [7, 0], "x": 8, "y": 1},
+ {"matrix": [7, 1], "x": 9, "y": 1},
+ {"matrix": [7, 2], "x": 10, "y": 1},
+ {"matrix": [7, 3], "x": 11, "y": 1},
+ {"matrix": [7, 4], "x": 12, "y": 1},
+ {"matrix": [7, 5], "x": 13, "y": 1},
+ {"matrix": [7, 6], "x": 14, "y": 1},
+ {"matrix": [7, 7], "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": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [8, 0], "x": 8, "y": 2},
+ {"matrix": [8, 1], "x": 9, "y": 2},
+ {"matrix": [8, 2], "x": 10, "y": 2},
+ {"matrix": [8, 3], "x": 11, "y": 2},
+ {"matrix": [8, 4], "x": 12, "y": 2},
+ {"matrix": [8, 5], "x": 13, "y": 2},
+ {"matrix": [8, 6], "x": 14, "y": 2},
+ {"matrix": [8, 7], "x": 15, "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": [9, 0], "x": 8, "y": 3},
+ {"matrix": [9, 1], "x": 9, "y": 3},
+ {"matrix": [9, 2], "x": 10, "y": 3},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [9, 4], "x": 12, "y": 3},
+ {"matrix": [9, 5], "x": 13, "y": 3},
+ {"matrix": [9, 6], "x": 14, "y": 3},
+ {"matrix": [9, 7], "x": 15, "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": [10, 0], "x": 8, "y": 4},
+ {"matrix": [10, 1], "x": 9, "y": 4},
+ {"matrix": [10, 2], "x": 10, "y": 4},
+ {"matrix": [10, 3], "x": 11, "y": 4},
+ {"matrix": [10, 4], "x": 12, "y": 4},
+ {"matrix": [10, 5], "x": 13, "y": 4},
+ {"matrix": [10, 6], "x": 14, "y": 4},
+ {"matrix": [10, 7], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"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, 5], "x": 5, "y": 5},
+ {"matrix": [5, 6], "x": 6, "y": 5},
+ {"matrix": [5, 7], "x": 7, "y": 5},
+ {"matrix": [11, 0], "x": 8, "y": 5},
+ {"matrix": [11, 1], "x": 9, "y": 5},
+ {"matrix": [11, 2], "x": 10, "y": 5},
+ {"matrix": [11, 3], "x": 11, "y": 5},
+ {"matrix": [11, 4], "x": 12, "y": 5},
+ {"matrix": [11, 5], "x": 13, "y": 5},
+ {"matrix": [11, 6], "x": 14, "y": 5},
+ {"matrix": [11, 7], "x": 15, "y": 5}
]
}
}
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c5a9673671..89de3d9a64 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* define tapping term */
#define TAPPING_TERM 100
diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c
deleted file mode 100644
index 594c532994..0000000000
--- a/keyboards/adkb96/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "adkb96.h"
diff --git a/keyboards/adkb96/rev1/rev1.h b/keyboards/adkb96/rev1/rev1.h
deleted file mode 100644
index 4c4c7bae3c..0000000000
--- a/keyboards/adkb96/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "adkb96.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
-#define LAYOUT_ortho_6x16( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
- L50, L51, L52, L53, L54, L55, L56, L57, R50, R51, R52, R53, R54, R55, R56, R57 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, L07 }, \
- { L10, L11, L12, L13, L14, L15, L16, L17 }, \
- { L20, L21, L22, L23, L24, L25, L26, L27 }, \
- { L30, L31, L32, L33, L34, L35, L36, L37 }, \
- { L40, L41, L42, L43, L44, L45, L46, L47 }, \
- { L50, L51, L52, L53, L54, L55, L56, L57 }, \
- { 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 }, \
- { R50, R51, R52, R53, R54, R55, R56, R57 } \
- }
-
-#define LAYOUT LAYOUT_ortho_6x16
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:06:17 +0000