From 2845481490d129911f1cadc38981ab9cdc033415 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Mon, 22 Jan 2024 12:25:50 -0800
Subject: [PATCH] Minor changes

---
 .../betalupi_ergodox/keymaps/default/keymap.c |  6 +++
 .../betalupi_ergodox/keymaps/default/rules.mk |  3 +-
 .../default/layers/definitions/horizon.h      | 47 -------------------
 .../default/layers/definitions/layers.inc     |  1 -
 .../keymaps/default/parts/leader.c            |  5 --
 .../keymaps/default/parts/tapdance.c          | 12 -----
 6 files changed, 8 insertions(+), 66 deletions(-)
 delete mode 100644 keyboards/betalupi_voyager/keymaps/default/layers/definitions/horizon.h

diff --git a/keyboards/betalupi_ergodox/keymaps/default/keymap.c b/keyboards/betalupi_ergodox/keymaps/default/keymap.c
index 6a6f579..f44b26c 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/keymap.c
+++ b/keyboards/betalupi_ergodox/keymaps/default/keymap.c
@@ -97,6 +97,12 @@ void matrix_scan_user(void) {
 }
 
 
+const uint16_t PROGMEM test_combo2[] = {KC_D, KC_F, COMBO_END};
+combo_t key_combos[] = {
+	COMBO(test_combo2, KC_TAB),
+};
+
+
 
 // Include all other parts of configuration
 #include "layers/layers.c"
diff --git a/keyboards/betalupi_ergodox/keymaps/default/rules.mk b/keyboards/betalupi_ergodox/keymaps/default/rules.mk
index f1301d3..1bb5c82 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/rules.mk
+++ b/keyboards/betalupi_ergodox/keymaps/default/rules.mk
@@ -1,3 +1,4 @@
 # rules.mk overrides
 
-TAP_DANCE_ENABLE = yes
\ No newline at end of file
+TAP_DANCE_ENABLE = yes
+COMBO_ENABLE      = yes
\ No newline at end of file
diff --git a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/horizon.h b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/horizon.h
deleted file mode 100644
index 465fa13..0000000
--- a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/horizon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// See symbols.h for docs
-
-#define BETA_LAYER_MAGIC_MACRO BETA_LAYER(HORIZON)
-
-#ifdef BETA_LAYER_LAYOUTS
-    #define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
-    BETA_LAYER_MAGIC_MACRO
-#endif
-
-#ifdef BETA_LAYER_KEYS
-    #define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
-        TD(TD_ESCAPE), KC_1,    KC_2,  KC_3,   KC_4,  KC_5, \
-        KC_H,          KC_Q,    KC_Q,  KC_W,   KC_E,  KC_R, \
-        KC_TAB,        KC_LSFT, KC_A,  KC_S,   KC_D,  KC_F, \
-        KC_NO,         KC_Z,    KC_X, KC_NO,   KC_C,  KC_V, \
-        KC_SPACE,      KC_ENTER, \
-    \
-    \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
-        KC_NO, KC_NO \
-    )
-
-    BETA_LAYER_MAGIC_MACRO
-#endif
-
-#ifdef BETA_LAYER_LEDS
-    #define BETA_LAYER_CONTEXT_DATA {\
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_BLU, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_BLU, LC_BLU, LC_BLU, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
-        LC_OFF, LC_OFF \
-    }
-
-    BETA_LAYER_MAGIC_MACRO
-#endif
-
-#undef BETA_LAYER_CONTEXT_DATA
-#undef BETA_LAYER_MAGIC_MACRO
\ No newline at end of file
diff --git a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc
index 38f7dfe..dc71ef6 100644
--- a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc
+++ b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc
@@ -19,7 +19,6 @@
 
 // The order of the layers below doesn't matter,
 // since they avoid transparent keys.
-#include "horizon.h"
 #include "symbols.h"
 #include "arrows.h"
 #include "macros.h"
diff --git a/keyboards/betalupi_voyager/keymaps/default/parts/leader.c b/keyboards/betalupi_voyager/keymaps/default/parts/leader.c
index 9ac9933..7c69a24 100644
--- a/keyboards/betalupi_voyager/keymaps/default/parts/leader.c
+++ b/keyboards/betalupi_voyager/keymaps/default/parts/leader.c
@@ -33,10 +33,5 @@ bool beta_leader_check(void) {
 		return false;
 	}
 
-	BETA_SEQ_2_SHORT(KC_H, KC_O) {
-		layer_move(LAYER_HORIZON);
-		return false;
-	}
-
 	return true;
 }
\ No newline at end of file
diff --git a/keyboards/betalupi_voyager/keymaps/default/parts/tapdance.c b/keyboards/betalupi_voyager/keymaps/default/parts/tapdance.c
index 40ab05d..e4d32b0 100644
--- a/keyboards/betalupi_voyager/keymaps/default/parts/tapdance.c
+++ b/keyboards/betalupi_voyager/keymaps/default/parts/tapdance.c
@@ -20,19 +20,7 @@ void td_wmlayout(tap_dance_state_t *state, void *user_data) {
 	}
 }
 
-void td_escape(tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
-		tap_code16(KC_ESCAPE);
-	} else if (state->count == 2) {
-		layer_move(LAYER_MAIN);
-	} else {
-		reset_tap_dance(state);
-	}
-}
-
-
 tap_dance_action_t tap_dance_actions[] = {
 	[TD_WMLAYOUT] = ACTION_TAP_DANCE_FN(td_wmlayout),
 	[TD_SCREENSHOT] = ACTION_TAP_DANCE_FN(td_screenshot),
-	[TD_ESCAPE] = ACTION_TAP_DANCE_FN(td_escape),
 };