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

29 files changed, 203 insertions, 396 deletions

diff --git a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/README.md b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/README.md
deleted file mode 100644
index 3c9a5e98b3..0000000000
--- a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Gherkin Layout
-This is my gherkin layout.
-It is used as a game pad, and key layout is inspired by spare keys I had lying around.
-The firmware is very simple, and only includes one layer keymap, and RGB effects.
-
-# Flashing
-The following command should be used from the main qmk directory.
-```
-make gherkin:bbaserdem
-sudo avrdude -p atmgea34u4 -P `ls /dev/ttyACM*` -c avr109 -U flash:.build/gherkin_bbaserdem.hex
-```
diff --git a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h
deleted file mode 100644
index 5c9ca52d75..0000000000
--- a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#define RGB_DI_PIN F6
-#define RGBLED_NUM 10
-#define RGBLIGHT_ANIMATIONS
-#ifdef BACKLIGHT_LEVELS
-#undef BACKLIGHT_LEVELS
-#endif
-#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/keymap.c b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/keymap.c
deleted file mode 100644
index 0d3c8557c5..0000000000
--- a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,36 +0,0 @@
-// This is a game-pad gherkin layout with RGB and LED lights
-
-#include QMK_KEYBOARD_H
-
-backlight_config_t backlight_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Game pad
- * ,-----------------------------------------------------------.
- * | Esc |  1  |  2  |  3  |  4  |  5  |  6  | Ctl | Alt |  ~  |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * | Tab |  Q  |  W  |  E  |  R  |  T  | |^| |  ;  |  '  |  /  |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * | Shf |  A  |  S  |  D  |  F  | <-- | |v| | --> |  ,  |  .  |
- * `-----------------------------------------------------------'
- */
-    LAYOUT_ortho_3x10(
-        KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5,    KC_6,    KC_LCTRL, KC_LALT,  KC_GRAVE,
-        KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T,    KC_UP,   KC_SCLN,  KC_QUOTE, KC_SLASH,
-        KC_LSHIFT, KC_A, KC_S, KC_D, KC_F, KC_LEFT, KC_DOWN, KC_RIGHT, KC_COMMA, KC_DOT
-    )
-};
-
-void matrix_init_user(void) {
-    // Set LED's to max
-    _delay_us(300);
-    backlight_config.level = 2;
-    backlight_config.enable = 1;
-    eeconfig_update_backlight(backlight_config.raw);
-    backlight_set(backlight_config.level);
-    // Set RGB to rainbow mood light
-    rgblight_enable();
-    rgblight_mode(1);
-    rgblight_sethsv(120,255,255);
-    rgblight_mode(6);
-}
diff --git a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk
deleted file mode 100644
index 07a20a4217..0000000000
--- a/keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-USER_NAME := bbaserdem-nouserspace
-
-STENO_ENABLE = no      # Additional protocols for Stenography(+1700), requires VIRTSER
-MOUSEKEY_ENABLE = no   # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no   # Audio control and System control(+450)
-CONSOLE_ENABLE = no    # Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-AUDIO_ENABLE = no 	   # Enable audio output from keyboard
-
-NKRO_ENABLE = yes      # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes  # Enable RBG light strips
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
diff --git a/keyboards/lets_split/keymaps/bbaserdem/README.md b/keyboards/lets_split/keymaps/bbaserdem/README.md
deleted file mode 100644
index 4b37d73555..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Lets Split Layout
-
-Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
-
-# Usage
-
-**These commands depend on there being no other arduino connected!**
-Also udev rules can be set instead of using sudo.
-Please unplug all other usb devices.
-
-To make the hex files;
-```
-make lets_split/rev2:bbaserdem
-make lets_split/rev2:bbaserdem_right
-```
-
-For the left half, after plugging in and resetting; (from repo main directory)
-```
-sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:.build/lets_split_rev2_bbaserdem.hex
-sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -U eeprom:w:keyboards/lets_split/eeprom-lefthand.eep
-```
-
-For the right half;
-```
-sudo avrdude -p atmgea34u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:.build/lets_split_rev2_bbaserdem_right.hex
-sudo avrdude -p atmega32u4 -P "$(ls /dev/ttyACM*)" -c avr109 -U eeprom:w:keyboards/lets_split/eeprom-righhand.eep
-```
diff --git a/keyboards/lets_split/keymaps/bbaserdem/config.h b/keyboards/lets_split/keymaps/bbaserdem/config.h
deleted file mode 100755
index 6a90e1c356..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-
-#include "../../config.h"
-
-#define USE_SERIAL
-#define EE_HANDS
-
-// LED strip stuff
-#ifdef RGBLIGHT_ENABLE
-
-// Who thought it was a good idea to predefine these in the rev2/config.h ???
-#ifdef RGBLED_NUM
-#undef RGBLED_NUM
-#endif
-#define RGBLED_NUM 12
-
-#define RGBLIGHT_HUE_STEP 6
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 20
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 6
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 2000
-#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#endif
-
-#endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem/keymap.c b/keyboards/lets_split/keymaps/bbaserdem/keymap.c
deleted file mode 100755
index 296b3ccd23..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Let's Split - Dvorak turkish
- * Keymap by @bbaserdem
- * Dvorak layout with multiple features
- * Most of the code is in the "user" directory.
- * Check qmk_firmware/users/bbaserdem for the main part of the code
- */
-
-#include "lets_split.h"
-#include "bbaserdem.h"
-
-
-void matrix_init_keymap (void) {
-}
-
-layer_state_t layer_state_set_keymap(layer_state_t state) {
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Main Dvorak layer
-    [_DV] = LAYOUT_letssplit_wrapper(DVORAK),
-    // Turkish and special character overlay
-    [_AL] = LAYOUT_letssplit_wrapper(ALTCHAR),
-    // Gaming layer
-    [_GA] = LAYOUT_letssplit_wrapper(GAME),
-    // Numbers layer
-    [_NU] = LAYOUT_letssplit_wrapper(NUMBERS),
-    // Settings layer
-    [_SE] = LAYOUT_letssplit_wrapper(SETTINGS),
-    // Mouse emulation layer
-    [_MO] = LAYOUT_letssplit_wrapper(MOUSE),
-    // Music layer
-    [_MU] = LAYOUT_letssplit_wrapper(MUSIC),
-};
diff --git a/keyboards/lets_split/keymaps/bbaserdem/rules.mk b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
deleted file mode 100755
index 7a37e989d8..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build options
-
-BACKLIGHT_ENABLE = no		# Switch LEDs
-MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = yes 		# LED strips
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-AUDIO_ENABLE = no 			# Audio stuff
-
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/README.md b/keyboards/lets_split/keymaps/bbaserdem_right/README.md
deleted file mode 100644
index 8608f23f79..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem_right/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Lets Split - Right Half
-
-Keymap for my right half, to be used as a numpad.
-Check [main readme](../bbaserdem/README.md) for flashing info.
-
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/config.h b/keyboards/lets_split/keymaps/bbaserdem_right/config.h
deleted file mode 100755
index 47545a059b..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem_right/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-
-#include "../../config.h"
-
-#define USE_SERIAL
-#define EE_HANDS
-
-#endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c b/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c
deleted file mode 100755
index 2dcae0dca5..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem_right/keymap.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Let's Split - Dvorak turkish
- * Keymap by @bbaserdem
- * Dvorak layout with multiple features
- * Most of the code is in the "user" directory.
- * Check qmk_firmware/users/bbaserdem for the main part of the code
- */
-
-#include "lets_split.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*      Navigation All Supered)                        Numpad
-   * ,-----------------------. ,-----------------------.
-   * | F4| ` | Q |Alt| L | > | | ) | - | + | = |Ent|Bkp|
-   * |---+---+---+---+---+---| |---+---+---+---+---+---|
-   * | F3| M |Ent|Ctl| K | ^ | | ( | * | 9 | 6 | 3 | . |
-   * |---+---+---+---+---+---| |---+---+---+---+---+---|
-   * | F2| T |Spc|Shf| J | v | | % | / | 8 | 5 | 2 | , |
-   * |---+---+---+---+---+---| |---+---+---+---+---+---|
-   * | F1| F | P |Tab| H | < | |Nlc|Tab| 7 | 4 | 1 | 0 |
-   * `-----------------------' `-----------------------'
-   */
-  // Main Dvorak layer
-  [0] = LAYOUT_ortho_4x12(
-    LCTL(LALT(KC_DEL)), LGUI(KC_GRV), LGUI(KC_Q),   LGUI(KC_LALT), LGUI(KC_L), LGUI(KC_RGHT), KC_RPRN, KC_PMNS, KC_PPLS, KC_PEQL, KC_PENT, KC_BSPC, \
-    LGUI(KC_F3),        LGUI(KC_M),   LGUI(KC_ENT), LGUI(KC_LCTL), LGUI(KC_K), LGUI(KC_UP),   KC_LPRN, KC_PAST, KC_P9,   KC_P6,   KC_P3,   KC_PDOT, \
-    LGUI(KC_F2),        LGUI(KC_T),   LGUI(KC_SPC), LGUI(KC_LSFT), LGUI(KC_J), LGUI(KC_DOWN), KC_PERC, KC_PSLS, KC_P8,   KC_P5,   KC_P2,   KC_PCMM, \
-    LGUI(KC_F1),        LGUI(KC_F),   LGUI(KC_P),   LGUI(KC_TAB),  LGUI(KC_H), LGUI(KC_LEFT), KC_NLCK, KC_TAB,  KC_P7,   KC_P4,   KC_P1,   KC_P0   \
-  )
-};
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
deleted file mode 100755
index 6886a320a5..0000000000
--- a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build options
-
-USER_NAME := bbaserdem-without-userspace
-
-BACKLIGHT_ENABLE = no		# Switch LEDs
-MOUSEKEY_ENABLE = no		# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = no 		# LED strips
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-AUDIO_ENABLE = no 			# Audio stuff
-BLUETOOTH_ENABLE = no 		# No bluetooth
-COMMAND_ENABLE = no			# Some bootmagic thing
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-CONSOLE_ENABLE = no			# Allows console output with a command
-SLEEP_LED_ENABLE = no  		# Breathes LED's when computer is asleep. Untested.
-NKRO_ENABLE = no 			# Default is 6KRO which is plenty
-MIDI_ENABLE = no 			# Untested feature
-KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
-UNICODE_ENABLE = no			# Used for unicode character emulation
-EXTRAKEY_ENABLE = no		# OS signals like volume control
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
deleted file mode 100644
index fcb7037937..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Lets Split Eh Layout
-
-Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
-
-# Usage
-
-Fill in after flashing
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
deleted file mode 100755
index 47be76567e..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-#include "../../config.h"
-#endif
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
deleted file mode 100755
index 73329c3114..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "lets_split_eh.h"
-#include "bbaserdem.h"
-
-
-void matrix_init_keymap (void) {
-}
-
-layer_state_t layer_state_set_keymap(layer_state_t state) {
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Main Dvorak layer
-    [_DV] = LAYOUT_letssplit_wrapper(DVORAK),
-    // Turkish and special character overlay
-    [_AL] = LAYOUT_letssplit_wrapper(ALTCHAR),
-    // Gaming layer
-    [_GA] = LAYOUT_letssplit_wrapper(GAME),
-    // Numbers layer
-    [_NU] = LAYOUT_letssplit_wrapper(NUMBERS),
-    // Settings layer
-    [_SE] = LAYOUT_letssplit_wrapper(SETTINGS),
-    // Mouse emulation layer
-    [_MO] = LAYOUT_letssplit_wrapper(MOUSE),
-    // Music layer
-    [_MU] = LAYOUT_letssplit_wrapper(MUSIC),
-};
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
deleted file mode 100755
index 7a37e989d8..0000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build options
-
-BACKLIGHT_ENABLE = no		# Switch LEDs
-MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = yes 		# LED strips
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-AUDIO_ENABLE = no 			# Audio stuff
-
diff --git a/keyboards/planck/keymaps/bbaserdem/README.md b/keyboards/planck/keymaps/bbaserdem/README.md
deleted file mode 100644
index c8e8c3963c..0000000000
--- a/keyboards/planck/keymaps/bbaserdem/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Planck Layout
-
-Current keymap is for rev4.
-Audio is disabled in favor of RGB.
-Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
-
-# Build
-
-Get keyboard into reset mode, and then;
-
-```
-make planck/rev4:bbaserdem:dfu
-```
-
-Either use sudo or set up udev rules.
diff --git a/keyboards/planck/keymaps/bbaserdem/config.h b/keyboards/planck/keymaps/bbaserdem/config.h
deleted file mode 100755
index ac5460bda6..0000000000
--- a/keyboards/planck/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CONFIG_KEYMAP_H
-#define CONFIG_KEYMAP_H
-
-#include "config_common.h"
-
-// LED strip stuff
-#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B2
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 6
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 20
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 6
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 6
-#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 6
-#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 2000
-#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#endif
-
-#define ENCODER_RESOLUTION 4
-
-#endif
diff --git a/keyboards/planck/keymaps/bbaserdem/keymap.c b/keyboards/planck/keymaps/bbaserdem/keymap.c
deleted file mode 100755
index 1fa8132ddb..0000000000
--- a/keyboards/planck/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * PLANCK - Dvorak turkish
- * Keymap by @bbaserdem
- * Dvorak layout with multiple features
- * Most of the code is in the "user" directory.
- * Check qmk_firmware/users/bbaserdem for the main part of the code
- */
-
-#include "planck.h"
-#include "bbaserdem.h"
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // Main Dvorak layer
-    [_DV] = LAYOUT_planck_wrapper(DVORAK),
-    // Turkish and special character overlay
-    [_AL] = LAYOUT_planck_wrapper(ALTCHAR),
-    // Gaming layer
-    [_GA] = LAYOUT_planck_wrapper(GAME),
-    // Numbers layer
-    [_NU] = LAYOUT_planck_wrapper(NUMBERS),
-    // Settings layer
-    [_SE] = LAYOUT_planck_wrapper(SETTINGS),
-    // Mouse emulation layer
-    [_MO] = LAYOUT_planck_wrapper(MOUSE),
-    // Music mode
-    [_MU] = LAYOUT_planck_wrapper(MUSIC),
-};
diff --git a/keyboards/planck/keymaps/bbaserdem/rules.mk b/keyboards/planck/keymaps/bbaserdem/rules.mk
deleted file mode 100755
index b9b589e8d2..0000000000
--- a/keyboards/planck/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build options
-
-BACKLIGHT_ENABLE = yes		# Switch LEDs
-MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = yes 		# LED strips
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-AUDIO_ENABLE = yes			# Audio stuff
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h b/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h
new file mode 100644
index 0000000000..b7b883d3bd
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/bbaserdem/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 Batuhan Başerdem
+ * <baserdem.batuhan@gmail.com> @bbaserdem
+ *
+ * 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
+
+// Kyria specific
+#ifdef KEYBOARD_splitkb_kyria_rev1
+    // Split definition; use the following to flash;
+    //  pro-micro:      avrdude-split-left/right
+    //  elite-c:        dfu-split-left/right
+#   define ENCODER_DIRECTION_FLIP
+#   define EE_HANDS
+
+    // Make sure kyria has bigger oled display
+#   ifdef OLED_ENABLE
+#   define OLED_DISPLAY_128X64
+#   endif
+#endif
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c b/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
new file mode 100644
index 0000000000..d3720ea764
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/bbaserdem/keymap.c
@@ -0,0 +1,109 @@
+/* Copyright 2021 Batuhan Başerdem
+ * <baserdem.batuhan@gmail.com> @bbaserdem
+ *
+ * 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
+#include "bbaserdem.h"
+
+#define LAYOUT_split_3x6_5_wrapper(...) LAYOUT_split_3x6_5(__VA_ARGS__)
+
+/* F layout
+ * ┌───┬───┬───┬───┬───┬───┐                 ┌───┬───┬───┬───┬───┬───┐
+ * │ W │ F │ G │ Ğ │ I │ O │                 │ D │ R │ N │ H │ P │ Q │
+ * ├───┼───┼───┼───┼───┼───┤                 ├───┼───┼───┼───┼───┼───┤
+ * │ X │ A │ S │ D │ F │ G │                 │ T │ K │ M │ L │ Y │ Ş │
+ * ├───┼───┼───┼───┼───┼───┼───┬───┐ ┌───┬───┼───┼───┼───┼───┼───┼───┤
+ * │* +│ J │ Ö │ V │ C │ Ç │   │   │ │   │   │ Z │ S │ B │. :│, ;│< >│
+ * └───┴───┴───┼───┼───┼───┤Esc│Shf│ │Shf│Del├───┼───┼───┼───┴───┴───┘
+ *             │En1│Tab│Ent│   │   │ │   │   │Spc│Bsp│En2│
+ *             └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split_3x6_5_wrapper(
+        _BL1_1_,_BL1_5_,                _BR1_5_,_BR1_1_,
+        _BL2_1_,_BL2_5_,                _BR2_5_,_BR2_1_,
+        _BL3_1_,_BL3_5_,xxx2xxx,xxx2xxx,_BR3_5_,_BR3_1_,
+        BB_ENC0, _BL4_3_,KC_LSFT,KC_RSFT,_BR4_3_,BB_ENC1
+    ),
+    [_CHAR] = LAYOUT_split_3x6_5_wrapper(
+        XXXXXXX,_CL1_5_,                _CR1_5_,XXXXXXX,
+        XXXXXXX,_CL2_5_,                _CR2_5_,XXXXXXX,
+        XXXXXXX,_CL3_5_,xxx2xxx,xxx2xxx,_CR3_5_,XXXXXXX,
+        _______,_CL4_3_,_______,_______,_CR4_3_,_______
+    ),
+    [_GAME] = LAYOUT_split_3x6_5_wrapper(
+        _GA1_1_,_GA1_5_,                ___5___,___1___,
+        _GA2_1_,_GA2_5_,                ___5___,___1___,
+        _GA3_1_,_GA3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
+        _______,_GA4_3_,_______,_______,___3___,_______
+    ),
+    [_MEDI] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,___5___,                _ME1_5_,___1___,
+        ___1___,___5___,                _ME2_5_,___1___,
+        ___1___,___5___,xxx2xxx,xxx2xxx,_ME3_5_,___1___,
+        ___1___,___3___,_______,_______,_ME4_3_,___1___	
+    ),
+    [_NAVI] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,___5___,                _NA1_5_,___1___,
+        ___1___,___5___,                _NA2_5_,___1___,
+        ___1___,___5___,xxx2xxx,xxx2xxx,_NA3_5_,___1___,
+        ___1___,___3___,_______,_______,_NA4_3_,___1___
+    ),
+    [_SYMB] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,___5___,                _SY1_5_,___1___,
+        ___1___,___5___,                _SY2_5_,___1___,
+        ___1___,___5___,xxx2xxx,xxx2xxx,_SY3_5_,___1___,
+        ___1___,___3___,_______,_______,_SY4_3_,___1___
+    ),
+    [_NUMB] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,_NU1_5_,                ___5___,___1___,
+        ___1___,_NU2_5_,                ___5___,___1___,
+        ___1___,_NU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
+        ___1___,_NU4_3_,_______,_______,___3___,___1___
+    ),
+    [_FUNC] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,_FU1_5_,                ___5___,___1___,
+        ___1___,_FU2_5_,                ___5___,___1___,
+        ___1___,_FU3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
+        ___1___,_FU4_3_,_______,_______,___3___,___1___
+    ),
+    [_MOUS] = LAYOUT_split_3x6_5_wrapper(
+        ___1___,_MO1_5_,                ___5___,___1___,
+        ___1___,_MO2_5_,                ___5___,___1___,
+        ___1___,_MO3_5_,xxx2xxx,xxx2xxx,___5___,___1___,
+        ___1___,_MO4_3_,_______,_______,___3___,___1___
+    ),
+    [_MUSI] = LAYOUT_split_3x6_5_wrapper(
+        _MU_12_,_MU_12_,
+        _MU_06_,xxx2xxx,xxx2xxx,_MU_06_,
+        MU_TOG,_MUL_3_,_MU_02_,_MUR_3_,___1___
+    )
+};
+
+#ifdef KEYBOARD_splitkb_kyria_rev1      // Kyria specific code
+#ifdef OLED_ENABLE                          // Kyria's oled screen
+// Rotate the display on kyria
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+// For kyria; print logo, and allow default status printing
+bool oled_task_keymap(void) {
+    render_qmk_logo(0, 0);
+    render_status_lite(4, 0);
+    return false;
+}
+#endif //OLED_ENABLE
+#endif //KEYBOARD_splitkb_kyria_rev1
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md b/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
new file mode 100644
index 0000000000..6381612978
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/bbaserdem/readme.md
@@ -0,0 +1,32 @@
+This folder contains my Kyria (`split_3x6_5`) board layout.
+Check out the [user readme](../../../../../users/bbaserdem/readme.md) for more info.
+
+# Kyria
+
+I use a rev 1.3 PCB as a daily driver.
+
+## Hardware
+
+* Using a modified High-profile case; with metal switch plate.
+* Currently using a Pro-Micro and an Elite-C as microcontrollers.
+* Using Gateron Silent Black Ink with Progressive springs (100g), lubed.
+* Have mill-max sockets for hotswap feature.
+* All microcontrollers and OLED's are socketed for easy removal.
+
+## Features
+
+* Use two thumb keys in the 2u layout.
+* Have rotary encoders in the outermost keys of the thumb cluster.
+* Have underglow leds soldered.
+
+## Issues
+
+* Stabilizers squiek, and need lubing.
+* The double tap buttons (home row; left leader the most) don't contact well.
+
+## Todo
+
+* Switch to Proton C conversion with a game plan.
+* Lube stabilizers.
+* Get tenting puck.
+* (Not depending on me) migrate this code to layouts.
diff --git a/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk b/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
new file mode 100644
index 0000000000..21013120e6
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/bbaserdem/rules.mk
@@ -0,0 +1,30 @@
+# Copyright 2021 Batuhan Başerdem
+# <baserdem.batuhan@gmail.com> @bbaserdem
+#
+# 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/>.
+
+# Kyria hardware
+ifneq (,$(findstring splitkb/kyria/rev1,$(KEYBOARD)))
+    # Elective features
+    ENCODER_ENABLE = yes
+    OLED_ENABLE = yes
+    # Nonexistent features
+    AUDIO_ENABLE = no
+    BACKLIGHT_ENABLE = no
+    RGB_MATRIX_ENABLE = no
+    # Space savers
+    NKRO_ENABLE = no
+    VELOCIKEY_ENABLE = no
+    WPM_ENABLE = no
+endif
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk
index cc2cbba604..e7d6763fcd 100644
--- a/keyboards/splitkb/kyria/rev1/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/rules.mk
@@ -1,5 +1,4 @@
 OLED_ENABLE = yes
-OLED_DRIVER = SSD1306   # Enables the use of OLED displays
 ENCODER_ENABLE = yes       # ENables the use of one or more encoders
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
diff --git a/keyboards/xiudi/xd75/keymaps/bbaserdem/config.h b/keyboards/xiudi/xd75/keymaps/bbaserdem/config.h
deleted file mode 100644
index 271f48d001..0000000000
--- a/keyboards/xiudi/xd75/keymaps/bbaserdem/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-// place overrides here
diff --git a/keyboards/xiudi/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xiudi/xd75/keymaps/bbaserdem/keymap.c
deleted file mode 100644
index 6f8576b09b..0000000000
--- a/keyboards/xiudi/xd75/keymaps/bbaserdem/keymap.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bbaserdem.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layout
- * ,-----------------------------------------------------------.
- * |Blt|Lck| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |
- * |---+---+-----------------------------------------------+---|
- * |Int|Trm|                                               |Cps|
- * |---+---|                                               |---|
- * |Clc|Psw|                                               | \ |
- * |---+---|                    PLANCK                     |---|
- * |Rev|Ffw|                                               | [ |
- * |---+---|                                               |---|
- * |Tog|Mut|                                               | ] |
- * `-----------------------------------------------------------'
- */
-[0] = KM( FKLAVYE ),
-[1] = KM( AYARLAR ),
-};
-
diff --git a/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md b/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
deleted file mode 100644
index a0ade691aa..0000000000
--- a/keyboards/xiudi/xd75/keymaps/bbaserdem/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# XD75RE Setup
-
-(WIP) F keyboard for turkish, using unicode.
-
-* Write down keymap in userspace
-* Figure out LED indicators
-
-# Make
-
-Take the board into reset mode, then
-```
-make xiudi/xd75:bbaserdem:dfu
-```
-Either sudo it or set permissions in udev.
diff --git a/keyboards/xiudi/xd75/keymaps/bbaserdem/rules.mk b/keyboards/xiudi/xd75/keymaps/bbaserdem/rules.mk
deleted file mode 100644
index 3e501cd00e..0000000000
--- a/keyboards/xiudi/xd75/keymaps/bbaserdem/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build options
-BACKLIGHT_ENABLE = yes		# Switch LEDs
-MOUSEKEY_ENABLE = yes		# Emulates mouse key using keypresses
-RGBLIGHT_ENABLE = no 		# LED strips
-TAP_DANCE_ENABLE = no 		# Use multi-tap features
-AUDIO_ENABLE = no  			# Audio stuff
-