mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 13:22:31 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						a9f8111eac
					
				| @ -18,6 +18,23 @@ | ||||
| #include "quantum.h" | ||||
| #define _X_ KC_NO | ||||
| 
 | ||||
| /*
 | ||||
|  *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐ | ||||
|  *              │00 │01 │02 │03 │04 │05 │45 │06 │07 │08 │09 │0A │0B │0C │0D │      │0C     │ 2u Backspace | ||||
|  *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤ | ||||
|  *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │        │     │ | ||||
|  *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐2D  │ ISO Enter | ||||
|  *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C      │     │2C │    │ | ||||
|  * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤ | ||||
|  * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift | ||||
|  * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘ | ||||
|  *              │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │ | ||||
|  *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ | ||||
|  *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ | ||||
|  *              │40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL | ||||
|  *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ | ||||
|  */ | ||||
| 
 | ||||
| #define LAYOUT_all( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45,     K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ | ||||
|     K10, K11, K12, K13, K14, K15,          K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ | ||||
| @ -31,3 +48,73 @@ | ||||
|     { K30,  K31,  K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ | ||||
|     { K40,  K41,  K42,  _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \ | ||||
| } | ||||
| 
 | ||||
| #define LAYOUT_60_ansi( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, \ | ||||
|     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,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \ | ||||
|     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ | ||||
| ) { \ | ||||
|     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _X_ }, \ | ||||
|     { 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, _X_ }, \ | ||||
|     { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _X_ }, \ | ||||
|     { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \ | ||||
| } | ||||
| 
 | ||||
| #define LAYOUT_60_ansi_split_bs_rshift( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45, 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,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | ||||
|     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ | ||||
| ) { \ | ||||
|     { 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, _X_ }, \ | ||||
|     { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ | ||||
|     { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \ | ||||
| } | ||||
| 
 | ||||
| #define LAYOUT_60_tsangan_hhkb( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45, 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,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | ||||
|     K40, K41, K42,                K46,                     K4B, K4C, K4D  \ | ||||
| ) { \ | ||||
|     { 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, _X_ }, \ | ||||
|     { K30, _X_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ | ||||
|     { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, _X_, K4B, K4C, K4D }  \ | ||||
| } | ||||
| 
 | ||||
| #define LAYOUT_60_iso( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, \ | ||||
|     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \ | ||||
|     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ | ||||
|     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \ | ||||
|     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ | ||||
| ) { \ | ||||
|     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, _X_ }, \ | ||||
|     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, _X_ }, \ | ||||
|     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ | ||||
|     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, _X_ }, \ | ||||
|     { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \ | ||||
| } | ||||
| 
 | ||||
