diff options
Diffstat (limited to 'keyboards/kopibeng/typ65')
-rw-r--r-- | keyboards/kopibeng/typ65/config.h | 17 | ||||
-rw-r--r-- | keyboards/kopibeng/typ65/info.json | 164 | ||||
-rw-r--r-- | keyboards/kopibeng/typ65/typ65.c | 2 | ||||
-rw-r--r-- | keyboards/kopibeng/typ65/typ65.h | 54 |
4 files changed, 88 insertions, 149 deletions
diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h index dfedea3dd2..76cd3ae659 100644 --- a/keyboards/kopibeng/typ65/config.h +++ b/keyboards/kopibeng/typ65/config.h @@ -16,27 +16,10 @@ #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, D1, D2, F6, B0 } -#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F5, F4, F1, F0, E6 } - #define INDICATOR_0 B2 #define INDICATOR_1 B7 #define INDICATOR_2 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/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json index 258acfee65..f6ce5d4e67 100644 --- a/keyboards/kopibeng/typ65/info.json +++ b/keyboards/kopibeng/typ65/info.json @@ -8,6 +8,11 @@ "pid": "0x065E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F5", "F4", "F1", "F0", "E6"], + "rows": ["D0", "D1", "D2", "F6", "B0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B1" }, @@ -19,83 +24,88 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K01", "x": 1.25, "y": 0 }, - { "label": "K02", "x": 2.25, "y": 0 }, - { "label": "K03", "x": 3.25, "y": 0 }, - { "label": "K04", "x": 4.25, "y": 0 }, - { "label": "K05", "x": 5.25, "y": 0 }, - { "label": "K06", "x": 6.25, "y": 0 }, - { "label": "K07", "x": 7.25, "y": 0 }, - { "label": "K08", "x": 8.25, "y": 0 }, - { "label": "K09", "x": 9.25, "y": 0 }, - { "label": "K0A", "x": 10.25, "y": 0 }, - { "label": "K0B", "x": 11.25, "y": 0 }, - { "label": "K0C", "x": 12.25, "y": 0 }, - { "label": "K0D", "x": 13.25, "y": 0 }, - { "label": "K1E", "x": 14.25, "y": 0 }, - { "label": "K0E", "x": 15.25, "y": 0 }, - { "label": "K0F", "x": 16.25, "y": 0 }, - - { "label": "K00", "x": 0, "y": 1 }, - { "label": "K11", "w": 1.5, "x": 1.25, "y": 1 }, - { "label": "K12", "x": 2.75, "y": 1 }, - { "label": "K13", "x": 3.75, "y": 1 }, - { "label": "K14", "x": 4.75, "y": 1 }, - { "label": "K15", "x": 5.75, "y": 1 }, - { "label": "K16", "x": 6.75, "y": 1 }, - { "label": "K17", "x": 7.75, "y": 1 }, - { "label": "K18", "x": 8.75, "y": 1 }, - { "label": "K19", "x": 9.75, "y": 1 }, - { "label": "K1A", "x": 10.75, "y": 1 }, - { "label": "K1B", "x": 11.75, "y": 1 }, - { "label": "K1C", "x": 12.75, "y": 1 }, - { "label": "K1D", "x": 13.75, "y": 1 }, - { "label": "K2E", "w": 1.5, "x": 14.75, "y": 1 }, - { "label": "K1F", "x": 16.25, "y": 1 }, - - { "label": "K10", "x": 0, "y": 2 }, - { "label": "K21", "w": 1.75, "x": 1.25, "y": 2 }, - { "label": "K22", "x": 3, "y": 2 }, - { "label": "K23", "x": 4, "y": 2 }, - { "label": "K24", "x": 5, "y": 2 }, - { "label": "K25", "x": 6, "y": 2 }, - { "label": "K26", "x": 7, "y": 2 }, - { "label": "K27", "x": 8, "y": 2 }, - { "label": "K28", "x": 9, "y": 2 }, - { "label": "K29", "x": 10, "y": 2 }, - { "label": "K2A", "x": 11, "y": 2 }, - { "label": "K2B", "x": 12, "y": 2 }, - { "label": "K2C", "x": 13, "y": 2 }, - { "label": "K2D", "w": 2.25, "x": 14, "y": 2 }, - { "label": "K2F", "x": 16.25, "y": 2 }, - - { "label": "K20", "x": 0, "y": 3 }, - { "label": "K31", "w": 1.25, "x": 1.25, "y": 3 }, - { "label": "K32", "x": 2.5, "y": 3 }, - { "label": "K33", "x": 3.5, "y": 3 }, - { "label": "K34", "x": 4.5, "y": 3 }, - { "label": "K35", "x": 5.5, "y": 3 }, - { "label": "K36", "x": 6.5, "y": 3 }, - { "label": "K37", "x": 7.5, "y": 3 }, - { "label": "K38", "x": 8.5, "y": 3 }, - { "label": "K39", "x": 9.5, "y": 3 }, - { "label": "K3A", "x": 10.5, "y": 3 }, - { "label": "K3B", "x": 11.5, "y": 3 }, - { "label": "K3C", "x": 12.5, "y": 3 }, - { "label": "K3D", "w": 1.75, "x": 13.5, "y": 3 }, - { "label": "K3E", "x": 15.25, "y": 3 }, - { "label": "K3F", "x": 16.25, "y": 3 }, - - { "label": "K30", "x": 0, "y": 4 }, - { "label": "K41", "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "K42", "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "K43", "w": 1.25, "x": 3.75, "y": 4 }, - { "label": "K47", "w": 6.25, "x": 5, "y": 4 }, - { "label": "K4B", "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "K4C", "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "K4D", "x": 14.25, "y": 4 }, - { "label": "K4E", "x": 15.25, "y": 4 }, - { "label": "K4F", "x": 16.25, "y": 4 } + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [1, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1}, + {"matrix": [2, 14], "x": 14.75, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.25, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 14.25, "y": 4}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4} ] } } diff --git a/keyboards/kopibeng/typ65/typ65.c b/keyboards/kopibeng/typ65/typ65.c index 2844f2ca83..246a8c13af 100644 --- a/keyboards/kopibeng/typ65/typ65.c +++ b/keyboards/kopibeng/typ65/typ65.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "typ65.h" +#include "quantum.h" void keyboard_pre_init_kb (void) { setPinOutput(INDICATOR_0); diff --git a/keyboards/kopibeng/typ65/typ65.h b/keyboards/kopibeng/typ65/typ65.h deleted file mode 100644 index a4bbf9ab99..0000000000 --- a/keyboards/kopibeng/typ65/typ65.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 - -/* - * - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ - * │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │0E │0F │ │0E │ Full Backspace - * ┌───┐ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ - * │00 │ │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2E │1F │ │2E │ - * 2.25u ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌─┴─┐ │ ISO - * LShift │10 │ │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F │ │2D │ │ - * ┌────────┐ ├───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴───┘ - * │31 │ │20 │ │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │ - * └────────┘ ├───┤ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │30 │ │41 │42 │43 │47 │4B │4C │ │4D │4E │4F │ - * └───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┐ - * │41 │42 │43 │47 │4C │ 7u Tsangan - * └─────┴───┴─────┴───────────────────────────┴─────┘ - * - */ - -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, K0E, K0F, \ - K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K1F, \ - K10, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K20, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K30, K41, K42, K43, K47, K4B, K4C, K4D, K4E, K4F \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \ - {___, K41, K42, K43, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, K4E, K4F} \ -} |