Merge remote-tracking branch 'upstream/master' into develop

keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c

@@ -59,3 +59,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
+
+#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

keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c

@@ -76,3 +76,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
+
+#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

keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk

@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c

@@ -59,3 +59,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
+
+#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

keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c

@@ -78,3 +78,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
+
+#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

keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk

@@ -1 +1,2 @@
 VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes

keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c

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

keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c

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

keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes