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

4 files changed, 25 insertions, 19 deletions

diff --git a/users/wanleg/config.h b/users/wanleg/config.h
index f2e785659f..0c8b048af7 100644
--- a/users/wanleg/config.h
+++ b/users/wanleg/config.h
@@ -1,10 +1,12 @@
-#ifndef USERSPACE_CONFIG_H
-#define USERSPACE_CONFIG_H
+#pragma once
 
 //TAPPING_TERM
 //tapping term short (<100): on multi-purpose keys, slow taps may not register, but "holds" register easier. multi-tap keys may be difficult to activate.
 //tapping term long (>200): holds don't register as easily - noticeable when typing quickly (e.g. shift doesn't want to engage.)
-#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2)
+
+
+//MIGHT HAVE TO SPLIT THIS INTO TWO CONDITIONS
+#if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_iris_rev2)
 //Kailh Coppers activate quickly and don't need a long tapping term
 #define TAPPING_TERM 100
 
@@ -39,6 +41,4 @@
 // Disable mod tap interrrupt
 #ifndef IGNORE_MOD_TAP_INTERRUPT
 #define IGNORE_MOD_TAP_INTERRUPT
-#endif // !mod tap interrrupt
-
-#endif // !USERSPACE_CONFIG_H
+#endif // !mod tap interrrupt
\ No newline at end of file
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index e3e802b4a7..c6569594b3 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -18,5 +18,13 @@ endif
 #use alternate settings for boards using "Adafruit Feather 32u4 Bluefruit LE" instead of Micro
 #example usage: make 5x5:wanleg BT=yes
 ifeq ($(strip $(BT)), yes)
-	OPT_DEFS += -DBLUEFRUIT
+  #opt_defs for alternate pin usage
+  OPT_DEFS += -DBLUEFRUIT
+  #Adafruit Bluefruit controller settings
+  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
diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c
index 3878e6d31c..e5051f9ee6 100644
--- a/users/wanleg/tapdances.c
+++ b/users/wanleg/tapdances.c
@@ -73,9 +73,9 @@ void CAD_finished (qk_tap_dance_state_t *state, void *user_data) {
 		//register_code(KC_NO);
 		//take a screenshot of a single window, open Paint and paste
 		SEND_STRING(SS_LALT(SS_TAP(X_PSCREEN)) SS_LGUI("r"));
-        _delay_ms(500);
+        wait_ms(500);
         SEND_STRING("mspaint" SS_TAP(X_ENTER));
-        _delay_ms(700);
+        wait_ms(700);
         SEND_STRING(SS_LCTRL("v"));
 		break; //register this keycode when button is held
     case DOUBLE_TAP:
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index 9e0cf3ee5d..c2644cd6c4 100644
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -1,5 +1,4 @@
-#ifndef USERSPACE
-#define USERSPACE
+#pragma once
 
 #include "quantum.h"
 
@@ -32,7 +31,6 @@ enum userspace_layers {
 #elif KEYBOARD_xd75
 enum userspace_layers {
   GK75 = 0,
-  PAD,
   QW75,
   SUB75,
   SUP75,
@@ -43,6 +41,7 @@ enum userspace_layers {
   gGK,
   _GK,
   _QW,
+  PAD,
   ONE,
   SUB,
   SUP,
@@ -54,7 +53,7 @@ enum userspace_layers {
   gETC,
   GK50,
 };
-#elif KEYBOARD_5x5
+#elif KEYBOARD_40percentclub_5x5
 enum userspace_layers {
   GK50 = 0,
   gNUM,
@@ -82,8 +81,8 @@ enum userspace_layers {
 #else
   enum userspace_layers {
   _GK = 0,
-  PAD,
   _QW,
+  PAD,
   ONE,
   SUB,
   SUP,
@@ -156,11 +155,11 @@ enum {
 #define KEYMAP_wrapper(...)                  LAYOUT(__VA_ARGS__)
 #define LAYOUT_wrapper(...)                  LAYOUT(__VA_ARGS__)
 #define LAYOUT_ortho_3x10_wrapper(...)       LAYOUT_ortho_3x10(__VA_ARGS__)
-#define LAYOUT_ortho_5x10_wrapper(...)       LAYOUT_ortho_5x10(__VA_ARGS__)
-#define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
-#define LAYOUT_ortho_5x15_wrapper(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
 #define LAYOUT_ortho_4x4_wrapper(...)        LAYOUT_ortho_4x4(__VA_ARGS__)
+#define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x5_wrapper(...)        LAYOUT_ortho_5x5(__VA_ARGS__)
+#define LAYOUT_ortho_5x10_wrapper(...)       LAYOUT_ortho_5x10(__VA_ARGS__)
+#define LAYOUT_ortho_5x15_wrapper(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
 
 // Blocks for each of the major keyboard layouts
 // Organized so we can quickly adapt and modify all of them
@@ -229,7 +228,7 @@ enum {
 
 /* Gherkin-Like
  * .-----------------------------------------------------------------------------------------------------------.
- * | ESC    | Q//ESC | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BSPC |
+ * | ESC    | Q//ESC | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BSPC   |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | TAB    | A      | S      | D      | F      | G      | H      | J      | K      | L      | SPACE  |  '     |
  * |        |        |        |        |        |        |        |        |        |        |SFThold |        |
@@ -361,4 +360,3 @@ enum {
 #define _______________NUMPAD_Row__1_______________  KC_KP_4, KC_KP_5, KC_KP_6,   KC_SPC
 #define _______________NUMPAD_Row__2_______________  KC_KP_1, KC_KP_2, KC_KP_3,   KC_PENT
 #define _______________NUMPAD_Row__3_______________  KC_KP_0, TD(LYR_TAP_DANCE), KC_KP_DOT, KC_PMNS
-#endif // !USERSPACE