Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-05-03 10:22:46 +00:00
commit 34e6be748a
3 changed files with 5 additions and 7 deletions

View file

@ -34,3 +34,6 @@
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DISABLE_WHEN_USB_SUSPENDED
#endif #endif
// Reduce layers to 3 to save memory
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -41,13 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_NO, KC_DEL, KC_INS, KC_NO, KC_NO, KC_NO, KC_P0, KC_00, KC_PDOT, KC_PSLS, _______, _______, _______, _______, KC_NO, KC_DEL, KC_INS, KC_NO, KC_NO, KC_NO, KC_P0, KC_00, KC_PDOT, KC_PSLS, _______, _______, _______,
_______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______ _______, _______, _______, KC_BSPC, _______, _______, _______, _______, _______
), ),
[_RAISE] = LAYOUT_65_ansi_blocker(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, KC_SPC, _______, _______, _______, _______, _______
),
}; };
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE

View file

@ -1,8 +1,10 @@
VIA_ENABLE = yes VIA_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
CONSOLE_ENABLE = no
MOUSEKEY_ENABLE = no MOUSEKEY_ENABLE = no
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
EXTRAKEY_ENABLE = no
TD_LSFT_CAPSLOCK_ENABLE = yes TD_LSFT_CAPSLOCK_ENABLE = yes
IDLE_TIMEOUT_ENABLE = yes IDLE_TIMEOUT_ENABLE = yes