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

7 files changed, 0 insertions, 195 deletions

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
deleted file mode 100644
index b1bdefb4d4..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base layer
-   * ,--------------------------------------------------------------------------------------------------.
-   * |Esc ~|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Backspace  | Home |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \     | End  |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | CtrlCaps |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     Enter    | PgUp |
-   * |-------------------------------------------------------------------------------------------+------+
-   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   MO(2)    | Up  | PgDn |
-   * +-------------------------------------------------------------------------┬---┬-------------+------+
-   * | LCtrl | LGUI | LAlt |               Space                 | Btn2 | MO(1)|   | Left  |Down | Right|
-   * `-------------------------------------------------------------------------┘   └-------------+------´
-   */
-    [0] = LAYOUT_65_ansi_blocker( /* Base */
-        QK_GESC,       KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-        KC_TAB,        KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_END, 
-        CTL_T(KC_CAPS),KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGUP,
-        KC_LSFT,       KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  MO(2),             KC_UP,     KC_PGDN,
-        KC_LCTL,       KC_LGUI,  KC_LALT,                KC_SPC,                KC_BTN2,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT
-    ),
-
-    [1] = LAYOUT_65_ansi_blocker( /* MO(1) - Fn */
-        KC_GRV,        KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-        _______,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR,  KC_SCRL, KC_PAUS, QK_BOOT,  KC_PGUP,
-        CTL_T(KC_CAPS),RGB_SPI,  RGB_SPD, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          EE_CLR,   KC_PGDN,
-        KC_LSFT,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,          KC_VOLU,  KC_MUTE,
-        _______,       _______,  _______,                  _______,                   _______,          _______,  KC_MPRV,          KC_VOLD,  KC_MNXT
-    ),
-
-    [2] = LAYOUT_65_ansi_blocker( /* MO(2) - RShift */
-        QK_GESC,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-        LCTL(KC_L),    _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,
-        _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-        _______,       _______,  _______, _______,_______, _______, _______, _______, _______, _______, _______,  _______,           _______, _______,
-        _______,       _______,  _______,                  _______,                   _______,          _______,  _______,           _______, _______
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk
deleted file mode 100644
index a4a9db461b..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/codecoffeecode/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE   = yes
-NKRO_ENABLE       = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h
deleted file mode 100644
index 02bde2d217..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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
-
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
deleted file mode 100644
index 20921aff80..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2020 Christian Eiden, cykedev
-//
-// 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 QMK_KEYBOARD_H
-
-// layers, ordering is important!
-enum layers {
-    _BASE,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Base layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Backspace  | `    |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \     | Del  |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | MO(_FN2) |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     Enter    | PgUp |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   Shift    | Up  | PgDn |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * | LCtrl | LAlt | LGUI |               Space                 | RGUI | RAlt |   | Left  | Dn  | Rght |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_BASE] = LAYOUT_65_ansi_blocker(
-		KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,           KC_MINS,   KC_EQL,    KC_BSPC,   KC_GRV,
-		KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,           KC_LBRC,   KC_RBRC,   KC_BSLS,   KC_DEL,
-		MO(_FN1),  KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,        KC_QUOT,              KC_ENT,    KC_PGUP,
-		KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,        KC_RSFT,              KC_UP,     KC_PGDN,
-		KC_LCTL,   KC_LALT,   KC_LGUI,                         KC_SPC,                                     KC_RGUI,   OSM(MOD_RALT),             KC_LEFT,   KC_DOWN,   KC_RGHT
-		),
-
-  /* FN 1 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |             | Mute |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     | Br - |Br +|          | Ins  |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     | Lft | Dwn | Up  | Rgt |     |     |              | Home |
-  * |-------------------------------------------------------------------------------------------+------+
-  * | MO(_FN2)   |     |     |     |     |     |     |     |     |     |     |            | V + | End  |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |                                     |      |      |   | Prev  | V - | Next |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_FN1] = LAYOUT_65_ansi_blocker(
-		_______,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,   KC_F11,    KC_F12,    _______,   KC_MUTE,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_BRID,   KC_BRIU,   _______,   KC_INS,
-		_______,   _______,   _______,   _______,   _______,   _______,   KC_LEFT,   KC_DOWN,   KC_UP,     KC_RGHT,   _______,   _______,              _______,   KC_HOME,
-		MO(_FN2),  _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              KC_VOLU,   KC_END,
-		_______,   _______,   _______,                         _______,                                    _______,   _______,              KC_MRWD,   KC_VOLD,   KC_MFFD
-		),
-
-	/* FN 2 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |     |     |     |     |     |     |     |     |     |     |     |     |     Reset   | EEPR |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     | Mo- | Mo+ |          |Solid |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     |     |     |     |     | Sp- | Sp+ |              |  V + |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |            |     |     |     |     |     |     |     |     |     |     |            | S + |  V - |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |             Backlight               |      |      |   |  H -  | S - |  H + |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-	[_FN2] = LAYOUT_65_ansi_blocker(
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   QK_BOOT,   EE_CLR,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_RMOD,  RGB_MOD,   _______,   RGB_M_P,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   RGB_SPD,   RGB_SPI,              _______,   RGB_VAI,
-		_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              RGB_SAI,   RGB_VAD,
-		_______,   _______,   _______,                         RGB_TOG,                                    _______,   _______,              RGB_HUD,   RGB_SAD,   RGB_HUI
-    ),
-
-  /* FN 3 layer
-  * ,--------------------------------------------------------------------------------------------------.
-  * |     |     |     |     |     |     |     |     |     |     |     |     |     |             |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |        |     |     |     |     |     |     |     |     |     |     |     |     |          |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |          |     |     |     |     |     |     |     |     |     |     |     |              |      |
-  * |-------------------------------------------------------------------------------------------+------+
-  * |            |     |     |     |     |     |     |     |     |     |     |            |     |      |
-  * +-------------------------------------------------------------------------┬---┬-------------+------+
-  * |       |      |      |                                     |      |      |   |       |     |      |
-  * `-------------------------------------------------------------------------┘   └-------------+------´
-  */
-  [_FN3] = LAYOUT_65_ansi_blocker(
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,
-    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,   _______,
-    _______,   _______,   _______,                         _______,                                    _______,   _______,              _______,   _______,   _______
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/rules.mk
deleted file mode 100644
index 36b7ba9cbc..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
deleted file mode 100644
index 5f7977e5b5..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/keymap.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker(
-		QK_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  
-		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, 
-		KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  	  KC_PGUP, 
-		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,		 KC_UP,   KC_PGDN, 
-		KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, 					      KC_RALT, MO(1), 		KC_LEFT, KC_DOWN, KC_RGHT  
-	),
-	[1] = LAYOUT_65_ansi_blocker(
-		KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  
-		_______, _______,  RGB_VAI, _______, _______, RGB_SAI, RGB_HUI, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  
-		_______, RGB_SPD,  RGB_VAD, RGB_SPI, _______, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, 	       KC_VOLU, 
-		_______, RGB_RMOD, RGB_TOG, RGB_MOD, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, _______, 	      KC_PGUP, KC_VOLD, 
-		_______, _______,  _______, _______, 						  _______, _______,	     KC_HOME, KC_PGDN, KC_END   
-	)
-};
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md
deleted file mode 100644
index 7e681294f2..0000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/mikefightsbears/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for hotswap