From fb79015049ebd1309cd4f69a7584db614f50d1db Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 31 Aug 2018 14:49:18 -0700
Subject: Keymap: Merlin Learns to QMK (#3820)

* Fix up my keymaps to use more QMK features

* update 60_ansi readme

* add the start of my userspace

* begin to use my new userspace

* use more of my userspace

* spread userspace love to my clueboard

* spread userspace love to 75 layout

* add a fairly vanilla readme

* put the FNX into a userspace incase I ever want to use it for something else

* respond to drashna's code review comments
---
 .../60_ansi_split_bs_rshift/mechmerlin-split/keymap.c   | 17 +++++++----------
 .../60_ansi_split_bs_rshift/mechmerlin-split/rules.mk   |  1 +
 2 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/rules.mk

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 4c6458c9b..5ec005162 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -1,25 +1,22 @@
 #include QMK_KEYBOARD_H
-
-#define BASE   0
-#define FN     1
-#define ARROWS 2
+#include "mechmerlin.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = LAYOUT_60_ansi_split_bs_rshift(
+[_BL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_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_NO, KC_BSPC, \
 	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_BSLASH, \
-    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_CTCP, 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_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(2), \
     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(1),   KC_RALT, KC_RGUI, KC_RCTL),
 
-[FN] = LAYOUT_60_ansi_split_bs_rshift(
-    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_NO, KC_DEL, \
+[_FL] = LAYOUT_60_ansi_split_bs_rshift(
+    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_NO, KC_DEL, \
 	RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, \
     KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
-[ARROWS] = LAYOUT_60_ansi_split_bs_rshift(
+[_AL] = LAYOUT_60_ansi_split_bs_rshift(
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/rules.mk b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/rules.mk
new file mode 100644
index 000000000..e2ce3d773
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/rules.mk
@@ -0,0 +1 @@
+USER_NAME := mechmerlin
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 743449472e58651ec8111e6f70811103fb0a28bd Mon Sep 17 00:00:00 2001
From: Joe Wasson <jwasson+github@gmail.com>
Date: Mon, 17 Sep 2018 10:48:02 -0700
Subject: Make `PREVENT_STUCK_MODIFIERS` the default (#3107)

* Remove chording as it is not documented, not used, and needs work.

* Make Leader Key an optional feature.

* Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE`

* Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
---
 layouts/community/60_ansi_split_bs_rshift/talljoe/config.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
index 81ab5cf89..bf18fd9f7 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
@@ -3,7 +3,6 @@
 
 #include QMK_KEYBOARD_CONFIG_H
 
-#define PREVENT_STUCK_MODIFIERS
 #define ENABLE_GAME_LAYER
 
 #define TEMPLATE(                                                                   \
-- 
cgit v1.2.3-24-g4f1b


From c23233f41ab9221577fc83bbae0a230452a38231 Mon Sep 17 00:00:00 2001
From: Joe Wasson <jwasson+github@gmail.com>
Date: Wed, 19 Sep 2018 16:13:58 -0700
Subject: Keymap: Talljoe's keymap for oddball keyboards (#3910)

* Create layout for JD45

* Tweak layout to better support JD45 and add more tap dancing.

* Add Maltron and tweak layout for 40% enter compatibility.

* Switch back to `BL_TOGGLE` for backlight.

* More tweaks

* Rename talljoe_gherkin to talljoe-gherkin

* Make NAV layer tab C_S_T also.

* Add missing RESET key.

* Add Talljoe layout for minivan.

* MTI is not for me

* Tweak keymap.

* Add talljoe keymap to Atreus.

* Minor tweaks.

* Fix talljoe keymaps to work with new Zeal60 commit.
---
 .../60_ansi_split_bs_rshift/talljoe/keymap.c       | 25 ++++++++++++--------
 .../60_ansi_split_bs_rshift/talljoe/rules.mk       |  1 +
 .../60_ansi_split_bs_rshift/talljoe/solarized.c    | 23 ++++++++++++++++++
 .../60_ansi_split_bs_rshift/talljoe/solarized.h    | 27 ++++++++++++++++++++++
 4 files changed, 66 insertions(+), 10 deletions(-)
 create mode 100644 layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk
 create mode 100644 layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
 create mode 100644 layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
index b5dc54492..cfad9da8a 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
@@ -1,7 +1,7 @@
 #ifdef KEYBOARD_zeal60
 #include "config.h"
 #include "zeal60.h"
-#include "zeal_backlight.h"
+#include "rgb_backlight.h"
 #include "action_layer.h"
 #include "solarized.h"
 #include "talljoe.h"
@@ -9,7 +9,7 @@
 // from zeal_backlight.c
 // we want to be able to set indicators for the spacebar stabs
 // but they are not represented by a row/index.
-extern zeal_backlight_config g_config;
+extern backlight_config g_config;
 void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led );
 
 void set_backlight_defaults(void) {
@@ -17,7 +17,7 @@ void set_backlight_defaults(void) {
   uint8_t caps_lock;
   map_row_column_to_led(3, 12, &caps_lock);
   map_row_column_to_led(4, 7, &space);
-  zeal_backlight_config default_values = {
+  backlight_config default_values = {
     .use_split_backspace = USE_SPLIT_BACKSPACE,
     .use_split_left_shift = USE_SPLIT_LEFT_SHIFT,
     .use_split_right_shift = USE_SPLIT_RIGHT_SHIFT,
@@ -34,15 +34,17 @@ void set_backlight_defaults(void) {
     .layer_2_indicator = { .index = space, .color = solarized.yellow },
     .layer_3_indicator = { .index = 254, .color = solarized.red },
     .alphas_mods = {
-      BACKLIGHT_ALPHAS_MODS_ROW_0,
-      BACKLIGHT_ALPHAS_MODS_ROW_1,
-      BACKLIGHT_ALPHAS_MODS_ROW_2,
-      BACKLIGHT_ALPHAS_MODS_ROW_3,
-      BACKLIGHT_ALPHAS_MODS_ROW_4 }
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_0,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_1,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_2,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_3,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 }
   };
-  memcpy(&g_config, &default_values, sizeof(zeal_backlight_config));
+  memcpy(&g_config, &default_values, sizeof(backlight_config));
   backlight_config_save();
 
+#undef CUSTOM_RGB_LAYOUTS
+#ifdef CUSTOM_RGB_LAYOUTS
   solarized_t* S = &solarized;
   HSV alphas = S->base2;
   HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM(
@@ -54,9 +56,12 @@ void set_backlight_defaults(void) {
   );
   for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
     for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
-      backlight_set_key_color(row, col, custom_color_map[row][col]);
+      uint8_t index;
+			map_row_column_to_led( row, col, &index );
+      set_key_color(index, custom_color_map[row][col]);
     }
   }
+#endif // CUSTOM_RGB_LAYOUTS
 }
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk b/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk
new file mode 100644
index 000000000..239f03091
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk
@@ -0,0 +1 @@
+SRC += $(KEYMAP_PATH)/solarized.c
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
new file mode 100644
index 000000000..3e9e726b9
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
@@ -0,0 +1,23 @@
+#include "solarized.h"
+
+#define MAKE_COLOR(_H, _S, _V) \
+  { .h = (((uint32_t)_H) * 255) / 360, .s = (((uint16_t)_S) * 255) / 100, .v = (((uint16_t)_V) * 255) / 100 }
+
+solarized_t solarized = {
+  .base03   = MAKE_COLOR(193, 100,  21),
+  .base02   = MAKE_COLOR(192,  90,  26),
+  .base01   = MAKE_COLOR(194,  25,  46),
+  .base00   = MAKE_COLOR(195,  23,  51),
+  .base0    = MAKE_COLOR(186,  13,  59),
+  .base1    = MAKE_COLOR(180,   9,  63),
+  .base2    = MAKE_COLOR( 44,  11,  93),
+  .base3    = MAKE_COLOR( 44,  10,  99),
+  .yellow   = MAKE_COLOR( 45, 100,  71),
+  .orange   = MAKE_COLOR( 18,  89,  80),
+  .red      = MAKE_COLOR(  1,  79,  86),
+  .magenta  = MAKE_COLOR(331,  74,  83),
+  .violet   = MAKE_COLOR(237,  45,  77),
+  .blue     = MAKE_COLOR(205,  82,  82),
+  .cyan     = MAKE_COLOR(175,  74,  63),
+  .green    = MAKE_COLOR( 68, 100,  60),
+};
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
new file mode 100644
index 000000000..3b00caea7
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
@@ -0,0 +1,27 @@
+#ifndef SOLARIZED_H
+#define SOLARIZED_H
+
+#include "quantum/color.h"
+
+typedef struct {
+  HSV base03;
+  HSV base02;
+  HSV base01;
+  HSV base00;
+  HSV base0;
+  HSV base1;
+  HSV base2;
+  HSV base3;
+  HSV yellow;
+  HSV orange;
+  HSV red;
+  HSV magenta;
+  HSV violet;
+  HSV blue;
+  HSV cyan;
+  HSV green;
+} solarized_t;
+
+extern solarized_t solarized;
+
+#endif
-- 
cgit v1.2.3-24-g4f1b


From b11a776cef1d5e26e435ed6b4a12711c965abeb6 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Fri, 26 Oct 2018 17:14:50 -0700
Subject: Keymap: Update userspace (I want my Hacktoberfest shirt!) (#4252)

* use ctl_t

* spruce up readme and add a changelog

* add comment about using CTL_T

* add more description

* use RSFT_T so I can still have a right shift key even on the _AL layer

* add config.h for rgblight_sleep

* update readme to talk about rgblight_sleep

* update changelog with new changes
---
 layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 5ec005162..2464dcaa7 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RSFT_T(KC_UP),   KC_TRNS, \
     KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT)
 
  };
-- 
cgit v1.2.3-24-g4f1b


From e0690096f8b5199cd6f602bc3a11c234b4309fb2 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Sun, 18 Nov 2018 15:20:21 -0800
Subject: Fix my community layouts (#4449)

* fix formatting of keymap

* update readme with boards I currently own

* made the wrong assumption that every board would use the same space for backspace

* update readme with boards I currently own
---
 .../mechmerlin-split/keymap.c                      | 24 +++++++++++-----------
 .../mechmerlin-split/readme.md                     |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index 2464dcaa7..96c3a32f2 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -3,24 +3,24 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BL] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_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_NO, KC_BSPC, \
-	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_BSLASH, \
-    KC_CTCP, 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_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(2), \
+    KC_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_BSPC, \
+	  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_BSLASH,        \
+    KC_CTCP, 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_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  TG(2),                     \
     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPACE,             MO(1),   KC_RALT, KC_RGUI, KC_RCTL),
 
 [_FL] = LAYOUT_60_ansi_split_bs_rshift(
-    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_NO, KC_DEL, \
-	RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, \
+    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_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS,                 \
     KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 [_AL] = LAYOUT_60_ansi_split_bs_rshift(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RSFT_T(KC_UP),   KC_TRNS, \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+	  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   \
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RSFT_T(KC_UP),   KC_TRNS,           \
     KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT)
 
  };
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md
index 9f7cef347..855fd5ac9 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/readme.md
@@ -6,7 +6,8 @@ host of the [MechMerlin](www.youtube.com/mechmerlin) YouTube channel.
 
 It is used on his   
 [Sentraq S60-X RGB](https://github.com/qmk/qmk_firmware/tree/master/keyboards/s60_x)   
-[MechanicalKeyboards.com FaceW](https://github.com/qmk/qmk_firmware/tree/master/keyboards/bfake)   
+[Zeal60 Rev4](https://github.com/qmk/qmk_firmware/tree/master/keyboards/zeal60)  
+[DO60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/do60)   
 
 ## Keymap Notes
 - Highly influenced by the KBP V60 and WKL B.Face standard layouts
-- 
cgit v1.2.3-24-g4f1b


From 2f34252278280c34b6958066240e38a2ee6a7237 Mon Sep 17 00:00:00 2001
From: Joe Wasson <jwasson+github@gmail.com>
Date: Wed, 21 Nov 2018 13:18:18 -0800
Subject: Keymap: Update keymap to match latest changes to Wilba's firmware.
 (#4432)

* Fix firmware to work with latest Wilba changes (i.e. dynamic keymap) and M60a.

* Get back RGB Backlight codes.

* More tweaks.

* Update users/talljoe/rules.mk

Co-Authored-By: Talljoe <jwasson+github@gmail.com>
---
 .../60_ansi_split_bs_rshift/talljoe/config.h       |  2 +-
 .../60_ansi_split_bs_rshift/talljoe/keymap.c       | 95 +---------------------
 2 files changed, 2 insertions(+), 95 deletions(-)

(limited to 'layouts/community/60_ansi_split_bs_rshift')

diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
index bf18fd9f7..65568d3ab 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
@@ -34,7 +34,7 @@
    { K40, K41, K42, {}, {}, {}, {}, K47, {}, {}, K4A, K4B, K4C, K4D } \
   }
 
-#ifdef KEYBOARD_zeal60
+#if defined (RGB_BACKLIGHT_ZEAL60) || defined (RGB_BACKLIGHT_M60_A)
 
   #define ZEAL_RGB
 
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
index cfad9da8a..7812add81 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c
@@ -1,94 +1 @@
-#ifdef KEYBOARD_zeal60
-#include "config.h"
-#include "zeal60.h"
-#include "rgb_backlight.h"
-#include "action_layer.h"
-#include "solarized.h"
-#include "talljoe.h"
-
-// from zeal_backlight.c
-// we want to be able to set indicators for the spacebar stabs
-// but they are not represented by a row/index.
-extern backlight_config g_config;
-void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led );
-
-void set_backlight_defaults(void) {
-  uint8_t space;
-  uint8_t caps_lock;
-  map_row_column_to_led(3, 12, &caps_lock);
-  map_row_column_to_led(4, 7, &space);
-  backlight_config default_values = {
-    .use_split_backspace = USE_SPLIT_BACKSPACE,
-    .use_split_left_shift = USE_SPLIT_LEFT_SHIFT,
-    .use_split_right_shift = USE_SPLIT_RIGHT_SHIFT,
-    .use_7u_spacebar = USE_7U_SPACEBAR,
-    .use_iso_enter = USE_ISO_ENTER,
-    .disable_when_usb_suspended = 1,
-    .disable_after_timeout = 0,
-    .brightness = 255,
-    .effect = 10,
-    .color_1 = solarized.base2,
-    .color_2 = solarized.base02,
-    .caps_lock_indicator = { .index = caps_lock, .color = solarized.red },
-    .layer_1_indicator = { .index = space, .color = solarized.blue },
-    .layer_2_indicator = { .index = space, .color = solarized.yellow },
-    .layer_3_indicator = { .index = 254, .color = solarized.red },
-    .alphas_mods = {
-      RGB_BACKLIGHT_ALPHAS_MODS_ROW_0,
-      RGB_BACKLIGHT_ALPHAS_MODS_ROW_1,
-      RGB_BACKLIGHT_ALPHAS_MODS_ROW_2,
-      RGB_BACKLIGHT_ALPHAS_MODS_ROW_3,
-      RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 }
-  };
-  memcpy(&g_config, &default_values, sizeof(backlight_config));
-  backlight_config_save();
-
-#undef CUSTOM_RGB_LAYOUTS
-#ifdef CUSTOM_RGB_LAYOUTS
-  solarized_t* S = &solarized;
-  HSV alphas = S->base2;
-  HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM(
-    S->red, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->red,
-    S->orange, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->orange,
-    S->green, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->green,
-    S->blue, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, alphas, S->blue, S->blue,
-    S->violet, S->magenta, S->yellow,              alphas,          S->yellow, S->magenta, S->violet, S->green
-  );
-  for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
-    for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
-      uint8_t index;
-			map_row_column_to_led( row, col, &index );
-      set_key_color(index, custom_color_map[row][col]);
-    }
-  }
-#endif // CUSTOM_RGB_LAYOUTS
-}
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  static uint8_t last_effect;
-  switch (keycode) {
-    case DFAULTS:
-      if (IS_PRESSED(record->event)) set_backlight_defaults();
-      return false;
-    case BL_TOGG:
-      if (IS_PRESSED(record->event)) {
-        if (g_config.effect) {
-          last_effect = g_config.effect;
-          g_config.effect = 0;
-        } else {
-          g_config.effect = last_effect;
-        }
-      }
-      return false;
-    case EFFECT...EFFECT_END:
-      if (IS_PRESSED(record->event)) {
-        uint8_t effect = keycode - EFFECT;
-        g_config.effect = effect;
-        backlight_config_save();
-      }
-      return false;
-  }
-
-  return true;
-}
-#endif
+// This space intentionally left blank
-- 
cgit v1.2.3-24-g4f1b