summaryrefslogtreecommitdiff
path: root/keyboards/handwired/twadlee/tp69
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/twadlee/tp69')
-rw-r--r--keyboards/handwired/twadlee/tp69/config.h20
-rw-r--r--keyboards/handwired/twadlee/tp69/info.json81
-rw-r--r--keyboards/handwired/twadlee/tp69/tp69.c18
-rw-r--r--keyboards/handwired/twadlee/tp69/tp69.h48
4 files changed, 80 insertions, 87 deletions
diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h
index 7c1079397a..390c13b55c 100644
--- a/keyboards/handwired/twadlee/tp69/config.h
+++ b/keyboards/handwired/twadlee/tp69/config.h
@@ -17,26 +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)
- */
-/* 19 17 16 15 14 2 8 6 7 9 */
-#define MATRIX_ROW_PINS { B2, B1, B0, C0, D1, D0, D3, D4, D2, C3 }
-/* 20 21 18 0 1 3 4 5 */
-#define MATRIX_COL_PINS { D5, D6, A4, B16, B17, A1, A2, D7 }
-
-/* for trackpoint: C1 (22) C2 (23) */
-
-/* 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/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json
index a06580eadd..afd79a9bcc 100644
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ b/keyboards/handwired/twadlee/tp69/info.json
@@ -8,11 +8,90 @@
"pid": "0xCACA",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"],
+ "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "MKL26Z64",
"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.c b/keyboards/handwired/twadlee/tp69/tp69.c
deleted file mode 100644
index f4454c3bda..0000000000
--- a/keyboards/handwired/twadlee/tp69/tp69.c
+++ /dev/null
@@ -1,18 +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/>.
- *
- */
-
-#include "tp69.h"
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} \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 04:27:43 +0000