From a36926391a5dc89b72dacd80beca388968d1fb56 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Fri, 23 Aug 2024 09:43:24 -0700
Subject: [PATCH] Minor edits

---
 Makefile                                                   | 4 +++-
 .../default/layers/definitions/{layers.inc => include.c}   | 0
 keyboards/betalupi_ergodox/keymaps/default/layers/layers.c | 2 +-
 keyboards/betalupi_voyager/keymaps/default/keymap.c        | 7 +++++++
 .../default/layers/definitions/{layers.inc => include.c}   | 0
 .../keymaps/default/layers/definitions/macros.h            | 2 +-
 keyboards/betalupi_voyager/keymaps/default/layers/layers.c | 2 +-
 7 files changed, 13 insertions(+), 4 deletions(-)
 rename keyboards/betalupi_ergodox/keymaps/default/layers/definitions/{layers.inc => include.c} (100%)
 rename keyboards/betalupi_voyager/keymaps/default/layers/definitions/{layers.inc => include.c} (100%)

diff --git a/Makefile b/Makefile
index 2e11530..3e21b8f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+all: voyager ergodox
+
 voyager:
 	@mkdir -p "$$(pwd)/output"
 	docker run -it --rm \
@@ -23,4 +25,4 @@ docker:
 	docker build docker -t git.betalupi.com/mark/qmk
 
 
-.PHONY: voyager ergodox ergodox_upload docker
\ No newline at end of file
+.PHONY: voyager ergodox ergodox_upload docker all
\ No newline at end of file
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/include.c
similarity index 100%
rename from keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc
rename to keyboards/betalupi_ergodox/keymaps/default/layers/definitions/include.c
diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c b/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c
index 657583d..dde6e89 100644
--- a/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c
+++ b/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c
@@ -1,5 +1,5 @@
 #include "extra_mappings.h"
-#define LAYER_INCLUDE_FILE "definitions/layers.inc"
+#define LAYER_INCLUDE_FILE "definitions/include.c"
 
 
 /*
diff --git a/keyboards/betalupi_voyager/keymaps/default/keymap.c b/keyboards/betalupi_voyager/keymaps/default/keymap.c
index 63eab90..f108853 100644
--- a/keyboards/betalupi_voyager/keymaps/default/keymap.c
+++ b/keyboards/betalupi_voyager/keymaps/default/keymap.c
@@ -117,6 +117,13 @@ enum tap_dance_codes {
 #include "parts/tapdance.c"
 
 bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
+	if (
+		false
+		//|| layer_state_is(LAYER_SIMPLEARROWS)
+	) {
+		return false;
+	}
+
 	/* Disable combo `SOME_COMBO` on layer `_LAYER_A` */
 	if (
 		combo_index == 0 ||
diff --git a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/include.c
similarity index 100%
rename from keyboards/betalupi_voyager/keymaps/default/layers/definitions/layers.inc
rename to keyboards/betalupi_voyager/keymaps/default/layers/definitions/include.c
diff --git a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/macros.h b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/macros.h
index 46627a3..f99cfd3 100644
--- a/keyboards/betalupi_voyager/keymaps/default/layers/definitions/macros.h
+++ b/keyboards/betalupi_voyager/keymaps/default/layers/definitions/macros.h
@@ -29,7 +29,7 @@
 #ifdef BETA_LAYER_LEDS
     #define BETA_LAYER_CONTEXT_DATA {\
         LC_RED, LC_PNK, LC_PNK, LC_PNK, LC_PNK, LC_PNK, \
-        LC_CYN, LC_OFF, LC_CYN, LC_OFF, LC_OFF, LC_CYN, \
+        LC_CYN, LC_OFF, LC_CYN, LC_OFF, LC_OFF, LC_OFF, \
         LC_GRN, LC_GRN, LC_OFF, LC_OFF, LC_BLU, LC_OFF, \
         LC_OFF, LC_GRN, LC_OFF, LC_ORN, LC_OFF, LC_OFF, \
         LC_PNK, LC_PNK, \
diff --git a/keyboards/betalupi_voyager/keymaps/default/layers/layers.c b/keyboards/betalupi_voyager/keymaps/default/layers/layers.c
index a406272..3503ea0 100644
--- a/keyboards/betalupi_voyager/keymaps/default/layers/layers.c
+++ b/keyboards/betalupi_voyager/keymaps/default/layers/layers.c
@@ -1,5 +1,5 @@
 //#include "extra_mappings.h"
-#define LAYER_INCLUDE_FILE "definitions/layers.inc"
+#define LAYER_INCLUDE_FILE "definitions/include.c"
 
 
 /*