diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
| commit | b835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch) | |
| tree | de22c239cc47556f8be7538f95f48ad75b86d110 /keyboards/mechlovin | |
| parent | f5d091a9d58c8349437e9d52de87294258cbd256 (diff) | |
| parent | 0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff) | |
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'keyboards/mechlovin')
| -rw-r--r-- | keyboards/mechlovin/hex4b/rev2/chconf.h | 24 | ||||
| -rw-r--r-- | keyboards/mechlovin/tmkl/keymaps/default/keymap.c | 2 |
2 files changed, 1 insertions, 25 deletions
diff --git a/keyboards/mechlovin/hex4b/rev2/chconf.h b/keyboards/mechlovin/hex4b/rev2/chconf.h deleted file mode 100644 index fe716d6552..0000000000 --- a/keyboards/mechlovin/hex4b/rev2/chconf.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 - -#define CH_CFG_ST_TIMEDELTA 0 - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#include_next <chconf.h> - diff --git a/keyboards/mechlovin/tmkl/keymaps/default/keymap.c b/keyboards/mechlovin/tmkl/keymaps/default/keymap.c index e39051d9b4..0a6311bce2 100644 --- a/keyboards/mechlovin/tmkl/keymaps/default/keymap.c +++ b/keyboards/mechlovin/tmkl/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), [1] = LAYOUT( - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |