Merge branch 'develop'

11 files changed, 0 insertions, 154 deletions

diff --git a/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c b/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c
deleted file mode 100644
index f7bfdf1df5..0000000000
--- a/keyboards/yatara/drink_me/keymaps/caterpillar/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        LSFT(KC_O),
-        LSFT(KC_R),
-        LSFT(KC_U),
-        LSFT(KC_SLSH)
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md b/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md
deleted file mode 100644
index d04a30f238..0000000000
--- a/keyboards/yatara/drink_me/keymaps/caterpillar/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Drink Me - Caterpillar layout
-
-> ‘Who are you?’ said the Caterpillar.
-
-![Drink Me - Default layout](https://i.imgur.com/BHWNATB.png)
-
-```
-O, R, U, ?
-```
diff --git a/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c b/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c
deleted file mode 100644
index 528c1e408e..0000000000
--- a/keyboards/yatara/drink_me/keymaps/cheshire_cat/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_LEFT,
-        KC_DOWN,
-        KC_UP,
-        KC_RIGHT
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md b/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md
deleted file mode 100644
index 1dd0d658a3..0000000000
--- a/keyboards/yatara/drink_me/keymaps/cheshire_cat/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Drink Me - Cheshire Cat layout
-
-> ‘Would you tell me, please, which way I ought to go from here?’
->
-> ‘That depends a good deal on where you want to get to,’ said the Cat.
-
-Cursor keys in VI layout.
-
-![Drink Me - Default layout](https://i.imgur.com/E4cScrK.png)
-
-```
-Left, Down, Up, Right
-```
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c b/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c
deleted file mode 100644
index e2d29a026a..0000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_SLEP,
-        KC_MUTE,
-        KC_VOLD,
-        KC_VOLU
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/readme.md b/keyboards/yatara/drink_me/keymaps/dormouse/readme.md
deleted file mode 100644
index 1a8c854d44..0000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Drink Me - Dormouse layout
-
-> The Dormouse slowly opened his eyes. ‘I wasn’t asleep,’ he said in a hoarse, feeble voice: ‘I heard every word you fellows were saying.’
-
-Sleep and volume control.
-
-![Drink Me - Default layout](https://i.imgur.com/VQXH512.png)
-
-```
-Sleep, Mute, Volume down, Volume up
-```
diff --git a/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk b/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk
deleted file mode 100644
index fcfd2225bc..0000000000
--- a/keyboards/yatara/drink_me/keymaps/dormouse/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/yatara/drink_me/keymaps/queen/config.h b/keyboards/yatara/drink_me/keymaps/queen/config.h
deleted file mode 100644
index 4cb538fc6c..0000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS, UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
deleted file mode 100644
index 806dae3fcd..0000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum td_keys {
-    TD_K0,
-    TD_K1,
-    TD_K2,
-    TD_K3
-};
-
-
-void td_spade_lnx (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2660); // ♠
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_LINUX);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_diamond_osx (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2666); // ♦
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_MACOS);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_club_win (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2663); // ♣
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_WINDOWS);
-    }
-    reset_tap_dance(state);
-}
-
-
-void td_heart_winc (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        register_unicode(0x2665); // ♥
-    } else {
-        set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
-    }
-    reset_tap_dance(state);
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_K0] = ACTION_TAP_DANCE_FN(td_spade_lnx),
-    [TD_K1] = ACTION_TAP_DANCE_FN(td_diamond_osx),
-    [TD_K2] = ACTION_TAP_DANCE_FN(td_club_win),
-    [TD_K3] = ACTION_TAP_DANCE_FN(td_heart_winc)
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        TD(TD_K0),
-        TD(TD_K1),
-        TD(TD_K2),
-        TD(TD_K3)
-    )
-};
diff --git a/keyboards/yatara/drink_me/keymaps/queen/readme.md b/keyboards/yatara/drink_me/keymaps/queen/readme.md
deleted file mode 100644
index cd89b7b0cb..0000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Drink Me - Queen layout
-
-> ‘Off with her head!’ the Queen shouted at the top of her voice. Nobody moved.
->
-> ‘Who cares for you?’ said Alice, (she had grown to her full size by this time.) ‘You’re nothing but a pack of cards!’
-
-Single tap for unicode symbols for playing card suits:
-
-![Drink Me - Queen layout single tap](https://i.imgur.com/xwHicLJ.png)
-
-```
-Spade, Diamond, Club, Heart
-```
-
-Double tap to change operating system unicode input method:
-
-![Drink Me - Queen layout double tap](https://i.imgur.com/fBbzq55.png)
-```
-Linux, OSX, Windows, Wincompose
-```
diff --git a/keyboards/yatara/drink_me/keymaps/queen/rules.mk b/keyboards/yatara/drink_me/keymaps/queen/rules.mk
deleted file mode 100644
index 705db8e333..0000000000
--- a/keyboards/yatara/drink_me/keymaps/queen/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-UNICODE_ENABLE = yes
-TAP_DANCE_ENABLE = yes