Merge branch 'master' into develop
This commit is contained in:
		
						commit
						4e20740efa
					
				
					 3 changed files with 18 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -11,6 +11,8 @@ INDICATOR_LIGHTS = yes      # Enable indicator lights for caps lock, etc.
 | 
			
		|||
# KEY_OVERRIDE_ENABLE = yes   # Override key combos
 | 
			
		||||
# COMBO_ENABLE = yes          # Custom key combos
 | 
			
		||||
 | 
			
		||||
RGB_MATRIX_ENABLE = yes
 | 
			
		||||
 | 
			
		||||
LTO_ENABLE = yes
 | 
			
		||||
RGBLIGHT_SUPPORTED = yes
 | 
			
		||||
RGB_MATRIX_SUPPORTED = yes
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E,                 KC_R,                KC_T,                     KC_T,                KC_R,                KC_E,                 KC_W,    KC_Q,    LGUI_T(KC_GRV), KC_LSFT,
 | 
			
		||||
           KC_LCTL,        KC_A, KC_S, KC_D,                 KC_F,                KC_G,                     KC_G,                KC_F,                KC_D,                 KC_S,    KC_A,    KC_LCTL,
 | 
			
		||||
           KC_LALT,        KC_Z, KC_X, KC_C,                 KC_V,                KC_B,                     KC_B,                KC_V,                KC_C,                 KC_X,    KC_Z,    KC_LALT,
 | 
			
		||||
                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
 | 
			
		||||
                                       LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT),      LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC)
 | 
			
		||||
),
 | 
			
		||||
[_DFLT_R] = LAYOUT(
 | 
			
		||||
  KC_RBRC, KC_LBRC, KC_P,    KC_O,    KC_I,                KC_U,    KC_Y,                     KC_Y,                KC_U,    KC_I,               KC_O,    KC_P,    KC_LBRC, KC_RBRC,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -64,10 +64,11 @@
 | 
			
		|||
	//#define RGBLIGHT_EFFECT_TWINKLE
 | 
			
		||||
 | 
			
		||||
    #define RGBLIGHT_LED_COUNT 70
 | 
			
		||||
	//#define RGBLED_SPLIT
 | 
			
		||||
	#undef RGBLED_SPLIT
 | 
			
		||||
	#define RGBLED_SPLIT { 35, 35 } // haven't figured out how to use this yet
 | 
			
		||||
 | 
			
		||||
	//#define RGBLIGHT_LED_COUNT 30
 | 
			
		||||
    #undef RGBLIGHT_LIMIT_VAL
 | 
			
		||||
    #define RGBLIGHT_LIMIT_VAL 120
 | 
			
		||||
    #define RGBLIGHT_HUE_STEP 10
 | 
			
		||||
    #define RGBLIGHT_SAT_STEP 17
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue