diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-13 08:57:24 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-13 08:57:24 +0000 |
| commit | 49e0d2ea03bda1c05f24f0c7558b589db8ade20a (patch) | |
| tree | 7ce476422e93e6332f1c94ba4c18a1676d78abf6 | |
| parent | 0b2c506f6699c9db23a0db9aeb723982a818771f (diff) | |
| parent | 04cf161aa01fd433b5dae69d9fd31569ed5dca59 (diff) | |
| download | qmk_firmware-49e0d2ea03bda1c05f24f0c7558b589db8ade20a.tar.gz qmk_firmware-49e0d2ea03bda1c05f24f0c7558b589db8ade20a.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/maxr1998/pulse4k/keymaps/default/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c index e33dcad21..1ed4b5f1a 100644 --- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c +++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c | |||
| @@ -24,8 +24,8 @@ enum layers { | |||
| 24 | const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END}; | 24 | const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END}; |
| 25 | 25 | ||
| 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 27 | [DEFAULT] = { | 27 | [DEFAULT] = LAYOUT( |
| 28 | { KC_END, KC_UP, KC_MUTE }, | 28 | KC_END, KC_UP, KC_MUTE, |
| 29 | { KC_LEFT, KC_DOWN, KC_RGHT } | 29 | KC_LEFT, KC_DOWN, KC_RGHT |
| 30 | } | 30 | ) |
| 31 | }; | 31 | }; |
diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c index 4ef977901..9eec3f0ae 100644 --- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c +++ b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c | |||
| @@ -24,10 +24,10 @@ enum layers { | |||
| 24 | const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END}; | 24 | const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END}; |
| 25 | 25 | ||
| 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 27 | [DEFAULT] = { | 27 | [DEFAULT] = LAYOUT( |
| 28 | { KC_F20, KC_F21, KC_MUTE }, | 28 | KC_F20, KC_F21, KC_MUTE, |
| 29 | { KC_F22, KC_F23, KC_F24 } | 29 | KC_F22, KC_F23, KC_F24 |
| 30 | } | 30 | ) |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | void encoder_one_update(bool clockwise) { | 33 | void encoder_one_update(bool clockwise) { |