summaryrefslogtreecommitdiff
path: root/keyboards/qpockets
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/qpockets
parent433dc6068603e61d466e755aedcea0be96664f95 (diff)
Keymap introspection for combos. (#19670)
Diffstat (limited to 'keyboards/qpockets')
-rw-r--r--keyboards/qpockets/eggman/keymaps/default/config.h3
-rw-r--r--keyboards/qpockets/eggman/keymaps/default/keymap.c2
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h3
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c2
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/default/config.h3
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c2
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h3
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c8
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/default/config.h3
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c8
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h3
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c10
-rw-r--r--keyboards/qpockets/wanten/keymaps/2u_bars/config.h3
-rw-r--r--keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c11
-rw-r--r--keyboards/qpockets/wanten/keymaps/625_bar/config.h3
-rw-r--r--keyboards/qpockets/wanten/keymaps/625_bar/keymap.c11
-rw-r--r--keyboards/qpockets/wanten/keymaps/default/config.h3
-rw-r--r--keyboards/qpockets/wanten/keymaps/default/keymap.c11
18 files changed, 40 insertions, 52 deletions
diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
index 90d12ee7da..cc4b487fe8 100644
--- a/keyboards/qpockets/eggman/keymaps/default/config.h
+++ b/keyboards/qpockets/eggman/keymaps/default/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif
+#endif
diff --git a/keyboards/qpockets/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c
index 13a34c14b0..9e6ec192c2 100644
--- a/keyboards/qpockets/eggman/keymaps/default/keymap.c
+++ b/keyboards/qpockets/eggman/keymaps/default/keymap.c
@@ -84,7 +84,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
index fd24168f47..40d4cc44c4 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
index 9755cdec3f..1bbdd632e8 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
index fd24168f47..40d4cc44c4 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
index 09b74316a8..4b0262d4ed 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
+++ b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
@@ -122,7 +122,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
index fd24168f47..40d4cc44c4 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
index afde5f7b20..3c8b875d47 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
+++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -52,14 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS,
- KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS
),
[_NAV] = LAYOUT_big_space(
KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
- KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS
),
};
@@ -71,7 +71,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
index 7fdb8504a6..e398cb5b2d 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 50
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
index 7d47cf4f8d..faf9c0f3d4 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
+++ b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -46,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_NAV] = LAYOUT_default(
KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F4, KC_F5, KC_F6, KC_F7, KC_TAB,
KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_LCAP, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
@@ -67,7 +67,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
index 31291ecc8f..98cdcbcdb1 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 25
-#endif
+#endif
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
index c163c6eac9..1c3cdfc61f 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
+++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -41,19 +41,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_PSCR, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, KC_MPLY
),
-
+
[_SYM] = LAYOUT_default(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS, KC_UNDS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_NAV] = LAYOUT_default(
KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_BSPC,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8, KC_TAB,
KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
@@ -65,7 +65,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
index 072519ff6c..77051be69b 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 25
-#endif
+#endif
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
index d8c75895bf..3322fc8923 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -21,7 +21,7 @@ enum layers{
_GAME,
_SYM,
_NAV
-
+
};
enum combo_events {
@@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
SNIP, KC_LGUI, KC_LCTL, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, TG(_GAME), KC_MUTE
),
-
+
[_GAME] = LAYOUT_2u_bars(
KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LCTL, KC_LGUI, KC_LALT, KC_ESC, KC_SPC, KC_GUP_BSPC, KC_RALT, KC_TRNS, KC_BSPC
),
-
+
[_SYM] = LAYOUT_2u_bars(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
@@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
@@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = {
[COMBO_DEL] = COMBO(combo_del,KC_DEL)
};
#endif
-
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
index 072519ff6c..77051be69b 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 25
-#endif
+#endif
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
index c9dcfd4af5..1bd1be2f66 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -21,7 +21,7 @@ enum layers{
_GAME,
_SYM,
_NAV
-
+
};
enum combo_events {
@@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPRV, KC_DZ, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
SNIP, KC_LGUI, KC_LCTL, KC_UP_SPC, KC_RALT, TG(_GAME)
),
-
+
[_GAME] = LAYOUT_625_bar(
KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS
),
-
+
[_SYM] = LAYOUT_625_bar(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
@@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
@@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = {
[COMBO_DEL] = COMBO(combo_del,KC_DEL)
};
#endif
-
diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
index 072519ff6c..77051be69b 100644
--- a/keyboards/qpockets/wanten/keymaps/default/config.h
+++ b/keyboards/qpockets/wanten/keymaps/default/config.h
@@ -21,6 +21,5 @@
/*Combos*/
#ifdef COMBO_ENABLE
-# define COMBO_COUNT 5
# define COMBO_TERM 25
-#endif
+#endif
diff --git a/keyboards/qpockets/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
index cafcd61d31..13d8a30146 100644
--- a/keyboards/qpockets/wanten/keymaps/default/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include QMK_KEYBOARD_H
enum layers{
@@ -21,7 +21,7 @@ enum layers{
_GAME,
_SYM,
_NAV
-
+
};
enum combo_events {
@@ -45,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
SNIP, KC_LGUI, KC_LCTL, KC_DN_BSPC, KC_UP_SPC, KC_RALT, TG(_GAME), KC_MUTE
),
-
+
[_GAME] = LAYOUT_default(
KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_H, KC_SJ, KC_K, KC_L, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_GUP_BSPC, KC_RALT, KC_TRNS, KC_BSPC
),
-
+
[_SYM] = LAYOUT_default(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
@@ -93,7 +93,7 @@ const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
[COMBO_ENT] = COMBO(combo_ent,KC_ENT),
[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
@@ -101,4 +101,3 @@ combo_t key_combos[COMBO_COUNT] = {
[COMBO_DEL] = COMBO(combo_del,KC_DEL)
};
#endif
-