diff --git a/keyboards/cheapino/cheapino.c b/keyboards/cheapino/cheapino.c index cfc4592bf4..9da277d17c 100644 --- a/keyboards/cheapino/cheapino.c +++ b/keyboards/cheapino/cheapino.c @@ -73,3 +73,16 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } */ +void caps_word_set_user(bool active) { + + static uint8_t hue = 0, saturation = 0, value = 0; + + if (active) { + hue = rgblight_get_hue(); + saturation = rgblight_get_sat(); + value = rgblight_get_val(); + rgblight_sethsv(21, 255, 10); + } else { + rgblight_sethsv(hue, saturation, value); + } +} diff --git a/keyboards/cheapino/encoder.c b/keyboards/cheapino/encoder.c index d793797b8f..ad0ab09b0c 100644 --- a/keyboards/cheapino/encoder.c +++ b/keyboards/cheapino/encoder.c @@ -16,14 +16,14 @@ void clicked(void) { } void turned(bool clockwise) { - if (IS_LAYER_ON(6)) { + if (IS_LAYER_ON(6)) { // media (volume control) tap_code(clockwise ? KC_VOLU : KC_VOLD); - } else if (IS_LAYER_ON(3)) { - tap_code16(clockwise ? LCTL(KC_TAB) : LCTL(LSFT(KC_TAB))); - } else if (IS_LAYER_ON(5)) { - tap_code16(clockwise ? LGUI(KC_Y) : LGUI(KC_Z)); - } else { + } else if (IS_LAYER_ON(4)) { // navigation (page up and down) tap_code16(clockwise ? KC_PGDN : KC_PGUP); + } else if (IS_LAYER_ON(5)) { // mouse (switch windows in current application) + tap_code16(clockwise ? LGUI(KC_GRV) : LGUI(LSFT(KC_GRV))); + } else { // Default (tab search) + tap_code16(clockwise ? KC_TAB : LSFT(KC_TAB)); } } diff --git a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h index dea06bb690..8074c9301a 100644 --- a/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h +++ b/users/manna-harbour_miryoku/miryoku_babel/miryoku_layer_alternatives.h @@ -90,13 +90,13 @@ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC), LT(U KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ -U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT), LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL), U_NP, U_NP +U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_BSPC), LT(U_MOUSE,KC_DEL),LT(U_SYM,KC_ENT), LT(U_NUM,KC_SPC), LT(U_FUN,KC_TAB), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \ KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_K, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ -U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT), LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL), U_NP, U_NP +U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_BSPC), LT(U_MOUSE,KC_DEL),LT(U_SYM,KC_ENT), LT(U_NUM,KC_SPC), LT(U_FUN,KC_TAB), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_DVORAK \ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, \ @@ -120,7 +120,7 @@ U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC), LT(U KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), \ LT(U_BUTTON,KC_Z), ALGR_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, ALGR_T(KC_DOT), LT(U_BUTTON,KC_SLSH),\ -U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_SPC), LT(U_MOUSE,KC_TAB),LT(U_SYM,KC_ENT), LT(U_NUM,KC_BSPC), LT(U_FUN,KC_DEL), U_NP, U_NP +U_NP, U_NP, LT(U_MEDIA,KC_ESC),LT(U_NAV,KC_BSPC), LT(U_MOUSE,KC_DEL),LT(U_SYM,KC_ENT), LT(U_NUM,KC_SPC), LT(U_FUN,KC_TAB), U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BASE_QWERTZ \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, \ @@ -211,7 +211,7 @@ U_NP, U_NP, KC_ESC, KC_SPC, KC_T KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, \ -U_NP, U_NP, KC_ESC, KC_SPC, KC_TAB, KC_ENT, KC_BSPC, KC_DEL, U_NP, U_NP +U_NP, U_NP, KC_ESC, KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_TAB, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_TAP_COLEMAKDHK \ KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ @@ -272,7 +272,7 @@ U_NP, U_NP, U_NA, U_NA, U_NA TD(U_TD_BOOT), TD(U_TD_U_TAP), TD(U_TD_U_EXTRA), TD(U_TD_U_BASE), U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, CW_TOGG, \ U_NA, KC_ALGR, TD(U_TD_U_NUM), TD(U_TD_U_NAV), U_NA, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, \ -U_NP, U_NP, U_NA, U_NA, U_NA, KC_ENT, KC_BSPC, KC_DEL, U_NP, U_NP +U_NP, U_NP, U_NA, U_NA, U_NA, KC_ENT, KC_SPC, KC_TAB, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_NAV \ TD(U_TD_BOOT), TD(U_TD_U_TAP), TD(U_TD_U_EXTRA), TD(U_TD_U_BASE), U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \ @@ -379,7 +379,7 @@ U_NP, U_NP, U_NA, U_NA, U_NA KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, U_NA, TD(U_TD_U_BASE), TD(U_TD_U_EXTRA), TD(U_TD_U_TAP), TD(U_TD_BOOT), \ KC_F11, KC_F4, KC_F5, KC_F6, KC_SCRL, U_NA, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, \ KC_F10, KC_F1, KC_F2, KC_F3, KC_PAUS, U_NA, TD(U_TD_U_FUN), TD(U_TD_U_MEDIA), KC_ALGR, U_NA, \ -U_NP, U_NP, KC_APP, KC_SPC, KC_TAB, U_NA, U_NA, U_NA, U_NP, U_NP +U_NP, U_NP, KC_APP, KC_BSPC, KC_DEL, U_NA, U_NA, U_NA, U_NP, U_NP #define MIRYOKU_ALTERNATIVES_BUTTON \