From 0677e64655f230722eaa35160acaefacf3684a43 Mon Sep 17 00:00:00 2001
From: wanleg <32079073+wanleg@users.noreply.github.com>
Date: Wed, 5 Dec 2018 08:42:50 -0800
Subject: Keymap: Wanleg layout updates (#4550)

* config fixes (including for issue #3678)

* put back audio

* jj40 backlighting setup

* jj40 backlighting setup

* rules.mk fix

* jj40 backlighting settings

* iris setup

* iris setup

* iris setup

* iris setup

* iris setup - onehand

* remove commented-out section

* edits due to #4403

* xd75 testing

* fix 5x15 layout issues with 5x5 bluetooth & xd75

* commenting out unused placeholders

* change iris to more wanleg-like 4x12 layout

* formatting changes

* onehand layout cleanup/fix

* revert temp change
---
 layouts/community/ortho_4x12/wanleg/config.h | 13 +++++++++++--
 layouts/community/ortho_4x12/wanleg/keymap.c | 17 +++++++++++++++--
 layouts/community/ortho_4x12/wanleg/rules.mk | 16 ++++++----------
 3 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'layouts/community/ortho_4x12')

diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h
index 2b2072db2..f7650ddd3 100644
--- a/layouts/community/ortho_4x12/wanleg/config.h
+++ b/layouts/community/ortho_4x12/wanleg/config.h
@@ -1,5 +1,14 @@
 #pragma once
 
+#if defined(KEYBOARD_jj40)
+#undef BACKLIGHT_BREATHING
+#undef BACKLIGHT_LEVELS
+#undef BREATHING_PERIOD
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+#define BREATHING_PERIOD 15
+#endif
+
 //QMK DFU settings (ProMicro boards with QMK bootloader)
 // set top left key as bootloader mode escape key on Lets Split rev2
 #if defined(KEYBOARD_lets_split_rev2)
@@ -12,7 +21,7 @@
 #endif
 
 // set top left key as bootloader mode escape key on 4x4 48key layout
-#if defined(KEYBOARD_4x4) && !defined(PRO_MICRO)
+#if defined(KEYBOARD_40percentclub_4x4) && !defined(PRO_MICRO)
 #define QMK_LED B0
 #define QMK_ESC_OUTPUT C6 // usually COL
 #define QMK_ESC_INPUT B2 // usually ROW
@@ -20,7 +29,7 @@
 
 // use alternate settings for 4x4 board using ProMicro instead of Micro
 // usage: make 4x4:wanleg PM=yes
-#if defined(KEYBOARD_4x4) && defined(PRO_MICRO) 
+#if defined(KEYBOARD_40percentclub_4x4) && defined(PRO_MICRO) 
 #define QMK_ESC_OUTPUT F4 // usually COL
 #define QMK_ESC_INPUT D1 // usually ROW
 #define QMK_LED B0
diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c
index 6fe8446f6..23e794dc4 100644
--- a/layouts/community/ortho_4x12/wanleg/keymap.c
+++ b/layouts/community/ortho_4x12/wanleg/keymap.c
@@ -15,8 +15,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______________Qwerty_Row__2_______________,
   KC_LCTL, KC_LGUI, KC_LALT, GHERKIN, SUBTER, SH_T(KC_SPC), SH_T(KC_SPC), SUPRA, KC_RGUI, KC_RALT, GHERKIN, KC_RCTL
 ),
-
-#elif defined(KEYBOARD_4x4)
+[DIR] = LAYOUT_ortho_4x12_wrapper(
+  _____________DIRECTIONS_Row__0_____________,
+  _____________DIRECTIONS_Row__1_____________,
+  _____________DIRECTIONS_Row__2_____________,
+  _______, _______, ONEHAND, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+#elif defined(KEYBOARD_40percentclub_4x4)
 [_GK] = LAYOUT_ortho_4x12_wrapper(
   _______________GherkinLike_0_______________,
   _______________GherkinLike_1_______________,
@@ -31,6 +36,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______________NUMPAD_Row__3_______________
 ),
 
+#elif defined(KEYBOARD_jj40)
+[_GK] = LAYOUT_ortho_4x12_wrapper(
+  _______________GherkinLike_0_______________,
+  _______________GherkinLike_1_______________,
+  _______________GherkinLike_2_______________,
+  TD(RST_TAP_DANCE), BL_TOGG, BL_STEP, BL_BRTG, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
+),
+
 #else
 [_GK] = LAYOUT_ortho_4x12_wrapper(
   _______________GherkinLike_0_______________,
diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk
index 835022f4b..e8277610b 100644
--- a/layouts/community/ortho_4x12/wanleg/rules.mk
+++ b/layouts/community/ortho_4x12/wanleg/rules.mk
@@ -1,14 +1,10 @@
 AUDIO_ENABLE = no
-SWAP_HANDS_ENABLE = yes
+SWAP_HANDS_ENABLE = no
 
-ifeq ($(strip $(KEYBOARD)), jj40)
-	SWAP_HANDS_ENABLE = no
+ifeq ($(strip $(KEYBOARD)), lets_split/rev2)
+	SWAP_HANDS_ENABLE = yes
 endif
 
-ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
-	SWAP_HANDS_ENABLE = no
-endif
-
-ifeq ($(strip $(KEYBOARD)), zlant)
-	SWAP_HANDS_ENABLE = no
-endif
+ifeq ($(strip $(KEYBOARD)), planck/rev6)
+	AUDIO_ENABLE = yes
+endif
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b