~ruther/qmk_firmware

7c4a0125095bb78bfa322c599cdddfd3704acf17 — QMK Bot 2 years ago c9d66be + ca2f9e4 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
10 files changed, 46 insertions(+), 80 deletions(-)

M keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
A keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk
M keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
M keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
M keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
A keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk
M keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
M keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
M keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
A keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk

M keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c => keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c +8 -0
@@ 67,6 67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
};
#endif

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {


A keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk => keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk +1 -0
@@ 0,0 1,1 @@
ENCODER_MAP_ENABLE = yes
\ No newline at end of file


M keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c => keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c +6 -39
@@ 67,46 67,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
};

#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)

#define ENCODERS 1
static uint8_t  encoder_state[ENCODERS] = {0};
static keypos_t encoder_cw[ENCODERS]    = {{ 8, 5 }};
static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 5 }};

void encoder_action_unregister(void) {
    for (int index = 0; index < ENCODERS; ++index) {
        if (encoder_state[index]) {
            keyevent_t encoder_event = (keyevent_t) {
                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                .pressed = false,
                .time = (timer_read() | 1)
            };
            encoder_state[index] = 0;
            action_exec(encoder_event);
        }
    }
}

void encoder_action_register(uint8_t index, bool clockwise) {
    keyevent_t encoder_event = (keyevent_t) {
        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
        .pressed = true,
        .time = (timer_read() | 1)
    };
    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
    action_exec(encoder_event);
}

void matrix_scan_user(void) {
    encoder_action_unregister();
}

bool encoder_update_user(uint8_t index, bool clockwise) {
    encoder_action_register(index, clockwise);
    return false;
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
};

#endif

bool process_record_user(uint16_t keycode, keyrecord_t *record) {


M keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk => keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk +1 -1
@@ 1,2 1,2 @@
VIA_ENABLE = yes
MOUSEKEY_ENABLE = no
\ No newline at end of file
ENCODER_MAP_ENABLE = yes
\ No newline at end of file


M keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c => keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c +10 -0
@@ 72,6 72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS)
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {
        case KC_MISSION_CONTROL:


A keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk => keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk +1 -0
@@ 0,0 1,1 @@
ENCODER_MAP_ENABLE = yes
\ No newline at end of file


M keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c => keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c +7 -39
@@ 72,46 72,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};

#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)

#define ENCODERS 1
static uint8_t  encoder_state[ENCODERS] = {0};
static keypos_t encoder_cw[ENCODERS]    = {{ 8, 4 }};
static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 4 }};

void encoder_action_register(uint8_t index, bool clockwise) {
    keyevent_t encoder_event = (keyevent_t) {
        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
        .pressed = true,
        .time = (timer_read() | 1)
    };
    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
    action_exec(encoder_event);
}

void encoder_action_unregister(void) {
    for (int index = 0; index < ENCODERS; ++index) {
        if (encoder_state[index]) {
            keyevent_t encoder_event = (keyevent_t) {
                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
                .pressed = false,
                .time = (timer_read() | 1)
            };
            encoder_state[index] = 0;
            action_exec(encoder_event);
        }
    }
}

void matrix_scan_user(void) {
    encoder_action_unregister();
}

bool encoder_update_user(uint8_t index, bool clockwise) {
    encoder_action_register(index, clockwise);
    return false;
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};

#endif

bool process_record_user(uint16_t keycode, keyrecord_t *record) {


M keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk => keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk +1 -1
@@ 1,2 1,2 @@
VIA_ENABLE = yes
MOUSEKEY_ENABLE = no
\ No newline at end of file
ENCODER_MAP_ENABLE = yes
\ No newline at end of file


M keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c => keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c +10 -0
@@ 72,6 72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
    [_FN1]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN2]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
    [_FN3]     = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch (keycode) {
        case KC_MISSION_CONTROL:


A keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk => keyboards/keychron/q2/rev_0113/keymaps/default/rules.mk +1 -0
@@ 0,0 1,1 @@
ENCODER_MAP_ENABLE = yes
\ No newline at end of file