summaryrefslogtreecommitdiff
path: root/keyboards/makenova/omega/omega4
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-15 22:27:37 +1000
committerGitHub <noreply@github.com>2023-05-15 22:27:37 +1000
commit5faa23d54ca1e3ab83097f2a07922f48800616e6 (patch)
tree6ed05e5492f3fc8dda210a75b897dd9d4ed8df38 /keyboards/makenova/omega/omega4
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/makenova/omega/omega4')
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default/keymap.c4
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c4
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c4
6 files changed, 6 insertions, 9 deletions
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
index c60e064e21..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -4,7 +4,6 @@
#pragma once
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 4
# define COMBO_TERM 50
#endif
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
index 583d5a8a3d..cfe3233145 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END};
const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
COMBO(combo_bspc,KC_BSPC), // 1
COMBO(combo_ent,KC_ENT), // 2
COMBO(combo_tab,KC_TAB), // 3
@@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS,
QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
-}; \ No newline at end of file
+};
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
index c60e064e21..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -4,7 +4,6 @@
#pragma once
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 4
# define COMBO_TERM 50
#endif
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
index 2cbc706ee4..b443a57a65 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END};
const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
COMBO(combo_bspc,KC_BSPC), // 1
COMBO(combo_ent,KC_ENT), // 2
COMBO(combo_tab,KC_TAB), // 3
@@ -62,4 +62,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS,
QK_BOOT
)
-}; \ No newline at end of file
+};
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
index c60e064e21..067267521d 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -4,7 +4,6 @@
#pragma once
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 4
# define COMBO_TERM 50
#endif
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
index e5e9cc05a6..00c135b3f3 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM combo_ent[] = {ALT_D, GUI_F, COMBO_END};
const uint16_t PROGMEM combo_tab[] = {KC_C, KC_V, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_M, KC_COMM, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
COMBO(combo_bspc,KC_BSPC), // 1
COMBO(combo_ent,KC_ENT), // 2
COMBO(combo_tab,KC_TAB), // 3
@@ -61,4 +61,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS,
QK_BOOT, KC_TRNS, KC_TRNS
)
-}; \ No newline at end of file
+};