From 738a9fc16c833d79831c5a26eb33880661e33524 Mon Sep 17 00:00:00 2001 From: Batuhan Baserdem Date: Wed, 18 Jul 2018 23:17:55 -0400 Subject: Userspace update for user bbaserdem (#3443) * Put in my keymaps * Fixed all but weird lets split issue * Organized and tried to trobleshoot lets split * Organized and tried to trobleshoot lets split * Added bbaserdem keymaps * Added bbaserdem keymaps * Fixed stuff * FIxed a filename error * Lets split eh * Finalized things regarding keymap --- users/bbaserdem/bbaserdem.c | 86 ++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 52 deletions(-) (limited to 'users/bbaserdem/bbaserdem.c') diff --git a/users/bbaserdem/bbaserdem.c b/users/bbaserdem/bbaserdem.c index 59e5d4ba7..ac7b1b62e 100644 --- a/users/bbaserdem/bbaserdem.c +++ b/users/bbaserdem/bbaserdem.c @@ -14,6 +14,12 @@ #include "rgblight.h" #endif +/*-------------*\ +|*---UNICODE---*| +\*-------------*/ +#ifdef UNICODE_ENABLE +#endif + /*-----------------*\ |*-----SECRETS-----*| \*-----------------*/ @@ -61,8 +67,6 @@ __attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { } /* ----------------------- *\ * -----RGB Functions----- * \* ----------------------- */ - - #ifdef RGBLIGHT_ENABLE // Storage variables extern rgblight_config_t rgblight_config; @@ -106,7 +110,7 @@ void rgblight_colorStatic( int hu, int sa, int va ) { rgblight_mode(1); rgblight_sethsv(hu,sa,va); } -/* HSV values, thank you @drashna! +/* HSV values * white ( 0, 0, 255) * red ( 0, 255, 255) * coral ( 16, 176, 255) @@ -126,16 +130,15 @@ void rgblight_colorStatic( int hu, int sa, int va ) { * magenta (300, 255, 255) * pink (330, 128, 255) */ + // Set RGBLIGHT state depending on layer -void rgblight_change( uint8_t last_layer ) { +void rgblight_change( uint8_t this_layer ) { // Save state, if saving is requested - /* if ( base_sta ) { rgblight_saveBase(); } - */ // Change RGB light - switch ( last_layer ) { + switch ( this_layer ) { case _DV: // Load base layer rgblight_loadBase(); @@ -160,12 +163,10 @@ void rgblight_change( uint8_t last_layer ) { // Do green for mouse rgblight_colorStatic(120,255,255); break; -#ifdef AUDIO_ENABLE case _MU: // Do orange for music rgblight_colorStatic( 39,255,255); break; -#endif default: // Something went wrong rgblight_colorStatic( 0,255,255); @@ -184,7 +185,9 @@ void matrix_init_user (void) { matrix_init_keymap(); // Correct unicode +#ifdef UNICODE_ENABLE set_unicode_input_mode(UC_LNX); +#endif // Make beginning layer DVORAK set_single_persistent_default_layer(_DV); @@ -212,7 +215,6 @@ void matrix_init_user (void) { void matrix_scan_user (void) { // Keymap specific, do it first matrix_scan_keymap(); - // Moved RGB check to layer_state_set_user } /*------------------*\ @@ -227,15 +229,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { // Secrets implementation - case SECRET1 ... SECRET3: #if (__has_include("secrets.h")) + case SECRET1: if( !record->event.pressed ) { send_string_P( secret[ keycode - SECRET1 ] ); } -#endif return false; break; + case SECRET2: + if( !record->event.pressed ) { + send_string_P( secret[ keycode - SECRET2 ] ); + } + return false; + break; + case SECRET3: + if( !record->event.pressed ) { + send_string_P( secret[ keycode - SECRET3 ] ); + } + return false; + break; +#endif + // If these keys are pressed, load base layer config, and mark saving +#ifdef RGBLIGHT_ENABLE case RGB_TOG: case RGB_MOD: case RGB_VAI: @@ -244,13 +260,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_SAD: case RGB_HUI: case RGB_HUD: -#ifdef RGBLIGHT_ENABLE if ( !base_sta ) { rgblight_loadBase(); } -#endif return true; break; +#endif // Lock functionality: These layers are locked if the LOCKED buttons are // pressed. Otherwise, they are momentary toggles @@ -261,7 +276,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; break; case K_MOUSE: -#ifdef MOUSEKEY_ENABLE if (record->event.pressed) { layer_on(_MO); lock_flag = false; @@ -272,7 +286,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_off(_MO); } } -#endif return false; break; case K_NUMBR: @@ -314,7 +327,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; break; case MU_TOG: -#ifdef AUDIO_ENABLE if (record->event.pressed) { // On press, turn off layer if active if ( layer == _SE ) { @@ -324,14 +336,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_off(_MU); } } -#endif return true; break; //------UNICODE // Unicode switches with sound - case UNI_LI: #ifdef UNICODE_ENABLE + case UNI_LI: if (record->event.pressed) { #ifdef AUDIO_ENABLE stop_all_notes(); @@ -339,11 +350,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #endif set_unicode_input_mode(UC_LNX); } -#endif return false; break; case UNI_WN: -#ifdef UNICODE_ENABLE if (record->event.pressed) { #ifdef AUDIO_ENABLE stop_all_notes(); @@ -351,13 +360,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #endif set_unicode_input_mode(UC_WIN); } -#endif return false; break; // Turkish letters, with capital functionality case TUR_A: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -369,11 +376,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_O: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -385,11 +390,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_U: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -401,11 +404,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_I: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -417,11 +418,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_G: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -433,11 +432,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_C: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -449,11 +446,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; case TUR_S: -#ifdef UNICODE_ENABLE if (record->event.pressed) { if ( is_capital ) { unicode_input_start(); @@ -465,13 +460,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unicode_input_finish(); } } -#endif return false; break; +#endif //-------Diagonal mouse movements - case MO_NE: #ifdef MOUSEKEY_ENABLE + case MO_NE: if( record->event.pressed ) { mousekey_on(MO_N); mousekey_on(MO_E); @@ -481,11 +476,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_E); mousekey_send(); } -#endif return false; break; case MO_NW: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_N); mousekey_on(MO_W); @@ -495,11 +488,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_W); mousekey_send(); } -#endif return false; break; case MO_SE: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S); mousekey_on(MO_E); @@ -509,11 +500,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_E); mousekey_send(); } -#endif return false; break; case MO_SW: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S); mousekey_on(MO_W); @@ -523,11 +512,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_W); mousekey_send(); } -#endif return false; break; case MO_S_NE: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S_N); mousekey_on(MO_S_E); @@ -537,11 +524,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_S_E); mousekey_send(); } -#endif return false; break; case MO_S_NW: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S_N); mousekey_on(MO_S_W); @@ -551,11 +536,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_S_W); mousekey_send(); } -#endif return false; break; case MO_S_SE: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S_S); mousekey_on(MO_S_E); @@ -565,11 +548,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_S_E); mousekey_send(); } -#endif return false; break; case MO_S_SW: -#ifdef MOUSEKEY_ENABLE if( record->event.pressed ) { mousekey_on(MO_S_S); mousekey_on(MO_S_W); @@ -579,9 +560,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { mousekey_off(MO_S_W); mousekey_send(); } -#endif return false; break; +#endif + //------DOUBLE PRESS, with added left navigation case DBL_SPC: if( record->event.pressed ) { -- cgit v1.2.3-24-g4f1b