Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						528f6a1af7
					
				
					 3 changed files with 12 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -171,19 +171,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		|||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
  [0] = LAYOUT_all(
 | 
			
		||||
  [0] = LAYOUT(
 | 
			
		||||
      TD(TD_CUT_REDO), TD(TD_MPRV_LEFT), TD(TD_PLAY_PAUSE_MUTE), TD(TD_MNXT_RIGHT), TD(QUAD_CVXA), TD(QUAD_LAYER_SWITCH)
 | 
			
		||||
      ),
 | 
			
		||||
 | 
			
		||||
  [1] = LAYOUT_all(
 | 
			
		||||
  [1] = LAYOUT(
 | 
			
		||||
      YOUTUBE, KC_WBAK, TD(TD_SEARCH_REFRESH), KC_WFWD, FACEBOOK, TD(QUAD_LAYER_SWITCH)
 | 
			
		||||
      ),
 | 
			
		||||
 | 
			
		||||
  [2] = LAYOUT_all(
 | 
			
		||||
  [2] = LAYOUT(
 | 
			
		||||
      A(KC_F4), SGUI(KC_S), KC_MYCM, LCA(KC_DEL), KC_CALC, TD(QUAD_LAYER_SWITCH)
 | 
			
		||||
      ),
 | 
			
		||||
  
 | 
			
		||||
  [3] = LAYOUT_all(
 | 
			
		||||
  [3] = LAYOUT(
 | 
			
		||||
      C(KC_SLSH), VALORANT, VSCODE, DISCORD, LSA(KC_A), TD(QUAD_LAYER_SWITCH)
 | 
			
		||||
      ),
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
  [0] = LAYOUT_all(
 | 
			
		||||
  [0] = LAYOUT(
 | 
			
		||||
      KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,    KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL,   KC_BSPC,    MO(1),  KC_HOME, KC_PGUP,
 | 
			
		||||
      KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_SLSH,     KC_DEL, KC_END,  KC_PGDN,
 | 
			
		||||
      KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,    KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT, 
 | 
			
		||||
| 
						 | 
				
			
			@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
      KC_LCTL,  KC_LALT, KC_LGUI,                 KC_SPC,                         KC_RGUI, KC_RALT, KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RIGHT
 | 
			
		||||
      ),
 | 
			
		||||
 | 
			
		||||
  [1] = LAYOUT_all(
 | 
			
		||||
  [1] = LAYOUT(
 | 
			
		||||
      KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11, KC_F12, KC_TRNS,      MO(1),  TG(2),  KC_TRNS,
 | 
			
		||||
      KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
      KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, 
 | 
			
		||||
| 
						 | 
				
			
			@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
      KC_TRNS,  KC_TRNS, KC_TRNS,                 KC_TRNS,                KC_TRNS,KC_TRNS,KC_TRNS,                           KC_TRNS,KC_TRNS,KC_TRNS
 | 
			
		||||
      ),
 | 
			
		||||
 | 
			
		||||
  [2] = LAYOUT_all(
 | 
			
		||||
  [2] = LAYOUT(
 | 
			
		||||
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,TG(2),  MO(4),
 | 
			
		||||
      KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
      KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, 
 | 
			
		||||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
      KC_TRNS,  KC_TRNS, KC_TRNS,                 KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,                          KC_TRNS,KC_TRNS,KC_TRNS
 | 
			
		||||
      ),
 | 
			
		||||
  
 | 
			
		||||
  [3] = LAYOUT_all(
 | 
			
		||||
  [3] = LAYOUT(
 | 
			
		||||
      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,KC_TRNS,MO(4),
 | 
			
		||||
      KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS,
 | 
			
		||||
      KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@
 | 
			
		|||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 | 
			
		||||
  //base layer
 | 
			
		||||
  [0] = LAYOUT_all(
 | 
			
		||||
  [0] = LAYOUT(
 | 
			
		||||
                                              KC_NUM,
 | 
			
		||||
                                              KC_PAST, KC_PSLS,
 | 
			
		||||
                                              KC_P7,   KC_P8,   KC_P9,
 | 
			
		||||
| 
						 | 
				
			
			@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
                   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,    KC_M,    KC_COMM, KC_RSFT,
 | 
			
		||||
                            KC_LCTL, KC_LALT, KC_SPC,  MO(1), KC_RALT, KC_RCTL
 | 
			
		||||
  ),
 | 
			
		||||
  [1] = LAYOUT_all(
 | 
			
		||||
  [1] = LAYOUT(
 | 
			
		||||
                                              KC_F2,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
| 
						 | 
				
			
			@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
  ),
 | 
			
		||||
  [2] = LAYOUT_all(
 | 
			
		||||
  [2] = LAYOUT(
 | 
			
		||||
                                              KC_F2,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
| 
						 | 
				
			
			@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 | 
			
		||||
  ),
 | 
			
		||||
  [3] = LAYOUT_all(
 | 
			
		||||
  [3] = LAYOUT(
 | 
			
		||||
                                              KC_F2,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS,
 | 
			
		||||
                                              KC_TRNS, KC_TRNS, KC_TRNS,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue