diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-28 17:16:50 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-28 17:16:50 +0000 |
| commit | 10a84d6b93ad459560e5f21db315fb49921249bb (patch) | |
| tree | 19b1a1cbc50c2087361c11480768a845c93bf26a /keyboards | |
| parent | 75c3e9545cfc1d09e2e6d9b9fe2d6a59f1924a87 (diff) | |
| parent | 4adb64a91b3c8bf665bd9f7357fb806d30ac09f5 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
42 files changed, 501 insertions, 509 deletions
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 <http://www.gnu.org/licenses/>. - */ - -#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 <http://www.gnu.org/licenses/>. - */ -#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 <http://www.gnu.org/licenses/>. #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/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 <http://www.gnu.org/licenses/>. - */ - - -/* 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/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 <http://www.gnu.org/licenses/>. - */ - - -#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/keymaps/righty_default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h index 80e8e2e015..5c2d15a006 100644 --- a/keyboards/mechwild/bde/keymaps/righty_default/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - +#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 diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c index 3f7b092bc7..804c29824c 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c +++ b/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -25,21 +25,21 @@ #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) +#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 + 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 + 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, 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/keymaps/lefty_fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h index 8476c8ccd6..8476c8ccd6 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c index 61c59932cf..3240dbdfb2 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ #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) +#define WIN_C LGUI_T(KC_C) typedef struct { bool is_press_action; @@ -55,15 +55,15 @@ 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 + 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 + 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, @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) - + }; @@ -84,9 +84,9 @@ uint8_t cur_dance(qk_tap_dance_state_t *state) { 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 return DOUBLE_TAP; //} else if (state->count >= 2) { - // return DOUBLE_TAP; + // return DOUBLE_TAP; //}else return 8; // Magic number. At some point this method will expand to work for more presses } @@ -101,7 +101,7 @@ void left_enter_finished(qk_tap_dance_state_t *state, void *user_data) { //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) { diff --git a/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk index 9a56408f8e..9a56408f8e 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h index 8476c8ccd6..8476c8ccd6 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_via/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c index cf1f8451d0..722062935a 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c +++ b/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -25,22 +25,22 @@ #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) +#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 + 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 + 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, diff --git a/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk b/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk index 16d33cd89f..16d33cd89f 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk +++ b/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk diff --git a/keyboards/mechwild/bde/lefty/lefty.c b/keyboards/mechwild/bde/lefty/lefty.c deleted file mode 100644 index 6873ed36a0..0000000000 --- a/keyboards/mechwild/bde/lefty/lefty.c +++ /dev/null @@ -1,17 +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 <http://www.gnu.org/licenses/>. - */ - -#include "bde.h" diff --git a/keyboards/mechwild/bde/lefty/lefty.h b/keyboards/mechwild/bde/lefty/lefty.h deleted file mode 100644 index 37b8771db6..0000000000 --- a/keyboards/mechwild/bde/lefty/lefty.h +++ /dev/null @@ -1,30 +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 <http://www.gnu.org/licenses/>. - */ - - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D , \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D , \ - K20, K21, K22, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - {K20, K21, K22, KC_NO, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D} \ -} diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/lefty/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/mechwild/bde/lefty/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bde/readme.md b/keyboards/mechwild/bde/readme.md index 5481b47160..623903b4e7 100644 --- a/keyboards/mechwild/bde/readme.md +++ b/keyboards/mechwild/bde/readme.md @@ -12,4 +12,22 @@ Make example for this keyboard (after setting up your build environment): make mechwild/bde:default +Flashing example for this keyboard: + + make mechwild/bde:default:flash + See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving. +* **Physical reset**: Press the 6x6mm button on the underside of the keyboard. On Rev1, it is above the Pro Micro; on Rev2, it is below the OLED. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, replacing the R key. + +As a Pro Micro-compatible board, the BDE defines `caterina` as its bootloader by default. Many popular Pro Micro alternatives like the Elite-C, Bit-C, Sea-Micro, Puchi-C etc should be flashed with a different bootloader such as `atmel-dfu`. + +**If the incorrect bootloader is specified, bootmagic reset and the `QK_BOOT` keycode will not work**. + +To avoid this problem, set the correct bootloader in your custom keymap's `rules.mk` file before compiling, or flash using an appropriate target (e.g. `make mechwild/bde:default:dfu`). See [flashing instructions and bootloader information](https://docs.qmk.fm/#/flashing) for more details. diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h index 7ea5536055..3d045762ca 100644 --- a/keyboards/mechwild/bde/rev2/config.h +++ b/keyboards/mechwild/bde/rev2/config.h @@ -17,46 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* Key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 7 - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { C6, D7, B4, D4, E6, B2 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B5 } - /* Encoder pins */ -#define ENCODERS_PAD_A { D3 } -#define ENCODERS_PAD_B { D2 } +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D3 } /* Encoder resolution */ #define ENCODER_RESOLUTION 4 -#define TAP_CODE_DELAY 10 - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW #define OLED_FONT_H "keyboards/mechwild/bde/lib/rev2.c" - -#define RGB_DI_PIN B6 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 8 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== Chosen enabled animations ==*/ -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json index 9c9aa3e2c2..29ddb0e017 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/info.json @@ -3,5 +3,70 @@ "usb": { "pid": "0x170A", "device_version": "1.0.1" + }, + "matrix_pins": { + "rows":[ "C6", "D7", "B4", "D4", "E6", "B2" ], + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5" ] + }, + "diode_direction": "COL2ROW", + "rgblight": { + "led_count": 8, + "pin": "B6", + "animations": { + "rainbow_swirl": true + }, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8 + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "label":"Q", "x":0, "y":0}, + { "matrix": [0, 1], "label":"W", "x":1, "y":0}, + { "matrix": [0, 2], "label":"E", "x":2, "y":0}, + { "matrix": [0, 3], "label":"R", "x":3, "y":0}, + { "matrix": [0, 4], "label":"T", "x":4, "y":0}, + { "matrix": [0, 5], "label":"Y", "x":5, "y":0}, + { "matrix": [0, 6], "label":"U", "x":6, "y":0}, + { "matrix": [3, 6], "label":"I", "x":7, "y":0}, + { "matrix": [3, 5], "label":"O", "x":8, "y":0}, + { "matrix": [3, 4], "label":"P", "x":9, "y":0}, + { "matrix": [3, 3], "label":"7", "x":10, "y":0}, + { "matrix": [3, 2], "label":"8", "x":11, "y":0}, + { "matrix": [3, 1], "label":"9", "x":12, "y":0}, + { "matrix": [3, 0], "label":"Mute", "x":13, "y":0}, + + { "matrix": [1, 0], "label":"A", "x":0, "y":1}, + { "matrix": [1, 1], "label":"S", "x":1, "y":1}, + { "matrix": [1, 2], "label":"D", "x":2, "y":1}, + { "matrix": [1, 3], "label":"F", "x":3, "y":1}, + { "matrix": [1, 4], "label":"G", "x":4, "y":1}, + { "matrix": [1, 5], "label":"H", "x":5, "y":1}, + { "matrix": [1, 6], "label":"J", "x":6, "y":1}, + { "matrix": [4, 6], "label":"K", "x":7, "y":1}, + { "matrix": [4, 5], "label":"L", "x":8, "y":1}, + { "matrix": [4, 4], "label":"Esc", "x":9, "y":1}, + { "matrix": [4, 3], "label":"4", "x":10, "y":1}, + { "matrix": [4, 2], "label":"5", "x":11, "y":1}, + { "matrix": [4, 1], "label":"6", "x":12, "y":1}, + { "matrix": [4, 0], "label":"0", "x":13, "y":1}, + + { "matrix": [2, 0], "label":"Z", "x":0, "y":2}, + { "matrix": [2, 1], "label":"X", "x":1, "y":2}, + { "matrix": [2, 2], "label":"C", "x":2, "y":2}, + { "matrix": [2, 3], "label":"V", "x":3, "y":2}, + { "matrix": [2, 4], "label":"Back", "x":4, "y":2}, + { "matrix": [2, 5], "label":"Space", "x":5, "y":2}, + { "matrix": [2, 6], "label":"B", "x":6, "y":2}, + { "matrix": [5, 6], "label":"N", "x":7, "y":2}, + { "matrix": [5, 5], "label":"M", "x":8, "y":2}, + { "matrix": [5, 4], "label":"Enter", "x":9, "y":2}, + { "matrix": [5, 3], "label":"1", "x":10, "y":2}, + { "matrix": [5, 2], "label":"2", "x":11, "y":2}, + { "matrix": [5, 1], "label":"3", "x":12, "y":2}, + { "matrix": [5, 0], "label":"EQL", "x":13, "y":2} + ] + } } } diff --git a/keyboards/mechwild/bde/keymaps/default/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c index 8222af7576..375dc25ae2 100644 --- a/keyboards/mechwild/bde/keymaps/default/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -25,7 +25,7 @@ #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) +#define WIN_C LGUI_T(KC_C) enum layer_names { _BASE, @@ -36,24 +36,34 @@ enum layer_names { 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_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, + ), + [_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_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, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + ), + [_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, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; + +// If you are not using an encoder, remember to set ENCODER_ENABLE and ENCODER_MAP_ENABLE to no in rules.mk. +#ifdef ENCODER_MAP_ENABLE + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + }; +#endif diff --git a/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk new file mode 100644 index 0000000000..d976f24919 --- /dev/null +++ b/keyboards/mechwild/bde/rev2/keymaps/default/rules.mk @@ -0,0 +1,13 @@ +# 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 + +# If you are not using an encoder, set these options to no. +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechwild/bde/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h index d09385ca5d..d09385ca5d 100644 --- a/keyboards/mechwild/bde/keymaps/via/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/via/config.h diff --git a/keyboards/mechwild/bde/keymaps/via/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c index e28c1b6db8..8ce001cff8 100644 --- a/keyboards/mechwild/bde/keymaps/via/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -25,7 +25,7 @@ #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) +#define WIN_C LGUI_T(KC_C) enum layer_names { _BASE, @@ -36,24 +36,33 @@ enum layer_names { 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_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, + ), + [_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_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, + ), + [_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 ) }; + +#ifdef ENCODER_MAP_ENABLE + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + }; +#endif diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk new file mode 100644 index 0000000000..9ff50262fb --- /dev/null +++ b/keyboards/mechwild/bde/rev2/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c index 88c06988d9..3dae312e2b 100644 --- a/keyboards/mechwild/bde/rev2/rev2.c +++ b/keyboards/mechwild/bde/rev2/rev2.c @@ -1,21 +1,20 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ - -#include "bde.h" +#include "rev2.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { @@ -34,30 +33,25 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { #endif #ifdef OLED_ENABLE - oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; // flips the display 270 degrees - } +static const char PROGMEM mw_logo[] = { + 0x8A, 0x8B, 0x8C, 0x8D, '\r', + 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, + 0xCA, 0xCB, 0xCC, 0xCD, '\r', + 0x20, 0x8E, 0x8F, 0x90, 0x00}; + +oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; // flips the display 270 degrees +} - static void render_logo(void) { // Render MechWild "MW" Logo - static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00}; - static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00}; - static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00}; - static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00}; - oled_set_cursor(0,0); - oled_write_P(logo_1, false); - oled_set_cursor(0,1); - oled_write_P(logo_2, false); - oled_set_cursor(0,2); - oled_write_P(logo_3, false); - oled_set_cursor(0,3); - oled_write_P(logo_4, false); - } +bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } - bool oled_task_user(void) { - render_logo(); - oled_set_cursor(0,6); + oled_write_P(mw_logo, false); // Render MechWild "MW" Logo + oled_set_cursor(0,6); - oled_write_ln_P(PSTR("Layer"), false); + oled_write_ln_P(PSTR("Layer"), false); switch (get_highest_layer(layer_state)) { case 0: @@ -75,14 +69,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { default: oled_write_ln_P(PSTR("Undef"), false); } - oled_write_ln_P(PSTR(""), false); + oled_write_ln_P(PSTR(""), false); // Host Keyboard LED Status led_t led_state = host_keyboard_led_state(); oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; - - } + + return true; +} #endif diff --git a/keyboards/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h index 8c8191710a..bb37c7ef69 100644 --- a/keyboards/mechwild/bde/rev2/rev2.h +++ b/keyboards/mechwild/bde/rev2/rev2.h @@ -16,16 +16,3 @@ #pragma once #include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K0D, K0C, K0B, K0A, K09, K08, K07 }, \ - { K1D, K1C, K1B, K1A, K19, K18, K17 }, \ - { K2D, K2C, K2B, K2A, K29, K28, K27 } \ -} diff --git a/keyboards/mechwild/bde/righty/config.h b/keyboards/mechwild/bde/righty/config.h deleted file mode 100644 index 732e125bf9..0000000000 --- a/keyboards/mechwild/bde/righty/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 <http://www.gnu.org/licenses/>. - */ - - -#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 { B4, B5, E6, C6, D4, D0, F4, F5, F6, B6, B3, B2, B1, F7} - -/* 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/righty/info.json b/keyboards/mechwild/bde/righty/info.json index 93161bfcec..af23e6e293 100644 --- a/keyboards/mechwild/bde/righty/info.json +++ b/keyboards/mechwild/bde/righty/info.json @@ -3,5 +3,75 @@ "usb": { "pid": "0x1702", "device_version": "2.0.3" + }, + "matrix_pins": { + "rows": ["D1", "D7", "D3"], + "cols": [ "B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] + }, + "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":"Q", "x":0, "y":0 }, + { "matrix": [0, 1], "label":"W", "x":1, "y":0 }, + { "matrix": [0, 2], "label":"E", "x":2, "y":0 }, + { "matrix": [0, 3], "label":"R", "x":3, "y":0 }, + { "matrix": [0, 4], "label":"T", "x":4, "y":0 }, + { "matrix": [0, 5], "label":"Y", "x":5, "y":0 }, + { "matrix": [0, 6], "label":"U", "x":6, "y":0 }, + { "matrix": [0, 7], "label":"I", "x":7, "y":0 }, + { "matrix": [0, 8], "label":"O", "x":8, "y":0 }, + { "matrix": [0, 9], "label":"P", "x":9, "y":0 }, + { "matrix": [0, 10], "label":"0", "x":10, "y":0 }, + { "matrix": [0, 11], "label":"7", "x":11, "y":0 }, + { "matrix": [0, 12], "label":"8", "x":12, "y":0 }, + { "matrix": [0, 13], "label":"9", "x":13, "y":0 }, + + { "matrix": [1, 0], "label":"A", "x":0, "y":1 }, + { "matrix": [1, 1], "label":"S", "x":1, "y":1 }, + { "matrix": [1, 2], "label":"D", "x":2, "y":1 }, + { "matrix": [1, 3], "label":"F", "x":3, "y":1 }, + { "matrix": [1, 4], "label":"G", "x":4, "y":1 }, + { "matrix": [1, 5], "label":"H", "x":5, "y":1 }, + { "matrix": [1, 6], "label":"J", "x":6, "y":1 }, + { "matrix": [1, 7], "label":"K", "x":7, "y":1 }, + { "matrix": [1, 8], "label":"L", "x":8, "y":1 }, + { "matrix": [1, 9], "label":"Esc", "x":9, "y":1 }, + { "matrix": [1, 10], "label":"Enter", "x":10, "y":1 , "h":2 }, + { "matrix": [1, 11], "label":"4", "x":11, "y":1 }, + { "matrix": [1, 12], "label":"5", "x":12, "y":1 }, + { "matrix": [1, 13], "label":"6", "x":13, "y":1 }, + + { "matrix": [2, 0], "label":"Z", "x":0, "y":2 }, + { "matrix": [2, 1], "label":"X", "x":1, "y":2 }, + { "matrix": [2, 2], "label":"C", "x":2, "y":2 }, + { "matrix": [2, 3], "label":"V", "x":3, "y":2 }, + { "matrix": [2, 4], "label":"Back", "x":4, "y":2 }, + { "matrix": [2, 5], "label":"Space", "x":5, "y":2 }, + { "matrix": [2, 6], "label":"B", "x":6, "y":2 }, + { "matrix": [2, 7], "label":"N", "x":7, "y":2 }, + { "matrix": [2, 8], "label":"M", "x":8, "y":2 }, + { "matrix": [2, 9], "label":"Esc", "x":9, "y":2 }, + { "matrix": [2, 11], "label":"1", "x":11, "y":2 }, + { "matrix": [2, 12], "label":"2", "x":12, "y":2 }, + { "matrix": [2, 13], "label":"3", "x":13, "y":2 } + ] + } } } diff --git a/keyboards/mechwild/bde/keymaps/lefty_default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h index 80e8e2e015..5c2d15a006 100644 --- a/keyboards/mechwild/bde/keymaps/lefty_default/config.h +++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - +#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 diff --git a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c b/keyboards/mechwild/bde/righty/keymaps/default/keymap.c index c832b83617..dea0054d95 100644 --- a/keyboards/mechwild/bde/keymaps/righty_via/keymap.c +++ b/keyboards/mechwild/bde/righty/keymaps/default/keymap.c @@ -1,17 +1,17 @@ -/* 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 <http://www.gnu.org/licenses/>. +/* 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 <http://www.gnu.org/licenses/>. */ @@ -24,22 +24,22 @@ #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) +#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, + 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 + _______, _______, 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, _______, _______, _______, _______, diff --git a/keyboards/mechwild/bde/righty/keymaps/default/rules.mk b/keyboards/mechwild/bde/righty/keymaps/default/rules.mk new file mode 100644 index 0000000000..a4c9ac387a --- /dev/null +++ b/keyboards/mechwild/bde/righty/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/righty/keymaps/via/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h new file mode 100644 index 0000000000..5c2d15a006 --- /dev/null +++ b/keyboards/mechwild/bde/righty/keymaps/via/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 <http://www.gnu.org/licenses/>. + */ + +#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/righty_default/keymap.c b/keyboards/mechwild/bde/righty/keymaps/via/keymap.c index c832b83617..b8238b152f 100644 --- a/keyboards/mechwild/bde/keymaps/righty_default/keymap.c +++ b/keyboards/mechwild/bde/righty/keymaps/via/keymap.c @@ -24,7 +24,7 @@ #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) +#define WIN_C LGUI_T(KC_C) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [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 + _______, _______, 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, _______, _______, _______, _______, diff --git a/keyboards/mechwild/bde/keymaps/righty_via/rules.mk b/keyboards/mechwild/bde/righty/keymaps/via/rules.mk index 16d33cd89f..16d33cd89f 100644 --- a/keyboards/mechwild/bde/keymaps/righty_via/rules.mk +++ b/keyboards/mechwild/bde/righty/keymaps/via/rules.mk diff --git a/keyboards/mechwild/bde/righty/righty.c b/keyboards/mechwild/bde/righty/righty.c deleted file mode 100644 index 6873ed36a0..0000000000 --- a/keyboards/mechwild/bde/righty/righty.c +++ /dev/null @@ -1,17 +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 <http://www.gnu.org/licenses/>. - */ - -#include "bde.h" diff --git a/keyboards/mechwild/bde/righty/righty.h b/keyboards/mechwild/bde/righty/righty.h deleted file mode 100644 index f1f29554a1..0000000000 --- a/keyboards/mechwild/bde/righty/righty.h +++ /dev/null @@ -1,30 +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 <http://www.gnu.org/licenses/>. - */ - - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D , \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D , \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2C, K2D \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B, K2C, K2D} \ -} diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk new file mode 100644 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/mechwild/bde/righty/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/mechwild/bde/rules.mk b/keyboards/mechwild/bde/rules.mk index 2ae725a20b..138a291916 100644 --- a/keyboards/mechwild/bde/rules.mk +++ b/keyboards/mechwild/bde/rules.mk @@ -1,20 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mechwild/bde/rev2 |