~ruther/qmk_firmware

e798c02d82d97e2beca5f89f609c53c9dcde48c8 — QMK Bot 2 years ago 1429556 + 281541f
Merge remote-tracking branch 'origin/master' into develop
M keyboards/chosfox/cf81/keymaps/default/keymap.c => keyboards/chosfox/cf81/keymaps/default/keymap.c +1 -1
@@ 61,7 61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
    [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },

M keyboards/chosfox/cf81/keymaps/via/keymap.c => keyboards/chosfox/cf81/keymaps/via/keymap.c +1 -1
@@ 61,7 61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
    [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },