From 53a81fc2f681eda7267804eb990bc24c4ef58512 Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Sun, 16 Jun 2019 02:35:46 -0500
Subject: [PATCH] [Keymap] Minor userspace and Quefrency keymap fixes (#6134)

* Fix typo for RGBLIGHT config values

It doesn't make a difference right now since these are the defaults in
rgblight.h (which I'm just setting explicitly since some of the keyboard
configs change these defaults). However, I'd rather be explicit, so
fixing my typo. :)

* Remove mouse keys layer from Quefrency keymap

It's a fun idea, but I never use it in practice.
---
 keyboards/keebio/quefrency/keymaps/bcat/keymap.c  | 15 +--------------
 keyboards/keebio/quefrency/keymaps/bcat/readme.md |  8 ++------
 users/bcat/config.h                               |  6 +++---
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index fc66ff10135..9dc98f5a1d5 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -3,15 +3,11 @@
 enum layer {
     LAYER_DEFAULT,
     LAYER_FUNCTION,
-    LAYER_MOUSE,
 };
 
 /* Switch to function layer when held. */
 #define LY_FUNC MO(LAYER_FUNCTION)
 
-/* Switch to mouse layer when held; send menu key when tapped. */
-#define LY_MOUSE LT(LAYER_MOUSE, KC_APP)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Default layer: http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b */
     [LAYER_DEFAULT] = LAYOUT_65(
@@ -19,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_BSPC,  KC_PGUP,
         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_PGDN,
         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_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FUNC,  KC_SPC,   KC_SPC,   XXXXXXX,  KC_RALT,  LY_FUNC,  LY_MOUSE, KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FUNC,  KC_SPC,   KC_SPC,   XXXXXXX,  KC_RALT,  LY_FUNC,  KC_APP,   KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
 
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
@@ -30,13 +26,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,  RGB_HUD,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_MOD
     ),
-
-    /* Mouse layer: http://www.keyboard-layout-editor.com/#/gists/05b9fbe8a34f65ed85ded659b3941152 */
-    [LAYER_MOUSE] = LAYOUT_65(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BTN3,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WH_U,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WH_D,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_BTN3,  KC_BTN1,  KC_MS_U,  KC_BTN2,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MS_L,  KC_MS_D,  KC_MS_R
-    ),
 };
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
index 2e9e0f6d768..793e8833a46 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/readme.md
+++ b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
@@ -2,16 +2,12 @@
 
 This is pretty much a stock 65% split keyboard layout, with an HHKB-style
 (split) backspace, media keys in the function layer centered around the WASD
-cluster, and mouse keys on their own layer centered around the arrow cluster.
+cluster, and RGB controls in the function layer on the arrow/nav keys.
 
 ## Default layer
 
-![Default layer layout](https://i.imgur.com/3riRFev.png)
+![Default layer layout](https://i.imgur.com/CU2fxDg.png)
 
 ## Function layer
 
 ![Function layer layout](https://i.imgur.com/4R1F72M.png)
-
-## Mouse layer
-
-![Mouse layer layout](https://i.imgur.com/LmGgJEG.png)
diff --git a/users/bcat/config.h b/users/bcat/config.h
index c5f731b739a..7d420089556 100644
--- a/users/bcat/config.h
+++ b/users/bcat/config.h
@@ -13,9 +13,9 @@
 #undef RGBLIGHT_VAL_STEP
 
 #define BACKLIGHT_LEVELS 7
-#define RGVLIGHT_HUE_STEP 8
-#define RGVLIGHT_SAT_STEP 17
-#define RGVLIGHT_VAL_STEP 17
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
 
 /* Make mouse operation smoother. */
 #undef MOUSEKEY_DELAY