~ruther/qmk_firmware

8b919aa5d61ccfa4cf3d79d271a615d27374f760 — QMK Bot 4 years ago 3f813f8 + de8939a
Merge remote-tracking branch 'origin/master' into develop
M keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c => keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c +2 -1
@@ 26,10 26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
};

void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
    if (clockwise) {
        tap_code(KC_VOLU);
    } else {
        tap_code(KC_VOLD);
    }
    return true;
}

M keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c => keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c +2 -1
@@ 26,10 26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
};

void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
    if (clockwise) {
        tap_code(KC_VOLU);
    } else {
        tap_code(KC_VOLD);
    }
    return true;
}

M keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c => keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c +2 -1
@@ 28,10 28,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
};

void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
    if (clockwise) {
        tap_code(KC_VOLU);
    } else {
        tap_code(KC_VOLD);
    }
    return true;
}

M keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c => keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c +2 -1
@@ 51,7 51,7 @@ void matrix_scan_user(void) {
    }
}

void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
    if (clockwise) {
        encoder_cw.pressed = true;
        encoder_cw.time = (timer_read() | 1);


@@ 61,4 61,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
        encoder_ccw.time = (timer_read() | 1);
        action_exec(encoder_ccw);
    }
    return true;
}