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_5x15/wanleg/config.h |  2 +-
 layouts/community/ortho_5x15/wanleg/keymap.c | 49 ++++++++++++++--------------
 layouts/community/ortho_5x15/wanleg/rules.mk | 19 ++++++-----
 3 files changed, 37 insertions(+), 33 deletions(-)

(limited to 'layouts/community/ortho_5x15')

diff --git a/layouts/community/ortho_5x15/wanleg/config.h b/layouts/community/ortho_5x15/wanleg/config.h
index 1aeda2db4e..d2b3d67193 100644
--- a/layouts/community/ortho_5x15/wanleg/config.h
+++ b/layouts/community/ortho_5x15/wanleg/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 //5x5 powered by Adafruit Feather 32u4 Bluefruit LE
-#if defined(KEYBOARD_5x5) && defined(BLUEFRUIT)
+#if defined(KEYBOARD_40percentclub_5x5) && defined(BLUEFRUIT)
 
 //need to undefine standard 5x5 array before defining alternate Bluefruit array
 #undef MATRIX_ROW_PINS
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index 66b3ce018d..51b020fcde 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -6,7 +6,7 @@
 #define _________________Num_Row_75________________ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-#if defined(KEYBOARD_5x5)
+#if defined(KEYBOARD_40percentclub_5x5)
 [GK75] = LAYOUT_ortho_5x15_wrapper(
   _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
   _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
@@ -23,6 +23,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
 ),
 
+[gNUM] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_NUM_1_______________,
+  _______________Gherkin_NUM_2_______________,
+  _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
+),
+
+[gDIR] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_DIR_0_______________,
+  _______________Gherkin_DIR_1_______________,
+  _______________Gherkin_DIR_2_______________,
+  _________________BLANK_50__________________
+),
+
+[gETC] = LAYOUT_ortho_5x10_wrapper(
+  _________________BLANK_50__________________,
+  _______________Gherkin_ETC_0_______________,
+  _______________Gherkin_ETC_1_______________,
+  _______________Gherkin_ETC_2_______________,
+  _______, KC_CAPS, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
+),
+
 #if defined(BLUEFRUIT)
 [PAD] = LAYOUT_ortho_5x5_wrapper(
   _______, _______, _______, OUT_BT, OUT_USB,
@@ -210,27 +234,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
 ),
 
-[gNUM] = LAYOUT_ortho_5x10_wrapper(
-  _________________BLANK_50__________________,
-  _______________Gherkin_NUM_0_______________,
-  _______________Gherkin_NUM_1_______________,
-  _______________Gherkin_NUM_2_______________,
-  _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
-),
-
-[gDIR] = LAYOUT_ortho_5x10_wrapper(
-  _________________BLANK_50__________________,
-  _______________Gherkin_DIR_0_______________,
-  _______________Gherkin_DIR_1_______________,
-  _______________Gherkin_DIR_2_______________,
-  _________________BLANK_50__________________
-),
-
-[gETC] = LAYOUT_ortho_5x10_wrapper(
-  _________________BLANK_50__________________,
-  _______________Gherkin_ETC_0_______________,
-  _______________Gherkin_ETC_1_______________,
-  _______________Gherkin_ETC_2_______________,
-  _______, KC_CAPS, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
-),
 };
diff --git a/layouts/community/ortho_5x15/wanleg/rules.mk b/layouts/community/ortho_5x15/wanleg/rules.mk
index bfc4c69d99..96bbaa458e 100644
--- a/layouts/community/ortho_5x15/wanleg/rules.mk
+++ b/layouts/community/ortho_5x15/wanleg/rules.mk
@@ -1,8 +1,11 @@
-ifeq (,$(findstring yes,$(BLUEFRUIT)))
-  BLUETOOTH = AdafruitBLE
-  BLUETOOTH_ENABLE = yes
-  F_CPU = 8000000
-  CONSOLE_ENABLE = no 		# Console for debug(+400)
-  COMMAND_ENABLE = no 		# Commands for debug and configuration
-  RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-endif
\ No newline at end of file
+#ifeq ($(strip $(KEYBOARD)), xd75)
+#or
+#ifeq (,$(findstring xd75,$(KEYBOARD)))
+#something
+#endif
+
+#ifeq ($(strip $(KEYBOARD)), 40percentclub/5x5)
+#or
+#ifeq (,$(findstring 40percentclub/5x5,$(KEYBOARD)))
+#something
+#endif
\ No newline at end of file
-- 
cgit v1.2.1