Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						2f5074cf32
					
				| @ -9,7 +9,7 @@ | ||||
| 
 | ||||
|         "LAYOUT_2x3uC": { | ||||
|             "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}] | ||||
|         }, | ||||
|         } | ||||
|          | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -88,10 +88,10 @@ | ||||
| 				{"label":"K100", "x":10, "y":5.5, "w":1.25},  | ||||
|                 {"label":"K111", "x":11.25, "y":5.5, "w":1.25},  | ||||
|                 {"label":"K112", "x":12.5, "y":5.5, "w":1.25},  | ||||
|                 {"label":"K113", "x":13.75, "y":5.5, "w":1.25} | ||||
|                 {"label":"K113", "x":13.75, "y":5.5, "w":1.25}, | ||||
| 				{"label":"K114", "x":15.25, "y":5.5},  | ||||
| 				{"label":"K115", "x":16.25, "y":5.5},  | ||||
| 				{"label":"K116", "x":17.25, "y":5.5}, | ||||
| 				{"label":"K116", "x":17.25, "y":5.5} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -31,7 +31,7 @@ | ||||
|             ["C4", "A7", "A3", "F4"], | ||||
|             ["C5", null, null, "F5"], | ||||
|             ["C6", null, null, "F6"], | ||||
|             ["C7", null, null, "F7"], | ||||
|             ["C7", null, null, "F7"] | ||||
|         ] | ||||
|     }, | ||||
|     "usb": { | ||||
|  | ||||
| @ -23,7 +23,7 @@ | ||||
|             ["LINE_PIN9",  null,         "LINE_PIN16"], | ||||
|             ["LINE_PIN10", null,         "LINE_PIN15"], | ||||
|             ["LINE_PIN11", null,         "LINE_PIN14"], | ||||
|             ["LINE_PIN12", "E30",        "LINE_PIN13"], | ||||
|             ["LINE_PIN12", "E30",        "LINE_PIN13"] | ||||
|         ] | ||||
|     }, | ||||
|     "usb": { | ||||
|  | ||||
| @ -23,7 +23,7 @@ | ||||
|             ["LINE_PIN9",  null,         "LINE_PIN16"], | ||||
|             ["LINE_PIN10", null,         "LINE_PIN15"], | ||||
|             ["LINE_PIN11", null,         "LINE_PIN14"], | ||||
|             ["LINE_PIN12", "E30",        "LINE_PIN13"], | ||||
|             ["LINE_PIN12", "E30",        "LINE_PIN13"] | ||||
|         ] | ||||
|     }, | ||||
|     "usb": { | ||||
|  | ||||
| @ -18,7 +18,7 @@ | ||||
|                 {"label":"F10", "x":10.75, "y":0}, | ||||
|                 {"label":"F11", "x":11.75, "y":0}, | ||||
|                 {"label":"F12", "x":12.75, "y":0}, | ||||
|                 {"label":"Print Screen", "x":14, "y":0} | ||||
|                 {"label":"Print Screen", "x":14, "y":0}, | ||||
| 
 | ||||
|                 {"label":"~", "x":0, "y":1.25}, | ||||
|                 {"label":"!", "x":1, "y":1.25}, | ||||
|  | ||||
| @ -28,7 +28,7 @@ | ||||
|               "y": 1 | ||||
|             } | ||||
|           ] | ||||
|         }, | ||||
|         } | ||||
|     }, | ||||
|     "matrix_pins": { | ||||
|         "rows": ["B0", "B1"], | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| { | ||||
|     "matrix_pins": { | ||||
|         "rows": ["D7", "E6", "B4", "B5"], | ||||
|         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], | ||||
|         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"] | ||||
|      },     | ||||
|     "diode_direction": "COL2ROW", | ||||
| 
 | ||||
| @ -9,5 +9,5 @@ | ||||
|       "vid": "0xFEED", | ||||
|       "pid": "0x67C0", | ||||
|       "device_ver": "0x0001" | ||||
|     }, | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -13,7 +13,7 @@ | ||||
|                 {"x": 0, "y": 1}, | ||||
|                 {"x": 1, "y": 1}, | ||||
|                 {"x": 2, "y": 1}, | ||||
|                 {"x": 3, "y": 1}, | ||||
|                 {"x": 3, "y": 1} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -9,7 +9,7 @@ | ||||
|                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1}, | ||||
|                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2}, | ||||
|                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3}, | ||||
|                 {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4}, | ||||
|                 {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_standard_numpad": { | ||||
| @ -18,7 +18,7 @@ | ||||
|                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1}, | ||||
|                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2, "h":2}, | ||||
|                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3}, | ||||
|                 {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2}, | ||||
|                 {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -91,7 +91,7 @@ | ||||
|                 {"label": "PGDOWN",  "x": 10.5, "y": 5}, | ||||
|                 {"label": "LEFT",    "x": 11.5, "y": 5}, | ||||
|                 {"label": "DOWN",    "x": 12.5, "y": 5}, | ||||
|                 {"label": "RIGHT",   "x": 13.5, "y": 5}, | ||||
|                 {"label": "RIGHT",   "x": 13.5, "y": 5} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -35,7 +35,7 @@ | ||||
|                 {"label":"k1b", "x":11.5, "y":1}, | ||||
|                 {"label":"k1c", "x":12.5, "y":1}, | ||||
|                 {"label":"k1d", "x":13.5, "y":1, "w":1.5}, | ||||
|                 {"label":"k1e", "x":15, "y":1,}, | ||||
|                 {"label":"k1e", "x":15, "y":1}, | ||||
|                  | ||||
|                 {"label":"k20", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"k21", "x":1.75, "y":2}, | ||||
|  | ||||
| @ -80,7 +80,7 @@ | ||||
|                 {"label":"<", "x":9, "y":2},  | ||||
|                 {"label":">", "x":10, "y":2},  | ||||
|                 {"label":"?", "x":11, "y":2}] | ||||
|         }, | ||||
|         } | ||||
| 
 | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -67,7 +67,7 @@ | ||||
