david
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
miryoku-merge-master
fauxpark 3 years ago
parent 49030e3e5b fe6f707a85
commit 4d0177cd2a
12 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File

7
keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev1/ansi/keymaps/default/rules.mk
Unescape Escape View File

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

9
keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
Unescape Escape View File

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

7
keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev1/iso/keymaps/default/rules.mk
Unescape Escape View File

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

9
keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
Unescape Escape View File

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

16
keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk
Unescape Escape View File

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

14
keyboards/gmmk/pro/rev2/iso/keymaps/default/keymap.c
Unescape Escape View File

@ -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

1
keyboards/gmmk/pro/rev2/iso/keymaps/default/rules.mk
Unescape Escape View File

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
Write Preview
Loading…
Cancel
Save