diff options
Diffstat (limited to 'keyboards/iris/keymaps/drashna/keymap.c')
| -rw-r--r-- | keyboards/iris/keymaps/drashna/keymap.c | 108 |
1 files changed, 17 insertions, 91 deletions
diff --git a/keyboards/iris/keymaps/drashna/keymap.c b/keyboards/iris/keymaps/drashna/keymap.c index b24e5fe53..bc3cd38ad 100644 --- a/keyboards/iris/keymaps/drashna/keymap.c +++ b/keyboards/iris/keymaps/drashna/keymap.c @@ -2,15 +2,6 @@ #include QMK_KEYBOARD_H #include "drashna.h" -#ifdef INDICATOR_LIGHTS -extern userspace_config_t userspace_config; - -uint8_t last_mod; -uint8_t last_led; -uint8_t last_osm; -bool has_mods_changed = false; -#endif - #define KC_ALAP ALT_T(KC_APP) #define KC_OSLG OSM(MOD_LGUI) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -55,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_wrapper( _______, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______ @@ -63,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_wrapper( _______, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______, _______, _______, _______, _______ @@ -71,93 +62,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_wrapper( KC_MAKE, _______, _______, _______, _______, _______, KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5, KC_RST, - VRSN, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, _______, _______, _______, _______, _______, EPRM, - _______, _______, CK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_QWERTY, KC_COLEMAK, KC_DVORAK, KC_WORKMAN, _______, - TG(_MODS),RGB_SMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T,_______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, + VRSN, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, KC_NUKE, _______, _______, _______, _______, EPRM, + _______, _______, CK_TOGG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN, TG(_MODS), + _______, RGB_SMOD,RGB_HUD, RGB_SAD, RGB_VAD, KC_RGB_T,_______, _______, MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, _______, _______, _______, _______, _______, _______ ) }; -void matrix_init_keymap(void) { +bool indicator_is_this_led_used(uint8_t index) { + switch (index) { #ifdef INDICATOR_LIGHTS - last_mod = get_mods(); - last_led = host_keyboard_leds(); - last_osm =get_oneshot_mods(); + case SHFT_LED1: + case SHFT_LED2: + case CTRL_LED1: + case CTRL_LED2: + case GUI_LED1: + case GUI_LED2: + return true; + break; #endif -} - -uint32_t layer_state_set_keymap (uint32_t state) { -#ifdef INDICATOR_LIGHTS - uint8_t modifiders = get_mods(); - uint8_t led_usb_state = host_keyboard_leds(); - uint8_t one_shot = get_oneshot_mods(); - - - if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) { - rgblight_sethsv_at(0, 255, 255, 5); - rgblight_sethsv_at(0, 255, 255, 10); - } - if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) { - rgblight_sethsv_at(51, 255, 255, 6); - rgblight_sethsv_at(51, 255, 255, 9); - } - if (modifiders & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) { - rgblight_sethsv_at(120, 255, 255, 7); - rgblight_sethsv_at(120, 255, 255, 8); + default: + return false; } -#endif - - return state; -} - - -void matrix_scan_keymap (void) { - -#ifdef INDICATOR_LIGHTS - uint8_t current_mod = get_mods(); - uint8_t current_led = host_keyboard_leds(); - uint8_t current_osm =get_oneshot_mods(); - - if (last_mod == current_mod) { - last_mod = current_mod; - has_mods_changed = true; - } - if (last_led == current_led) { - last_led = current_led; - has_mods_changed = true; - } - if (last_osm == current_osm) { - last_osm = current_osm; - has_mods_changed = true; - } - - - if (userspace_config.rgb_layer_change && has_mods_changed && biton32(layer_state) == 0) { - if (current_mod & MODS_SHIFT_MASK || current_led & (1<<USB_LED_CAPS_LOCK) || current_osm & MODS_SHIFT_MASK) { - rgblight_sethsv_at(0, 255, 255, 5); - rgblight_sethsv_at(0, 255, 255, 10); - } else { - rgblight_sethsv_default_helper(5); - rgblight_sethsv_default_helper(10); - } - if (current_mod & MODS_CTRL_MASK || current_osm & MODS_CTRL_MASK) { - rgblight_sethsv_at(51, 255, 255, 6); - rgblight_sethsv_at(51, 255, 255, 9); - } else { - rgblight_sethsv_default_helper(6); - rgblight_sethsv_default_helper(9); - } - if (current_mod & MODS_GUI_MASK || current_osm & MODS_GUI_MASK) { - rgblight_sethsv_at(120, 255, 255, 7); - rgblight_sethsv_at(120, 255, 255, 8); - } else { - rgblight_sethsv_default_helper(7); - rgblight_sethsv_default_helper(8); - - } - } -#endif - } |