diff options
Diffstat (limited to 'keyboards/kkatano/wallaby')
| -rw-r--r-- | keyboards/kkatano/wallaby/config.h | 17 | ||||
| -rw-r--r-- | keyboards/kkatano/wallaby/info.json | 192 | ||||
| -rw-r--r-- | keyboards/kkatano/wallaby/wallaby.c | 2 | ||||
| -rw-r--r-- | keyboards/kkatano/wallaby/wallaby.h | 44 |
4 files changed, 106 insertions, 149 deletions
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h index aecfcb1c13..6aac1d9a5e 100644 --- a/keyboards/kkatano/wallaby/config.h +++ b/keyboards/kkatano/wallaby/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, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 } - -/* 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/kkatano/wallaby/info.json b/keyboards/kkatano/wallaby/info.json index b5ee4bd1ed..6939509fac 100644 --- a/keyboards/kkatano/wallaby/info.json +++ b/keyboards/kkatano/wallaby/info.json @@ -8,99 +8,117 @@ "pid": "0x5967", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"], + "rows": ["B5", "B4", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6.5, "y":0}, - {"label":"7", "x":7.5, "y":0}, - {"label":"8", "x":8.5, "y":0}, - {"label":"9", "x":9.5, "y":0}, - {"label":"10", "x":11, "y":0}, - {"label":"11", "x":12, "y":0}, - {"label":"12", "x":13, "y":0}, - {"label":"13", "x":14, "y":0}, - {"label":"14", "x":15.26, "y":0}, - {"label":"15", "x":16.26, "y":0}, - {"label":"16", "x":17.26, "y":0}, - {"label":"17", "x":0, "y":1.47}, - {"label":"18", "x":1, "y":1.47}, - {"label":"19", "x":2, "y":1.47}, - {"label":"20", "x":3, "y":1.47}, - {"label":"21", "x":4, "y":1.47}, - {"label":"22", "x":5, "y":1.47}, - {"label":"23", "x":6, "y":1.47}, - {"label":"24", "x":7, "y":1.47}, - {"label":"25", "x":8, "y":1.47}, - {"label":"26", "x":9, "y":1.47}, - {"label":"27", "x":10, "y":1.47}, - {"label":"28", "x":11, "y":1.47}, - {"label":"29", "x":12, "y":1.47}, - {"label":"30", "x":13, "y":1.47, "w":2}, - {"label":"31", "x":15.26, "y":1.47}, - {"label":"32", "x":16.26, "y":1.47}, - {"label":"33", "x":17.26, "y":1.47}, - {"label":"34", "x":0, "y":2.47, "w":1.5}, - {"label":"35", "x":1.5, "y":2.47}, - {"label":"36", "x":2.5, "y":2.47}, - {"label":"37", "x":3.5, "y":2.47}, - {"label":"38", "x":4.5, "y":2.47}, - {"label":"39", "x":5.5, "y":2.47}, - {"label":"40", "x":6.5, "y":2.47}, - {"label":"41", "x":7.5, "y":2.47}, - {"label":"42", "x":8.5, "y":2.47}, - {"label":"43", "x":9.5, "y":2.47}, - {"label":"44", "x":10.5, "y":2.47}, - {"label":"45", "x":11.5, "y":2.47}, - {"label":"46", "x":12.5, "y":2.47}, - {"label":"47", "x":13.5, "y":2.47, "w":1.5}, - {"label":"48", "x":15.26, "y":2.47}, - {"label":"49", "x":16.26, "y":2.47}, - {"label":"50", "x":17.26, "y":2.47}, - {"label":"51", "x":0, "y":3.47, "w":1.75}, - {"label":"52", "x":1.75, "y":3.47}, - {"label":"53", "x":2.75, "y":3.47}, - {"label":"54", "x":3.75, "y":3.47}, - {"label":"55", "x":4.75, "y":3.47}, - {"label":"56", "x":5.75, "y":3.47}, - {"label":"57", "x":6.75, "y":3.47}, - {"label":"58", "x":7.75, "y":3.47}, - {"label":"59", "x":8.75, "y":3.47}, - {"label":"60", "x":9.75, "y":3.47}, - {"label":"61", "x":10.75, "y":3.47}, - {"label":"62", "x":11.75, "y":3.47}, - {"label":"63", "x":12.75, "y":3.47, "w":2.25}, - {"label":"64", "x":0, "y":4.47, "w":2.25}, - {"label":"65", "x":2.25, "y":4.47}, - {"label":"66", "x":3.25, "y":4.47}, - {"label":"67", "x":4.25, "y":4.47}, - {"label":"68", "x":5.25, "y":4.47}, - {"label":"69", "x":6.25, "y":4.47}, - {"label":"70", "x":7.25, "y":4.47}, - {"label":"71", "x":8.25, "y":4.47}, - {"label":"72", "x":9.25, "y":4.47}, - {"label":"73", "x":10.25, "y":4.47}, - {"label":"74", "x":11.25, "y":4.47}, - {"label":"75", "x":12.25, "y":4.47, "w":2.75}, - {"label":"76", "x":16.26, "y":4.47}, - {"label":"77", "x":0, "y":5.47, "w":1.25}, - {"label":"78", "x":1.25, "y":5.47, "w":1.25}, - {"label":"79", "x":2.5, "y":5.47, "w":1.25}, - {"label":"80", "x":3.75, "y":5.47, "w":6.25}, - {"label":"81", "x":10, "y":5.47, "w":1.25}, - {"label":"82", "x":11.25, "y":5.47, "w":1.25}, - {"label":"83", "x":12.5, "y":5.47, "w":1.25}, - {"label":"84", "x":13.75, "y":5.47, "w":1.25}, - {"label":"85", "x":15.26, "y":5.47}, - {"label":"86", "x":16.26, "y":5.47}, - {"label":"87", "x":17.26, "y":5.47} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.26, "y": 0}, + {"matrix": [0, 15], "x": 16.26, "y": 0}, + {"matrix": [0, 16], "x": 17.26, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.47}, + {"matrix": [1, 1], "x": 1, "y": 1.47}, + {"matrix": [1, 2], "x": 2, "y": 1.47}, + {"matrix": [1, 3], "x": 3, "y": 1.47}, + {"matrix": [1, 4], "x": 4, "y": 1.47}, + {"matrix": [1, 5], "x": 5, "y": 1.47}, + {"matrix": [1, 6], "x": 6, "y": 1.47}, + {"matrix": [1, 7], "x": 7, "y": 1.47}, + {"matrix": [1, 8], "x": 8, "y": 1.47}, + {"matrix": [1, 9], "x": 9, "y": 1.47}, + {"matrix": [1, 10], "x": 10, "y": 1.47}, + {"matrix": [1, 11], "x": 11, "y": 1.47}, + {"matrix": [1, 12], "x": 12, "y": 1.47}, + {"matrix": [1, 13], "x": 13, "y": 1.47, "w": 2}, + + {"matrix": [1, 14], "x": 15.26, "y": 1.47}, + {"matrix": [1, 15], "x": 16.26, "y": 1.47}, + {"matrix": [1, 16], "x": 17.26, "y": 1.47}, + + {"matrix": [2, 0], "x": 0, "y": 2.47, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.47}, + {"matrix": [2, 2], "x": 2.5, "y": 2.47}, + {"matrix": [2, 3], "x": 3.5, "y": 2.47}, + {"matrix": [2, 4], "x": 4.5, "y": 2.47}, + {"matrix": [2, 5], "x": 5.5, "y": 2.47}, + {"matrix": [2, 6], "x": 6.5, "y": 2.47}, + {"matrix": [2, 7], "x": 7.5, "y": 2.47}, + {"matrix": [2, 8], "x": 8.5, "y": 2.47}, + {"matrix": [2, 9], "x": 9.5, "y": 2.47}, + {"matrix": [2, 10], "x": 10.5, "y": 2.47}, + {"matrix": [2, 11], "x": 11.5, "y": 2.47}, + {"matrix": [2, 12], "x": 12.5, "y": 2.47}, + {"matrix": [2, 13], "x": 13.5, "y": 2.47, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.26, "y": 2.47}, + {"matrix": [2, 15], "x": 16.26, "y": 2.47}, + {"matrix": [2, 16], "x": 17.26, "y": 2.47}, + + {"matrix": [3, 0], "x": 0, "y": 3.47, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.47}, + {"matrix": [3, 2], "x": 2.75, "y": 3.47}, + {"matrix": [3, 3], "x": 3.75, "y": 3.47}, + {"matrix": [3, 4], "x": 4.75, "y": 3.47}, + {"matrix": [3, 5], "x": 5.75, "y": 3.47}, + {"matrix": [3, 6], "x": 6.75, "y": 3.47}, + {"matrix": [3, 7], "x": 7.75, "y": 3.47}, + {"matrix": [3, 8], "x": 8.75, "y": 3.47}, + {"matrix": [3, 9], "x": 9.75, "y": 3.47}, + {"matrix": [3, 10], "x": 10.75, "y": 3.47}, + {"matrix": [3, 11], "x": 11.75, "y": 3.47}, + {"matrix": [3, 13], "x": 12.75, "y": 3.47, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.47, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.47}, + {"matrix": [4, 3], "x": 3.25, "y": 4.47}, + {"matrix": [4, 4], "x": 4.25, "y": 4.47}, + {"matrix": [4, 5], "x": 5.25, "y": 4.47}, + {"matrix": [4, 6], "x": 6.25, "y": 4.47}, + {"matrix": [4, 7], "x": 7.25, "y": 4.47}, + {"matrix": [4, 8], "x": 8.25, "y": 4.47}, + {"matrix": [4, 9], "x": 9.25, "y": 4.47}, + {"matrix": [4, 10], "x": 10.25, "y": 4.47}, + {"matrix": [4, 11], "x": 11.25, "y": 4.47}, + {"matrix": [4, 12], "x": 12.25, "y": 4.47, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.26, "y": 4.47}, + + {"matrix": [5, 0], "x": 0, "y": 5.47, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.47, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.47, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.47, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.47, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.47, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.47, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.47, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.26, "y": 5.47}, + {"matrix": [5, 15], "x": 16.26, "y": 5.47}, + {"matrix": [5, 16], "x": 17.26, "y": 5.47} ] } } diff --git a/keyboards/kkatano/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c index b27ff4e29c..4d619bec8e 100644 --- a/keyboards/kkatano/wallaby/wallaby.c +++ b/keyboards/kkatano/wallaby/wallaby.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "wallaby.h" +#include "quantum.h" bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { diff --git a/keyboards/kkatano/wallaby/wallaby.h b/keyboards/kkatano/wallaby/wallaby.h deleted file mode 100644 index f5ab30b830..0000000000 --- a/keyboards/kkatano/wallaby/wallaby.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Koichi Katano - * - * 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_tkl_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4F, \ - k50, k51, k52, k56, k5A, k5B, k5C, k5D, k5E, k5F, k5G \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F, k0G }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, KC_NO, KC_NO, KC_NO }, \ - { k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, KC_NO, KC_NO, k4F, KC_NO }, \ - { k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \ -} |