diff options
Diffstat (limited to 'keyboards/sidderskb/majbritt/rev2')
| -rw-r--r-- | keyboards/sidderskb/majbritt/rev2/config.h | 8 | ||||
| -rw-r--r-- | keyboards/sidderskb/majbritt/rev2/info.json | 155 | ||||
| -rw-r--r-- | keyboards/sidderskb/majbritt/rev2/rev2.c | 17 | ||||
| -rw-r--r-- | keyboards/sidderskb/majbritt/rev2/rev2.h | 41 |
4 files changed, 85 insertions, 136 deletions
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h index c0c6902e3b..ced239c833 100644 --- a/keyboards/sidderskb/majbritt/rev2/config.h +++ b/keyboards/sidderskb/majbritt/rev2/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - - //0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10, 11, 12, 13, 14 ,15 -#define MATRIX_ROW_PINS { B0, B1, F7, C6, B5} -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, D5 ,D3, D2, D1, D0} - -/* 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/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 2ba227e4a8..cced270ff8 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "B1", "F7", "C6", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} @@ -18,76 +23,86 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0.75, "y": 0 }, - { "label": "!", "x": 1.75, "y": 0 }, - { "label": "\"", "x": 2.75, "y": 0 }, - { "label": "\u00a3", "x": 3.75, "y": 0 }, - { "label": "$", "x": 4.75, "y": 0 }, - { "label": "%", "x": 5.75, "y": 0 }, - { "label": "^", "x": 6.75, "y": 0 }, - { "label": "&", "x": 8.5, "y": 0 }, - { "label": "*", "x": 9.5, "y": 0 }, - { "label": "(", "x": 10.5, "y": 0 }, - { "label": ")", "x": 11.5, "y": 0 }, - { "label": "_", "x": 12.5, "y": 0 }, - { "label": "+", "x": 13.5, "y": 0 }, - { "label": "|", "x": 14.5, "y": 0 }, - { "label": "~", "x": 15.5, "y": 0 }, - { "label": "Del", "x": 16.5, "y": 0 }, - { "label": "Tab", "w": 1.5, "x": 0.5, "y": 1 }, - { "label": "Q", "x": 2, "y": 1 }, - { "label": "W", "x": 3, "y": 1 }, - { "label": "E", "x": 4, "y": 1 }, - { "label": "R", "x": 5, "y": 1 }, - { "label": "T", "x": 6, "y": 1 }, - { "label": "Y", "x": 8, "y": 1 }, - { "label": "U", "x": 9, "y": 1 }, - { "label": "I", "x": 10, "y": 1 }, - { "label": "O", "x": 11, "y": 1 }, - { "label": "P", "x": 12, "y": 1 }, - { "label": "{", "x": 13, "y": 1 }, - { "label": "}", "x": 14, "y": 1 }, - { "label": "Enter", "w": 1.5, "x": 15, "y": 1 }, - { "label": "Pgup", "x": 16.5, "y": 1 }, - { "label": "Caps Lock", "w": 1.75, "x": 0.25, "y": 2 }, - { "label": "A", "x": 2, "y": 2 }, - { "label": "S", "x": 3, "y": 2 }, - { "label": "D", "x": 4, "y": 2 }, - { "label": "F", "x": 5, "y": 2 }, - { "label": "G", "x": 6, "y": 2 }, - { "label": "H", "x": 8.25, "y": 2 }, - { "label": "J", "x": 9.25, "y": 2 }, - { "label": "K", "x": 10.25, "y": 2 }, - { "label": "L", "x": 11.25, "y": 2 }, - { "label": ":", "x": 12.25, "y": 2 }, - { "label": "@", "x": 13.25, "y": 2 }, - { "label": "~", "x": 14.25, "y": 2 }, - { "label": "Enter", "w": 1.25, "x": 15.25, "y": 2 }, - { "label": "Pgdn", "x": 16.5, "y": 2 }, - { "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, - { "label": "|", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 8.75, "y": 3 }, - { "label": "M", "x": 9.75, "y": 3 }, - { "label": "<", "x": 10.75, "y": 3 }, - { "label": ">", "x": 11.75, "y": 3 }, - { "label": "?", "x": 12.75, "y": 3 }, - { "label": "Shift", "w": 1.75, "x": 13.75, "y": 3 }, - { "label": "Up", "x": 15.5, "y": 3 }, - { "label": "Fn", "x": 16.5, "y": 3 }, - { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 }, - { "label": "Alt", "w": 1.5, "x": 3, "y": 4 }, - { "label": "LSpace", "w": 2.25, "x": 4.5, "y": 4 }, - { "label": "Fn", "x": 6.75, "y": 4 }, - { "label": "RSpace", "w": 2.75, "x": 8.25, "y": 4 }, - { "label": "AltGr", "w": 1.5, "x": 11, "y": 4 }, - { "label": "Left", "x": 14.5, "y": 4 }, - { "label": "Down", "x": 15.5, "y": 4 }, - { "label": "Right", "x": 16.5, "y": 4 } + {"matrix": [0, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"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, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6.75, "y": 4}, + + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [4, 13], "x": 14.5, "y": 4}, + {"matrix": [4, 14], "x": 15.5, "y": 4}, + {"matrix": [4, 15], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.c b/keyboards/sidderskb/majbritt/rev2/rev2.c deleted file mode 100644 index f9120ab2a1..0000000000 --- a/keyboards/sidderskb/majbritt/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Sleepdealer - * - * 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 "rev2.h" diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.h b/keyboards/sidderskb/majbritt/rev2/rev2.h deleted file mode 100644 index a03a2ff105..0000000000 --- a/keyboards/sidderskb/majbritt/rev2/rev2.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Sleepdealer - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ - K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, K315, \ - K400, K403, K404, K405, K408, K410, K413, K414, K415 \ -) {\ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, KC_NO, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \ - { K400, KC_NO, KC_NO, K403, K404, K405, KC_NO, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, K413, K414, K415 } \ -} |