|                 {"x":10.25, "y":3},  | ||||
|                 {"x":11.25, "y":3},  | ||||
|                 {"x":12.25, "y":3, "w":1.75}, | ||||
|                 {"x":14, "y":3}  | ||||
|                 {"x":14, "y":3},  | ||||
|                 {"x":16.25, "y":3},  | ||||
|                  | ||||
|                 {"x":0, "y":4, "w":1.25},  | ||||
|  | ||||
| @ -27,7 +27,7 @@ | ||||
| 
 | ||||
|       "LAYOUT_tkl_f13_iso_tsangan": { | ||||
|         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] | ||||
|       } | ||||
|       }, | ||||
| 
 | ||||
|       "LAYOUT_tkl_f13_iso_tsangan_split_rshift": { | ||||
|         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] | ||||
|  | ||||
| @ -3,7 +3,7 @@ | ||||
|     "url": "", | ||||
|     "maintainer": "TerryMathews", | ||||
|     "layout_aliases": { | ||||
|         "LAYOUT_all": "LAYOUT_65_ansi_blocker", | ||||
|         "LAYOUT_all": "LAYOUT_65_ansi_blocker" | ||||
|     }, | ||||
|     "layouts": { | ||||
|         "LAYOUT_65_ansi_blocker": { | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
|                 {"label": "k08", "x": 8, "y": 1, "w": 0}, | ||||
|                 {"label": "k09", "x": 9, "y": 1, "w": 0}, | ||||
|                 {"label": "k0a", "x": 10, "y": 1, "w": 0}, | ||||
|                 {"label": "k0b", "x": 11, "y": 1, "w": 0}, | ||||
|                 {"label": "k0b", "x": 11, "y": 1, "w": 0} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
|             "layout": [ | ||||
|                 {"label": "k00", "x": 0, "y": 0}, | ||||
|                 {"label": "k01", "x": 1, "y": 0}, | ||||
|                 {"label": "k02", "x": 2, "y": 0}, | ||||
|                 {"label": "k02", "x": 2, "y": 0} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -81,7 +81,7 @@ | ||||
|                 {"x": 2.5, "y": 1}, | ||||
|                 {"x": 3.5, "y": 1}, | ||||
|                 {"x": 4.5, "y": 1}, | ||||
|                 {"x": 5.5, "y": 1,}, | ||||
|                 {"x": 5.5, "y": 1}, | ||||
| 
 | ||||
|                 {"x": 0, "y": 2, "w": 1.5}, | ||||
|                 {"x": 1.5, "y": 2}, | ||||
|  | ||||
| @ -19,7 +19,7 @@ | ||||
| 
 | ||||
|                 {"x": 0.5, "y": 3}, | ||||
|                 {"x": 1.5, "y": 3}, | ||||
|                 {"x": 2.5, "y": 3}, | ||||
|                 {"x": 2.5, "y": 3} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user