~ruther/qmk_firmware: [Keyboard] Add encoder map support for GMMK Pro (#18600)

12 files changed, 44 insertions(+), 58 deletions(-)

M keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
A keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk
M keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
M keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
M keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
A keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk
M keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
M keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
M keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
A keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk
M keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
A keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk

M keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c => keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c +6 -10

@@ 60,13 60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif<
\ No newline at end of file

A keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk => keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file

M keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c => keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c +8 -10

@@ 77,13 77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif<
\ No newline at end of file

M keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk => keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk +1 -0

@@ 1,1 1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file

M keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c => keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c +5 -9

@@ 60,13 60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
 #endif

A keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk => keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file

M keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c => keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c +8 -10

@@ 79,13 79,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif

M keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk => keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk +1 -0

@@ 1,1 1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file

M keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c => keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c +6 -10

@@ 60,13 60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+#endif<
\ No newline at end of file

A keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk => keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file

M keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c => keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c +5 -9

@@ 60,13 60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+    [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
 #endif

A keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk => keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes<
\ No newline at end of file