Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						3793abe44a
					
				
					 2 changed files with 31 additions and 14 deletions
				
			
		| 
						 | 
				
			
			@ -28,7 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  [1] = LAYOUT_numpad_5x4(
 | 
			
		||||
    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, RESET
 | 
			
		||||
  ),
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  [1] = LAYOUT_numpad_5x4(
 | 
			
		||||
    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, RESET
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [2] = LAYOUT_numpad_5x4(
 | 
			
		||||
    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, RESET
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  [3] = LAYOUT_numpad_5x4(
 | 
			
		||||
    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, RESET
 | 
			
		||||
  ),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue