Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8f78be076d
2 changed files with 18 additions and 18 deletions
|
@ -46,9 +46,9 @@ KC_TRNS, RGB_SAD, RGB_M_P, RGB_MOD, RGB_SPD,
|
||||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||||
if (index == 0) { /* First encoder */
|
if (index == 0) { /* First encoder */
|
||||||
if (clockwise) {
|
if (clockwise) {
|
||||||
tap_code(KC_VOLD);
|
|
||||||
} else {
|
|
||||||
tap_code(KC_VOLU);
|
tap_code(KC_VOLU);
|
||||||
|
} else {
|
||||||
|
tap_code(KC_VOLD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -64,7 +64,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
|
||||||
case SQUASHKB:
|
case SQUASHKB:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
SEND_STRING("http://squashkb.com");
|
SEND_STRING("https://squashkb.com");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,21 +43,21 @@ KC_TRNS, RGB_SAD, RGB_M_P, RGB_MOD, RGB_SPD,
|
||||||
),
|
),
|
||||||
|
|
||||||
[2] = LAYOUT(
|
[2] = LAYOUT(
|
||||||
_______,
|
KC_TRNS,
|
||||||
_______,
|
KC_TRNS,
|
||||||
_______, _______, _______, _______,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
_______, _______, _______, _______, _______,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
_______, _______,
|
KC_TRNS, KC_TRNS,
|
||||||
_______
|
KC_TRNS
|
||||||
),
|
),
|
||||||
|
|
||||||
[3] = LAYOUT(
|
[3] = LAYOUT(
|
||||||
_______,
|
KC_TRNS,
|
||||||
_______,
|
KC_TRNS,
|
||||||
_______, _______, _______, _______,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
_______, _______, _______, _______, _______,
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
_______, _______,
|
KC_TRNS, KC_TRNS,
|
||||||
_______
|
KC_TRNS
|
||||||
),
|
),
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -65,9 +65,9 @@ _______, _______, _______, _______, _______,
|
||||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||||
if (index == 0) { /* First encoder */
|
if (index == 0) { /* First encoder */
|
||||||
if (clockwise) {
|
if (clockwise) {
|
||||||
tap_code(KC_VOLD);
|
|
||||||
} else {
|
|
||||||
tap_code(KC_VOLU);
|
tap_code(KC_VOLU);
|
||||||
|
} else {
|
||||||
|
tap_code(KC_VOLD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -83,7 +83,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
|
||||||
case SQUASHKB:
|
case SQUASHKB:
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
SEND_STRING("http://squashkb.com");
|
SEND_STRING("https://squashkb.com");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue