summaryrefslogtreecommitdiff
path: root/keyboards/gboards/gergoplex/keymaps
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
committerNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
commitb835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch)
treede22c239cc47556f8be7538f95f48ad75b86d110 /keyboards/gboards/gergoplex/keymaps
parentf5d091a9d58c8349437e9d52de87294258cbd256 (diff)
parent0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff)
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'keyboards/gboards/gergoplex/keymaps')
-rw-r--r--keyboards/gboards/gergoplex/keymaps/colemak-dhm/config.h4
-rw-r--r--keyboards/gboards/gergoplex/keymaps/colemak-dhm/rules.mk1
-rw-r--r--keyboards/gboards/gergoplex/keymaps/default/config.h4
-rw-r--r--keyboards/gboards/gergoplex/keymaps/default/rules.mk1
-rw-r--r--keyboards/gboards/gergoplex/keymaps/georgepetri/config.h2
-rw-r--r--keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk1
-rw-r--r--keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h4
-rw-r--r--keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk1
8 files changed, 18 insertions, 0 deletions
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)