From 7d0547b48fd5cd4c7efc627760512c8901d292be Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sun, 8 Apr 2018 22:12:12 +0200
Subject: [PATCH 01/11] initial commit

---
 keyboards/dz60/keymaps/weeheavy/README.md |  7 ++
 keyboards/dz60/keymaps/weeheavy/keymap.c  | 98 +++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 keyboards/dz60/keymaps/weeheavy/README.md
 create mode 100644 keyboards/dz60/keymaps/weeheavy/keymap.c

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
new file mode 100644
index 000000000000..2ed71559a841
--- /dev/null
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -0,0 +1,7 @@
+![DZ60 split spacebar layout image](http://i.imgur.com/FIXME.png)
+
+# weeheavy's DZ60 split spacebar layout
+
+* 2u left shift
+* arrow cluster
+* split spacebar with 1.2u key in the middle
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
new file mode 100644
index 000000000000..68ab83b15dda
--- /dev/null
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -0,0 +1,98 @@
+#include "dz60.h"
+
+// Make special keycodes more visible
+#define ____ KC_TRNS
+#define XXXX KC_NO
+
+// Layer definition
+#define BASE 0
+#define CONF 1
+#define GAME 2
+
+#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	/* Key sizing:
+   * 1u    = 4 chars  = |  |
+   * 1.25u = 5 chars  = |   |
+   * 1.5u  = 6 chars  = |    |
+   * 1.75u = 7 chars  = |     |
+   * 2u    = 8 chars  = |      |
+   * 2.25u = 9 chars  = |       |
+   * 2.75u = 11 chars = |         |
+   * 6.25u = 25 chars = |                       |
+   */
+
+	/* QWERTY
+	 * ,----------------------------------------------------------.
+	 * |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
+	 * |----------------------------------------------------------+
+	 * |Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
+	 * |----------------------------------------------------------+
+	 * |Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
+	 * |----------------------------------------------------------+
+	 * |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
+	 * |----------------------------------------------------------+
+	 * |Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
+	 * `----------------------------------------------------------'
+	 */
+
+	[BASE] = KEYMAP(
+		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, XXXX, 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_BSLS, 
+		KC_CAPS, 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, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXX, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(GAME), XXXX, MO(CONF), KC_RCTL),
+
+	[CONF] = KEYMAP(
+		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, 
+		____, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
+
+	[GAME] = KEYMAP(
+		____, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
+};
+
+enum function_id {
+    SHIFT_ESC,
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+  [0]  = ACTION_FUNCTION(SHIFT_ESC),
+};
+
+// FIXME: guess it's only needed when mapping 'F(0)' to a key. But 'KC_GESC'
+// seems to supersede this function here?
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  static uint8_t shift_esc_shift_mask;
+  switch (id) {
+    case SHIFT_ESC:
+      shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
+      if (record->event.pressed) {
+        if (shift_esc_shift_mask) {
+          add_key(KC_GRV);
+          send_keyboard_report();
+        } else {
+          add_key(KC_ESC);
+          send_keyboard_report();
+        }
+      } else {
+        if (shift_esc_shift_mask) {
+          del_key(KC_GRV);
+          send_keyboard_report();
+        } else {
+          del_key(KC_ESC);
+          send_keyboard_report();
+        }
+      }
+      break;
+  }
+}
+

From 490156d386d90ffab55735c55322c9a68d229fd4 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sun, 8 Apr 2018 23:13:58 +0200
Subject: [PATCH 02/11] - Move layout to readme - Finish first (0) layer

---
 keyboards/dz60/keymaps/weeheavy/README.md | 44 +++++++++++++++++++++--
 keyboards/dz60/keymaps/weeheavy/keymap.c  | 40 +++++----------------
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
index 2ed71559a841..3ab4a92176d5 100644
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -1,7 +1,47 @@
-![DZ60 split spacebar layout image](http://i.imgur.com/FIXME.png)
+![DZ60 split spacebar layout image](https://i.imgur.com/EFF7pBN.png)
 
 # weeheavy's DZ60 split spacebar layout
 
 * 2u left shift
 * arrow cluster
-* split spacebar with 1.2u key in the middle
+* split spacebar with 1.25u key in the middle
+
+## Layouts
+
+Key sizes (ASCII keyboards below match this scale):
+
+    1u    = 4 chars  = |  |
+    1.25u = 5 chars  = |   |
+    1.5u  = 6 chars  = |    |
+    1.75u = 7 chars  = |     |
+    2u    = 8 chars  = |      |
+    2.25u = 9 chars  = |       |
+    2.75u = 11 chars = |         |
+    6.25u = 25 chars = |                       |
+
+
+### Layer 0: Base layout
+
+ANSI QWERTY layout. Specialities:
+
+* Arrow cluster
+* Left shift: `KC_LSPO` == Left Shift when held, ( when tapped
+* Right shift: `KC_RSPC` == Right Shift when held, ) when tapped
+
+    ,----------------------------------------------------------.
+    |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
+    |----------------------------------------------------------+
+    |Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
+    |----------------------------------------------------------+
+    |Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
+    |----------------------------------------------------------+
+    |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
+    |----------------------------------------------------------+
+    |Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
+    `----------------------------------------------------------'
+
+### Layer 1: Configuration layout
+
+
+### Layer 2: Gaming layout
+
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index 68ab83b15dda..4bb537444c7b 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -13,50 +13,26 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	/* Key sizing:
-   * 1u    = 4 chars  = |  |
-   * 1.25u = 5 chars  = |   |
-   * 1.5u  = 6 chars  = |    |
-   * 1.75u = 7 chars  = |     |
-   * 2u    = 8 chars  = |      |
-   * 2.25u = 9 chars  = |       |
-   * 2.75u = 11 chars = |         |
-   * 6.25u = 25 chars = |                       |
-   */
-
-	/* QWERTY
-	 * ,----------------------------------------------------------.
-	 * |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
-	 * |----------------------------------------------------------+
-	 * |Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
-	 * |----------------------------------------------------------+
-	 * |Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
-	 * |----------------------------------------------------------+
-	 * |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
-	 * |----------------------------------------------------------+
-	 * |Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
-	 * `----------------------------------------------------------'
-	 */
-
-	[BASE] = KEYMAP(
+  // ANSI QWERTY
+	[BASE] = LAYOUT(
 		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, XXXX, 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_BSLS, 
 		KC_CAPS, 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, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXX, 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(GAME), XXXX, MO(CONF), KC_RCTL),
+		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(GAME), KC_SPC, KC_RALT, MO(CONF), KC_LEFT, KC_DOWN, KC_RIGHT),
 
-	[CONF] = KEYMAP(
+	[CONF] = LAYOUT(
 		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, 
 		____, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET, 
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
-		____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 
-	[GAME] = KEYMAP(
+	[GAME] = LAYOUT(
 		____, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), ____, ____, 
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 };
 

From 5e4124d3c24c564f5113288ab3cedb72af3c4764 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Tue, 10 Apr 2018 00:06:32 +0200
Subject: [PATCH 03/11] remove cruft

---
 keyboards/dz60/keymaps/weeheavy/keymap.c | 36 ------------------------
 1 file changed, 36 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index 4bb537444c7b..9199c02ba350 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -36,39 +36,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 };
 
-enum function_id {
-    SHIFT_ESC,
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [0]  = ACTION_FUNCTION(SHIFT_ESC),
-};
-
-// FIXME: guess it's only needed when mapping 'F(0)' to a key. But 'KC_GESC'
-// seems to supersede this function here?
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  static uint8_t shift_esc_shift_mask;
-  switch (id) {
-    case SHIFT_ESC:
-      shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
-      if (record->event.pressed) {
-        if (shift_esc_shift_mask) {
-          add_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          add_key(KC_ESC);
-          send_keyboard_report();
-        }
-      } else {
-        if (shift_esc_shift_mask) {
-          del_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          del_key(KC_ESC);
-          send_keyboard_report();
-        }
-      }
-      break;
-  }
-}
-

From ae1fd4229f5e21ab44e3c39f54b4fd1ea82cb7c2 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Tue, 10 Apr 2018 00:13:31 +0200
Subject: [PATCH 04/11] fix ASCII keymap in readme

---
 keyboards/dz60/keymaps/weeheavy/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
index 3ab4a92176d5..2e31d0f14021 100644
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -28,6 +28,7 @@ ANSI QWERTY layout. Specialities:
 * Left shift: `KC_LSPO` == Left Shift when held, ( when tapped
 * Right shift: `KC_RSPC` == Right Shift when held, ) when tapped
 
+
     ,----------------------------------------------------------.
     |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
     |----------------------------------------------------------+

From 652d43593c4bed9e6dfb6da4ef9b2b4a981264cb Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Tue, 10 Apr 2018 00:16:13 +0200
Subject: [PATCH 05/11] fix ASCII keymap in readme #2

---
 keyboards/dz60/keymaps/weeheavy/README.md | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
index 2e31d0f14021..67ffca919c48 100644
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -28,18 +28,19 @@ ANSI QWERTY layout. Specialities:
 * Left shift: `KC_LSPO` == Left Shift when held, ( when tapped
 * Right shift: `KC_RSPC` == Right Shift when held, ) when tapped
 
-
-    ,----------------------------------------------------------.
-    |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
-    |----------------------------------------------------------+
-    |Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
-    |----------------------------------------------------------+
-    |Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
-    |----------------------------------------------------------+
-    |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
-    |----------------------------------------------------------+
-    |Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
-    `----------------------------------------------------------'
+```
+,----------------------------------------------------------.
+|Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
+|----------------------------------------------------------+
+|Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
+|----------------------------------------------------------+
+|Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
+|----------------------------------------------------------+
+|Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
+|----------------------------------------------------------+
+|Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
+`----------------------------------------------------------'
+```
 
 ### Layer 1: Configuration layout
 

From 868edf25ba4e2c6dd507d1e625ef3c58ecb080ed Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Tue, 10 Apr 2018 00:13:31 +0200
Subject: [PATCH 06/11] fix ASCII keymap in readme

---
 keyboards/dz60/keymaps/weeheavy/README.md | 24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
index 3ab4a92176d5..67ffca919c48 100644
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -28,17 +28,19 @@ ANSI QWERTY layout. Specialities:
 * Left shift: `KC_LSPO` == Left Shift when held, ( when tapped
 * Right shift: `KC_RSPC` == Right Shift when held, ) when tapped
 
-    ,----------------------------------------------------------.
-    |Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
-    |----------------------------------------------------------+
-    |Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
-    |----------------------------------------------------------+
-    |Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
-    |----------------------------------------------------------+
-    |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
-    |----------------------------------------------------------+
-    |Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
-    `----------------------------------------------------------'
+```
+,----------------------------------------------------------.
+|Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
+|----------------------------------------------------------+
+|Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
+|----------------------------------------------------------+
+|Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
+|----------------------------------------------------------+
+|Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
+|----------------------------------------------------------+
+|Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
+`----------------------------------------------------------'
+```
 
 ### Layer 1: Configuration layout
 

From 4692646ef54ad6d6627ac77ea549f096eed1df57 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Fri, 13 Apr 2018 23:24:36 +0200
Subject: [PATCH 07/11] rename layers

---
 keyboards/dz60/keymaps/weeheavy/keymap.c | 30 +++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index 9199c02ba350..a80868dfcfc7 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -6,32 +6,30 @@
 
 // Layer definition
 #define BASE 0
-#define CONF 1
-#define GAME 2
-
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define SETUP 1
+#define UTIL 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // ANSI QWERTY
 	[BASE] = LAYOUT(
-		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, XXXX, 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_BSLS, 
-		KC_CAPS, 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_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, XXXX, 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_BSLS,
+		KC_CAPS, 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(GAME), KC_SPC, KC_RALT, MO(CONF), KC_LEFT, KC_DOWN, KC_RIGHT),
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(UTIL), KC_SPC, KC_RALT, MO(SETUP), KC_LEFT, KC_DOWN, KC_RIGHT),
 
-	[CONF] = LAYOUT(
-		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, 
-		____, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET, 
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+	[SETUP] = LAYOUT(
+		RESET, 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_B, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET,
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 
-	[GAME] = LAYOUT(
-		____, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), ____, ____, 
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, 
+	[UTIL] = LAYOUT(
+		____, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), ____, ____,
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 };

From 739a258fd8d86169dcd094b135f72f44d89e819c Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sat, 14 Apr 2018 01:08:08 +0200
Subject: [PATCH 08/11] use 2 shift layout

---
 keyboards/dz60/keymaps/weeheavy/keymap.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index a80868dfcfc7..c9b347b9e9b3 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -12,25 +12,11 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // ANSI QWERTY
-	[BASE] = LAYOUT(
+	[BASE] = LAYOUT_2_shifts(
 		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, XXXX, 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_BSLS,
 		KC_CAPS, 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
+		KC_LSPO, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
 		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(UTIL), KC_SPC, KC_RALT, MO(SETUP), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-	[SETUP] = LAYOUT(
-		RESET, 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_B, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-		____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
-
-	[UTIL] = LAYOUT(
-		____, M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), M(12), ____, ____,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-		____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 };
 

From 0e798e34bef8610550115e15d1eb535fb3dd3088 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sat, 14 Apr 2018 11:34:14 +0200
Subject: [PATCH 09/11] rename layers, populate additional layers

---
 keyboards/dz60/keymaps/weeheavy/keymap.c | 38 +++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index c9b347b9e9b3..dddb29bffd62 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -5,18 +5,36 @@
 #define XXXX KC_NO
 
 // Layer definition
-#define BASE 0
-#define SETUP 1
-#define UTIL 2
+#define L0 0
+#define L1 1
+#define L2 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  // ANSI QWERTY
-	[BASE] = LAYOUT_2_shifts(
-		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, XXXX, 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_BSLS,
-		KC_CAPS, 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_LSPO, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(UTIL), KC_SPC, KC_RALT, MO(SETUP), KC_LEFT, KC_DOWN, KC_RIGHT),
+// Base layer
+[L0] = LAYOUT_2_shifts(
+	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, XXXX, 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_BSLS,
+	KC_CAPS, 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_LSPO, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
+	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(L1), KC_SPC, KC_RALT, MO(L2), KC_LEFT, KC_DOWN, KC_RIGHT),
+
+// Utility layer
+[L1] = LAYOUT_2_shifts(
+	KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
+	____, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, ____,
+	____, ____, ____, ____, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
+	____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
+	____, ____, ____, ____, ____, ____, ____, ____, KC_MPRV, KC_VOLD, KC_MNXT),
+
+
+// Setup/config layer
+[L2] = LAYOUT_2_shifts(
+	RESET, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+	KC_B, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET,
+	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+	____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____, ____,
+	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
+
 };
 

From d55cd8d422f727aaacb566f800dd2aa3e894fd95 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sat, 14 Apr 2018 14:43:27 +0200
Subject: [PATCH 10/11] final layout (TM)

---
 keyboards/dz60/keymaps/weeheavy/README.md | 28 ++++++++++++++++-------
 keyboards/dz60/keymaps/weeheavy/keymap.c  | 23 +++++++++----------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/README.md b/keyboards/dz60/keymaps/weeheavy/README.md
index 67ffca919c48..95a435a13c80 100644
--- a/keyboards/dz60/keymaps/weeheavy/README.md
+++ b/keyboards/dz60/keymaps/weeheavy/README.md
@@ -4,10 +4,12 @@
 
 * 2u left shift
 * arrow cluster
-* split spacebar with 1.25u key in the middle
+* split spacebar with a center key
 
 ## Layouts
 
+The base layout is ANSI QWERTY.
+
 Key sizes (ASCII keyboards below match this scale):
 
     1u    = 4 chars  = |  |
@@ -19,14 +21,13 @@ Key sizes (ASCII keyboards below match this scale):
     2.75u = 11 chars = |         |
     6.25u = 25 chars = |                       |
 
-
 ### Layer 0: Base layout
 
-ANSI QWERTY layout. Specialities:
+Specialities:
 
 * Arrow cluster
-* Left shift: `KC_LSPO` == Left Shift when held, ( when tapped
-* Right shift: `KC_RSPC` == Right Shift when held, ) when tapped
+* FN1: access to layer 1
+* F2: access to layer 2
 
 ```
 ,----------------------------------------------------------.
@@ -38,12 +39,23 @@ ANSI QWERTY layout. Specialities:
 |----------------------------------------------------------+
 |Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||Sf||↑ ||Dl|
 |----------------------------------------------------------+
-|Ctl||Win||Alt|| Space ||TBD||  Space  ||FN||Ct||← ||↓ ||→ |
+|Ctl||Win||Alt|| Space ||FN1||  Space  ||Al||F2||← ||↓ ||→ |
 `----------------------------------------------------------'
 ```
 
-### Layer 1: Configuration layout
+### Layer 1: Utility
+
+Specialities:
+
+* F1-F12 keys when holding FN1
+* Movement cluster on the right hand side
+* Multimedia cluster on the bottom right
+* RGB config on the left hand side
+
+### Layer 2: Config and setup
 
+Specialities:
 
-### Layer 2: Gaming layout
+* Reset key on ESC and backslash location
+* Additional "B" key (a learning from my mistakes)
 
diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index dddb29bffd62..0284873919b5 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -11,29 +11,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-// Base layer
+// Base layer - ANSI QWERTY
 [L0] = LAYOUT_2_shifts(
 	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, XXXX, 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_BSLS,
 	KC_CAPS, 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_LSPO, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_DEL,
+	KC_LSFT, XXXX, 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_DEL,
 	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(L1), KC_SPC, KC_RALT, MO(L2), KC_LEFT, KC_DOWN, KC_RIGHT),
 
-// Utility layer
+// Utility layer - RGB and multimedia control
 [L1] = LAYOUT_2_shifts(
-	KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
-	____, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, ____,
-	____, ____, ____, ____, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
-	____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
-	____, ____, ____, ____, ____, ____, ____, ____, KC_MPRV, KC_VOLD, KC_MNXT),
+	____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
+	____, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, ____, ____, ____, ____,
+	____, RGB_HUI, RGB_HUD, ____, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
+	____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
+	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, ____, KC_MPRV, KC_VOLD, KC_MNXT),
 
-
-// Setup/config layer
+// Setup layer - Reset an additional "b" button
 [L2] = LAYOUT_2_shifts(
 	RESET, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	KC_B, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, ____, ____, ____, ____, RESET,
+	KC_B, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RESET,
 	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-	____, ____, ____, BL_BRTG, BL_DEC, BL_TOGG, BL_INC, BL_STEP, ____, ____, ____, ____, ____, ____, ____,
+	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 	____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____),
 
 };

From 4b4a20c2f36194019afbd056ba1765db6f33381a Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Sat, 14 Apr 2018 22:45:53 +0200
Subject: [PATCH 11/11] fix RGB saturation increase position

---
 keyboards/dz60/keymaps/weeheavy/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/dz60/keymaps/weeheavy/keymap.c b/keyboards/dz60/keymaps/weeheavy/keymap.c
index 0284873919b5..4c7b038d51cc 100644
--- a/keyboards/dz60/keymaps/weeheavy/keymap.c
+++ b/keyboards/dz60/keymaps/weeheavy/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ____, ____,
 	____, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, ____, ____, ____, ____,
 	____, RGB_HUI, RGB_HUD, ____, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
-	____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
+	____, ____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, KC_END, KC_PGDN, ____, KC_MPLY, KC_VOLU, KC_MUTE,
 	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, ____, KC_MPRV, KC_VOLD, KC_MNXT),
 
 // Setup layer - Reset an additional "b" button