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

7 files changed, 0 insertions, 245 deletions

diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h b/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
deleted file mode 100644
index df06a26206..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
deleted file mode 100644
index cbd6aa8b3d..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
-
-// Aliases for some other things I want to try out
-#define RAI_ESC LT(_RAISE, KC_ESC)
-#define LOW_QUQ LT(_LOWER, KC_QUOT)
-#define LOW_MIN LT(_LOWER, KC_MINS) // Same as above, but for Dvorak layer
-#define GUIBSPC GUI_T(KC_BSPC)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_DVORAK] = LAYOUT( /* 0: Dvorak */
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
-    RAI_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    LOW_MIN,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,
-    KC_LCTL, KC_LALT, LOWER,                     GUIBSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_QWERTY] = LAYOUT( /* 1: Qwerty */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    RAI_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, LOW_QUQ,
-    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_LCTL, KC_LALT, LOWER,                     KC_BSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_COLEMAK] = LAYOUT( /* 2: Colemak */
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    RAI_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    LOW_QUQ,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, LOWER,                     KC_BSPC, KC_SPC,                    RAISE,   KC_LGUI, KC_ENT
-  ),
-
-  [_LOWER] = LAYOUT( /* 1: FN 1 */
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
-    _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-    KC_LEFT, KC_RGHT, _______,                   KC_DEL,  KC_INS,                    _______, KC_UP,   KC_DOWN
-  ),
-
-  [_RAISE] = LAYOUT( /* 2: FN 2 */
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-    _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
-    KC_LEFT, KC_RGHT, _______,                   KC_DEL,  KC_INS,                    _______, KC_UP,   KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_HOME, KC_END,  _______,                   _______, _______,                   _______, KC_PGUP, KC_PGDN
-  )
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case COLEMAK:
-                set_single_persistent_default_layer(_COLEMAK);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-        }
-    }
-    return true;
-}
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md b/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
deleted file mode 100644
index ac84c08cfa..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for tv44
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
deleted file mode 100644
index 93e7cd8bb7..0000000000
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h b/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
deleted file mode 100644
index da6ed7189c..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#define TAPPING_TERM 175
-
-#ifdef BACKLIGHT_ENABLE
-  #define BACKLIGHT_PIN B5
-  #define BACKLIGHT_LEVELS 3
-  #define BACKLIGHT_ON_STATE 0
-#endif	
-	
-#endif
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
deleted file mode 100644
index eb7bb3ab76..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _NP 0
-#define _L1 1
-#define _L2 2
-
-enum custom_keycodes {
-  NUMPAD = SAFE_RANGE,
-  ADMIN,
-  SMSPC1,
-  STR192,
-  STR255
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Numpad
-   * ,-----------------------.
-   * |  7  |  8  |  9  |Bksp |
-   * |-----`-----`-----`-----|
-   * |  4  |  5  |  6  | Tab |
-   * |-----`-----`-----`-----|
-   * |  1  |  2  |  3  |Enter|
-   * |-----`-----`-----`-----|
-   * |  0  |Space|  .  |  /  |
-   * `-----`-----`-----`-----'
-   * | L1  | L2  |     |     | Layer hold
-   */
-  [_NP] = LAYOUT_ortho_4x4( /* Numpad */
-    KC_P7,        KC_P8,         KC_P9,   KC_BSPC,
-    KC_P4,        KC_P5,         KC_P6,   KC_TAB,
-    KC_P1,        KC_P2,         KC_P3,   KC_PENT,
-    LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS
-  ),
-
-  /* L1
-   * ,-----------------------.
-   * |Reset|     |     | Del |
-   * |-----`-----`-----`-----|
-   * | Left| Down| Up  |Right|
-   * |-----`-----`-----`-----|
-   * | 192.| 255 |     |     |
-   * |-----`-----`-----`-----|
-   * |_____| LED |  .  |     |
-   * `-----`-----`-----`-----'
-   */
-  [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
-    QK_BOOT, XXXXXXX, XXXXXXX, KC_DEL,
-    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-    STR192,  STR255,  XXXXXXX, XXXXXXX,
-    _______, BL_STEP, _______, XXXXXXX
-  ),
-
-  /* L2
-   * ,-----------------------.
-   * |     |     | str | str |
-   * |-----`-----`-----`-----|
-   * |     |     |     |     |
-   * |-----`-----`-----`-----|
-   * |     |     |     |     |
-   * |-----`-----`-----`-----|
-   * |     |_____|     |     |
-   * `-----`-----`-----`-----'
-   */
-  [_L2] = LAYOUT_ortho_4x4( /* LAYER 2 */
-    XXXXXXX, XXXXXXX, ADMIN,   SMSPC1,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, _______, XXXXXXX, XXXXXXX
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case ADMIN:
-      if (record->event.pressed) {
-  SEND_STRING("Administrator");
-      }
-      return false;
-      break;
-    case SMSPC1:
-      if (record->event.pressed) {
-  SEND_STRING("Simspace1!");
-      }
-      return false;
-      break;
-    case STR192:
-      if (record->event.pressed) {
-  SEND_STRING("192.168.");
-      }
-      return false;
-      break;
-    case STR255:
-      if (record->event.pressed) {
-  SEND_STRING("255");
-      }
-      return false;
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
deleted file mode 100644
index f6dfc2483b..0000000000
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = no      # Enable Tap Dance functionality
-