summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-13 00:45:05 +0000
committerQMK Bot <hello@qmk.fm>2022-08-13 00:45:05 +0000
commit06c7614a71ce19772f4cee58ff45ea8a41c0e024 (patch)
treeda74e9678b26e2233d7f694a38dcec697538c70b /keyboards
parent06391314cd6ed1cc8e3d8391bc06787d61ed7fbd (diff)
parentea2ec5835b0b9f9f93f0fbee079b1852c4aae4c2 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/mechlovin/adelais/keymaps/default/keymap.c82
-rw-r--r--keyboards/mechlovin/adelais/keymaps/via/keymap.c82
2 files changed, 82 insertions, 82 deletions
diff --git a/keyboards/mechlovin/adelais/keymaps/default/keymap.c b/keyboards/mechlovin/adelais/keymaps/default/keymap.c
index 3a33b59d1c..716a10affa 100644
--- a/keyboards/mechlovin/adelais/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/default/keymap.c
@@ -51,15 +51,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else {
tap_code(KC_VOLU);
}
- }
- else if (index == 1) {
+ } else if (index == 1) {
if (clockwise) {
tap_code(KC_LEFT);
} else {
tap_code(KC_RGHT);
}
- }
- else if (index == 2) {
+ } else if (index == 2) {
if (clockwise) {
tap_code(KC_UP);
} else {
@@ -69,44 +67,46 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return true;
}
- #endif
+#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (record->event.pressed) {
- switch(keycode) {
- case KC_F13: // toggle rgb matrix
- rgb_matrix_toggle();
- return false;
- case KC_F14:
- rgb_matrix_step();
- return false;
- case KC_F15:
- rgb_matrix_increase_speed();
- return false;
- case KC_F16:
- rgb_matrix_decrease_speed();
- return false;
- case KC_F17:
- rgb_matrix_increase_hue();
- return false;
- case KC_F18:
- rgb_matrix_decrease_hue();
- return false;
- case KC_F19:
- rgb_matrix_increase_sat();
- return false;
- case KC_F20:
- rgb_matrix_decrease_sat();
- return false;
- case KC_F21:
- rgb_matrix_increase_val();
- return false;
- case KC_F22:
- rgb_matrix_decrease_val();
- return false;
- default:
- break;
+ if (record->event.pressed) {
+ switch (keycode) {
+#ifdef RGB_MATRIX_ENABLE
+ case KC_F13: // toggle rgb matrix
+ rgb_matrix_toggle();
+ return false;
+ case KC_F14:
+ rgb_matrix_step();
+ return false;
+ case KC_F15:
+ rgb_matrix_increase_speed();
+ return false;
+ case KC_F16:
+ rgb_matrix_decrease_speed();
+ return false;
+ case KC_F17:
+ rgb_matrix_increase_hue();
+ return false;
+ case KC_F18:
+ rgb_matrix_decrease_hue();
+ return false;
+ case KC_F19:
+ rgb_matrix_increase_sat();
+ return false;
+ case KC_F20:
+ rgb_matrix_decrease_sat();
+ return false;
+ case KC_F21:
+ rgb_matrix_increase_val();
+ return false;
+ case KC_F22:
+ rgb_matrix_decrease_val();
+ return false;
+#endif
+ default:
+ break;
+ }
}
- }
- return true;
+ return true;
}
diff --git a/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
index e9ed9b6a36..f38d7b2e57 100644
--- a/keyboards/mechlovin/adelais/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/adelais/keymaps/via/keymap.c
@@ -65,15 +65,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else {
tap_code(KC_VOLU);
}
- }
- else if (index == 1) {
+ } else if (index == 1) {
if (clockwise) {
tap_code(KC_LEFT);
} else {
tap_code(KC_RGHT);
}
- }
- else if (index == 2) {
+ } else if (index == 2) {
if (clockwise) {
tap_code(KC_UP);
} else {
@@ -83,44 +81,46 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
return true;
}
- #endif
+#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (record->event.pressed) {
- switch(keycode) {
- case BL_TOG: // toggle rgb matrix
- rgb_matrix_toggle();
- return false;
- case BL_EFFECT:
- rgb_matrix_step();
- return false;
- case BL_ISPD:
- rgb_matrix_increase_speed();
- return false;
- case BL_DSPD:
- rgb_matrix_decrease_speed();
- return false;
- case BL_IHUE:
- rgb_matrix_increase_hue();
- return false;
- case BL_DHUE:
- rgb_matrix_decrease_hue();
- return false;
- case BL_ISAT:
- rgb_matrix_increase_sat();
- return false;
- case BL_DSAT:
- rgb_matrix_decrease_sat();
- return false;
- case BL_IVAL:
- rgb_matrix_increase_val();
- return false;
- case BL_DVAL:
- rgb_matrix_decrease_val();
- return false;
- default:
- break;
+ if (record->event.pressed) {
+ switch (keycode) {
+#ifdef RGB_MATRIX_ENABLE
+ case BL_TOG: // toggle rgb matrix
+ rgb_matrix_toggle();
+ return false;
+ case BL_EFFECT:
+ rgb_matrix_step();
+ return false;
+ case BL_ISPD:
+ rgb_matrix_increase_speed();
+ return false;
+ case BL_DSPD:
+ rgb_matrix_decrease_speed();
+ return false;
+ case BL_IHUE:
+ rgb_matrix_increase_hue();
+ return false;
+ case BL_DHUE:
+ rgb_matrix_decrease_hue();
+ return false;
+ case BL_ISAT:
+ rgb_matrix_increase_sat();
+ return false;
+ case BL_DSAT:
+ rgb_matrix_decrease_sat();
+ return false;
+ case BL_IVAL:
+ rgb_matrix_increase_val();
+ return false;
+ case BL_DVAL:
+ rgb_matrix_decrease_val();
+ return false;
+#endif
+ default:
+ break;
+ }
}
- }
- return true;
+ return true;
}