From e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 Mon Sep 17 00:00:00 2001
From: lokher <lokher@gmail.com>
Date: Wed, 26 Apr 2023 16:32:15 +0800
Subject: merge upstream 713427c

---
 users/alfrdmalr/alfrdmalr.c | 16 ++++++----------
 users/alfrdmalr/alfrdmalr.h |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'users/alfrdmalr')

diff --git a/users/alfrdmalr/alfrdmalr.c b/users/alfrdmalr/alfrdmalr.c
index 18ce8bad7c..7bc04fb55c 100644
--- a/users/alfrdmalr/alfrdmalr.c
+++ b/users/alfrdmalr/alfrdmalr.c
@@ -7,7 +7,12 @@ uint16_t muse_counter = 0;
 uint8_t muse_offset = 70;
 uint16_t muse_tempo = 50;
 
-LEADER_EXTERNS();
+void leader_end_user(void) {
+    // reset keyboard to bootloader
+    if (leader_sequence_five_keys(KC_R, KC_E, KC_S, KC_E, KC_T)) {
+        reset_keyboard();
+    }
+}
 
 void matrix_scan_user(void) {
 #ifdef AUDIO_ENABLE
@@ -28,15 +33,6 @@ void matrix_scan_user(void) {
         }
     }
 #endif
-
-  LEADER_DICTIONARY() {
-    leading = false;
-    // reset keyboard to bootloader
-    SEQ_FIVE_KEYS(KC_R, KC_E, KC_S, KC_E, KC_T) {
-      reset_keyboard();
-    }
-    leader_end(); 
-  }
 }
 
 bool syml_pressed = false;
diff --git a/users/alfrdmalr/alfrdmalr.h b/users/alfrdmalr/alfrdmalr.h
index 851ab02815..0709f80b86 100644
--- a/users/alfrdmalr/alfrdmalr.h
+++ b/users/alfrdmalr/alfrdmalr.h
@@ -58,7 +58,7 @@ enum alfrdmalr_keycodes {
 #define K47    SYMR
 #define K48    KC_RALT
 #define K49    SETLAYER
-#define K4A    MU_TOG
+#define K4A    MU_TOGG
 
 // leftmost column
 #define K00    KC_ESC
@@ -261,7 +261,7 @@ enum alfrdmalr_keycodes {
 // - CORE
 #define ___SETTINGS_L1___    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
 #define ___SETTINGS_L2___    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
-#define ___SETTINGS_L3___    MU_TOG,   AU_OFF,   AU_ON,    KC_NO,    KC_NO
+#define ___SETTINGS_L3___    MU_TOGG,  AU_OFF,   AU_ON,    KC_NO,    KC_NO
 
 // - MODS
 #define ___SETTINGS_L4___    KC_NO,    KC_NO,    KC_NO,    KC_TRNS,  KC_NO
-- 
cgit v1.2.3