g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-08-13 00:45:05 +00:00
parent 06391314cd ea2ec5835b
commit 06c7614a71
2 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keyboards/mechlovin/adelais/keymaps/default/keymap.c
View File

@ -51,15 +51,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else { } else {
tap_code(KC_VOLU); tap_code(KC_VOLU);
} }
} } else if (index == 1) {
else if (index == 1) {
if (clockwise) { if (clockwise) {
tap_code(KC_LEFT); tap_code(KC_LEFT);
} else { } else {
tap_code(KC_RGHT); tap_code(KC_RGHT);
} }
} } else if (index == 2) {
else if (index == 2) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
@ -69,11 +67,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return true; return true;
} }
#endif #endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
switch(keycode) { switch (keycode) {
#ifdef RGB_MATRIX_ENABLE
case KC_F13: // toggle rgb matrix case KC_F13: // toggle rgb matrix
rgb_matrix_toggle(); rgb_matrix_toggle();
return false; return false;
@ -104,6 +103,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case KC_F22: case KC_F22:
rgb_matrix_decrease_val(); rgb_matrix_decrease_val();
return false; return false;
#endif
default: default:
break; break;
} }

12
keyboards/mechlovin/adelais/keymaps/via/keymap.c
View File

@ -65,15 +65,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else { } else {
tap_code(KC_VOLU); tap_code(KC_VOLU);
} }
} } else if (index == 1) {
else if (index == 1) {
if (clockwise) { if (clockwise) {
tap_code(KC_LEFT); tap_code(KC_LEFT);
} else { } else {
tap_code(KC_RGHT); tap_code(KC_RGHT);
} }
} } else if (index == 2) {
else if (index == 2) {
if (clockwise) { if (clockwise) {
tap_code(KC_UP); tap_code(KC_UP);
} else { } else {
@ -83,11 +81,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return true; return true;
} }
#endif #endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
switch(keycode) { switch (keycode) {
#ifdef RGB_MATRIX_ENABLE
case BL_TOG: // toggle rgb matrix case BL_TOG: // toggle rgb matrix
rgb_matrix_toggle(); rgb_matrix_toggle();
return false; return false;
@ -118,6 +117,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case BL_DVAL: case BL_DVAL:
rgb_matrix_decrease_val(); rgb_matrix_decrease_val();
return false; return false;
#endif
default: default:
break; break;
} }