diff options
author | Alexander Kagno <cwre@protonmail.com> | 2019-03-18 17:31:09 +0000 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-03-18 10:31:09 -0700 |
commit | d7b381128e503a57315261841c66c13d3ab5be25 (patch) | |
tree | 88acb74a360b9b4cb9e99d5d2742c6d82b56b8be /users/arkag | |
parent | 221ac2eabbc73c9d59583c6d78c779bbfec0d7bc (diff) |
[Keymap] Arkag Userspace Update (#5438)
* fresh commit for a new fork for PR to upstream/master
* gaming mode added, lighting changes for other modes
* rules.mk fixed...
* fixed collision issue with aesthetic and shifty modes
* fixed collision issue with aesthetic and shifty modes
* troubleshooting game mode failing
* moved game tapdance key to default layer, fixed issue
Diffstat (limited to 'users/arkag')
-rw-r--r-- | users/arkag/arkag.c | 42 | ||||
-rw-r--r-- | users/arkag/arkag.h | 4 |
2 files changed, 36 insertions, 10 deletions
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c index 80f7b1bbc1..9e8c7af247 100644 --- a/users/arkag/arkag.c +++ b/users/arkag/arkag.c @@ -121,7 +121,7 @@ void check_state (void) { case sleeping: if (!slept) { - rgblight_mode_noeeprom(2); + rgblight_mode_noeeprom(5); slept = true; activated = false; deactivated = false; @@ -359,6 +359,26 @@ void dance_cbrck (qk_tap_dance_state_t *state, void *user_data) { } } +void dance_game (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 1) { + + } else if (state->count == 2) { + + } else if (state->count == 3) { + uint8_t layer = biton32(layer_state); + if (layer == _QWERTY) { + layer_off(_QWERTY); + layer_on(_GAMING); + // swirling rgb + rgblight_mode_noeeprom(12); + } else { + layer_off(_GAMING); + layer_on(_QWERTY); + rgblight_mode_noeeprom(1); + } + } +} + void matrix_init_user(void) { current_os = eeprom_read_byte(EECONFIG_USERSPACE); set_os(current_os, false); @@ -379,6 +399,7 @@ void matrix_scan_user(void) { if (current_os == OS_WIN) { long_keystroke(2, (uint16_t[]){KC_LGUI, KC_PAUSE}); } else { + return; } } SEQ_TWO_KEYS(KC_LSFT, M_PMOD) { @@ -442,7 +463,7 @@ void matrix_scan_user(void) { // end format functions // start fancy functions - SEQ_THREE_KEYS(KC_C, KC_C, KC_C) { + SEQ_THREE_KEYS(KC_C, KC_C, KC_ENT) { surround_type(6, KC_GRAVE, false); pri_mod(true); tap_code(KC_V); @@ -564,30 +585,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if(record->event.pressed){ if (aesthetic) { aesthetic = false; - num_extra_flashes_off = 1; + rgblight_mode_noeeprom(1); } else { aesthetic = true; + shifty = false; + // snake mode + rgblight_mode_noeeprom(20); } - flash_color = underglow; - flash_state = flash_off; return false; } - case M_SFT: if(record->event.pressed){ if (shifty) { shifty = false; - num_extra_flashes_off = 1; + rgblight_mode_noeeprom(1); } else { shifty = true; + aesthetic = false; + // knight mode + rgblight_mode_noeeprom(23); } - flash_color = underglow; - flash_state = flash_off; return false; } - default: if (record->event.pressed) { state = active; @@ -605,4 +626,5 @@ qk_tap_dance_action_t tap_dance_actions[] = { [TD_BRCK_PARN_O] = ACTION_TAP_DANCE_FN (dance_obrck), [TD_BRCK_PARN_C] = ACTION_TAP_DANCE_FN (dance_cbrck), [TD_LALT_RALT] = ACTION_TAP_DANCE_DOUBLE (KC_LALT, KC_RALT), + [TD_GAME] = ACTION_TAP_DANCE_FN (dance_game), }; diff --git a/users/arkag/arkag.h b/users/arkag/arkag.h index a5f2a6a352..fdc4a5fee6 100644 --- a/users/arkag/arkag.h +++ b/users/arkag/arkag.h @@ -14,6 +14,7 @@ #define STRIKE TD(TD_STRK_SHOT) #define HYPHEN TD(TD_HYPH_UNDR) #define CEDILLA TD(TD_C_CED) +#define GAME TD(TD_GAME) #define RAISE MO(1) #define LOWER MO(2) @@ -40,6 +41,7 @@ enum { _MEDIA, _FUNCT, _KEEB, + _GAMING, }; typedef enum { @@ -92,6 +94,7 @@ enum tapdances { TD_BRCK_PARN_O, TD_BRCK_PARN_C, TD_LALT_RALT, + TD_GAME, }; void velocikey_accelerate(void); @@ -129,6 +132,7 @@ void dance_quot (qk_tap_dance_state_t *state, void *user_data); void dance_strk (qk_tap_dance_state_t *state, void *user_data); void dance_3 (qk_tap_dance_state_t *state, void *user_data); void dance_c (qk_tap_dance_state_t *state, void *user_data); +void dance_game (qk_tap_dance_state_t *state, void *user_data); int cur_dance (qk_tap_dance_state_t *state); void spc_finished (qk_tap_dance_state_t *state, void *user_data); |