diff options
Diffstat (limited to 'keyboards/yoichiro/lunakey_mini')
-rw-r--r-- | keyboards/yoichiro/lunakey_mini/config.h | 20 | ||||
-rw-r--r-- | keyboards/yoichiro/lunakey_mini/info.json | 104 | ||||
-rw-r--r-- | keyboards/yoichiro/lunakey_mini/lunakey_mini.c | 17 | ||||
-rw-r--r-- | keyboards/yoichiro/lunakey_mini/lunakey_mini.h | 44 |
4 files changed, 60 insertions, 125 deletions
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h index a4ddefb53c..1e2b0af370 100644 --- a/keyboards/yoichiro/lunakey_mini/config.h +++ b/keyboards/yoichiro/lunakey_mini/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 { D4, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT { 6, 6 } @@ -56,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Audio Support */ #define AUDIO_PIN C6 diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/info.json index 4baa40bda4..1347f73cb0 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/info.json @@ -8,58 +8,74 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"label":"L00", "x":0, "y":1.5}, - {"label":"L01", "x":1, "y":1.25}, - {"label":"L02", "x":2, "y":0.5}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.25}, - {"label":"L05", "x":5, "y":0.5}, - {"label":"R00", "x":8.75, "y":0.5}, - {"label":"R01", "x":9.75, "y":0.25}, - {"label":"R02", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0.5}, - {"label":"R04", "x":12.75, "y":1.25}, - {"label":"R05", "x":13.75, "y":1.5}, - {"label":"L10", "x":0, "y":2.5}, - {"label":"L11", "x":1, "y":2.25}, - {"label":"L12", "x":2, "y":1.5}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.25}, - {"label":"L15", "x":5, "y":1.5}, - {"label":"R10", "x":8.75, "y":1.5}, - {"label":"R11", "x":9.75, "y":1.25}, - {"label":"R12", "x":10.75, "y":1}, - {"label":"R13", "x":11.75, "y":1.5}, - {"label":"R14", "x":12.75, "y":2.25}, - {"label":"R15", "x":13.75, "y":2.5}, - {"label":"L20", "x":0, "y":3.5}, - {"label":"L21", "x":1, "y":3.25}, - {"label":"L22", "x":2, "y":2.5}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.25}, - {"label":"L25", "x":5, "y":2.5}, - {"label":"R20", "x":8.75, "y":2.5}, - {"label":"R21", "x":9.75, "y":2.25}, - {"label":"R22", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2.5}, - {"label":"R24", "x":12.75, "y":3.25}, - {"label":"R25", "x":13.75, "y":3.5}, - {"label":"L30", "x":3, "y":4}, - {"label":"L31", "x":4, "y":3.75}, - {"label":"L32", "x":5, "y":3.75}, - {"label":"L33", "x":6, "y":4}, - {"label":"R30", "x":7.75, "y":4}, - {"label":"R31", "x":8.75, "y":3.75}, - {"label":"R32", "x":9.75, "y":3.75}, - {"label":"R33", "x":10.75, "y":4}] + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.25}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + + {"matrix": [4, 5], "x": 8.75, "y": 0.5}, + {"matrix": [4, 4], "x": 9.75, "y": 0.25}, + {"matrix": [4, 3], "x": 10.75, "y": 0}, + {"matrix": [4, 2], "x": 11.75, "y": 0.5}, + {"matrix": [4, 1], "x": 12.75, "y": 1.25}, + {"matrix": [4, 0], "x": 13.75, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + + {"matrix": [5, 5], "x": 8.75, "y": 1.5}, + {"matrix": [5, 4], "x": 9.75, "y": 1.25}, + {"matrix": [5, 3], "x": 10.75, "y": 1}, + {"matrix": [5, 2], "x": 11.75, "y": 1.5}, + {"matrix": [5, 1], "x": 12.75, "y": 2.25}, + {"matrix": [5, 0], "x": 13.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [6, 5], "x": 8.75, "y": 2.5}, + {"matrix": [6, 4], "x": 9.75, "y": 2.25}, + {"matrix": [6, 3], "x": 10.75, "y": 2}, + {"matrix": [6, 2], "x": 11.75, "y": 2.5}, + {"matrix": [6, 1], "x": 12.75, "y": 3.25}, + {"matrix": [6, 0], "x": 13.75, "y": 3.5}, + + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 3.75}, + {"matrix": [3, 4], "x": 5, "y": 3.75}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [7, 5], "x": 7.75, "y": 4}, + {"matrix": [7, 4], "x": 8.75, "y": 3.75}, + {"matrix": [7, 3], "x": 9.75, "y": 3.75}, + {"matrix": [7, 2], "x": 10.75, "y": 4} + ] } } } diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c b/keyboards/yoichiro/lunakey_mini/lunakey_mini.c deleted file mode 100644 index 4114706374..0000000000 --- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * 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 "lunakey_mini.h" diff --git a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/keyboards/yoichiro/lunakey_mini/lunakey_mini.h deleted file mode 100644 index bb649cc018..0000000000 --- a/keyboards/yoichiro/lunakey_mini/lunakey_mini.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Yoichiro Tanaka - * - * 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_split_3x6_4( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } |