mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-30 21:02:32 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						99f7a8fcd3
					
				| @ -2,275 +2,286 @@ | |||||||
|     "keyboard_name": "Novus", |     "keyboard_name": "Novus", | ||||||
|     "url": "", |     "url": "", | ||||||
|     "maintainer": "Cutie Club", |     "maintainer": "Cutie Club", | ||||||
|  |     "layout_aliases": { | ||||||
|  |         "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" | ||||||
|  |     }, | ||||||
|     "layouts": { |     "layouts": { | ||||||
|         "LAYOUT_all": { |         "LAYOUT_60_ansi": { | ||||||
|             "layout": [ |             "layout": [ | ||||||
|                 { |                 {"x":0, "y":0}, | ||||||
|                     "x": 0, |                 {"x":1, "y":0}, | ||||||
|                     "y": 0 |                 {"x":2, "y":0}, | ||||||
|  |                 {"x":3, "y":0}, | ||||||
|  |                 {"x":4, "y":0}, | ||||||
|  |                 {"x":5, "y":0}, | ||||||
|  |                 {"x":6, "y":0}, | ||||||
|  |                 {"x":7, "y":0}, | ||||||
|  |                 {"x":8, "y":0}, | ||||||
|  |                 {"x":9, "y":0}, | ||||||
|  |                 {"x":10, "y":0}, | ||||||
|  |                 {"x":11, "y":0}, | ||||||
|  |                 {"x":12, "y":0}, | ||||||
|  |                 {"x":13, "y":0, "w":2}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":1, "w":1.5}, | ||||||
|  |                 {"x":1.5, "y":1}, | ||||||
|  |                 {"x":2.5, "y":1}, | ||||||
|  |                 {"x":3.5, "y":1}, | ||||||
|  |                 {"x":4.5, "y":1}, | ||||||
|  |                 {"x":5.5, "y":1}, | ||||||
|  |                 {"x":6.5, "y":1}, | ||||||
|  |                 {"x":7.5, "y":1}, | ||||||
|  |                 {"x":8.5, "y":1}, | ||||||
|  |                 {"x":9.5, "y":1}, | ||||||
|  |                 {"x":10.5, "y":1}, | ||||||
|  |                 {"x":11.5, "y":1}, | ||||||
|  |                 {"x":12.5, "y":1}, | ||||||
|  |                 {"x":13.5, "y":1, "w":1.5}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":2, "w":1.75}, | ||||||
|  |                 {"x":1.75, "y":2}, | ||||||
|  |                 {"x":2.75, "y":2}, | ||||||
|  |                 {"x":3.75, "y":2}, | ||||||
|  |                 {"x":4.75, "y":2}, | ||||||
|  |                 {"x":5.75, "y":2}, | ||||||
|  |                 {"x":6.75, "y":2}, | ||||||
|  |                 {"x":7.75, "y":2}, | ||||||
|  |                 {"x":8.75, "y":2}, | ||||||
|  |                 {"x":9.75, "y":2}, | ||||||
|  |                 {"x":10.75, "y":2}, | ||||||
|  |                 {"x":11.75, "y":2}, | ||||||
|  |                 {"x":12.75, "y":2, "w":2.25}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":3, "w":2.25}, | ||||||
|  |                 {"x":2.25, "y":3}, | ||||||
|  |                 {"x":3.25, "y":3}, | ||||||
|  |                 {"x":4.25, "y":3}, | ||||||
|  |                 {"x":5.25, "y":3}, | ||||||
|  |                 {"x":6.25, "y":3}, | ||||||
|  |                 {"x":7.25, "y":3}, | ||||||
|  |                 {"x":8.25, "y":3}, | ||||||
|  |                 {"x":9.25, "y":3}, | ||||||
|  |                 {"x":10.25, "y":3}, | ||||||
|  |                 {"x":11.25, "y":3}, | ||||||
|  |                 {"x":12.25, "y":3, "w":2.75}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":4, "w":1.25}, | ||||||
|  |                 {"x":1.25, "y":4, "w":1.25}, | ||||||
|  |                 {"x":2.5, "y":4, "w":1.25}, | ||||||
|  |                 {"x":3.75, "y":4, "w":6.25}, | ||||||
|  |                 {"x":10, "y":4, "w":1.25}, | ||||||
|  |                 {"x":11.25, "y":4, "w":1.25}, | ||||||
|  |                 {"x":12.5, "y":4, "w":1.25}, | ||||||
|  |                 {"x":13.75, "y":4, "w":1.25} | ||||||
|  |             ] | ||||||
|         }, |         }, | ||||||
|                 { |         "LAYOUT_60_ansi_split_bs_rshift": { | ||||||
|                     "x": 1, |             "layout": [ | ||||||
|                     "y": 0 |                 {"x":0, "y":0}, | ||||||
|  |                 {"x":1, "y":0}, | ||||||
|  |                 {"x":2, "y":0}, | ||||||
|  |                 {"x":3, "y":0}, | ||||||
|  |                 {"x":4, "y":0}, | ||||||
|  |                 {"x":5, "y":0}, | ||||||
|  |                 {"x":6, "y":0}, | ||||||
|  |                 {"x":7, "y":0}, | ||||||
|  |                 {"x":8, "y":0}, | ||||||
|  |                 {"x":9, "y":0}, | ||||||
|  |                 {"x":10, "y":0}, | ||||||
|  |                 {"x":11, "y":0}, | ||||||
|  |                 {"x":12, "y":0}, | ||||||
|  |                 {"x":13, "y":0}, | ||||||
|  |                 {"x":14, "y":0}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":1, "w":1.5}, | ||||||
|  |                 {"x":1.5, "y":1}, | ||||||
|  |                 {"x":2.5, "y":1}, | ||||||
|  |                 {"x":3.5, "y":1}, | ||||||
|  |                 {"x":4.5, "y":1}, | ||||||
|  |                 {"x":5.5, "y":1}, | ||||||
|  |                 {"x":6.5, "y":1}, | ||||||
|  |                 {"x":7.5, "y":1}, | ||||||
|  |                 {"x":8.5, "y":1}, | ||||||
|  |                 {"x":9.5, "y":1}, | ||||||
|  |                 {"x":10.5, "y":1}, | ||||||
|  |                 {"x":11.5, "y":1}, | ||||||
|  |                 {"x":12.5, "y":1}, | ||||||
|  |                 {"x":13.5, "y":1, "w":1.5}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":2, "w":1.75}, | ||||||
|  |                 {"x":1.75, "y":2}, | ||||||
|  |                 {"x":2.75, "y":2}, | ||||||
|  |                 {"x":3.75, "y":2}, | ||||||
|  |                 {"x":4.75, "y":2}, | ||||||
|  |                 {"x":5.75, "y":2}, | ||||||
|  |                 {"x":6.75, "y":2}, | ||||||
|  |                 {"x":7.75, "y":2}, | ||||||
|  |                 {"x":8.75, "y":2}, | ||||||
|  |                 {"x":9.75, "y":2}, | ||||||
|  |                 {"x":10.75, "y":2}, | ||||||
|  |                 {"x":11.75, "y":2}, | ||||||
|  |                 {"x":12.75, "y":2, "w":2.25}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":3, "w":2.25}, | ||||||
|  |                 {"x":2.25, "y":3}, | ||||||
|  |                 {"x":3.25, "y":3}, | ||||||
|  |                 {"x":4.25, "y":3}, | ||||||
|  |                 {"x":5.25, "y":3}, | ||||||
|  |                 {"x":6.25, "y":3}, | ||||||
|  |                 {"x":7.25, "y":3}, | ||||||
|  |                 {"x":8.25, "y":3}, | ||||||
|  |                 {"x":9.25, "y":3}, | ||||||
|  |                 {"x":10.25, "y":3}, | ||||||
|  |                 {"x":11.25, "y":3}, | ||||||
|  |                 {"x":12.25, "y":3, "w":1.75}, | ||||||
|  |                 {"x":14, "y":3}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":4, "w":1.25}, | ||||||
|  |                 {"x":1.25, "y":4, "w":1.25}, | ||||||
|  |                 {"x":2.5, "y":4, "w":1.25}, | ||||||
|  |                 {"x":3.75, "y":4, "w":6.25}, | ||||||
|  |                 {"x":10, "y":4, "w":1.25}, | ||||||
|  |                 {"x":11.25, "y":4, "w":1.25}, | ||||||
|  |                 {"x":12.5, "y":4, "w":1.25}, | ||||||
|  |                 {"x":13.75, "y":4, "w":1.25} | ||||||
|  |             ] | ||||||
|         }, |         }, | ||||||
|                 { |         "LAYOUT_60_ansi_tsangan": { | ||||||
|                     "x": 2, |             "layout": [ | ||||||
|                     "y": 0 |                 {"x":0, "y":0}, | ||||||
|                 }, |                 {"x":1, "y":0}, | ||||||
|                 { |                 {"x":2, "y":0}, | ||||||
|                     "x": 3, |                 {"x":3, "y":0}, | ||||||
|                     "y": 0 |                 {"x":4, "y":0}, | ||||||
|                 }, |                 {"x":5, "y":0}, | ||||||
|                 { |                 {"x":6, "y":0}, | ||||||
|                     "x": 4, |                 {"x":7, "y":0}, | ||||||
|                     "y": 0 |                 {"x":8, "y":0}, | ||||||
|                 }, |                 {"x":9, "y":0}, | ||||||
|                 { |                 {"x":10, "y":0}, | ||||||
|                     "x": 5, |                 {"x":11, "y":0}, | ||||||
|                     "y": 0 |                 {"x":12, "y":0}, | ||||||
|                 }, |                 {"x":13, "y":0, "w":2}, | ||||||
|                 { | 
 | ||||||
|                     "x": 6, |                 {"x":0, "y":1, "w":1.5}, | ||||||
|                     "y": 0 |                 {"x":1.5, "y":1}, | ||||||
|                 }, |                 {"x":2.5, "y":1}, | ||||||
|                 { |                 {"x":3.5, "y":1}, | ||||||
|                     "x": 7, |                 {"x":4.5, "y":1}, | ||||||
|                     "y": 0 |                 {"x":5.5, "y":1}, | ||||||
|                 }, |                 {"x":6.5, "y":1}, | ||||||
|                 { |                 {"x":7.5, "y":1}, | ||||||
|                     "x": 8, |                 {"x":8.5, "y":1}, | ||||||
|                     "y": 0 |                 {"x":9.5, "y":1}, | ||||||
|                 }, |                 {"x":10.5, "y":1}, | ||||||
|                 { |                 {"x":11.5, "y":1}, | ||||||
|                     "x": 9, |                 {"x":12.5, "y":1}, | ||||||
|                     "y": 0 |                 {"x":13.5, "y":1, "w":1.5}, | ||||||
|                 }, | 
 | ||||||
|                 { |                 {"x":0, "y":2, "w":1.75}, | ||||||
|                     "x": 10, |                 {"x":1.75, "y":2}, | ||||||
|                     "y": 0 |                 {"x":2.75, "y":2}, | ||||||
|                 }, |                 {"x":3.75, "y":2}, | ||||||
|                 { |                 {"x":4.75, "y":2}, | ||||||
|                     "x": 11, |                 {"x":5.75, "y":2}, | ||||||
|                     "y": 0 |                 {"x":6.75, "y":2}, | ||||||
|                 }, |                 {"x":7.75, "y":2}, | ||||||
|                 { |                 {"x":8.75, "y":2}, | ||||||
|                     "x": 12, |                 {"x":9.75, "y":2}, | ||||||
|                     "y": 0 |                 {"x":10.75, "y":2}, | ||||||
|                 }, |                 {"x":11.75, "y":2}, | ||||||
|                 { |                 {"x":12.75, "y":2, "w":2.25}, | ||||||
|                     "x": 13, | 
 | ||||||
|                     "y": 0 |                 {"x":0, "y":3, "w":2.25}, | ||||||
|                 }, |                 {"x":2.25, "y":3}, | ||||||
|                 { |                 {"x":3.25, "y":3}, | ||||||
|                     "x": 14, |                 {"x":4.25, "y":3}, | ||||||
|                     "y": 0 |                 {"x":5.25, "y":3}, | ||||||
|                 }, |                 {"x":6.25, "y":3}, | ||||||
|                 { |                 {"x":7.25, "y":3}, | ||||||
|                     "x": 0, |                 {"x":8.25, "y":3}, | ||||||
|                     "y": 1, |                 {"x":9.25, "y":3}, | ||||||
|                     "w": 1.5 |                 {"x":10.25, "y":3}, | ||||||
|                 }, |                 {"x":11.25, "y":3}, | ||||||
|                 { |                 {"x":12.25, "y":3, "w":2.75}, | ||||||
|                     "x": 1.5, | 
 | ||||||
|                     "y": 1 |                 {"x":0, "y":4, "w":1.5}, | ||||||
|                 }, |                 {"x":1.5, "y":4}, | ||||||
|                 { |                 {"x":2.5, "y":4, "w":1.5}, | ||||||
|                     "x": 2.5, |                 {"x":4, "y":4, "w":7}, | ||||||
|                     "y": 1 |                 {"x":11, "y":4, "w":1.5}, | ||||||
|                 }, |                 {"x":12.5, "y":4}, | ||||||
|                 { |                 {"x":13.5, "y":4, "w":1.5} | ||||||
|                     "x": 3.5, |             ] | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 4.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 5.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 6.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 7.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 8.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 9.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 10.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 11.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 12.5, |  | ||||||
|                     "y": 1 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 13.5, |  | ||||||
|                     "y": 1, |  | ||||||
|                     "w": 1.5 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 0, |  | ||||||
|                     "y": 2, |  | ||||||
|                     "w": 1.75 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 1.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 2.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 3.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 4.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 5.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 6.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 7.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 8.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 9.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 10.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 11.75, |  | ||||||
|                     "y": 2 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 12.75, |  | ||||||
|                     "y": 2, |  | ||||||
|                     "w": 2.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 0, |  | ||||||
|                     "y": 3, |  | ||||||
|                     "w": 2.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 2.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 3.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 4.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 5.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 6.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 7.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 8.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 9.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 10.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 11.25, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 12.25, |  | ||||||
|                     "y": 3, |  | ||||||
|                     "w": 1.75 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 14, |  | ||||||
|                     "y": 3 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 0, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 1.25, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 2.5, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 3.75, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 6.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 10, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 11.25, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 12.5, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|                 }, |  | ||||||
|                 { |  | ||||||
|                     "x": 13.75, |  | ||||||
|                     "y": 4, |  | ||||||
|                     "w": 1.25 |  | ||||||
|         } |         } | ||||||
|  |         "LAYOUT_60_ansi_tsangan_split_bs_rshift": { | ||||||
|  |             "layout": [ | ||||||
|  |                 {"x":0, "y":0}, | ||||||
|  |                 {"x":1, "y":0}, | ||||||
|  |                 {"x":2, "y":0}, | ||||||
|  |                 {"x":3, "y":0}, | ||||||
|  |                 {"x":4, "y":0}, | ||||||
|  |                 {"x":5, "y":0}, | ||||||
|  |                 {"x":6, "y":0}, | ||||||
|  |                 {"x":7, "y":0}, | ||||||
|  |                 {"x":8, "y":0}, | ||||||
|  |                 {"x":9, "y":0}, | ||||||
|  |                 {"x":10, "y":0}, | ||||||
|  |                 {"x":11, "y":0}, | ||||||
|  |                 {"x":12, "y":0}, | ||||||
|  |                 {"x":13, "y":0}, | ||||||
|  |                 {"x":14, "y":0}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":1, "w":1.5}, | ||||||
|  |                 {"x":1.5, "y":1}, | ||||||
|  |                 {"x":2.5, "y":1}, | ||||||
|  |                 {"x":3.5, "y":1}, | ||||||
|  |                 {"x":4.5, "y":1}, | ||||||
|  |                 {"x":5.5, "y":1}, | ||||||
|  |                 {"x":6.5, "y":1}, | ||||||
|  |                 {"x":7.5, "y":1}, | ||||||
|  |                 {"x":8.5, "y":1}, | ||||||
|  |                 {"x":9.5, "y":1}, | ||||||
|  |                 {"x":10.5, "y":1}, | ||||||
|  |                 {"x":11.5, "y":1}, | ||||||
|  |                 {"x":12.5, "y":1}, | ||||||
|  |                 {"x":13.5, "y":1, "w":1.5}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":2, "w":1.75}, | ||||||
|  |                 {"x":1.75, "y":2}, | ||||||
|  |                 {"x":2.75, "y":2}, | ||||||
|  |                 {"x":3.75, "y":2}, | ||||||
|  |                 {"x":4.75, "y":2}, | ||||||
|  |                 {"x":5.75, "y":2}, | ||||||
|  |                 {"x":6.75, "y":2}, | ||||||
|  |                 {"x":7.75, "y":2}, | ||||||
|  |                 {"x":8.75, "y":2}, | ||||||
|  |                 {"x":9.75, "y":2}, | ||||||
|  |                 {"x":10.75, "y":2}, | ||||||
|  |                 {"x":11.75, "y":2}, | ||||||
|  |                 {"x":12.75, "y":2, "w":2.25}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":3, "w":2.25}, | ||||||
|  |                 {"x":2.25, "y":3}, | ||||||
|  |                 {"x":3.25, "y":3}, | ||||||
|  |                 {"x":4.25, "y":3}, | ||||||
|  |                 {"x":5.25, "y":3}, | ||||||
|  |                 {"x":6.25, "y":3}, | ||||||
|  |                 {"x":7.25, "y":3}, | ||||||
|  |                 {"x":8.25, "y":3}, | ||||||
|  |                 {"x":9.25, "y":3}, | ||||||
|  |                 {"x":10.25, "y":3}, | ||||||
|  |                 {"x":11.25, "y":3}, | ||||||
|  |                 {"x":12.25, "y":3, "w":1.75}, | ||||||
|  |                 {"x":14, "y":3}, | ||||||
|  | 
 | ||||||
|  |                 {"x":0, "y":4, "w":1.5}, | ||||||
|  |                 {"x":1.5, "y":4}, | ||||||
|  |                 {"x":2.5, "y":4, "w":1.5}, | ||||||
|  |                 {"x":4, "y":4, "w":7}, | ||||||
|  |                 {"x":11, "y":4, "w":1.5}, | ||||||
|  |                 {"x":12.5, "y":4}, | ||||||
|  |                 {"x":13.5, "y":4, "w":1.5} | ||||||
|             ] |             ] | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -16,17 +16,17 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     [0] = LAYOUT_all( |     [0] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         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, KC_BSPC, |         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, KC_BSPC, | ||||||
|         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_BSLS, |         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_BSLS, | ||||||
|         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, |         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, | ||||||
|         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), |         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), | ||||||
|         KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL |         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL | ||||||
|     ), |     ), | ||||||
|     [1] = LAYOUT_all( |     [1] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______, |         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______,                            _______,                            _______, _______, _______, _______ |         _______, _______, _______,                            _______,                            _______, _______, _______, _______ | ||||||
|     ) |     ) | ||||||
|  | |||||||
| @ -16,28 +16,28 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| 
 | 
 | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     [0] = LAYOUT_all( |     [0] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         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, KC_BSPC, |         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, KC_BSPC, | ||||||
|         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_BSLS, |         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_BSLS, | ||||||
|         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, |         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, | ||||||
|         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), |         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), | ||||||
|         KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL |         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL | ||||||
|     ), |     ), | ||||||
|     [1] = LAYOUT_all( |     [1] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______, |         _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______,                            _______,                            _______, _______, _______, _______ |         _______, _______, _______,                            _______,                            _______, _______, _______, _______ | ||||||
|     ), |     ), | ||||||
|     [2] = LAYOUT_all( |     [2] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______,                            _______,                            _______, _______, _______, _______ |         _______, _______, _______,                            _______,                            _______, _______, _______, _______ | ||||||
|     ), |     ), | ||||||
|     [3] = LAYOUT_all( |     [3] = LAYOUT_60_ansi_split_bs_rshift( | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, |         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||||
|  | |||||||
| @ -18,16 +18,77 @@ | |||||||
| 
 | 
 | ||||||
| #include "quantum.h" | #include "quantum.h" | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_all( \ | #define ___ KC_NO | ||||||
|     k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \ | 
 | ||||||
|     k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \ | /*
 | ||||||
|     k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12,                 \ |  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐ | ||||||
|     k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,                 \ |  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │      │0D     │ 2u Backspace | ||||||
|     k04_00, k04_01, k04_02,                 k04_05,                         k04_09, k04_10, k04_11, k04_12                  \ |  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └───────┘ | ||||||
|  |  * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │ | ||||||
|  |  * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ | ||||||
|  |  * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │ | ||||||
|  |  * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐ | ||||||
|  |  * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3C │   │3B        │ 2.75u RShift | ||||||
|  |  * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘ | ||||||
|  |  * │40  │41  │42  │45                      │49  │4A  │4B  │4C  │ | ||||||
|  |  * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ | ||||||
|  |  * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ | ||||||
|  |  * │40   │41 │42   │45                         │4A   │4B │4C   │ Tsangan/WKL | ||||||
|  |  * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ | ||||||
|  |  */ | ||||||
|  | 
 | ||||||
|  | #define LAYOUT_60_ansi( \ | ||||||
|  |     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ | ||||||
|  |     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ | ||||||
|  |     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C, \ | ||||||
|  |     k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3B, \ | ||||||
|  |     k40, k41, k42,                k45,                k49, k4A, k4B, k4C  \ | ||||||
| ) { \ | ) { \ | ||||||
|     { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \ |     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, ___ }, \ | ||||||
|     { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO  }, \ |     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \ | ||||||
|     { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, KC_NO,  KC_NO  }, \ |     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, ___ }, \ | ||||||
|     { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO,  KC_NO  }, \ |     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___ }, \ | ||||||
|     { k04_00, k04_01, k04_02, KC_NO,  KC_NO,  k04_05, KC_NO,  KC_NO,  KC_NO,  k04_09, k04_10, k04_11, k04_12, KC_NO,  KC_NO  }  \ |     { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, ___, ___ }  \ | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #define LAYOUT_60_ansi_split_bs_rshift( \ | ||||||
|  |     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ | ||||||
|  |     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \ | ||||||
|  |     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C,      \ | ||||||
|  |     k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      \ | ||||||
|  |     k40, k41, k42,                k45,                k49, k4A, k4B, k4C       \ | ||||||
|  | ) { \ | ||||||
|  |     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ | ||||||
|  |     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \ | ||||||
|  |     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, ___ }, \ | ||||||
|  |     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \ | ||||||
|  |     { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4A, k4B, k4C, ___, ___ }  \ | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #define LAYOUT_60_ansi_tsangan( \ | ||||||
|  |     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ | ||||||
|  |     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ | ||||||
|  |     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C, \ | ||||||
|  |     k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3B, \ | ||||||
|  |     k40, k41, k42,                k45,                     k4A, k4B, k4C  \ | ||||||
|  | ) { \ | ||||||
|  |     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, ___ }, \ | ||||||
|  |     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \ | ||||||
|  |     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, ___ }, \ | ||||||
|  |     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___ }, \ | ||||||
|  |     { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, ___ }  \ | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #define LAYOUT_60_ansi_tsangan_split_bs_rshift( \ | ||||||
|  |     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ | ||||||
|  |     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \ | ||||||
|  |     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2C,      \ | ||||||
|  |     k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      \ | ||||||
|  |     k40, k41, k42,                k45,                     k4A, k4B, k4C       \ | ||||||
|  | ) { \ | ||||||
|  |     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ | ||||||
|  |     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \ | ||||||
|  |     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, ___ }, \ | ||||||
|  |     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \ | ||||||
|  |     { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, ___ }  \ | ||||||
| } | } | ||||||
|  | |||||||
| @ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover | |||||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||||
| RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow | RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow | ||||||
| AUDIO_ENABLE = no           # Audio output | AUDIO_ENABLE = no           # Audio output | ||||||
|  | 
 | ||||||
|  | LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot