~ruther/qmk_firmware

49e0d2ea03bda1c05f24f0c7558b589db8ade20a — QMK Bot 3 years ago 0b2c506 + 04cf161
Merge remote-tracking branch 'origin/master' into develop
M keyboards/maxr1998/pulse4k/keymaps/default/keymap.c => keyboards/maxr1998/pulse4k/keymaps/default/keymap.c +4 -4
@@ 24,8 24,8 @@ enum layers {
const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [DEFAULT] = {
        { KC_END,  KC_UP,   KC_MUTE },
        { KC_LEFT, KC_DOWN, KC_RGHT }
    }
    [DEFAULT] = LAYOUT(
        KC_END,  KC_UP,   KC_MUTE,
        KC_LEFT, KC_DOWN, KC_RGHT
    )
};

M keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c => keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c +4 -4
@@ 24,10 24,10 @@ enum layers {
const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [DEFAULT] = {
        { KC_F20, KC_F21, KC_MUTE },
        { KC_F22, KC_F23, KC_F24  }
    }
    [DEFAULT] = LAYOUT(
        KC_F20,  KC_F21,  KC_MUTE,
        KC_F22,  KC_F23,  KC_F24
    )
};

void encoder_one_update(bool clockwise) {