| #define LAYOUT_60_iso_split_bs_rshift( \ | ||||
|     K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ | ||||
|     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \ | ||||
|     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ | ||||
|     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ | ||||
|     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ | ||||
| ) { \ | ||||
|     { 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, _X_ }, \ | ||||
|     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ | ||||
|     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ | ||||
|     { K40, K41, K42, _X_, _X_, K45, K46, _X_, _X_, _X_, K4A, K4B, K4C, K4D }  \ | ||||
| } | ||||
|  | ||||
| @ -26,6 +26,7 @@ | ||||
|         "pid": "0x001A", | ||||
|         "device_version": "0.0.1" | ||||
|     }, | ||||
|     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_tsangan_hhkb", "60_iso", "60_iso_split_bs_rshift"], | ||||
|     "layouts": { | ||||
|         "LAYOUT_all": { | ||||
|             "layout": [ | ||||
| @ -90,6 +91,358 @@ | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||||
|                 {"label":"Fn", "x":14, "y":3}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||||
|                 {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_60_ansi": { | ||||
|             "layout": [ | ||||
|                 {"label":"Esc", "x":0, "y":0}, | ||||
|                 {"label":"1!", "x":1, "y":0}, | ||||
|                 {"label":"2@", "x":2, "y":0}, | ||||
|                 {"label":"3#", "x":3, "y":0}, | ||||
|                 {"label":"4$", "x":4, "y":0}, | ||||
|                 {"label":"5%", "x":5, "y":0}, | ||||
|                 {"label":"6^", "x":6, "y":0}, | ||||
|                 {"label":"7&", "x":7, "y":0}, | ||||
|                 {"label":"8*", "x":8, "y":0}, | ||||
|                 {"label":"9(", "x":9, "y":0}, | ||||
|                 {"label":"0)", "x":10, "y":0}, | ||||
|                 {"label":"-_", "x":11, "y":0}, | ||||
|                 {"label":"=+", "x":12, "y":0}, | ||||
|                 {"label":"Backspace", "x":13, "y":0, "w":2}, | ||||
| 
 | ||||
|                 {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||||
|                 {"label":"Q", "x":1.5, "y":1}, | ||||
|                 {"label":"W", "x":2.5, "y":1}, | ||||
|                 {"label":"E", "x":3.5, "y":1}, | ||||
|                 {"label":"R", "x":4.5, "y":1}, | ||||
|                 {"label":"T", "x":5.5, "y":1}, | ||||
|                 {"label":"Y", "x":6.5, "y":1}, | ||||
|                 {"label":"U", "x":7.5, "y":1}, | ||||
|                 {"label":"I", "x":8.5, "y":1}, | ||||
|                 {"label":"O", "x":9.5, "y":1}, | ||||
|                 {"label":"P", "x":10.5, "y":1}, | ||||
|                 {"label":"[{", "x":11.5, "y":1}, | ||||
|                 {"label":"]}", "x":12.5, "y":1}, | ||||
|                 {"label":"\\|", "x":13.5, "y":1, "w":1.5}, | ||||
| 
 | ||||
|                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"A", "x":1.75, "y":2}, | ||||
|                 {"label":"S", "x":2.75, "y":2}, | ||||
|                 {"label":"D", "x":3.75, "y":2}, | ||||
|                 {"label":"F", "x":4.75, "y":2}, | ||||
|                 {"label":"G", "x":5.75, "y":2}, | ||||
|                 {"label":"H", "x":6.75, "y":2}, | ||||
|                 {"label":"J", "x":7.75, "y":2}, | ||||
|                 {"label":"K", "x":8.75, "y":2}, | ||||
|                 {"label":"L", "x":9.75, "y":2}, | ||||
|                 {"label":";:", "x":10.75, "y":2}, | ||||
|                 {"label":"'\"", "x":11.75, "y":2}, | ||||
|                 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||||
| 
 | ||||
|                 {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||||
|                 {"label":"Z", "x":2.25, "y":3}, | ||||
|                 {"label":"X", "x":3.25, "y":3}, | ||||
|                 {"label":"C", "x":4.25, "y":3}, | ||||
|                 {"label":"V", "x":5.25, "y":3}, | ||||
|                 {"label":"B", "x":6.25, "y":3}, | ||||
|                 {"label":"N", "x":7.25, "y":3}, | ||||
|                 {"label":"M", "x":8.25, "y":3}, | ||||
|                 {"label":",<", "x":9.25, "y":3}, | ||||
|                 {"label":".>", "x":10.25, "y":3}, | ||||
|                 {"label":"/?", "x":11.25, "y":3}, | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":2.75}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||||
|                 {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_60_ansi_split_bs_rshift": { | ||||
|             "layout": [ | ||||
|                 {"label":"Esc", "x":0, "y":0}, | ||||
|                 {"label":"1!", "x":1, "y":0}, | ||||
|                 {"label":"2@", "x":2, "y":0}, | ||||
|                 {"label":"3#", "x":3, "y":0}, | ||||
|                 {"label":"4$", "x":4, "y":0}, | ||||
|                 {"label":"5%", "x":5, "y":0}, | ||||
|                 {"label":"6^", "x":6, "y":0}, | ||||
|                 {"label":"7&", "x":7, "y":0}, | ||||
|                 {"label":"8*", "x":8, "y":0}, | ||||
|                 {"label":"9(", "x":9, "y":0}, | ||||
|                 {"label":"0)", "x":10, "y":0}, | ||||
|                 {"label":"-_", "x":11, "y":0}, | ||||
|                 {"label":"=+", "x":12, "y":0}, | ||||
|                 {"label":"`~", "x":13, "y":0}, | ||||
|                 {"label":"\\|", "x":14, "y":0}, | ||||
| 
 | ||||
|                 {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||||
|                 {"label":"Q", "x":1.5, "y":1}, | ||||
|                 {"label":"W", "x":2.5, "y":1}, | ||||
|                 {"label":"E", "x":3.5, "y":1}, | ||||
|                 {"label":"R", "x":4.5, "y":1}, | ||||
|                 {"label":"T", "x":5.5, "y":1}, | ||||
|                 {"label":"Y", "x":6.5, "y":1}, | ||||
|                 {"label":"U", "x":7.5, "y":1}, | ||||
|                 {"label":"I", "x":8.5, "y":1}, | ||||
|                 {"label":"O", "x":9.5, "y":1}, | ||||
|                 {"label":"P", "x":10.5, "y":1}, | ||||
|                 {"label":"[{", "x":11.5, "y":1}, | ||||
|                 {"label":"]}", "x":12.5, "y":1}, | ||||
|                 {"label":"\\|", "x":13.5, "y":1, "w":1.5}, | ||||
| 
 | ||||
|                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"A", "x":1.75, "y":2}, | ||||
|                 {"label":"S", "x":2.75, "y":2}, | ||||
|                 {"label":"D", "x":3.75, "y":2}, | ||||
|                 {"label":"F", "x":4.75, "y":2}, | ||||
|                 {"label":"G", "x":5.75, "y":2}, | ||||
|                 {"label":"H", "x":6.75, "y":2}, | ||||
|                 {"label":"J", "x":7.75, "y":2}, | ||||
|                 {"label":"K", "x":8.75, "y":2}, | ||||
|                 {"label":"L", "x":9.75, "y":2}, | ||||
|                 {"label":";:", "x":10.75, "y":2}, | ||||
|                 {"label":"'\"", "x":11.75, "y":2}, | ||||
|                 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||||
| 
 | ||||
|                 {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||||
|                 {"label":"Z", "x":2.25, "y":3}, | ||||
|                 {"label":"X", "x":3.25, "y":3}, | ||||
|                 {"label":"C", "x":4.25, "y":3}, | ||||
|                 {"label":"V", "x":5.25, "y":3}, | ||||
|                 {"label":"B", "x":6.25, "y":3}, | ||||
|                 {"label":"N", "x":7.25, "y":3}, | ||||
|                 {"label":"M", "x":8.25, "y":3}, | ||||
|                 {"label":",<", "x":9.25, "y":3}, | ||||
|                 {"label":".>", "x":10.25, "y":3}, | ||||
|                 {"label":"/?", "x":11.25, "y":3}, | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||||
|                 {"label":"Fn", "x":14, "y":3}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||||
|                 {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_60_tsangan_hhkb": { | ||||
|             "layout": [ | ||||
|                 {"label":"Esc", "x":0, "y":0}, | ||||
|                 {"label":"1!", "x":1, "y":0}, | ||||
|                 {"label":"2@", "x":2, "y":0}, | ||||
|                 {"label":"3#", "x":3, "y":0}, | ||||
|                 {"label":"4$", "x":4, "y":0}, | ||||
|                 {"label":"5%", "x":5, "y":0}, | ||||
|                 {"label":"6^", "x":6, "y":0}, | ||||
|                 {"label":"7&", "x":7, "y":0}, | ||||
|                 {"label":"8*", "x":8, "y":0}, | ||||
|                 {"label":"9(", "x":9, "y":0}, | ||||
|                 {"label":"0)", "x":10, "y":0}, | ||||
|                 {"label":"-_", "x":11, "y":0}, | ||||
|                 {"label":"=+", "x":12, "y":0}, | ||||
|                 {"label":"`~", "x":13, "y":0}, | ||||
|                 {"label":"\\|", "x":14, "y":0}, | ||||
| 
 | ||||
|                 {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||||
|                 {"label":"Q", "x":1.5, "y":1}, | ||||
|                 {"label":"W", "x":2.5, "y":1}, | ||||
|                 {"label":"E", "x":3.5, "y":1}, | ||||
|                 {"label":"R", "x":4.5, "y":1}, | ||||
|                 {"label":"T", "x":5.5, "y":1}, | ||||
|                 {"label":"Y", "x":6.5, "y":1}, | ||||
|                 {"label":"U", "x":7.5, "y":1}, | ||||
|                 {"label":"I", "x":8.5, "y":1}, | ||||
|                 {"label":"O", "x":9.5, "y":1}, | ||||
|                 {"label":"P", "x":10.5, "y":1}, | ||||
|                 {"label":"[{", "x":11.5, "y":1}, | ||||
|                 {"label":"]}", "x":12.5, "y":1}, | ||||
|                 {"label":"\\|", "x":13.5, "y":1, "w":1.5}, | ||||
| 
 | ||||
|                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"A", "x":1.75, "y":2}, | ||||
|                 {"label":"S", "x":2.75, "y":2}, | ||||
|                 {"label":"D", "x":3.75, "y":2}, | ||||
|                 {"label":"F", "x":4.75, "y":2}, | ||||
|                 {"label":"G", "x":5.75, "y":2}, | ||||
|                 {"label":"H", "x":6.75, "y":2}, | ||||
|                 {"label":"J", "x":7.75, "y":2}, | ||||
|                 {"label":"K", "x":8.75, "y":2}, | ||||
|                 {"label":"L", "x":9.75, "y":2}, | ||||
|                 {"label":";:", "x":10.75, "y":2}, | ||||
|                 {"label":"'\"", "x":11.75, "y":2}, | ||||
|                 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||||
| 
 | ||||
|                 {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||||
|                 {"label":"Z", "x":2.25, "y":3}, | ||||
|                 {"label":"X", "x":3.25, "y":3}, | ||||
|                 {"label":"C", "x":4.25, "y":3}, | ||||
|                 {"label":"V", "x":5.25, "y":3}, | ||||
|                 {"label":"B", "x":6.25, "y":3}, | ||||
|                 {"label":"N", "x":7.25, "y":3}, | ||||
|                 {"label":"M", "x":8.25, "y":3}, | ||||
|                 {"label":",<", "x":9.25, "y":3}, | ||||
|                 {"label":".>", "x":10.25, "y":3}, | ||||
|                 {"label":"/?", "x":11.25, "y":3}, | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||||
|                 {"label":"Fn", "x":14, "y":3}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.5}, | ||||
|                 {"label":"Win", "x":1.5, "y":4}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.5}, | ||||
|                 {"label":"Space", "x":4, "y":4, "w":7}, | ||||
|                 {"label":"Alt", "x":11, "y":4, "w":1.5}, | ||||
|                 {"label":"Menu", "x":12.5, "y":4}, | ||||
|                 {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_60_iso": { | ||||
|             "layout": [ | ||||
|                 {"label":"Esc", "x":0, "y":0}, | ||||
|                 {"label":"1!", "x":1, "y":0}, | ||||
|                 {"label":"2\"", "x":2, "y":0}, | ||||
|                 {"label":"3\u00a3", "x":3, "y":0}, | ||||
|                 {"label":"4$", "x":4, "y":0}, | ||||
|                 {"label":"5%", "x":5, "y":0}, | ||||
|                 {"label":"6^", "x":6, "y":0}, | ||||
|                 {"label":"7&", "x":7, "y":0}, | ||||
|                 {"label":"8*", "x":8, "y":0}, | ||||
|                 {"label":"9(", "x":9, "y":0}, | ||||
|                 {"label":"0)", "x":10, "y":0}, | ||||
|                 {"label":"-_", "x":11, "y":0}, | ||||
|                 {"label":"=+", "x":12, "y":0}, | ||||
|                 {"label":"Backspace", "x":13, "y":0, "w":2}, | ||||
| 
 | ||||
|                 {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||||
|                 {"label":"Q", "x":1.5, "y":1}, | ||||
|                 {"label":"W", "x":2.5, "y":1}, | ||||
|                 {"label":"E", "x":3.5, "y":1}, | ||||
|                 {"label":"R", "x":4.5, "y":1}, | ||||
|                 {"label":"T", "x":5.5, "y":1}, | ||||
|                 {"label":"Y", "x":6.5, "y":1}, | ||||
|                 {"label":"U", "x":7.5, "y":1}, | ||||
|                 {"label":"I", "x":8.5, "y":1}, | ||||
|                 {"label":"O", "x":9.5, "y":1}, | ||||
|                 {"label":"P", "x":10.5, "y":1}, | ||||
|                 {"label":"[{", "x":11.5, "y":1}, | ||||
|                 {"label":"]}", "x":12.5, "y":1}, | ||||
| 
 | ||||
|                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"A", "x":1.75, "y":2}, | ||||
|                 {"label":"S", "x":2.75, "y":2}, | ||||
|                 {"label":"D", "x":3.75, "y":2}, | ||||
|                 {"label":"F", "x":4.75, "y":2}, | ||||
|                 {"label":"G", "x":5.75, "y":2}, | ||||
|                 {"label":"H", "x":6.75, "y":2}, | ||||
|                 {"label":"J", "x":7.75, "y":2}, | ||||
|                 {"label":"K", "x":8.75, "y":2}, | ||||
|                 {"label":"L", "x":9.75, "y":2}, | ||||
|                 {"label":";:", "x":10.75, "y":2}, | ||||
|                 {"label":"'@", "x":11.75, "y":2}, | ||||
|                 {"label":"#~", "x":12.75, "y":2}, | ||||
|                 {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, | ||||
| 
 | ||||
|                 {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||||
|                 {"label":"\\|", "x":1.25, "y":3}, | ||||
|                 {"label":"Z", "x":2.25, "y":3}, | ||||
|                 {"label":"X", "x":3.25, "y":3}, | ||||
|                 {"label":"C", "x":4.25, "y":3}, | ||||
|                 {"label":"V", "x":5.25, "y":3}, | ||||
|                 {"label":"B", "x":6.25, "y":3}, | ||||
|                 {"label":"N", "x":7.25, "y":3}, | ||||
|                 {"label":"M", "x":8.25, "y":3}, | ||||
|                 {"label":",<", "x":9.25, "y":3}, | ||||
|                 {"label":".>", "x":10.25, "y":3}, | ||||
|                 {"label":"/?", "x":11.25, "y":3}, | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":2.75}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Space", "x":3.75, "y":4, "w":6.25}, | ||||
|                 {"label":"Alt", "x":10, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":11.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Menu", "x":12.5, "y":4, "w":1.25}, | ||||
|                 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} | ||||
|             ] | ||||
|         }, | ||||
|         "LAYOUT_60_iso_split_bs_rshift": { | ||||
|             "layout": [ | ||||
|                 {"label":"Esc", "x":0, "y":0}, | ||||
|                 {"label":"1!", "x":1, "y":0}, | ||||
|                 {"label":"2\"", "x":2, "y":0}, | ||||
|                 {"label":"3\u00a3", "x":3, "y":0}, | ||||
|                 {"label":"4$", "x":4, "y":0}, | ||||
|                 {"label":"5%", "x":5, "y":0}, | ||||
|                 {"label":"6^", "x":6, "y":0}, | ||||
|                 {"label":"7&", "x":7, "y":0}, | ||||
|                 {"label":"8*", "x":8, "y":0}, | ||||
|                 {"label":"9(", "x":9, "y":0}, | ||||
|                 {"label":"0)", "x":10, "y":0}, | ||||
|                 {"label":"-_", "x":11, "y":0}, | ||||
|                 {"label":"=+", "x":12, "y":0}, | ||||
|                 {"label":"`\u00ac", "x":13, "y":0}, | ||||
|                 {"label":"\\|", "x":14, "y":0}, | ||||
| 
 | ||||
|                 {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||||
|                 {"label":"Q", "x":1.5, "y":1}, | ||||
|                 {"label":"W", "x":2.5, "y":1}, | ||||
|                 {"label":"E", "x":3.5, "y":1}, | ||||
|                 {"label":"R", "x":4.5, "y":1}, | ||||
|                 {"label":"T", "x":5.5, "y":1}, | ||||
|                 {"label":"Y", "x":6.5, "y":1}, | ||||
|                 {"label":"U", "x":7.5, "y":1}, | ||||
|                 {"label":"I", "x":8.5, "y":1}, | ||||
|                 {"label":"O", "x":9.5, "y":1}, | ||||
|                 {"label":"P", "x":10.5, "y":1}, | ||||
|                 {"label":"[{", "x":11.5, "y":1}, | ||||
|                 {"label":"]}", "x":12.5, "y":1}, | ||||
| 
 | ||||
|                 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||||
|                 {"label":"A", "x":1.75, "y":2}, | ||||
|                 {"label":"S", "x":2.75, "y":2}, | ||||
|                 {"label":"D", "x":3.75, "y":2}, | ||||
|                 {"label":"F", "x":4.75, "y":2}, | ||||
|                 {"label":"G", "x":5.75, "y":2}, | ||||
|                 {"label":"H", "x":6.75, "y":2}, | ||||
|                 {"label":"J", "x":7.75, "y":2}, | ||||
|                 {"label":"K", "x":8.75, "y":2}, | ||||
|                 {"label":"L", "x":9.75, "y":2}, | ||||
|                 {"label":";:", "x":10.75, "y":2}, | ||||
|                 {"label":"'@", "x":11.75, "y":2}, | ||||
|                 {"label":"#~", "x":12.75, "y":2}, | ||||
|                 {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, | ||||
| 
 | ||||
|                 {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||||
|                 {"label":"\\|", "x":1.25, "y":3}, | ||||
|                 {"label":"Z", "x":2.25, "y":3}, | ||||
|                 {"label":"X", "x":3.25, "y":3}, | ||||
|                 {"label":"C", "x":4.25, "y":3}, | ||||
|                 {"label":"V", "x":5.25, "y":3}, | ||||
|                 {"label":"B", "x":6.25, "y":3}, | ||||
|                 {"label":"N", "x":7.25, "y":3}, | ||||
|                 {"label":"M", "x":8.25, "y":3}, | ||||
|                 {"label":",<", "x":9.25, "y":3}, | ||||
|                 {"label":".>", "x":10.25, "y":3}, | ||||
|                 {"label":"/?", "x":11.25, "y":3}, | ||||
|                 {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||||
|                 {"label":"Fn", "x":14, "y":3}, | ||||
| 
 | ||||
|                 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, | ||||
|                 {"label":"Win", "x":1.25, "y":4, "w":1.25}, | ||||
|                 {"label":"Alt", "x":2.5, "y":4, "w":1.25}, | ||||
|  | ||||
| @ -1,11 +1,11 @@ | ||||
| # dyz60 | ||||
| # dyz60_hs | ||||
| 
 | ||||
|  | ||||
| 
 | ||||
| 60% layout has flexcut with multiple layout and mounting support. | ||||
| 
 | ||||
| * Keyboard Maintainer: [dayatz](https://github.com/dayatz) | ||||
| * Hardware Supported: dyz60, ATmega32U4 | ||||
| * Hardware Supported: dyz60_hs, ATmega32U4 | ||||
| * Hardware Availability: Local Indonesia GB. | ||||
| 
 | ||||
| #### Enter Bootloader | ||||
| @ -20,10 +20,10 @@ Enter the bootloader in 3 ways: | ||||
| 
 | ||||
| Make example for this keyboard (after setting up your build environment): | ||||
| 
 | ||||
|     make dyz/dyz60:default | ||||
|     make dyz/dyz60_hs:default | ||||
| 
 | ||||
| Flashing example for this keyboard: | ||||
| 
 | ||||
|     make dyz/dyz60:default:flash | ||||
|     make dyz/dyz60_hs:default:flash | ||||
| 
 | ||||
| See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot