diff options
Diffstat (limited to 'keyboards/ibnuda/alicia_cook')
-rw-r--r-- | keyboards/ibnuda/alicia_cook/alicia_cook.c | 17 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/alicia_cook.h | 41 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/config.h | 35 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/info.json | 296 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/keymaps/rick/config.h | 2 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/ibnuda/alicia_cook/matrix_diagram.md | 16 |
7 files changed, 248 insertions, 161 deletions
diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c deleted file mode 100644 index 39f17e4a7d..0000000000 --- a/keyboards/ibnuda/alicia_cook/alicia_cook.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 "alicia_cook.h" diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.h b/keyboards/ibnuda/alicia_cook/alicia_cook.h deleted file mode 100644 index 35c803b3ae..0000000000 --- a/keyboards/ibnuda/alicia_cook/alicia_cook.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 XXX KC_NO - -/* 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_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k33, k34, k35, k36, k37, k38, k3b, k3c \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, k3b, k3c } \ -} diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h deleted file mode 100644 index c414e3254c..0000000000 --- a/keyboards/ibnuda/alicia_cook/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Ibnu D. Aji - -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 - - -/* - * 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 { D2, D3, F4, F5 } -#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 9e34484de5..1405e5d093 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -1,70 +1,236 @@ { - "keyboard_name": "Alicia Cook", - "manufacturer": "Ibnu D. Aji", - "url": "https://github.com/ibnuda/alicia-cook", - "maintainer": "ibnuda", - "usb": { - "vid": "0xFEED", - "pid": "0x6955", - "device_version": "8.9.9" - }, - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_all": { - "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":7,"y":0}, - {"x":8,"y":0}, - {"x":9,"y":0}, - {"x":10,"y":0}, - {"x":11,"y":0}, - {"x":12,"y":0}, - {"x":13,"y":0}, + "keyboard_name": "Alicia Cook", + "manufacturer": "Ibnu D. Aji", + "url": "https://github.com/ibnuda/alicia-cook", + "maintainer": "ibnuda", + "usb": { + "vid": "0xFEED", + "pid": "0x6955", + "device_version": "8.9.9" + }, + "matrix_pins": { + "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D2", "D3", "F4", "F5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, - {"x":0,"y":1,"w":1.25}, - {"x":1.25,"y":1}, - {"x":2.25,"y":1}, - {"x":3.25,"y":1}, - {"x":4.25,"y":1}, - {"x":5.25,"y":1}, - {"x":7.25,"y":1}, - {"x":8.25,"y":1}, - {"x":9.25,"y":1}, - {"x":10.25,"y":1}, - {"x":11.25,"y":1}, - {"x":12.25,"y":1,"w":1.75}, + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, - {"x":0,"y":2,"w":1.75}, - {"x":1.75,"y":2}, - {"x":2.75,"y":2}, - {"x":3.75,"y":2}, - {"x":4.75,"y":2}, - {"x":5.75,"y":2}, - {"x":6.75,"y":2}, - {"x":7.75,"y":2}, - {"x":8.75,"y":2}, - {"x":9.75,"y":2}, - {"x":10.75,"y":2}, - {"x":11.75,"y":2}, - {"x":12.75,"y":2,"w":1.25}, + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, - {"x":0,"y":3,"w":1.25}, - {"x":1.25,"y":3,"w":1.25}, - {"x":3.5,"y":3,"w":1.25}, - {"x":4.75,"y":3}, - {"x":5.75,"y":3}, - {"x":6.75,"y":3,"w":1.25}, - {"x":8,"y":3}, - {"x":9,"y":3,"w":1.25}, - {"x":11.5,"y":3,"w":1.25}, - {"x":12.75,"y":3,"w":1.25} - ] - } - } + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Backspace", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "Esc", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 7], "x": 8, "y": 3}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_lspace": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Esc", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 7], "x": 8, "y": 3}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_rspace": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Backspace", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "Esc", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_spaces": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Esc", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index fc9cdfe786..d4b4480810 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -16,8 +16,6 @@ #pragma once #define COMBO_TERM 50 -#define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 175 #define TAPPING_TERM 175 diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c index 88c3784754..9c1f0cb63e 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c @@ -188,7 +188,7 @@ const uint16_t PROGMEM rl_r_m_i_combo[] = {RLR, RLM, RLI, COMBO_END}; // both hand combinations. const uint16_t PROGMEM bl_m_m_combo[] = {LLM, RLM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [L_U_PINKY_RING] = COMBO(lu_p_r_combo, KC_TAB), [L_U_RING_MIDDLE] = COMBO(lu_r_m_combo, KC_QUES), diff --git a/keyboards/ibnuda/alicia_cook/matrix_diagram.md b/keyboards/ibnuda/alicia_cook/matrix_diagram.md new file mode 100644 index 0000000000..8011ac442e --- /dev/null +++ b/keyboards/ibnuda/alicia_cook/matrix_diagram.md @@ -0,0 +1,16 @@ +# Matrix Diagram for Alicia Cook by Ibnu D. Aji + +``` +┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │0C │ +├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ +│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │ +├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ +│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │ +├────┬─┴──┬┴──┬┴───┼───┼───┤ ├───┴┬──┴┬──┴─┬─┴──┬┴───┼────┤ +│30 │31 │ │33 │34 │35 │ │36 │37 │38 │ │3B │3C │ +└────┴────┘ └────┴───┴───┘ └────┴───┴────┘ └────┴────┘ + ┌───────┐ ┌────────┐ + 2u Left Space │35 │ │36 │ 2.25u Right Space + └───────┘ └────────┘ +``` |