diff options
Diffstat (limited to 'keyboards/shoc')
| -rw-r--r-- | keyboards/shoc/config.h | 7 | ||||
| -rw-r--r-- | keyboards/shoc/info.json | 135 | ||||
| -rw-r--r-- | keyboards/shoc/shoc.c | 16 | ||||
| -rw-r--r-- | keyboards/shoc/shoc.h | 38 |
4 files changed, 70 insertions, 126 deletions
diff --git a/keyboards/shoc/config.h b/keyboards/shoc/config.h index 8190ac773a..beb5d63a40 100644 --- a/keyboards/shoc/config.h +++ b/keyboards/shoc/config.h @@ -18,10 +18,3 @@ #define OLED_DISPLAY_128X64 #define OLED_TIMEOUT 300000 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B6, B2 } -#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json index d398e67956..fca5fdca0b 100644 --- a/keyboards/shoc/info.json +++ b/keyboards/shoc/info.json @@ -8,76 +8,81 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "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": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 0, "y": 2, "w": 1.5 }, - { "x": 1.5, "y": 2 }, - { "x": 2.5, "y": 2 }, - { "x": 3.5, "y": 2 }, - { "x": 4.5, "y": 2 }, - { "x": 5.5, "y": 2 }, - { "x": 6.5, "y": 2 }, - { "x": 7.5, "y": 2 }, - { "x": 0, "y": 3, "w": 2 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 0, "y": 4, "w": 1.5 }, - { "x": 1.5, "y": 4 }, - { "x": 2.5, "y": 4, "w": 1.5 }, - { "x": 4, "y": 4, "w": 2 }, - { "x": 6, "y": 4 }, - { "x": 7, "y": 4, "w": 2 }, - { "x": 9, "y": 4 }, - { "x": 10, "y": 4 }, - { "x": 12, "y": 0, "w": 2 }, - { "x": 11, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 13, "y": 4 }, - { "x": 12, "y": 4 }, - { "x": 11, "y": 4 }, - { "x": 13, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 12.5, "y": 2, "w": 1.5 }, - { "x": 11.5, "y": 2 }, - { "x": 10.5, "y": 2 }, - { "x": 9.5, "y": 2 }, - { "x": 8.5, "y": 2 } + {"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": [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": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 5], "x": 7, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 9, "y": 4}, + {"matrix": [4, 7], "x": 10, "y": 4}, + {"matrix": [5, 0], "x": 12, "y": 0, "w": 2}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 6], "x": 9, "y": 1}, + {"matrix": [5, 7], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 13, "y": 4}, + {"matrix": [6, 1], "x": 12, "y": 4}, + {"matrix": [6, 2], "x": 11, "y": 4}, + {"matrix": [6, 3], "x": 13, "y": 3}, + {"matrix": [6, 4], "x": 12, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 10, "y": 3}, + {"matrix": [6, 7], "x": 9, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 10.5, "y": 2}, + {"matrix": [7, 6], "x": 9.5, "y": 2}, + {"matrix": [7, 7], "x": 8.5, "y": 2} ] } } -}
\ No newline at end of file +} diff --git a/keyboards/shoc/shoc.c b/keyboards/shoc/shoc.c deleted file mode 100644 index eabb767d28..0000000000 --- a/keyboards/shoc/shoc.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 JannikB5825 - * - * 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 "shoc.h" diff --git a/keyboards/shoc/shoc.h b/keyboards/shoc/shoc.h deleted file mode 100644 index 3ea48781e0..0000000000 --- a/keyboards/shoc/shoc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 JannikB5825 - * - * 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 LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, \ - k10, k11, k12, k13, k14, k15, k16, k17, \ - k20, k21, k22, k23, k24, k25, k26, k27, \ - k30, k31, k32, k33, k34, k35, k36, k37, \ - k40, k41, k42, k43, k44, k45, k46, k47, \ - k50, k51, k52, k53, k54, k55, k56, k57, \ - k60, k61, k62, k63, k64, k65, k66, k67, \ - k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 } \ -} - |