From ceb9b0f7b8cd63cdaf9b0c8a853229f871189d4a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 7 May 2022 09:58:38 +1000
Subject: [PATCH] gboards/gergoplex: move `COMBO_ENABLE` to keymap level
 (#16667)

---
 keyboards/gboards/gergoplex/config.h                     | 2 --
 keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h | 4 ++++
 keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk | 1 +
 keyboards/gboards/gergoplex/keymaps/default/config.h     | 4 ++++
 keyboards/gboards/gergoplex/keymaps/default/rules.mk     | 1 +
 keyboards/gboards/gergoplex/keymaps/georgepetri/config.h | 2 ++
 keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk | 1 +
 keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h  | 4 ++++
 keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk  | 1 +
 keyboards/gboards/gergoplex/rules.mk                     | 1 -
 10 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h
 create mode 100644 keyboards/gboards/gergoplex/keymaps/default/config.h
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h

diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index a6d8d6b1be..6a73ccc4ea 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -44,8 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
 #define UNUSED_PINS
 #define IGNORE_MOD_TAP_INTERRUPT
-#define COMBO_ALLOW_ACTION_KEYS
-#define COMBO_VARIABLE_LEN
 
 #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
 
diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h
new file mode 100644
index 0000000000..1b30cc73b3
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define COMBO_ALLOW_ACTION_KEYS
+#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk
index e882b8008d..620cab16c0 100644
--- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk
@@ -10,6 +10,7 @@ DEBUG_MATRIX           = no
 CONSOLE_ENABLE         = no
 
 #Combos!
+COMBO_ENABLE = yes
 VPATH                  +=  keyboards/gboards/
 
 ifeq ($(strip $(DEBUG_MATRIX)), yes)
diff --git a/keyboards/gboards/gergoplex/keymaps/default/config.h b/keyboards/gboards/gergoplex/keymaps/default/config.h
new file mode 100644
index 0000000000..1b30cc73b3
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/default/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define COMBO_ALLOW_ACTION_KEYS
+#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/default/rules.mk b/keyboards/gboards/gergoplex/keymaps/default/rules.mk
index e882b8008d..620cab16c0 100644
--- a/keyboards/gboards/gergoplex/keymaps/default/rules.mk
+++ b/keyboards/gboards/gergoplex/keymaps/default/rules.mk
@@ -10,6 +10,7 @@ DEBUG_MATRIX           = no
 CONSOLE_ENABLE         = no
 
 #Combos!
+COMBO_ENABLE = yes
 VPATH                  +=  keyboards/gboards/
 
 ifeq ($(strip $(DEBUG_MATRIX)), yes)
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
index d3fe5b8145..f66c334b85 100644
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
+++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
@@ -25,3 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef DEBOUNCE
 #define DEBOUNCE 25
 
+#define COMBO_ALLOW_ACTION_KEYS
+#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
index e4064d4932..74d02c23bd 100644
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
+++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
@@ -10,6 +10,7 @@ DEBUG_MATRIX           = no
 CONSOLE_ENABLE         = no
 
 #Combos!
+COMBO_ENABLE = yes
 VPATH                  +=  keyboards/gboards/
 
 ifeq ($(strip $(DEBUG_MATRIX)), yes)
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h b/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
new file mode 100644
index 0000000000..1b30cc73b3
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define COMBO_ALLOW_ACTION_KEYS
+#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
index e882b8008d..620cab16c0 100644
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
@@ -10,6 +10,7 @@ DEBUG_MATRIX           = no
 CONSOLE_ENABLE         = no
 
 #Combos!
+COMBO_ENABLE = yes
 VPATH                  +=  keyboards/gboards/
 
 ifeq ($(strip $(DEBUG_MATRIX)), yes)
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 5cd5a7721c..31a7d6bae8 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -16,7 +16,6 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-COMBO_ENABLE = yes
 CUSTOM_MATRIX = yes
 
 LAYOUTS = split_3x5_3