Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						443d111403
					
				
					 3 changed files with 7 additions and 25 deletions
				
			
		|  | @ -23,8 +23,11 @@ | |||
|             "resync": true | ||||
|         } | ||||
|     }, | ||||
|     "layout_aliases": { | ||||
|         "LAYOUT_all": "LAYOUT" | ||||
|     }, | ||||
|     "layouts": { | ||||
|         "LAYOUT_all": { | ||||
|         "LAYOUT": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ | |||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| [0] = LAYOUT_all( /* Base */ | ||||
| [0] = LAYOUT( /* Base */ | ||||
|     KC_INS,  KC_HOME,  KC_PGUP, | ||||
|     KC_DEL,  KC_END,   KC_PGDN, | ||||
| 
 | ||||
|  |  | |||
|  | @ -16,31 +16,10 @@ | |||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| [0] = LAYOUT_all( /* Base */ | ||||
| [0] = LAYOUT( /* Base */ | ||||
|     KC_INS,  KC_HOME,  KC_PGUP, | ||||
|     KC_DEL,  KC_END,   KC_PGDN, | ||||
| 
 | ||||
|              KC_UP, | ||||
|     KC_LEFT, KC_DOWN,  KC_RIGHT), | ||||
| 
 | ||||
| [1] = LAYOUT_all( /* Empty for Dynamic keymap */ | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
| 
 | ||||
|               KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS), | ||||
| 
 | ||||
| [2] = LAYOUT_all( /* Empty for Dynamic keymap */ | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
| 
 | ||||
|               KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS), | ||||
| 
 | ||||
| [3] = LAYOUT_all( /* Empty for Dynamic keymap */ | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||
| 
 | ||||
|               KC_TRNS, | ||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS) | ||||
|     KC_LEFT, KC_DOWN,  KC_RIGHT) | ||||
| }; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot