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
						c2687906d2
					
				| @ -28,81 +28,81 @@ | |||||||
|  * represents the switch matrix. |  * represents the switch matrix. | ||||||
|  */ |  */ | ||||||
| #define LAYOUT_all( \ | #define LAYOUT_all( \ | ||||||
|   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ |     k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ | ||||||
|   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ |     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \ | ||||||
|   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |     k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ | ||||||
|   K30, K31, K32,      K34, K35, K36, K37, K38, K39, K3A, K3B  \ |     k60, k70, k61,      k62, k72, k63, k73, k64, k74, k65, k75 \ | ||||||
| ) { \ | ) { \ | ||||||
| { K00, K02, K04, K06, K08, K0A, }, \ |     { k00, k01, k02, k03, k04, k05 }, \ | ||||||
| { K01, K03, K05, K07, K09, K0B, }, \ |     { k10, k11, k12, k13, k14, k15 }, \ | ||||||
| { K10, K12, K14, K16, K18, K1A, }, \ |     { k20, k21, k22, k23, k24, k25 }, \ | ||||||
| { K11, K13, K15, K17, K19, K1B, }, \ |     { k30, k31, k32, k33, k34, k35 }, \ | ||||||
| { K20, K22, K24, K26, K28, K2A, }, \ |     { k40, k41, k42, k43, k44, k45 }, \ | ||||||
| { K21, K23, K25, K27, K29, K2B, }, \ |     { k50, k51, k52, k53, k54, k55 }, \ | ||||||
| { K30, K32, K34, K36, K38, K3A, }, \ |     { k60, k61, k62, k63, k64, k65 }, \ | ||||||
| { K31, _x_, K35, K37, K39, K3B, }  \ |     { k70, _x_, k72, k73, k74, k75 } \ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_ansi_40( \ | #define LAYOUT_ansi_40( \ | ||||||
|   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ |     k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ | ||||||
|   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \ |     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34,      k35, \ | ||||||
|   K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |     k40,      k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ | ||||||
|   K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \ |     k60, k70, k61,           k72, k63,      k64, k74, k65, k75 \ | ||||||
| ) { \ | ) { \ | ||||||
| { K00, K02, K04, K06, K08, K0A, }, \ |     { k00, k01, k02, k03, k04, k05 }, \ | ||||||
| { K01, K03, K05, K07, K09, K0B, }, \ |     { k10, k11, k12, k13, k14, k15 }, \ | ||||||
| { K10, K12, K14, K16, K18, K1A, }, \ |     { k20, k21, k22, k23, k24, _x_ }, \ | ||||||
| { K11, K13, K15, K17, K19, K1B, }, \ |     { k30, k31, k32, k33, k34, k35 }, \ | ||||||
| { K20, K22, K24, K26, K28, K2A, }, \ |     { k40, k41, k42, k43, k44, k45 }, \ | ||||||
| { K21, K23, K25, K27, K29, K2B, }, \ |     { _x_, k51, k52, k53, k54, k55 }, \ | ||||||
| { K30, K32, K34, K36, K38, K3A, }, \ |     { k60, k61, _x_, k63, k64, k65 }, \ | ||||||
| { K31, _x_, K35, K37, K39, K3B, }  \ |     { k70, _x_, k72, _x_, k74, k75 } \ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_ansi_split_lshift( \ | #define LAYOUT_ansi_split_lshift( \ | ||||||
|   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ |     k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ | ||||||
|   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \ |     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34,      k35, \ | ||||||
|   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |     k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ | ||||||
|   K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \ |     k60, k70, k61,           k72, k63,      k64, k74, k65, k75 \ | ||||||
| ) { \ | ) { \ | ||||||
| { K00, K02, K04, K06, K08, K0A, }, \ |     { k00, k01, k02, k03, k04, k05 }, \ | ||||||
| { K01, K03, K05, K07, K09, K0B, }, \ |     { k10, k11, k12, k13, k14, k15 }, \ | ||||||
| { K10, K12, K14, K16, K18, K1A, }, \ |     { k20, k21, k22, k23, k24, _x_ }, \ | ||||||
| { K11, K13, K15, K17, K19, K1B, }, \ |     { k30, k31, k32, k33, k34, k35 }, \ | ||||||
| { K20, K22, K24, K26, K28, K2A, }, \ |     { k40, k41, k42, k43, k44, k45 }, \ | ||||||
| { K21, K23, K25, K27, K29, K2B, }, \ |     { k50, k51, k52, k53, k54, k55 }, \ | ||||||
| { K30, K32, K34, K36, K38, K3A, }, \ |     { k60, k61, _x_, k63, k64, k65 }, \ | ||||||
| { K31, _x_, K35, K37, K39, K3B, }  \ |     { k70, _x_, k72, _x_, k74, k75 } \ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_ansi_split_space( \ | #define LAYOUT_ansi_split_space( \ | ||||||
|   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ |     k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ | ||||||
|   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, \ |     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34,      k35, \ | ||||||
|   K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |     k40,      k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ | ||||||
|   K30, K31, K32,      K34, K35, K36, K37, K38, K39, K3A, K3B  \ |     k60, k70, k61,      k62, k72, k63, k73, k64, k74, k65, k75 \ | ||||||
| ) { \ | ) { \ | ||||||
| { K00, K02, K04, K06, K08, K0A, }, \ |     { k00, k01, k02, k03, k04, k05 }, \ | ||||||
| { K01, K03, K05, K07, K09, K0B, }, \ |     { k10, k11, k12, k13, k14, k15 }, \ | ||||||
| { K10, K12, K14, K16, K18, K1A, }, \ |     { k20, k21, k22, k23, k24, _x_ }, \ | ||||||
| { K11, K13, K15, K17, K19, K1B, }, \ |     { k30, k31, k32, k33, k34, k35 }, \ | ||||||
| { K20, K22, K24, K26, K28, K2A, }, \ |     { k40, k41, k42, k43, k44, k45 }, \ | ||||||
| { K21, K23, K25, K27, K29, K2B, }, \ |     { _x_, k51, k52, k53, k54, k55 }, \ | ||||||
| { K30, K32, K34, K36, K38, K3A, }, \ |     { k60, k61, k62, k63, k64, k65 }, \ | ||||||
| { K31, _x_, K35, K37, K39, K3B, }  \ |     { k70, _x_, k72, k73, k74, k75 } \ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define LAYOUT_ansi_split_enter( \ | #define LAYOUT_ansi_split_enter( \ | ||||||
|   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ |     k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \ | ||||||
|   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ |     k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \ | ||||||
|   K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ |     k40,      k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \ | ||||||
|   K30, K31, K32,           K35, K36,      K38, K39, K3A, K3B  \ |     k60, k70, k61,           k72, k63,      k64, k74, k65, k75 \ | ||||||
| ) { \ | ) { \ | ||||||
| { K00, K02, K04, K06, K08, K0A, }, \ |     { k00, k01, k02, k03, k04, k05 }, \ | ||||||
| { K01, K03, K05, K07, K09, K0B, }, \ |     { k10, k11, k12, k13, k14, k15 }, \ | ||||||
| { K10, K12, K14, K16, K18, K1A, }, \ |     { k20, k21, k22, k23, k24, k25 }, \ | ||||||
| { K11, K13, K15, K17, K19, K1B, }, \ |     { k30, k31, k32, k33, k34, k35 }, \ | ||||||
| { K20, K22, K24, K26, K28, K2A, }, \ |     { k40, k41, k42, k43, k44, k45 }, \ | ||||||
| { K21, K23, K25, K27, K29, K2B, }, \ |     { _x_, k51, k52, k53, k54, k55 }, \ | ||||||
| { K30, K32, K34, K36, K38, K3A, }, \ |     { k60, k61, _x_, k63, k64, k65 }, \ | ||||||
| { K31, _x_, K35, K37, K39, K3B, }  \ |     { k70, _x_, k72, _x_, k74, k75 } \ | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot