From 4adb64a91b3c8bf665bd9f7357fb806d30ac09f5 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sun, 28 Aug 2022 13:16:20 -0400 Subject: [Keyboard] mechwild/bde cleanup and refactor (#18149) --- keyboards/mechwild/bde/bde.c | 17 --- keyboards/mechwild/bde/bde.h | 26 ----- keyboards/mechwild/bde/config.h | 8 +- keyboards/mechwild/bde/info.json | 30 +++-- keyboards/mechwild/bde/keymaps/default/keymap.c | 59 ---------- .../mechwild/bde/keymaps/lefty_default/config.h | 23 ---- .../mechwild/bde/keymaps/lefty_default/keymap.c | 55 ---------- .../mechwild/bde/keymaps/lefty_fancy/config.h | 22 ---- .../mechwild/bde/keymaps/lefty_fancy/keymap.c | 121 --------------------- .../mechwild/bde/keymaps/lefty_fancy/rules.mk | 2 - keyboards/mechwild/bde/keymaps/lefty_via/config.h | 22 ---- keyboards/mechwild/bde/keymaps/lefty_via/keymap.c | 56 ---------- keyboards/mechwild/bde/keymaps/lefty_via/rules.mk | 2 - .../mechwild/bde/keymaps/righty_default/config.h | 23 ---- .../mechwild/bde/keymaps/righty_default/keymap.c | 55 ---------- keyboards/mechwild/bde/keymaps/righty_via/config.h | 23 ---- keyboards/mechwild/bde/keymaps/righty_via/keymap.c | 55 ---------- keyboards/mechwild/bde/keymaps/righty_via/rules.mk | 2 - keyboards/mechwild/bde/keymaps/via/config.h | 22 ---- keyboards/mechwild/bde/keymaps/via/keymap.c | 59 ---------- keyboards/mechwild/bde/keymaps/via/rules.mk | 3 - keyboards/mechwild/bde/lefty/config.h | 46 -------- keyboards/mechwild/bde/lefty/info.json | 70 ++++++++++++ .../mechwild/bde/lefty/keymaps/default/config.h | 23 ++++ .../mechwild/bde/lefty/keymaps/default/keymap.c | 55 ++++++++++ .../mechwild/bde/lefty/keymaps/default/rules.mk | 9 ++ .../mechwild/bde/lefty/keymaps/fancy/config.h | 22 ++++ .../mechwild/bde/lefty/keymaps/fancy/keymap.c | 121 +++++++++++++++++++++ .../mechwild/bde/lefty/keymaps/fancy/rules.mk | 2 + keyboards/mechwild/bde/lefty/keymaps/via/config.h | 22 ++++ keyboards/mechwild/bde/lefty/keymaps/via/keymap.c | 56 ++++++++++ keyboards/mechwild/bde/lefty/keymaps/via/rules.mk | 2 + keyboards/mechwild/bde/lefty/lefty.c | 17 --- keyboards/mechwild/bde/lefty/lefty.h | 30 ----- keyboards/mechwild/bde/lefty/rules.mk | 1 + keyboards/mechwild/bde/readme.md | 18 +++ keyboards/mechwild/bde/rev2/config.h | 39 +------ keyboards/mechwild/bde/rev2/info.json | 65 +++++++++++ .../mechwild/bde/rev2/keymaps/default/keymap.c | 69 ++++++++++++ .../mechwild/bde/rev2/keymaps/default/rules.mk | 13 +++ keyboards/mechwild/bde/rev2/keymaps/via/config.h | 22 ++++ keyboards/mechwild/bde/rev2/keymaps/via/keymap.c | 68 ++++++++++++ keyboards/mechwild/bde/rev2/keymaps/via/rules.mk | 3 + keyboards/mechwild/bde/rev2/rev2.c | 77 ++++++------- keyboards/mechwild/bde/rev2/rev2.h | 13 --- keyboards/mechwild/bde/righty/config.h | 46 -------- keyboards/mechwild/bde/righty/info.json | 70 ++++++++++++ .../mechwild/bde/righty/keymaps/default/config.h | 23 ++++ .../mechwild/bde/righty/keymaps/default/keymap.c | 55 ++++++++++ .../mechwild/bde/righty/keymaps/default/rules.mk | 9 ++ keyboards/mechwild/bde/righty/keymaps/via/config.h | 23 ++++ keyboards/mechwild/bde/righty/keymaps/via/keymap.c | 55 ++++++++++ keyboards/mechwild/bde/righty/keymaps/via/rules.mk | 2 + keyboards/mechwild/bde/righty/righty.c | 17 --- keyboards/mechwild/bde/righty/righty.h | 30 ----- keyboards/mechwild/bde/righty/rules.mk | 1 + keyboards/mechwild/bde/rules.mk | 19 ---- 57 files changed, 945 insertions(+), 953 deletions(-) delete mode 100644 keyboards/mechwild/bde/bde.c delete mode 100644 keyboards/mechwild/bde/bde.h delete mode 100644 keyboards/mechwild/bde/keymaps/default/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_default/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_default/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_fancy/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_via/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_via/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/lefty_via/rules.mk delete mode 100644 keyboards/mechwild/bde/keymaps/righty_default/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/righty_default/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/righty_via/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/righty_via/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/righty_via/rules.mk delete mode 100644 keyboards/mechwild/bde/keymaps/via/config.h delete mode 100644 keyboards/mechwild/bde/keymaps/via/keymap.c delete mode 100644 keyboards/mechwild/bde/keymaps/via/rules.mk delete mode 100644 keyboards/mechwild/bde/lefty/config.h create mode 100644 keyboards/mechwild/bde/lefty/keymaps/default/config.h create mode 100644 keyboards/mechwild/bde/lefty/keymaps/default/keymap.c create mode 100644 keyboards/mechwild/bde/lefty/keymaps/default/rules.mk create mode 100644 keyboards/mechwild/bde/lefty/keymaps/fancy/config.h create mode 100644 keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c create mode 100644 keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk create mode 100644 keyboards/mechwild/bde/lefty/keymaps/via/config.h create mode 100644 keyboards/mechwild/bde/lefty/keymaps/via/keymap.c create mode 100644 keyboards/mechwild/bde/lefty/keymaps/via/rules.mk delete mode 100644 keyboards/mechwild/bde/lefty/lefty.c delete mode 100644 keyboards/mechwild/bde/lefty/lefty.h create mode 100644 keyboards/mechwild/bde/lefty/rules.mk create mode 100644 keyboards/mechwild/bde/rev2/keymaps/default/keymap.c create mode 100644 keyboards/mechwild/bde/rev2/keymaps/default/rules.mk create mode 100644 keyboards/mechwild/bde/rev2/keymaps/via/config.h create mode 100644 keyboards/mechwild/bde/rev2/keymaps/via/keymap.c create mode 100644 keyboards/mechwild/bde/rev2/keymaps/via/rules.mk delete mode 100644 keyboards/mechwild/bde/righty/config.h create mode 100644 keyboards/mechwild/bde/righty/keymaps/default/config.h create mode 100644 keyboards/mechwild/bde/righty/keymaps/default/keymap.c create mode 100644 keyboards/mechwild/bde/righty/keymaps/default/rules.mk create mode 100644 keyboards/mechwild/bde/righty/keymaps/via/config.h create mode 100644 keyboards/mechwild/bde/righty/keymaps/via/keymap.c create mode 100644 keyboards/mechwild/bde/righty/keymaps/via/rules.mk delete mode 100644 keyboards/mechwild/bde/righty/righty.c delete mode 100644 keyboards/mechwild/bde/righty/righty.h create mode 100644 keyboards/mechwild/bde/righty/rules.mk diff --git a/keyboards/mechwild/bde/bde.c b/keyboards/mechwild/bde/bde.c deleted file mode 100644 index 911d1c0434..0000000000 --- a/keyboards/mechwild/bde/bde.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Kyle McCreery - * - * 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 "bde.h" diff --git a/keyboards/mechwild/bde/bde.h b/keyboards/mechwild/bde/bde.h deleted file mode 100644 index 3d16bdb8db..0000000000 --- a/keyboards/mechwild/bde/bde.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Kyle McCreery - * - * 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" - -#ifdef KEYBOARD_mechwild_bde_rev2 - #include "rev2.h" -#elif KEYBOARD_mechwild_bde_lefty - #include "lefty.h" -#elif KEYBOARD_mechwild_bde_righty - #include "righty.h" -#endif diff --git a/keyboards/mechwild/bde/config.h b/keyboards/mechwild/bde/config.h index 5130918c08..ad54af1aa8 100644 --- a/keyboards/mechwild/bde/config.h +++ b/keyboards/mechwild/bde/config.h @@ -17,4 +17,10 @@ along with this program. If not, see . #pragma once -#include "config_common.h" \ No newline at end of file +#include "config_common.h" + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index 682038c681..0177b4c949 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -5,13 +5,27 @@ "usb": { "vid": "0x6D77" }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"Mute", "x":13, "y":0}, - {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"4", "x":10, "y":1}, {"label":"5", "x":11, "y":1}, {"label":"6", "x":12, "y":1}, {"label":"0", "x":13, "y":1}, - {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2}, {"label":"1", "x":10, "y":2}, {"label":"2", "x":11, "y":2}, {"label":"3", "x":12, "y":2}, {"label":"EQL", "x":13, "y":2} - ] - } + "debounce": 5, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "debug": false, + "extrakey": true, + "mousekey": true, + "rgblight": true, + "nkro": true + }, + "development_board": "promicro", + "rgblight": { + "sleep": true, + "max_brightness": 255 + }, + "tapping": { + "tap_keycode_delay": 10, + "tap_capslock_delay": 10 } } diff --git a/keyboards/mechwild/bde/keymaps/default/keymap.c b/keyboards/mechwild/bde/keymaps/default/keymap.c deleted file mode 100644 index 8222af7576..0000000000 --- a/keyboards/mechwild/bde/keymaps/default/keymap.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2022 Kyle McCreery - * - * 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 - -#define FN1_BSPC LT(1, KC_BSPC) -#define FN2_SPC LT(2, KC_SPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define SFT_ENT RSFT_T(KC_ENT) -#define WIN_C LGUI_T(KC_C) - -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_P7, KC_P8, KC_P9, KC_MUTE, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, KC_P4, KC_P5, KC_P6, KC_P0, - CTL_Z, ALT_X, WIN_C, KC_V, FN1_BSPC, FN2_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT, KC_P1, KC_P2, KC_P3, KC_MINS - ), - [_FN1] = LAYOUT( - _______, _______, _______, QK_BOOT, _______, _______, KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7, KC_8, KC_9, KC_NLCK, - _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_SCLN, KC_QUOT, KC_4, KC_5, KC_6, KC_0, - _______, _______, _______, _______, _______, KC_TAB, KC_LGUI, KC_COMM, KC_DOT, KC_SLSH, KC_1, KC_2, KC_3, KC_EQL - ), - [_FN2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK, - _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR, KC_PERC, KC_CIRC, KC_RPRN, - _______, _______, _______, _______, KC_DEL, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT, KC_HASH, KC_PLUS - ), - [_FN3] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/config.h b/keyboards/mechwild/bde/keymaps/lefty_default/config.h deleted file mode 100644 index 80e8e2e015..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_default/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 . - */ - - -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 - diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c deleted file mode 100644 index 3f7b092bc7..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_BSPC LT(2, KC_BSPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define SFT_ENT RSFT_T(KC_ENT) -#define WIN_C LGUI_T(KC_C) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_4, KC_5, KC_6, SFT_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, - KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT - ), - - [1] = LAYOUT( - KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, - KC_F1, KC_F2, KC_F3, _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, - KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [3] = LAYOUT( - RGB_M_G, RGB_M_T, _______, RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, - RGB_M_SN, RGB_M_K, RGB_M_X, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, - RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h b/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h deleted file mode 100644 index 8476c8ccd6..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c deleted file mode 100644 index 61c59932cf..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 - - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_BSPC LT(2, KC_BSPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define SFT_ENT RSFT_T(KC_ENT) -#define WIN_C LGUI_T(KC_C) - -typedef struct { - bool is_press_action; - uint8_t state; -} tap; - -enum { - SINGLE_TAP = 1, - SINGLE_HOLD, - DOUBLE_TAP -}; - -// Tap dance enums -enum { - left_enter, -}; - -uint8_t cur_dance(qk_tap_dance_state_t *state); -void left_enter_finished(qk_tap_dance_state_t *state, void *user_data); -void left_enter_reset(qk_tap_dance_state_t *state, void *user_data); - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_4, KC_5, KC_6, TD(left_enter), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, - KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT - ), - - [1] = LAYOUT( - KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, - KC_F1, KC_F2, KC_F3, _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, - KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - -[3] = LAYOUT( - RGB_M_G, RGB_M_T, _______, RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, - RGB_M_SN, RGB_M_K, RGB_M_X, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, - RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; - - -uint8_t cur_dance(qk_tap_dance_state_t *state) { - if (state->count == 1) { - if (state->interrupted || !state->pressed) return SINGLE_TAP; - // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'. - else return SINGLE_HOLD; - } else return DOUBLE_TAP; - //} else if (state->count >= 2) { - // return DOUBLE_TAP; - //}else return 8; // Magic number. At some point this method will expand to work for more presses -} - -static tap left_enter_tap_state = { - .is_press_action = true, - .state = 0 -}; - -void left_enter_finished(qk_tap_dance_state_t *state, void *user_data) { - left_enter_tap_state.state = cur_dance(state); - switch (left_enter_tap_state.state) { - //case SINGLE_TAP: register_code(KC_ENT); break; - case SINGLE_HOLD: register_code(KC_LSFT); break; - case DOUBLE_TAP: register_code(KC_ENT); break; - } -} - -void left_enter_reset(qk_tap_dance_state_t *state, void *user_data) { - switch (left_enter_tap_state.state) { - //case SINGLE_TAP: unregister_code(KC_ENT); break; - case SINGLE_HOLD: unregister_code(KC_LSFT); break; - case DOUBLE_TAP: unregister_code(KC_ENT); break; - } - left_enter_tap_state.state = 0; -} - -qk_tap_dance_action_t tap_dance_actions[] = { - [left_enter] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, left_enter_finished, left_enter_reset) -}; - - - diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk b/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk deleted file mode 100644 index 9a56408f8e..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -TAP_DANCE_ENABLE = yes - diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/config.h b/keyboards/mechwild/bde/keymaps/lefty_via/config.h deleted file mode 100644 index 8476c8ccd6..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_via/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c deleted file mode 100644 index cf1f8451d0..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_BSPC LT(2, KC_BSPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define SFT_ENT RSFT_T(KC_ENT) -#define WIN_C LGUI_T(KC_C) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_4, KC_5, KC_6, SFT_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, - KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT - ), - - [1] = LAYOUT( - KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, - KC_F1, KC_F2, KC_F3, _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, - KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk b/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk deleted file mode 100644 index 16d33cd89f..0000000000 --- a/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes - diff --git a/keyboards/mechwild/bde/keymaps/righty_default/config.h b/keyboards/mechwild/bde/keymaps/righty_default/config.h deleted file mode 100644 index 80e8e2e015..0000000000 --- a/keyboards/mechwild/bde/keymaps/righty_default/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 . - */ - - -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 - diff --git a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c b/keyboards/mechwild/bde/keymaps/righty_default/keymap.c deleted file mode 100644 index c832b83617..0000000000 --- a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_BSPC LT(2, KC_BSPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define WIN_C LGUI_T(KC_C) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_0, KC_7, KC_8, KC_9, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, KC_ENT, KC_4, KC_5, KC_6, - CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, KC_RSFT, KC_1, KC_2, KC_3 - ), - - [1] = LAYOUT( - _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7, KC_F8, KC_F9, - _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4, KC_F5, KC_F6, - _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F1, KC_F2, KC_F3 - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_F11, KC_F12, _______ - ), - - [3] = LAYOUT( - RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_G, RGB_M_T, _______, - RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_M_SN, RGB_M_K, RGB_M_X, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_R, RGB_M_SW - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/righty_via/config.h b/keyboards/mechwild/bde/keymaps/righty_via/config.h deleted file mode 100644 index 80e8e2e015..0000000000 --- a/keyboards/mechwild/bde/keymaps/righty_via/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 . - */ - - -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 - diff --git a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c b/keyboards/mechwild/bde/keymaps/righty_via/keymap.c deleted file mode 100644 index c832b83617..0000000000 --- a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 - -#define FN1_SPC LT(1, KC_SPC) -#define FN2_BSPC LT(2, KC_BSPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define WIN_C LGUI_T(KC_C) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_0, KC_7, KC_8, KC_9, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, KC_ENT, KC_4, KC_5, KC_6, - CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, KC_RSFT, KC_1, KC_2, KC_3 - ), - - [1] = LAYOUT( - _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7, KC_F8, KC_F9, - _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4, KC_F5, KC_F6, - _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F1, KC_F2, KC_F3 - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_F11, KC_F12, _______ - ), - - [3] = LAYOUT( - RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_G, RGB_M_T, _______, - RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_M_SN, RGB_M_K, RGB_M_X, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_R, RGB_M_SW - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/righty_via/rules.mk b/keyboards/mechwild/bde/keymaps/righty_via/rules.mk deleted file mode 100644 index 16d33cd89f..0000000000 --- a/keyboards/mechwild/bde/keymaps/righty_via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes - diff --git a/keyboards/mechwild/bde/keymaps/via/config.h b/keyboards/mechwild/bde/keymaps/via/config.h deleted file mode 100644 index d09385ca5d..0000000000 --- a/keyboards/mechwild/bde/keymaps/via/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 Kyle McCreery - * - * 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 -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - -/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ -#define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/keymaps/via/keymap.c b/keyboards/mechwild/bde/keymaps/via/keymap.c deleted file mode 100644 index e28c1b6db8..0000000000 --- a/keyboards/mechwild/bde/keymaps/via/keymap.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2022 Kyle McCreery - * - * 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 - -#define FN1_BSPC LT(1, KC_BSPC) -#define FN2_SPC LT(2, KC_SPC) -#define FN3_B LT(3, KC_B) -#define CTL_Z CTL_T(KC_Z) -#define ALT_X ALT_T(KC_X) -#define ALT_N ALGR_T(KC_N) -#define CTL_M RCTL_T(KC_M) -#define SFT_ENT RSFT_T(KC_ENT) -#define WIN_C LGUI_T(KC_C) - -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_P7, KC_P8, KC_P9, KC_MUTE, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, KC_P4, KC_P5, KC_P6, KC_P0, - CTL_Z, ALT_X, WIN_C, KC_V, FN1_BSPC, FN2_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT, KC_P1, KC_P2, KC_P3, KC_MINS - ), - [_FN1] = LAYOUT( - _______, _______, _______, QK_BOOT, _______, _______, KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7, KC_8, KC_9, KC_NLCK, - _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_SCLN, KC_QUOT, KC_4, KC_5, KC_6, KC_0, - _______, _______, _______, _______, _______, KC_TAB, KC_LGUI, KC_COMM, KC_DOT, KC_SLSH, KC_1, KC_2, KC_3, KC_EQL - ), - [_FN2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK, - _______, _______, _______, _______, _______, _______, _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR, KC_PERC, KC_CIRC, KC_RPRN, - _______, _______, _______, _______, KC_DEL, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT, KC_HASH, KC_PLUS - ), - [_FN3] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD - ) - -}; diff --git a/keyboards/mechwild/bde/keymaps/via/rules.mk b/keyboards/mechwild/bde/keymaps/via/rules.mk deleted file mode 100644 index 07681b4f2c..0000000000 --- a/keyboards/mechwild/bde/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGBLIGHT_ENABLE = yes -VIA_ENABLE = yes -LTO_ENABLE = no diff --git a/keyboards/mechwild/bde/lefty/config.h b/keyboards/mechwild/bde/lefty/config.h deleted file mode 100644 index 702a6d81b4..0000000000 --- a/keyboards/mechwild/bde/lefty/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 Kyle McCreery - * - * 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 "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 14 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D1, D7, D3} -#define MATRIX_COL_PINS { F7, B1, B6, B2, B3, F6, F5, F4, D0, D4, C6, E6, B5, B4} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* If RGBLIGHT_ENABLE is set to yes in the rules, ensure the RGBLED_NUM is accurate for how many you have attached. */ -#define RGB_DI_PIN D2 -#define RGBLED_NUM 16 -#define RGBLIGHT_ANIMATIONS - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json index 293df18387..5aa4ac1e80 100644 --- a/keyboards/mechwild/bde/lefty/info.json +++ b/keyboards/mechwild/bde/lefty/info.json @@ -3,5 +3,75 @@ "usb": { "pid": "0x1701", "device_version": "2.0.3" + }, + "matrix_pins": { + "rows": ["D1", "D7", "D3"], + "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"] + }, + "diode_direction": "ROW2COL", + "rgblight": { + "led_count": 16, + "pin": "D2", + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "label":"7", "x":0, "y":0 }, + { "matrix": [0, 1], "label":"8", "x":1, "y":0 }, + { "matrix": [0, 2], "label":"9", "x":2, "y":0 }, + { "matrix": [0, 3], "label":"0", "x":3, "y":0 }, + { "matrix": [0, 4], "label":"Q", "x":4, "y":0 }, + { "matrix": [0, 5], "label":"W", "x":5, "y":0 }, + { "matrix": [0, 6], "label":"E", "x":6, "y":0 }, + { "matrix": [0, 7], "label":"R", "x":7, "y":0 }, + { "matrix": [0, 8], "label":"T", "x":8, "y":0 }, + { "matrix": [0, 9], "label":"Y", "x":9, "y":0 }, + { "matrix": [0, 10], "label":"U", "x":10, "y":0 }, + { "matrix": [0, 11], "label":"I", "x":11, "y":0 }, + { "matrix": [0, 12], "label":"O", "x":12, "y":0 }, + { "matrix": [0, 13], "label":"P", "x":13, "y":0 }, + + { "matrix": [1, 0], "label":"4", "x":0, "y":1 }, + { "matrix": [1, 1], "label":"5", "x":1, "y":1 }, + { "matrix": [1, 2], "label":"6", "x":2, "y":1 }, + { "matrix": [1, 3], "label":"Enter", "x":3, "y":1, "h":2 }, + { "matrix": [1, 4], "label":"A", "x":4, "y":1 }, + { "matrix": [1, 5], "label":"S", "x":5, "y":1 }, + { "matrix": [1, 6], "label":"D", "x":6, "y":1 }, + { "matrix": [1, 7], "label":"F", "x":7, "y":1 }, + { "matrix": [1, 8], "label":"G", "x":8, "y":1 }, + { "matrix": [1, 9], "label":"H", "x":9, "y":1 }, + { "matrix": [1, 10], "label":"J", "x":10, "y":1 }, + { "matrix": [1, 11], "label":"K", "x":11, "y":1 }, + { "matrix": [1, 12], "label":"L", "x":12, "y":1 }, + { "matrix": [1, 13], "label":"Esc", "x":13, "y":1 }, + + { "matrix": [2, 0], "label":"1", "x":0, "y":2 }, + { "matrix": [2, 1], "label":"2", "x":1, "y":2 }, + { "matrix": [2, 2], "label":"3", "x":2, "y":2 }, + { "matrix": [2, 4], "label":"Z", "x":4, "y":2 }, + { "matrix": [2, 5], "label":"X", "x":5, "y":2 }, + { "matrix": [2, 6], "label":"C", "x":6, "y":2 }, + { "matrix": [2, 7], "label":"V", "x":7, "y":2 }, + { "matrix": [2, 8], "label":"Back", "x":8, "y":2 }, + { "matrix": [2, 9], "label":"Space", "x":9, "y":2 }, + { "matrix": [2, 10], "label":"B", "x":10, "y":2 }, + { "matrix": [2, 11], "label":"N", "x":11, "y":2 }, + { "matrix": [2, 12], "label":"M", "x":12, "y":2 }, + { "matrix": [2, 13], "label":"Shift", "x":13, "y":2 } + ] + } } } diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h new file mode 100644 index 0000000000..5c2d15a006 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h @@ -0,0 +1,23 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 +/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ +#define IGNORE_MOD_TAP_INTERRUPT + +/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ +#define TAPPING_TERM 250 + diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c new file mode 100644 index 0000000000..804c29824c --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c @@ -0,0 +1,55 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 + +#define FN1_SPC LT(1, KC_SPC) +#define FN2_BSPC LT(2, KC_BSPC) +#define FN3_B LT(3, KC_B) +#define CTL_Z CTL_T(KC_Z) +#define ALT_X ALT_T(KC_X) +#define ALT_N ALGR_T(KC_N) +#define CTL_M RCTL_T(KC_M) +#define SFT_ENT RSFT_T(KC_ENT) +#define WIN_C LGUI_T(KC_C) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_4, KC_5, KC_6, SFT_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, + KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT + ), + + [1] = LAYOUT( + KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, + KC_F1, KC_F2, KC_F3, _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, + KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [3] = LAYOUT( + RGB_M_G, RGB_M_T, _______, RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, + RGB_M_SN, RGB_M_K, RGB_M_X, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, + RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk new file mode 100644 index 0000000000..a4c9ac387a --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/default/rules.mk @@ -0,0 +1,9 @@ +# If you are using a custom Pro Micro-compatible dev board (Elite-C, Sea-Micro, etc) +# you may need to uncomment and modify this BOOTLOADER setting to use the correct +# bootloader. (e.g. Elite-Cs use "atmel-dfu", not "caterina".) +# +# See the QMK docs for more information: +# https://docs.qmk.fm/#/flashing +# https://docs.qmk.fm/#/driver_installation_zadig?id=list-of-known-bootloaders + +# BOOTLOADER = caterina diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h new file mode 100644 index 0000000000..8476c8ccd6 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h @@ -0,0 +1,22 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 +/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ +#define IGNORE_MOD_TAP_INTERRUPT + +/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ +#define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c new file mode 100644 index 0000000000..3240dbdfb2 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c @@ -0,0 +1,121 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 + + +#define FN1_SPC LT(1, KC_SPC) +#define FN2_BSPC LT(2, KC_BSPC) +#define FN3_B LT(3, KC_B) +#define CTL_Z CTL_T(KC_Z) +#define ALT_X ALT_T(KC_X) +#define ALT_N ALGR_T(KC_N) +#define CTL_M RCTL_T(KC_M) +#define SFT_ENT RSFT_T(KC_ENT) +#define WIN_C LGUI_T(KC_C) + +typedef struct { + bool is_press_action; + uint8_t state; +} tap; + +enum { + SINGLE_TAP = 1, + SINGLE_HOLD, + DOUBLE_TAP +}; + +// Tap dance enums +enum { + left_enter, +}; + +uint8_t cur_dance(qk_tap_dance_state_t *state); +void left_enter_finished(qk_tap_dance_state_t *state, void *user_data); +void left_enter_reset(qk_tap_dance_state_t *state, void *user_data); + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_4, KC_5, KC_6, TD(left_enter), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, + KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT + ), + + [1] = LAYOUT( + KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT, + KC_F1, KC_F2, KC_F3, _______, _______, KC_LGUI, _______, KC_DEL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, + KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + +[3] = LAYOUT( + RGB_M_G, RGB_M_T, _______, RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, _______, _______, _______, _______, _______, _______, + RGB_M_SN, RGB_M_K, RGB_M_X, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______, _______, + RGB_M_B, RGB_M_R, RGB_M_SW, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; + + +uint8_t cur_dance(qk_tap_dance_state_t *state) { + if (state->count == 1) { + if (state->interrupted || !state->pressed) return SINGLE_TAP; + // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'. + else return SINGLE_HOLD; + } else return DOUBLE_TAP; + //} else if (state->count >= 2) { + // return DOUBLE_TAP; + //}else return 8; // Magic number. At some point this method will expand to work for more presses +} + +static tap left_enter_tap_state = { + .is_press_action = true, + .state = 0 +}; + +void left_enter_finished(qk_tap_dance_state_t *state, void *user_data) { + left_enter_tap_state.state = cur_dance(state); + switch (left_enter_tap_state.state) { + //case SINGLE_TAP: register_code(KC_ENT); break; + case SINGLE_HOLD: register_code(KC_LSFT); break; + case DOUBLE_TAP: register_code(KC_ENT); break; + } +} + +void left_enter_reset(qk_tap_dance_state_t *state, void *user_data) { + switch (left_enter_tap_state.state) { + //case SINGLE_TAP: unregister_code(KC_ENT); break; + case SINGLE_HOLD: unregister_code(KC_LSFT); break; + case DOUBLE_TAP: unregister_code(KC_ENT); break; + } + left_enter_tap_state.state = 0; +} + +qk_tap_dance_action_t tap_dance_actions[] = { + [left_enter] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, left_enter_finished, left_enter_reset) +}; + + + diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk new file mode 100644 index 0000000000..9a56408f8e --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk @@ -0,0 +1,2 @@ +TAP_DANCE_ENABLE = yes + diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h new file mode 100644 index 0000000000..8476c8ccd6 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h @@ -0,0 +1,22 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 +/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ +#define IGNORE_MOD_TAP_INTERRUPT + +/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ +#define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c new file mode 100644 index 0000000000..722062935a --- /dev/null +++ b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c @@ -0,0 +1,56 @@ +/* Copyright 2020 Kyle McCreery + * + * 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 + +#define FN1_SPC LT(1, KC_SPC) +#define FN2_BSPC LT(2, KC_BSPC) +#define FN3_B LT(3, KC_B) +#define CTL_Z CTL_T(KC_Z) +#define ALT_X ALT_T(KC_X) +#define ALT_N ALGR_T(KC_N) +#define CTL_M RCTL_T(KC_M) +#define SFT_ENT RSFT_T(KC_ENT) +#define WIN_C LGUI_T(KC_C) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_7, KC_8, KC_9, KC_0, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_4, KC_5, KC_6, SFT_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC, + KC_1, KC_2, KC_3, CTL_Z, ALT_X, WIN_C, KC_V, FN2_BSPC, FN1_SPC, FN3_B, ALT_N, CTL_M, SFT_ENT + ), + + [1] = LAYOUT( + KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, QK_BOOT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_F4, KC_F5, KC_F6, KC_TAB, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SL