diff options
Diffstat (limited to 'keyboards/ibnuda')
19 files changed, 292 insertions, 398 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/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..137c6bc7de 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -8,6 +8,11 @@ "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": { diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index fc9cdfe786..ccfd50638b 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -17,7 +17,6 @@ #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/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index bf563918c9..2521d16e8c 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/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, D4, D0, D1, D2} -#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ibnuda/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c deleted file mode 100644 index bdca0269c2..0000000000 --- a/keyboards/ibnuda/gurindam/gurindam.c +++ /dev/null @@ -1,16 +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 "gurindam.h" diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 7b3c71aa88..3fd6dfe21a 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,11 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h index 9b7c369dda..fa95320e90 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h @@ -21,5 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h index 1c8cff4bb6..65eec1d7f8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h @@ -18,5 +18,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h index 5b97451890..9920602ab8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h @@ -2,7 +2,6 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define LEADER_TIMEOUT 300 diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h index f943c2c053..10887bdf18 100644 --- a/keyboards/ibnuda/squiggle/rev1/config.h +++ b/keyboards/ibnuda/squiggle/rev1/config.h @@ -1,19 +1,3 @@ #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 { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 7f48b11c76..c5f15104f6 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -17,143 +22,290 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc/lwr", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc/ris", "x":6, "y":3.6, "h":2} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2} + ] + }, + "LAYOUT_complicated": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6}, + {"matrix": [3, 4], "x": 4, "y": 3.65}, + + {"matrix": [7, 4], "x": 5, "y": 3.65}, + {"matrix": [7, 3], "x": 6, "y": 3.6}, + + {"matrix": [3, 1], "x": 3, "y": 4.6}, + {"matrix": [3, 2], "x": 4, "y": 4.65}, + + {"matrix": [7, 2], "x": 5, "y": 4.65}, + {"matrix": [7, 1], "x": 6, "y": 4.6} + ] + }, + "LAYOUT_full": { + "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": [4, 4], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 0], "x": 30, "y": 0}, + {"matrix": [3, 1], "x": 31, "y": 0}, + {"matrix": [3, 2], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0}, + {"matrix": [3, 4], "x": 34, "y": 0}, + + {"matrix": [7, 4], "x": 35, "y": 0}, + {"matrix": [7, 3], "x": 36, "y": 0}, + {"matrix": [7, 2], "x": 37, "y": 0}, + {"matrix": [7, 1], "x": 38, "y": 0}, + {"matrix": [7, 0], "x": 39, "y": 0} + ] + }, + "LAYOUT_reversed": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 1], "x": 8, "y": 0}, + {"matrix": [0, 0], "x": 9, "y": 0}, + + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 4], "x": 14, "y": 0}, + + {"matrix": [1, 4], "x": 15, "y": 0}, + {"matrix": [1, 3], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 1], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 19, "y": 0}, + + {"matrix": [6, 0], "x": 20, "y": 0}, + {"matrix": [6, 1], "x": 21, "y": 0}, + {"matrix": [6, 2], "x": 22, "y": 0}, + {"matrix": [6, 3], "x": 23, "y": 0}, + {"matrix": [6, 4], "x": 24, "y": 0}, + + {"matrix": [2, 4], "x": 25, "y": 0}, + {"matrix": [2, 3], "x": 26, "y": 0}, + {"matrix": [2, 2], "x": 27, "y": 0}, + {"matrix": [2, 1], "x": 28, "y": 0}, + {"matrix": [2, 0], "x": 29, "y": 0}, + + {"matrix": [7, 3], "x": 30, "y": 0}, + {"matrix": [7, 4], "x": 31, "y": 0}, + + {"matrix": [3, 4], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0} ] }, "LAYOUT_split_3x5_3": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"lower", "x":2, "y":3.6, "h":1.25}, - {"label":"bspc", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc", "x":6, "y":3.6, "h":2}, - {"label":"raise", "x":7, "y":3.6, "h":1.25} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25}, + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}, + {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25} ] }, - "LAYOUT_complicated": { + "LAYOUT_thumbrow": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc", "x":3, "y":3.6, "h":1}, - {"label":"esc/sft", "x":4, "y":3.65, "h":1}, - {"label":"ent/alt", "x":5, "y":3.65, "h":1}, - {"label":"spc", "x":6, "y":3.6, "h":1}, - - {"label":"lower", "x":3, "y":4.6, "h":1}, - {"label":"gui", "x":4, "y":4.65, "h":1}, - {"label":"tab", "x":5, "y":4.65, "h":1}, - {"label":"raise", "x":6, "y":4.6, "h":1} + {"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": [4, 4], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 1], "x": 30, "y": 0}, + {"matrix": [3, 2], "x": 31, "y": 0}, + {"matrix": [3, 3], "x": 32, "y": 0}, + {"matrix": [3, 4], "x": 33, "y": 0}, + + {"matrix": [7, 4], "x": 34, "y": 0}, + {"matrix": [7, 3], "x": 35, "y": 0}, + {"matrix": [7, 2], "x": 36, "y": 0}, + {"matrix": [7, 1], "x": 37, "y": 0} ] } } diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h deleted file mode 100644 index 73cb7abd2f..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ /dev/null @@ -1,119 +0,0 @@ -#pragma once - -#include "squiggle.h" - -#include "quantum.h" - -#define ___ 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( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L33, L34, R30, R31 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_reversed( \ - R04, R03, R02, R01, R00, L04, L03, L02, L01, L00, \ - R14, R13, R12, R11, R10, L14, L13, L12, L11, L10, \ - R24, R23, R22, R21, R20, L24, L23, L22, L21, L20, \ - R31, R30, L34, L33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_split_3x5_3(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L32, L33, L34, R30, R31, R32 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 }, \ -} - -#define LAYOUT_complicated(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L33, L34, R30, R31, \ - L31, L32, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_thumbrow(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, L33, L34, R30, R31, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_full(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { R34, R33, R32, R31, R30 }, \ -} - diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c deleted file mode 100644 index 7c73aabf51..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 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 "squiggle.h" diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h deleted file mode 100644 index 4ed95e707c..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 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 - -#ifdef KEYBOARD_ibnuda_squiggle_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" |