summaryrefslogtreecommitdiff
path: root/keyboards/gboards/g/keymap_combo.h
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-08-29 08:20:25 +1000
committerNick Brassel <nick@tzarc.org>2021-08-29 08:20:25 +1000
commitf061ca497464fe85284906fb163a33eaee7a91ef (patch)
tree33ef1bfb529aed382e8526c607c4e18717f92571 /keyboards/gboards/g/keymap_combo.h
parentff65185dec6f97be1eb49f17cea526a0d0bbf3d6 (diff)
parent4bad375d7c09d949a9dcdd4feba147c9c7a67ec6 (diff)
Breaking changes develop merge to master, 2021Q3 edition. (#14196)
Diffstat (limited to 'keyboards/gboards/g/keymap_combo.h')
-rw-r--r--keyboards/gboards/g/keymap_combo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h
index 58e99863ea..b92b6a4bc4 100644
--- a/keyboards/gboards/g/keymap_combo.h
+++ b/keyboards/gboards/g/keymap_combo.h
@@ -28,7 +28,10 @@
#define TOGG A_ENUM
enum combos {
#include "combos.def"
+ COMBO_LENGTH
};
+// Export length to combo module
+uint16_t COMBO_LEN = COMBO_LENGTH;
// Bake combos into mem
#undef COMB
@@ -53,9 +56,6 @@ combo_t key_combos[] = {
#undef SUBS
#undef TOGG
-// Export length to combo module
-int COMBO_LEN = sizeof(key_combos) / sizeof(key_combos[0]);
-
// Fill QMK hook
#define COMB BLANK
#define SUBS A_ACTI