diff options
Diffstat (limited to 'keyboards/takashiski')
19 files changed, 300 insertions, 706 deletions
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h index ff769451d2..ac6c077f6b 100644 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ b/keyboards/takashiski/hecomi/alpha/config.h @@ -17,27 +17,8 @@ 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) - * -*/ -#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 } -#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 } - //#define USE_I2C -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN D4 - #ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING - #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index 040e26dcd0..19a1f05760 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -8,364 +8,100 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 8.25, - "y": 0 - }, - { - "label": "*", - "x": 9.25, - "y": 0 - }, - { - "label": "(", - "x": 10.25, - "y": 0 - }, - { - "label": ")", - "x": 11.25, - "y": 0 - }, - { - "label": "_", - "x": 12.25, - "y": 0 - }, - { - "label": "+", - "x": 13.25, - "y": 0 - }, - { - "label": "|", - "x": 14.25, - "y": 0 - }, - { - "label": "~", - "x": 15.25, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "Y", - "x": 7.75, - "y": 1 - }, - { - "label": "U", - "x": 8.75, - "y": 1 - }, - { - "label": "I", - "x": 9.75, - "y": 1 - }, - { - "label": "O", - "x": 10.75, - "y": 1 - }, - { - "label": "P", - "x": 11.75, - "y": 1 - }, - { - "label": "{", - "x": 12.75, - "y": 1 - }, - { - "label": "}", - "x": 13.75, - "y": 1 - }, - { - "label": "Delete", - "x": 14.75, - "y": 1, - "w": 1.5 - }, - { - "label": "Control", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 8, - "y": 2 - }, - { - "label": "J", - "x": 9, - "y": 2 - }, - { - "label": "K", - "x": 10, - "y": 2 - }, - { - "label": "L", - "x": 11, - "y": 2 - }, - { - "label": ":", - "x": 12, - "y": 2 - }, - { - "label": "\"", - "x": 13, - "y": 2 - }, - { - "label": "Return", - "x": 14, - "y": 2, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "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": "B", - "x": 7.5, - "y": 3 - }, - { - "label": "N", - "x": 8.5, - "y": 3 - }, - { - "label": "M", - "x": 9.5, - "y": 3 - }, - { - "label": "<", - "x": 10.5, - "y": 3 - }, - { - "label": ">", - "x": 11.5, - "y": 3 - }, - { - "label": "?", - "x": 12.5, - "y": 3 - }, - { - "label": "Shift", - "x": 13.5, - "y": 3, - "w": 1.75 - }, - { - "label": "Fn", - "x": 15.25, - "y": 3 - }, - { - "x": 0, - "y": 4, - "w": 1.5 - }, - { - "label": "", - "x": 1.5, - "y": 4 - }, - { - "label": "GUI", - "x": 2.5, - "y": 4 - }, - { - "label": "無変換", - "x": 3.5, - "y": 4 - }, - { - "label": "tab", - "x": 4.5, - "y": 4 - }, - { - "x": 5.5, - "y": 4 - }, - { - "label": "Enter", - "x": 7.75, - "y": 4 - }, - { - "label": "BS", - "x": 8.75, - "y": 4 - }, - { - "label": "変換", - "x": 9.75, - "y": 4 - }, - { - "label": "GUI", - "x": 10.75, - "y": 4 - }, - { - "label": "Menu", - "x": 11.75, - "y": 4 - }, - { - "label": "", - "x": 12.75, - "y": 4 - } + {"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": [5, 0], "x": 8.25, "y": 0}, + {"matrix": [5, 1], "x": 9.25, "y": 0}, + {"matrix": [5, 2], "x": 10.25, "y": 0}, + {"matrix": [5, 3], "x": 11.25, "y": 0}, + {"matrix": [5, 4], "x": 12.25, "y": 0}, + {"matrix": [5, 5], "x": 13.25, "y": 0}, + {"matrix": [5, 6], "x": 14.25, "y": 0}, + {"matrix": [5, 7], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.75, "y": 1}, + {"matrix": [6, 1], "x": 8.75, "y": 1}, + {"matrix": [6, 2], "x": 9.75, "y": 1}, + {"matrix": [6, 3], "x": 10.75, "y": 1}, + {"matrix": [6, 4], "x": 11.75, "y": 1}, + {"matrix": [6, 5], "x": 12.75, "y": 1}, + {"matrix": [6, 6], "x": 13.75, "y": 1}, + {"matrix": [6, 7], "x": 14.75, "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, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [7, 6], "x": 13, "y": 2}, + {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 7.5, "y": 3}, + {"matrix": [8, 1], "x": 8.5, "y": 3}, + {"matrix": [8, 2], "x": 9.5, "y": 3}, + {"matrix": [8, 3], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 5], "x": 12.5, "y": 3}, + {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 15.25, "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}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + + {"matrix": [9, 2], "x": 7.75, "y": 4}, + {"matrix": [9, 3], "x": 8.75, "y": 4}, + {"matrix": [9, 4], "x": 9.75, "y": 4}, + {"matrix": [9, 5], "x": 10.75, "y": 4}, + {"matrix": [9, 6], "x": 11.75, "y": 4}, + {"matrix": [9, 7], "x": 12.75, "y": 4} ] } } diff --git a/keyboards/takashiski/hecomi/hecomi.c b/keyboards/takashiski/hecomi/hecomi.c deleted file mode 100644 index d527547119..0000000000 --- a/keyboards/takashiski/hecomi/hecomi.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 takashiski - * - * 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 "hecomi.h" -#include "split_util.h" diff --git a/keyboards/takashiski/hecomi/hecomi.h b/keyboards/takashiski/hecomi/hecomi.h deleted file mode 100644 index 9586e83947..0000000000 --- a/keyboards/takashiski/hecomi/hecomi.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2018 takashiski - * - * 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 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. - */ - - - -/* -Left hand : -7 -7 -6 -6 -6 - -32 - -Right hand: - -8 -8 -7 -8 -6 - -37 -*/ - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, K57, \ - K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, K67, \ - K20, K21, K22, K23, K24, K25, K71, K72, K73, K74, K75, K76, K77,\ - K30, K31, K32, K33, K34, K35, K80, K81, K82, K83, K84, K85, K86, K87, \ - K40, K41, K42, K43, K44, K45, K92, K93, K94, K95, K96, K97\ -) {\ - {K00, K01, K02, K03, K04, K05, K06, KC_NO},\ - {K10, K11, K12, K13, K14, K15, K16, KC_NO},\ - {K20, K21, K22, K23, K24, K25, KC_NO, KC_NO},\ - {K30, K31, K32, K33, K34, K35, KC_NO, KC_NO},\ - {K40, K41, K42, K43, K44, K45, KC_NO, KC_NO},\ - {K50, K51, K52, K53, K54, K55, K56, K57},\ - {K60, K61, K62, K63, K64, K65, K66, K67},\ - {KC_NO, K71, K72, K73, K74, K75, K76, K77},\ - {K80, K81, K82, K83, K84, K85, K86, K87},\ - {KC_NO, KC_NO, K92, K93, K94, K95, K96, K97}\ -} diff --git a/keyboards/takashiski/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json index d1aa7848fc..f64d385270 100644 --- a/keyboards/takashiski/namecard2x4/info.json +++ b/keyboards/takashiski/namecard2x4/info.json @@ -12,7 +12,17 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}, {"label":"5", "x":0, "y":1}, {"label":"6", "x":1, "y":1}, {"label":"7", "x":2, "y":1}, {"label":"8", "x":3, "y":1}] + "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": [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} + ] } } } diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c deleted file mode 100644 index 091b55c10d..0000000000 --- a/keyboards/takashiski/namecard2x4/namecard2x4.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 takashiski - * - * 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 "namecard2x4.h" diff --git a/keyboards/takashiski/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h deleted file mode 100644 index f3f6992703..0000000000 --- a/keyboards/takashiski/namecard2x4/namecard2x4.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2018 takashiski - * - * 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 a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h index 39b488c42a..c4a349580c 100644 --- a/keyboards/takashiski/namecard2x4/rev1/config.h +++ b/keyboards/takashiski/namecard2x4/rev1/config.h @@ -17,24 +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) - * -*/ -#define MATRIX_ROW_PINS { B4,B5 } -#define MATRIX_COL_PINS { E6,D7,C6,D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F4 #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/info.json new file mode 100644 index 0000000000..28781bcd0a --- /dev/null +++ b/keyboards/takashiski/namecard2x4/rev1/info.json @@ -0,0 +1,10 @@ +{ + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["E6", "D7", "C6", "D4"], + "rows": ["B4", "B5"] + }, + "diode_direction": "COL2ROW" +} diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h index e6897e7311..f90b4e073c 100644 --- a/keyboards/takashiski/namecard2x4/rev2/config.h +++ b/keyboards/takashiski/namecard2x4/rev2/config.h @@ -17,24 +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) - * -*/ -#define MATRIX_ROW_PINS { B2,B6 } -#define MATRIX_COL_PINS { D7,E6,B4,B5 } - -/* COL2ROW, ROW2COL */ -//#define DIODE_DIRECTION COL2ROW -#define DIODE_DIRECTION ROW2COL -#define RGB_DI_PIN D4 #define RGBLED_NUM 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/info.json new file mode 100644 index 0000000000..51fe26c555 --- /dev/null +++ b/keyboards/takashiski/namecard2x4/rev2/info.json @@ -0,0 +1,10 @@ +{ + "ws2812": { + "pin": "D4" + }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["B2", "B6"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h index 2919d7f0cc..b43d9c74c8 100644 --- a/keyboards/takashiski/otaku_split/rev0/config.h +++ b/keyboards/takashiski/otaku_split/rev0/config.h @@ -17,23 +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) - * -*/ -#define MATRIX_ROW_PINS { B5,B4,E6,D7,C6 } -#define MATRIX_COL_PINS { B6,B2,B3,B1,F7,F6,F5,F4 } - -/* 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/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 825cf08d2a..8f9f79e4f5 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -15,7 +20,88 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"x":0, "y":4, "w":2}, {"label":"Ctrl", "x":2, "y":4, "w":1.25}, {"label":"Alt", "x":3.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"Menu", "x":11.75, "y":4}, {"label":"\u5909\u63db", "x":12.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":14, "y":4, "w":1.25}, {"label":"Alt", "x":15.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":16.5, "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": [5, 0], "x": 9.75, "y": 0}, + {"matrix": [5, 1], "x": 10.75, "y": 0}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0}, + {"matrix": [5, 4], "x": 13.75, "y": 0}, + {"matrix": [5, 5], "x": 14.75, "y": 0}, + {"matrix": [5, 6], "x": 15.75, "y": 0}, + {"matrix": [5, 7], "x": 16.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4}, + {"matrix": [4, 4], "x": 5.5, "y": 4}, + {"matrix": [4, 5], "x": 6.5, "y": 4}, + + {"matrix": [9, 0], "x": 8.75, "y": 4}, + {"matrix": [9, 1], "x": 9.75, "y": 4}, + {"matrix": [9, 2], "x": 10.75, "y": 4}, + {"matrix": [9, 3], "x": 11.75, "y": 4}, + {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/takashiski/otaku_split/rev0/rev0.c b/keyboards/takashiski/otaku_split/rev0/rev0.c deleted file mode 100644 index 6ec80aabb6..0000000000 --- a/keyboards/takashiski/otaku_split/rev0/rev0.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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 "rev0.h" diff --git a/keyboards/takashiski/otaku_split/rev0/rev0.h b/keyboards/takashiski/otaku_split/rev0/rev0.h deleted file mode 100644 index c3040d2332..0000000000 --- a/keyboards/takashiski/otaku_split/rev0/rev0.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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 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(\ -L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06,R07,\ -L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16,R17,\ -L20,L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25,R26, \ -L30,L31,L32,L33,L34,L35, R30,R31,R32,R33,R34,R35,R36,R37,\ -L40,L41,L42,L43,L44,L45, R40,R41,R42,R43,R44,R45,R46,R47\ -) {\ -{L00,L01,L02,L03,L04,L05,L06,KC_NO},\ -{L10,L11,L12,L13,L14,L15,L16,KC_NO},\ -{L20,L21,L22,L23,L24,L25,KC_NO,KC_NO},\ -{L30,L31,L32,L33,L34,L35,KC_NO,KC_NO},\ -{L40,L41,L42,L43,L44,L45,KC_NO,KC_NO},\ -{R00,R01,R02,R03,R04,R05,R06,R07},\ -{R10,R11,R12,R13,R14,R15,R16,R17},\ -{R20,R21,R22,R23,R24,R25,R26,KC_NO},\ -{R30,R31,R32,R33,R34,R35,R36,R37},\ -{R40,R41,R42,R43,R44,R45,R46,R47}\ -} - - diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h index 63658aa6d4..6a81e8ddcb 100644 --- a/keyboards/takashiski/otaku_split/rev1/config.h +++ b/keyboards/takashiski/otaku_split/rev1/config.h @@ -17,25 +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) - * -*/ -#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 } -#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 } -#define MATRIX_ROW_PINS_RIGHT { B5,B4,E6,D7,C6 } -#define MATRIX_COL_PINS_RIGHT { B6,B2,B3,B1,F7,F6,F5,F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D2 //fix pin. HIGH is left, LOW is right /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 42c66376ec..12bd92c681 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -8,14 +8,108 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"Insert", "x":8.75, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.5, "y":4}, {"label":"2", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"\u5909\u63db", "x":11.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":13, "y":4, "w":1.25}, {"label":"Alt", "x":14.25, "y":4, "w":1.25}, {"label":"Menu", "x":15.5, "y":4}, {"label":"Ctrl", "x":16.5, "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": [5, 0], "x": 8.75, "y": 0}, + {"matrix": [5, 1], "x": 9.75, "y": 0}, + {"matrix": [5, 2], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 4], "x": 12.75, "y": 0}, + {"matrix": [5, 5], "x": 13.75, "y": 0}, + {"matrix": [5, 6], "x": 14.75, "y": 0}, + {"matrix": [5, 7], "x": 15.75, "y": 0}, + {"matrix": [6, 7], "x": 16.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + + {"matrix": [9, 0], "x": 8.75, "y": 4}, + {"matrix": [9, 1], "x": 9.75, "y": 4}, + {"matrix": [9, 2], "x": 10.75, "y": 4}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15.5, "y": 4}, + {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/takashiski/otaku_split/rev1/rev1.c b/keyboards/takashiski/otaku_split/rev1/rev1.c deleted file mode 100644 index b63bb047aa..0000000000 --- a/keyboards/takashiski/otaku_split/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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 "rev1.h" diff --git a/keyboards/takashiski/otaku_split/rev1/rev1.h b/keyboards/takashiski/otaku_split/rev1/rev1.h deleted file mode 100644 index a1f71f0338..0000000000 --- a/keyboards/takashiski/otaku_split/rev1/rev1.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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 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(\ -L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06,R07,R17,\ -L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16,R27,\ -L20,L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25,R26, \ -L30,L31,L32,L33,L34,L35, R30,R31,R32,R33,R34,R35,R36,R37,\ -L40,L41,L42,L43,L44,L45,L46, R40,R41,R42,R43,R44,R45,R46,R47\ -) {\ -{L00,L01,L02,L03,L04,L05,L06,KC_NO},\ -{L10,L11,L12,L13,L14,L15,L16,KC_NO},\ -{L20,L21,L22,L23,L24,L25,KC_NO,KC_NO},\ -{L30,L31,L32,L33,L34,L35,KC_NO,KC_NO},\ -{L40,L41,L42,L43,L44,L45,L46,KC_NO},\ -{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}\ -} - |