Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						79464f3c52
					
				
					 1 changed files with 118 additions and 118 deletions
				
			
		|  | @ -40,81 +40,81 @@ | |||
|     "layouts": { | ||||
|         "LAYOUT": { | ||||
|             "layout": [ | ||||
|         {"matrix": [0, 0], "x": 0, "y": 0}, | ||||
|         {"matrix": [0, 1], "x": 1, "y": 0}, | ||||
|         {"matrix": [0, 2], "x": 2, "y": 0}, | ||||
|                 {"matrix": [0, 0], "x": 0, "y": 0.75}, | ||||
|                 {"matrix": [0, 1], "x": 1, "y": 0.75}, | ||||
|                 {"matrix": [0, 2], "x": 2, "y": 0.25}, | ||||
|                 {"matrix": [0, 3], "x": 3, "y": 0}, | ||||
|                 {"matrix": [0, 4], "x": 4, "y": 0}, | ||||
|                 {"matrix": [0, 5], "x": 5, "y": 0}, | ||||
| 
 | ||||
|         {"matrix": [5, 5], "x": 10, "y": 0}, | ||||
|         {"matrix": [5, 4], "x": 11, "y": 0}, | ||||
|         {"matrix": [5, 3], "x": 12, "y": 0}, | ||||
|         {"matrix": [5, 2], "x": 13, "y": 0}, | ||||
|         {"matrix": [5, 1], "x": 14, "y": 0}, | ||||
|         {"matrix": [5, 0], "x": 15, "y": 0}, | ||||
|                 {"matrix": [5, 5], "x": 11, "y": 0}, | ||||
|                 {"matrix": [5, 4], "x": 12, "y": 0}, | ||||
|                 {"matrix": [5, 3], "x": 13, "y": 0}, | ||||
|                 {"matrix": [5, 2], "x": 14, "y": 0.25}, | ||||
|                 {"matrix": [5, 1], "x": 15, "y": 0.75}, | ||||
|                 {"matrix": [5, 0], "x": 16, "y": 0.75}, | ||||
| 
 | ||||
|         {"matrix": [1, 0], "x": 0, "y": 1}, | ||||
|         {"matrix": [1, 1], "x": 1, "y": 1}, | ||||
|         {"matrix": [1, 2], "x": 2, "y": 1}, | ||||
|                 {"matrix": [1, 0], "x": 0, "y": 1.75}, | ||||
|                 {"matrix": [1, 1], "x": 1, "y": 1.75}, | ||||
|                 {"matrix": [1, 2], "x": 2, "y": 1.25}, | ||||
|                 {"matrix": [1, 3], "x": 3, "y": 1}, | ||||
|                 {"matrix": [1, 4], "x": 4, "y": 1}, | ||||
|                 {"matrix": [1, 5], "x": 5, "y": 1}, | ||||
| 
 | ||||
|         {"matrix": [6, 5], "x": 10, "y": 1}, | ||||
|         {"matrix": [6, 4], "x": 11, "y": 1}, | ||||
|         {"matrix": [6, 3], "x": 12, "y": 1}, | ||||
|         {"matrix": [6, 2], "x": 13, "y": 1}, | ||||
|         {"matrix": [6, 1], "x": 14, "y": 1}, | ||||
|         {"matrix": [6, 0], "x": 15, "y": 1}, | ||||
|                 {"matrix": [6, 5], "x": 11, "y": 1}, | ||||
|                 {"matrix": [6, 4], "x": 12, "y": 1}, | ||||
|                 {"matrix": [6, 3], "x": 13, "y": 1}, | ||||
|                 {"matrix": [6, 2], "x": 14, "y": 1.25}, | ||||
|                 {"matrix": [6, 1], "x": 15, "y": 1.75}, | ||||
|                 {"matrix": [6, 0], "x": 16, "y": 1.75}, | ||||
| 
 | ||||
|         {"matrix": [2, 0], "x": 0, "y": 2}, | ||||
|         {"matrix": [2, 1], "x": 1, "y": 2}, | ||||
|         {"matrix": [2, 2], "x": 2, "y": 2}, | ||||
|                 {"matrix": [2, 0], "x": 0, "y": 2.75}, | ||||
|                 {"matrix": [2, 1], "x": 1, "y": 2.75}, | ||||
|                 {"matrix": [2, 2], "x": 2, "y": 2.25}, | ||||
|                 {"matrix": [2, 3], "x": 3, "y": 2}, | ||||
|                 {"matrix": [2, 4], "x": 4, "y": 2}, | ||||
|                 {"matrix": [2, 5], "x": 5, "y": 2}, | ||||
|                 {"matrix": [2, 6], "x": 6, "y": 2}, | ||||
| 
 | ||||
|         {"matrix": [7, 6], "x": 9, "y": 2}, | ||||
|         {"matrix": [7, 5], "x": 10, "y": 2}, | ||||
|         {"matrix": [7, 4], "x": 11, "y": 2}, | ||||
|         {"matrix": [7, 3], "x": 12, "y": 2}, | ||||
|         {"matrix": [7, 2], "x": 13, "y": 2}, | ||||
|         {"matrix": [7, 1], "x": 14, "y": 2}, | ||||
|         {"matrix": [7, 0], "x": 15, "y": 2}, | ||||
|                 {"matrix": [7, 6], "x": 10, "y": 2}, | ||||
|                 {"matrix": [7, 5], "x": 11, "y": 2}, | ||||
|                 {"matrix": [7, 4], "x": 12, "y": 2}, | ||||
|                 {"matrix": [7, 3], "x": 13, "y": 2}, | ||||
|                 {"matrix": [7, 2], "x": 14, "y": 2.25}, | ||||
|                 {"matrix": [7, 1], "x": 15, "y": 2.75}, | ||||
|                 {"matrix": [7, 0], "x": 16, "y": 2.75}, | ||||
| 
 | ||||
|         {"matrix": [3, 0], "x": 0, "y": 3}, | ||||
|         {"matrix": [3, 1], "x": 1, "y": 3}, | ||||
|         {"matrix": [3, 2], "x": 2, "y": 3}, | ||||
|                 {"matrix": [3, 0], "x": 0, "y": 3.75}, | ||||
|                 {"matrix": [3, 1], "x": 1, "y": 3.75}, | ||||
|                 {"matrix": [3, 2], "x": 2, "y": 3.25}, | ||||
|                 {"matrix": [3, 3], "x": 3, "y": 3}, | ||||
|                 {"matrix": [3, 4], "x": 4, "y": 3}, | ||||
|                 {"matrix": [3, 5], "x": 5, "y": 3}, | ||||
|                 {"matrix": [3, 6], "x": 6, "y": 3}, | ||||
|         {"matrix": [0, 6], "x": 7, "y": 3}, | ||||
|         {"matrix": [5, 6], "x": 8, "y": 3}, | ||||
|         {"matrix": [8, 6], "x": 9, "y": 3}, | ||||
|         {"matrix": [8, 5], "x": 10, "y": 3}, | ||||
|         {"matrix": [8, 4], "x": 11, "y": 3}, | ||||
|         {"matrix": [8, 3], "x": 12, "y": 3}, | ||||
|         {"matrix": [8, 2], "x": 13, "y": 3}, | ||||
|         {"matrix": [8, 1], "x": 14, "y": 3}, | ||||
|         {"matrix": [8, 0], "x": 15, "y": 3}, | ||||
|                 {"matrix": [0, 6], "x": 7, "y": 3.8}, | ||||
|                 {"matrix": [5, 6], "x": 9, "y": 3.8}, | ||||
|                 {"matrix": [8, 6], "x": 10, "y": 3}, | ||||
|                 {"matrix": [8, 5], "x": 11, "y": 3}, | ||||
|                 {"matrix": [8, 4], "x": 12, "y": 3}, | ||||
|                 {"matrix": [8, 3], "x": 13, "y": 3}, | ||||
|                 {"matrix": [8, 2], "x": 14, "y": 3.25}, | ||||
|                 {"matrix": [8, 1], "x": 15, "y": 3.75}, | ||||
|                 {"matrix": [8, 0], "x": 16, "y": 3.75}, | ||||
| 
 | ||||
|         {"matrix": [4, 0], "x": 0, "y": 4}, | ||||
|         {"matrix": [4, 1], "x": 1, "y": 4}, | ||||
|         {"matrix": [4, 2], "x": 2, "y": 4}, | ||||
|                 {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.25}, | ||||
|                 {"matrix": [4, 1], "x": 1.25, "y": 4.75, "w": 1.25}, | ||||
|                 {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25}, | ||||
| 
 | ||||
|         {"matrix": [4, 5], "x": 5, "y": 4}, | ||||
|         {"matrix": [4, 6], "x": 6, "y": 4}, | ||||
|         {"matrix": [1, 6], "x": 7, "y": 4}, | ||||
|         {"matrix": [6, 6], "x": 8, "y": 4}, | ||||
|         {"matrix": [9, 6], "x": 9, "y": 4}, | ||||
|         {"matrix": [9, 5], "x": 10, "y": 4}, | ||||
|                 {"matrix": [4, 5], "x": 4.8, "y": 4}, | ||||
|                 {"matrix": [4, 6], "x": 6, "y": 4.4}, | ||||
|                 {"matrix": [1, 6], "x": 7, "y": 4.8}, | ||||
|                 {"matrix": [6, 6], "x": 9, "y": 4.8}, | ||||
|                 {"matrix": [9, 6], "x": 10, "y": 4.4}, | ||||
|                 {"matrix": [9, 5], "x": 11.2, "y": 4}, | ||||
| 
 | ||||
|         {"matrix": [9, 2], "x": 13, "y": 4}, | ||||
|         {"matrix": [9, 1], "x": 14, "y": 4}, | ||||
|         {"matrix": [9, 0], "x": 15, "y": 4} | ||||
|                 {"matrix": [9, 2], "x": 13.25, "y": 4.25, "w": 1.25}, | ||||
|                 {"matrix": [9, 1], "x": 14.5, "y": 4.75, "w": 1.25}, | ||||
|                 {"matrix": [9, 0], "x": 15.75, "y": 4.75, "w": 1.25} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot