diff options
| author | QMK Bot <hello@qmk.fm> | 2023-08-30 00:24:50 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-08-30 00:24:50 +0000 |
| commit | d78c0007ba2f81cd6e2136326d88fb25351554f8 (patch) | |
| tree | 2c63e27e6c9cae7f9e6039e22e85fa59407d90d6 | |
| parent | e798c02d82d97e2beca5f89f609c53c9dcde48c8 (diff) | |
| parent | fbb61c3b1d4141d244049be25eeb5675d2c59428 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/macro1/keymaps/default/keymap.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/macro1/keymaps/default/keymap.c index 22cff4a718..047ea69808 100644 --- a/keyboards/macro1/keymaps/default/keymap.c +++ b/keyboards/macro1/keymaps/default/keymap.c @@ -41,24 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, - KC_KP_0, KC_KP_DOT), - - [1] = LAYOUT_numpad( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS), - - [2] = LAYOUT_numpad( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS), }; - - + KC_KP_0, KC_KP_DOT) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} +}; +#endif |