diff options
| author | QMK Bot <hello@qmk.fm> | 2022-01-29 14:28:24 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-01-29 14:28:24 +0000 |
| commit | d0faaa9c7c9cd623d0c996a45c7a26dd08330874 (patch) | |
| tree | 8df0ac0bc597eb5c68860d7a4854556de21c4ff1 /keyboards | |
| parent | b79b8dcdd036c1ad727985f088be1a03c5642be2 (diff) | |
| parent | cc6017517d466ed2f7f409adda3066bc00930d44 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/planck/planck.c | 20 | ||||
| -rw-r--r-- | keyboards/preonic/preonic.c | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c index a17036fcf1..e9bd90bdfe 100644 --- a/keyboards/planck/planck.c +++ b/keyboards/planck/planck.c @@ -27,3 +27,23 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_planck_grid( 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ); + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (get_highest_layer(layer_state) > 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } + return true; +} +#endif diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c index 16c99d9a80..2b56805202 100644 --- a/keyboards/preonic/preonic.c +++ b/keyboards/preonic/preonic.c @@ -7,3 +7,23 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid( 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ); + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (get_highest_layer(layer_state) > 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } + return true; +} +#endif |