diff --git a/keyboards/rainkeebs/twoyo/config.h b/keyboards/rainkeebs/twoyo/config.h
index e74c75e600..a14020674f 100644
--- a/keyboards/rainkeebs/twoyo/config.h
+++ b/keyboards/rainkeebs/twoyo/config.h
@@ -18,9 +18,6 @@
/* usb handedness? */
#define SPLIT_USB_DETECT
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING 5
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rainkeebs/twoyo/info.json b/keyboards/rainkeebs/twoyo/info.json
index 678691453d..2c8fcd1a4a 100644
--- a/keyboards/rainkeebs/twoyo/info.json
+++ b/keyboards/rainkeebs/twoyo/info.json
@@ -1,144 +1,97 @@
{
- "manufacturer": "rainkeebs",
- "keyboard_name": "Twoyo",
- "maintainer": "rainkeebs",
- "bootloader": "caterina",
- "config_h_features": {
- "audio": false,
- "backlight": false,
- "bootmagic": true,
- "command": false,
- "console": false,
- "encoder": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "sleep_led": false
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "enabled": true,
- "rotary": [
- {
- "pin_a": "F4",
- "pin_b": "F5"
- }
- ]
- },
- "features": {
- "audio": false,
- "backlight": false,
- "bootmagic": true,
- "command": false,
- "console": false,
- "encoder": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "sleep_led": false
- },
- "height": 4,
- "keyboard_folder": "rainkeebs/twoyo",
- "keymaps": {},
- "matrix_pins": {
- "cols": ["D1", "B6", "B2", "B3", "B1", "F7"],
- "rows": ["F6", "C6", "D4", "D0"]
- },
- "matrix_size": {
- "cols": 6,
- "rows": 8
- },
- "mouse_key": {
- "enabled": true
- },
- "parse_errors": [],
- "parse_warnings": [],
- "platform": "unknown",
- "processor": "atmega32u4",
- "processor_type": "avr",
- "protocol": "LUFA",
- "split": {
- "enabled": true,
- "encoder": {
- "right": {
- "rotary": [
- {
- "pin_a": "D1",
- "pin_b": "D0"
- }
- ]
- }
- },
- "matrix_pins": {
- "right": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F7", "F6", "B6"]
- }
- },
- "soft_serial_pin": "D3",
- "transport": {
- "protocol": "serial"
- },
- "usb_detect": {
- "enabled": false
- }
- },
- "url": "https://www.rainkeebs.mx/product/twoyo-keyboard-kit",
- "usb": {
- "device_ver": "0x0001",
- "device_version": "0.0.1",
- "pid": "0x616B",
- "vid": "0x726B"
- },
- "width": 14,
- "layouts": {
- "LAYOUT": {
- "c_macro": true,
- "filename": "keyboards/rainkeebs/twoyo/twoyo.h",
- "layout": [
- { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "0,6", "matrix": [4, 0], "w": 1, "x": 8, "y": 0 },
- { "label": "0,7", "matrix": [4, 1], "w": 1, "x": 9, "y": 0 },
- { "label": "0,8", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 },
- { "label": "0,9", "matrix": [4, 3], "w": 1, "x": 11, "y": 0 },
- { "label": "0,10", "matrix": [4, 4], "w": 1, "x": 12, "y": 0 },
- { "label": "0,11", "matrix": [4, 5], "w": 1, "x": 13, "y": 0 },
- { "label": "1,0", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
- { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
- { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
- { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
- { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
- { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
- { "label": "1,7", "matrix": [5, 1], "w": 1, "x": 8.25, "y": 1 },
- { "label": "1,8", "matrix": [5, 2], "w": 1, "x": 9.25, "y": 1 },
- { "label": "1,9", "matrix": [5, 3], "w": 1, "x": 10.25, "y": 1 },
- { "label": "1,10", "matrix": [5, 4], "w": 1, "x": 11.25, "y": 1 },
- { "label": "1,11", "matrix": [5, 5], "w": 1.75, "x": 12.25, "y": 1 },
- { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "2,7", "matrix": [6, 1], "w": 1, "x": 8.75, "y": 2 },
- { "label": "2,8", "matrix": [6, 2], "w": 1, "x": 9.75, "y": 2 },
- { "label": "2,9", "matrix": [6, 3], "w": 1, "x": 10.75, "y": 2 },
- { "label": "2,10", "matrix": [6, 4], "w": 1, "x": 11.75, "y": 2 },
- { "label": "2,11", "matrix": [6, 5], "w": 1.25, "x": 12.75, "y": 2 },
- { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "3,1", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
- { "label": "3,2", "matrix": [3, 2], "w": 1.25, "x": 2.25, "y": 3 },
- { "label": "3,4", "matrix": [3, 4], "w": 2.75, "x": 3.5, "y": 3 },
- { "label": "3,7", "matrix": [7, 1], "w": 2.25, "x": 8.25, "y": 3 },
- { "label": "3,9", "matrix": [7, 3], "w": 1.25, "x": 10.5, "y": 3 },
- { "label": "3,10", "matrix": [7, 4], "w": 1, "x": 11.75, "y": 3 },
- { "label": "3,11", "matrix": [7, 5], "w": 1.25, "x": 12.75, "y": 3 }
- ]
- }
- }
+ "manufacturer": "rainkeebs",
+ "keyboard_name": "Twoyo",
+ "maintainer": "rainkeebs",
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D1", "B6", "B2", "B3", "B1", "F7"],
+ "rows": ["F6", "C6", "D4", "D0"]
+ },
+ "split": {
+ "enabled": true,
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F7", "F6", "B6"]
+ }
+ },
+ "soft_serial_pin": "D3",
+ "transport": {
+ "protocol": "serial"
+ }
+ },
+ "url": "https://www.rainkeebs.mx/product/twoyo-keyboard-kit",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x616B",
+ "vid": "0x726B"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+ {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
+ {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+ {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+ {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
+ {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
+ {"label": "0,6", "matrix": [4, 0], "x": 8, "y": 0, "w": 1},
+ {"label": "0,7", "matrix": [4, 1], "x": 9, "y": 0, "w": 1},
+ {"label": "0,8", "matrix": [4, 2], "x": 10, "y": 0, "w": 1},
+ {"label": "0,9", "matrix": [4, 3], "x": 11, "y": 0, "w": 1},
+ {"label": "0,10", "matrix": [4, 4], "x": 12, "y": 0, "w": 1},
+ {"label": "0,11", "matrix": [4, 5], "x": 13, "y": 0, "w": 1},
+ {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"label": "1,1", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1},
+ {"label": "1,2", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1},
+ {"label": "1,3", "matrix": [1, 3], "x": 3.25, "y": 1, "w": 1},
+ {"label": "1,4", "matrix": [1, 4], "x": 4.25, "y": 1, "w": 1},
+ {"label": "1,5", "matrix": [1, 5], "x": 5.25, "y": 1, "w": 1},
+ {"label": "1,7", "matrix": [5, 1], "x": 8.25, "y": 1, "w": 1},
+ {"label": "1,8", "matrix": [5, 2], "x": 9.25, "y": 1, "w": 1},
+ {"label": "1,9", "matrix": [5, 3], "x": 10.25, "y": 1, "w": 1},
+ {"label": "1,10", "matrix": [5, 4], "x": 11.25, "y": 1, "w": 1},
+ {"label": "1,11", "matrix": [5, 5], "x": 12.25, "y": 1, "w": 1.75},
+ {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1},
+ {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1},
+ {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1},
+ {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1},
+ {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1},
+ {"label": "2,7", "matrix": [6, 1], "x": 8.75, "y": 2, "w": 1},
+ {"label": "2,8", "matrix": [6, 2], "x": 9.75, "y": 2, "w": 1},
+ {"label": "2,9", "matrix": [6, 3], "x": 10.75, "y": 2, "w": 1},
+ {"label": "2,10", "matrix": [6, 4], "x": 11.75, "y": 2, "w": 1},
+ {"label": "2,11", "matrix": [6, 5], "x": 12.75, "y": 2, "w": 1.25},
+ {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1},
+ {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"label": "3,4", "matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75},
+ {"label": "3,7", "matrix": [7, 1], "x": 8.25, "y": 3, "w": 2.25},
+ {"label": "3,9", "matrix": [7, 3], "x": 10.5, "y": 3, "w": 1.25},
+ {"label": "3,10", "matrix": [7, 4], "x": 11.75, "y": 3, "w": 1},
+ {"label": "3,11", "matrix": [7, 5], "x": 12.75, "y": 3, "w": 1.25}
+ ]
+ }
+ }
}
diff --git a/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk b/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c b/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c
deleted file mode 100644
index a32c73c291..0000000000
--- a/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * 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 .
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- LAYOUT(
- KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER,
- KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1),
- KC_LCTRL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL
- ),
-
- LAYOUT(
- KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_LCBR, KC_RCBR, KC_DQT, KC_COLON, KC_TRNS,
- KC_TRNS, RESET, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- LAYOUT(
- KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
- KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_MINS, KC_LBRC, KC_RBRC, KC_QUOTE, KC_SCLN, KC_TRNS,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_BSLS, KC_SLASH, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
- LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- )
-};
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-
- switch (get_highest_layer(layer_state)) {
- case 0:
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
- } else {
- tap_code(KC_MS_WH_UP);
- }
- }
- break;
- case 1:
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_MNXT);
- } else {
- tap_code(KC_MPRV);
- }
- }
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_WH_R);
- } else {
- tap_code(KC_WH_L);
- }
- }
- break;
- case 2:
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_PGUP);
- } else {
- tap_code(KC_PGDOWN);
- }
- }
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_END);
- } else {
- tap_code(KC_HOME);
- }
- }
- break;
- case 3:
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_PGUP);
- } else {
- tap_code(KC_PGDOWN);
- }
- }
- else if (index == 1) {
- if (clockwise) {
- tap_code(KC_END);
- } else {
- tap_code(KC_HOME);
- }
- }
- break;
- }
-};
diff --git a/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk b/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/rainkeebs/twoyo/twoyo.c b/keyboards/rainkeebs/twoyo/twoyo.c
deleted file mode 100644
index 515f2dc3f2..0000000000
--- a/keyboards/rainkeebs/twoyo/twoyo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * 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 .
- */
-#include "twoyo.h"
diff --git a/keyboards/rainkeebs/twoyo/twoyo.h b/keyboards/rainkeebs/twoyo/twoyo.h
deleted file mode 100644
index 96c9a88d45..0000000000
--- a/keyboards/rainkeebs/twoyo/twoyo.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * 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 .
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, \
- L30, L31, L32, L34, R31, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05}, \
- { L10, L11, L12, L13, L14, L15}, \
- { L20, L21, L22, L23, L24, L25}, \
- { L30, L31, L32, KC_NO, L34, KC_NO}, \
- { R00, R01, R02, R03, R04, R05}, \
- { KC_NO, R11, R12, R13, R14, R15}, \
- { KC_NO, R21, R22, R23, R24, R25}, \
- { KC_NO, R31, KC_NO, R33, R34, R35} \
- }