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

4 years ago · 34e6be748a
parent 766c2eeb16 c03e18f728
commit 34e6be748a
3 changed files with 5 additions and 7 deletions
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
@ -34,3 +34,6 @@
    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
    #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
+
+// Reduce layers to 3 to save memory
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@ -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_BSPC,                   _______, _______,           _______, _______,   _______
    ),
-    [_RAISE] = LAYOUT_65_ansi_blocker(
-        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______,
-        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______,
-        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,           _______,   _______,
-        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,           _______,   _______,
-        _______,  _______,  _______,                              KC_SPC,                    _______, _______,           _______, _______,   _______
-    ),
 };

 #ifdef RGB_MATRIX_ENABLE
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk
@ -1,8 +1,10 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
+CONSOLE_ENABLE = no
 MOUSEKEY_ENABLE = no
 TAP_DANCE_ENABLE = yes
 BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+EXTRAKEY_ENABLE = no

 TD_LSFT_CAPSLOCK_ENABLE = yes
 IDLE_TIMEOUT_ENABLE = yes