1
0
Fork 0

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-07-01 07:13:28 +00:00
commit 2b7172cbff
5 changed files with 11 additions and 7 deletions

View file

@ -52,7 +52,7 @@
{"x":11.75, "y":3}
]
},
"LAYOUT_2u_split": {
"LAYOUT_2u_space": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
@ -101,7 +101,7 @@
{"x":11.75, "y":3}
]
},
"LAYOUT_2u1u_split": {
"LAYOUT_2u1u_space": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
@ -150,7 +150,7 @@
{"x":11.75, "y":3}
]
},
"LAYOUT_3u_split": {
"LAYOUT_3u_space": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},

View file

@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// Rotary Encoder Functions
void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLD);
@ -56,4 +56,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_VOLU);
}
}
return true;
}

View file

@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// Rotary Encoder Functions
void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLD);
@ -56,4 +56,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_VOLU);
}
}
return true;
}

View file

@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// Rotary Encoder Functions
void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLD);
@ -64,4 +64,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_VOLU);
}
}
return true;
}

View file

@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Rotary Encoder Functions
void encoder_update_user(uint8_t index, bool clockwise) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLD);
@ -58,4 +58,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
tap_code(KC_VOLU);
}
}
return true;
}