Added short-circuit leader key

keyboards/betalupi_ergodox/keymaps/default/config.h

@@ -1,3 +1,4 @@
+#define ENABLE_BETA_LEADER
 
 // No timeout after initial leader key press
 #define LEADER_NO_TIMEOUT

keyboards/betalupi_ergodox/keymaps/default/keymap.c

@@ -73,6 +73,10 @@ enum tap_dance_codes {
 #include "features/autocorrect/autocorrect.h"
 #endif
 
+#ifdef ENABLE_BETA_LEADER
+#include "features/leader/beta_leader.h"
+#endif
+
 #include "features/beta_rawhid.h"
 
 // Send a special character.
@@ -86,6 +90,14 @@ bool send_special_character(uint16_t keycode) {
 }
 
 
+void matrix_scan_user(void) {
+	#ifdef ENABLE_BETA_LEADER
+		beta_qk_leader_check();
+	#endif
+}
+
+
+
 // Include all other parts of configuration
 #include "layers/layers.c"
 #include "parts/leader.c"
@@ -96,6 +108,10 @@ bool send_special_character(uint16_t keycode) {
 // Return TRUE to allow QMK to handle keypress.
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
+	#ifdef ENABLE_BETA_LEADER
+	if (!beta_process_leader(keycode, record)) { return false; }
+	#endif
+
 	#ifdef ENABLE_HID_SPELLCHECK
 	if (!process_spellcheck(keycode, record)) { return false; }
 	#endif
@@ -116,7 +132,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				SEND_STRING(SS_LCTL(SS_LGUI(SS_LSFT(SS_TAP(X_R)))));
 			}
 			return false;
-		
+
 		// Workaround for one-shot LGUI key.
 		// Using just LGUI with LAYER_DESKTOP as OSL
 		// does not allow you to hold lgui. This does.

keyboards/betalupi_ergodox/keymaps/default/parts/leader.c

@@ -1,49 +1,64 @@
-LEADER_EXTERNS();
+#include "features/leader/beta_leader.h"
 
-void leader_start(void) {
+BETA_LEADER_EXTERNS();
+
+void beta_leader_start(void) {
 	ergodox_right_led_3_on();
 }
 
-void leader_end(void) {
+void beta_leader_end(void) {
 	ergodox_right_led_3_off();
 }
 
-void matrix_scan_user(void) {
-	LEADER_DICTIONARY() {
-		leading = false;
-		leader_end();
-
-		SEQ_TWO_KEYS(KC_E, KC_M) {
-			SEND_STRING(SECRET_EMAIL);
-		}
-
-		SEQ_TWO_KEYS(KC_G, KC_M) {
-			SEND_STRING(SECRET_GMAIL);
-		}
-
-		SEQ_TWO_KEYS(KC_L, KC_I) {
-			SEND_STRING(SECRET_SCHOOL_EMAIL);
-		}
-
-		SEQ_TWO_KEYS(KC_K, KC_B) {
-			layer_move(LAYER_KEYBOARD);
-		}
-
-		//SEQ_ONE_KEY(KC_F) {
-		//	doesn't work, no deactivate
-		//	also, this is slow since laeder key uses dumb logic
-		//	set_oneshot_layer(LAYER_FKEYS, ONESHOT_START);
-		//}
-
-		SEQ_TWO_KEYS(KC_F, KC_1) { tap_code(KC_F1); }
-		SEQ_TWO_KEYS(KC_F, KC_2) { tap_code(KC_F2); }
-		SEQ_TWO_KEYS(KC_F, KC_3) { tap_code(KC_F3); }
-		SEQ_TWO_KEYS(KC_F, KC_4) { tap_code(KC_F4); }
-		SEQ_TWO_KEYS(KC_F, KC_5) { tap_code(KC_F5); }
-		SEQ_TWO_KEYS(KC_F, KC_Q) { tap_code(KC_F6); }
-		SEQ_TWO_KEYS(KC_F, KC_W) { tap_code(KC_F7); }
-		SEQ_TWO_KEYS(KC_F, KC_E) { tap_code(KC_F8); }
-		SEQ_TWO_KEYS(KC_F, KC_R) { tap_code(KC_F9); }
-		SEQ_TWO_KEYS(KC_F, KC_T) { tap_code(KC_F10); }
+bool beta_leader_check(void) {
+	BETA_SEQ_1_SHORT(KC_E) {
+		SEND_STRING(SECRET_GMAIL);
+		return false;
 	}
+
+	BETA_SEQ_2_LONG(KC_E, KC_M) {
+		SEND_STRING(SECRET_EMAIL);
+		return false;
+	}
+
+	BETA_SEQ_2_LONG(KC_G, KC_M) {
+		SEND_STRING(SECRET_GMAIL);
+		return false;
+	}
+
+	BETA_SEQ_2_LONG(KC_L, KC_I) {
+		SEND_STRING(SECRET_SCHOOL_EMAIL);
+		return false;
+	}
+
+	BETA_SEQ_2_LONG(KC_K, KC_B) {
+		layer_move(LAYER_KEYBOARD);
+		return false;
+	}
+
+	BETA_SEQ_2_LONG(KC_K, KC_B) {
+		layer_move(LAYER_KEYBOARD);
+		return false;
+	}
+
+
+	BETA_SEQ_1_SHORT(KC_F) {
+		// doesn't work, no deactivate
+		// also, this is slow since laeder key uses dumb logic
+		set_oneshot_layer(LAYER_NUMBERS, ONESHOT_START);
+		return false;
+	}
+
+	BETA_SEQ_2_LONG(KC_F, KC_1) { tap_code(KC_F1); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_2) { tap_code(KC_F2); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_3) { tap_code(KC_F3); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_4) { tap_code(KC_F4); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_5) { tap_code(KC_F5); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_Q) { tap_code(KC_F6); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_W) { tap_code(KC_F7); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_E) { tap_code(KC_F8); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_R) { tap_code(KC_F9); return false; }
+	BETA_SEQ_2_LONG(KC_F, KC_T) { tap_code(KC_F10); return false; }
+
+	return true;
 }

keyboards/betalupi_ergodox/keymaps/default/rules.mk

@@ -1,4 +1,3 @@
 # rules.mk overrides
 
-LEADER_ENABLE = yes
 TAP_DANCE_ENABLE = yes