Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-06-23 03:31:18 +00:00
commit c742d0bde4
2 changed files with 126 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
keyboards/makrosu/keymaps/default/keymap.c
View file

@ -71,26 +71,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case L1: case L1:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_1); set_single_persistent_default_layer(_1);
} }
return false; return false;
break;
case L2: case L2:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_2); set_single_persistent_default_layer(_2);
} }
return false; return false;
break;
case L3: case L3:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_3); set_single_persistent_default_layer(_3);
} }
return false; return false;
break;
} }
return true; return true;
} }
@ -106,28 +98,25 @@ void matrix_init_user(void) {
writePinHigh(IND_3); writePinHigh(IND_3);
} }
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
if (layer_state_is(_1)) { if (layer_state_is(_1)) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
tap_code(KC_DOWN); tap_code(KC_DOWN);
} }
} } else if (layer_state_is(_2)) {
else if (layer_state_is(_2)) {
if (clockwise) { if (clockwise) {
tap_code(KC_RGHT); tap_code(KC_RGHT);
} else { } else {
tap_code(KC_LEFT); tap_code(KC_LEFT);
} }
} } else if (layer_state_is(_3)) {
else if (layer_state_is(_3)) {
if (clockwise) { if (clockwise) {
tap_code(KC_VOLU); tap_code(KC_VOLU);
} else { } else {
tap_code(KC_VOLD); tap_code(KC_VOLD);
} }
} }
return true;
} }

19
keyboards/makrosu/keymaps/via/keymap.c
View file

@ -71,26 +71,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case L1: case L1:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_1); set_single_persistent_default_layer(_1);
} }
return false; return false;
break;
case L2: case L2:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_2); set_single_persistent_default_layer(_2);
} }
return false; return false;
break;
case L3: case L3:
if (record->event.pressed) { if (record->event.pressed) {
set_single_persistent_default_layer(_3); set_single_persistent_default_layer(_3);
} }
return false; return false;
break;
} }
return true; return true;
} }
@ -106,28 +98,25 @@ void matrix_init_user(void) {
writePinHigh(IND_3); writePinHigh(IND_3);
} }
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
if (layer_state_is(_1)) { if (layer_state_is(_1)) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
tap_code(KC_DOWN); tap_code(KC_DOWN);
} }
} } else if (layer_state_is(_2)) {
else if (layer_state_is(_2)) {
if (clockwise) { if (clockwise) {
tap_code(KC_RGHT); tap_code(KC_RGHT);
} else { } else {
tap_code(KC_LEFT); tap_code(KC_LEFT);
} }
} } else if (layer_state_is(_3)) {
else if (layer_state_is(_3)) {
if (clockwise) { if (clockwise) {
tap_code(KC_VOLU); tap_code(KC_VOLU);
} else { } else {
tap_code(KC_VOLD); tap_code(KC_VOLD);
} }
} }
return true;
} }