Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
		
						commit
						9ac3445454
					
				
					 12 changed files with 385 additions and 119 deletions
				
			
		| 
						 | 
				
			
			@ -21,149 +21,149 @@
 | 
			
		|||
#define LAYOUT_ortho1( \
 | 
			
		||||
    k00, k01,                                                           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, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
 | 
			
		||||
    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,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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 },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
    { 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,   k43,   k44,   k45,   KC_NO, k47,   k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho2( \
 | 
			
		||||
    k00, k01,                                                           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, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
 | 
			
		||||
    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,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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 },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
    { 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,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho3( \
 | 
			
		||||
    k00, k01,                                                           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, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,          k45,          k48,                 k4a, k4b, k4c  \
 | 
			
		||||
    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,   k43,          k45,          k48,                 k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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 },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
    { 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,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho4( \
 | 
			
		||||
    k00, k01,                                                           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, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,                    k46,                            k4a, k4b, k4c  \
 | 
			
		||||
    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,                    k46,                            k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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 },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
    { 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,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_ortho5( \
 | 
			
		||||
    k00, k01,                                                           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, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,                    k47,                                 k4b, k4c  \
 | 
			
		||||
    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,                    k47,                                 k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 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 },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,   k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
 | 
			
		||||
    { 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,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_stagger1( \
 | 
			
		||||
    k00, k01,                                                           k0a, k0b, k0c, \
 | 
			
		||||
    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
 | 
			
		||||
	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
 | 
			
		||||
    k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2c, \
 | 
			
		||||
    k30,      k31,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b,  k3c, \
 | 
			
		||||
    k40, k41,   k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
 | 
			
		||||
    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
 | 
			
		||||
	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
    { k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
    { k30, k31, KC_NO,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
    { k40, k41, k42,   k43,   k44,   k45,   KC_NO, k47,   k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_stagger2( \
 | 
			
		||||
    k00, k01,                                                           k0a, k0b, k0c, \
 | 
			
		||||
    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
 | 
			
		||||
	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
 | 
			
		||||
    k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2c, \
 | 
			
		||||
    k30,      k31,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b,  k3c, \
 | 
			
		||||
    k40, k41,   k42,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
 | 
			
		||||
    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
 | 
			
		||||
	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
    { k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
    { k30, k31, KC_NO,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
    { k40, k41, k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_stagger3( \
 | 
			
		||||
    k00, k01,                                                           k0a, k0b, k0c, \
 | 
			
		||||
    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
 | 
			
		||||
	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,   k43,          k45,          k48,                 k4a, k4b, k4c  \
 | 
			
		||||
    k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2c, \
 | 
			
		||||
    k30,      k31,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b,  k3c, \
 | 
			
		||||
    k40, k41,   k42,   k43,          k45,          k48,                 k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
 | 
			
		||||
    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
 | 
			
		||||
	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
    { k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
    { k30, k31, KC_NO,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
    { k40, k41, k42,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_stagger4( \
 | 
			
		||||
    k00, k01,                                                           k0a, k0b, k0c, \
 | 
			
		||||
    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
 | 
			
		||||
	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,                    k46,                            k4a, k4b, k4c  \
 | 
			
		||||
    k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2c, \
 | 
			
		||||
    k30,      k31,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b,  k3c, \
 | 
			
		||||
    k40, k41,   k42,                    k46,                            k4a, k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
 | 
			
		||||
    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
 | 
			
		||||
	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
    { k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
    { k30, k31, KC_NO,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
    { k40, k41, k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define LAYOUT_stagger5( \
 | 
			
		||||
    k00, k01,                                                           k0a, k0b, k0c, \
 | 
			
		||||
    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
 | 
			
		||||
	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
 | 
			
		||||
	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
 | 
			
		||||
	k40, k41,   k42,                    k47,                                 k4b, k4c  \
 | 
			
		||||
    k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2c, \
 | 
			
		||||
    k30,      k31,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b,  k3c, \
 | 
			
		||||
    k40, k41,   k42,                    k47,                                 k4b, k4c  \
 | 
			
		||||
) \
 | 
			
		||||
{ \
 | 
			
		||||
    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
 | 
			
		||||
    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
 | 
			
		||||
	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
 | 
			
		||||
    { k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
 | 
			
		||||
    { k30, k31, KC_NO,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
 | 
			
		||||
    { k40, k41, k42,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,20 +5,190 @@
 | 
			
		|||
    "layouts": {
 | 
			
		||||
        "LAYOUT_625u": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"Num Lock", "x":17.5, "y":0}, {"label":"/", "x":18.5, "y":0}, {"label":"*", "x":19.5, "y":0}, {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1}, {"label":"Del", "x":16.25, "y":1}, {"label":"7", "x":17.5, "y":1}, {"label":"8", "x":18.5, "y":1}, {"label":"9", "x":19.5, "y":1}, {"label":"+", "x":20.5, "y":1, "h":2},
 | 
			
		||||
                {"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":"4", "x":17.5, "y":2}, {"label":"5", "x":18.5, "y":2}, {"label":"6", "x":19.5, "y":2},
 | 
			
		||||
                {"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":"Up", "x":15.75, "y":3.5}, {"label":"1", "x":17.5, "y":3}, {"label":"2", "x":18.5, "y":3}, {"label":"3", "x":19.5, "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}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4, "w":1.25}, {"label":"Fn", "x":12.75, "y":4, "w":1.25}, {"label":"Left", "x":14.75, "y":4.5}, {"label":"Down", "x":15.75, "y":4.5}, {"label":"Right", "x":16.75, "y":4.5}, {"label":"0", "x":18.5, "y":4}, {"label":".", "x":19.5, "y":4}, {"label":"Enter", "x":20.5, "y":3, "h":2}
 | 
			
		||||
                {"label":"~", "x":0, "y":0},
 | 
			
		||||
                {"label":"!", "x":1, "y":0},
 | 
			
		||||
                {"label":"@", "x":2, "y":0},
 | 
			
		||||
                {"label":"#", "x":3, "y":0},
 | 
			
		||||
                {"label":"$", "x":4, "y":0},
 | 
			
		||||
                {"label":"%", "x":5, "y":0},
 | 
			
		||||
                {"label":"^", "x":6, "y":0},
 | 
			
		||||
                {"label":"&", "x":7, "y":0},
 | 
			
		||||
                {"label":"*", "x":8, "y":0},
 | 
			
		||||
                {"label":"(", "x":9, "y":0},
 | 
			
		||||
                {"label":")", "x":10, "y":0},
 | 
			
		||||
                {"label":"_", "x":11, "y":0},
 | 
			
		||||
                {"label":"+", "x":12, "y":0},
 | 
			
		||||
                {"label":"Backspace", "x":13, "y":0, "w":2},
 | 
			
		||||
                {"label":"Ins", "x":15.25, "y":0},
 | 
			
		||||
                {"label":"Home", "x":16.25, "y":0},
 | 
			
		||||
                {"label":"Num Lock", "x":17.5, "y":0},
 | 
			
		||||
                {"label":"/", "x":18.5, "y":0},
 | 
			
		||||
                {"label":"*", "x":19.5, "y":0},
 | 
			
		||||
                {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1},
 | 
			
		||||
                {"label":"Del", "x":16.25, "y":1},
 | 
			
		||||
                {"label":"7", "x":17.5, "y":1},
 | 
			
		||||
                {"label":"8", "x":18.5, "y":1},
 | 
			
		||||
                {"label":"9", "x":19.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":"Enter", "x":12.75, "y":2, "w":2.25},
 | 
			
		||||
                {"label":"4", "x":17.5, "y":2},
 | 
			
		||||
                {"label":"5", "x":18.5, "y":2},
 | 
			
		||||
                {"label":"6", "x":19.5, "y":2},
 | 
			
		||||
                {"label":"+", "x":20.5, "y":1, "h":2},
 | 
			
		||||
 | 
			
		||||
                {"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":"Up", "x":15.75, "y":3.5},
 | 
			
		||||
                {"label":"1", "x":17.5, "y":3},
 | 
			
		||||
                {"label":"2", "x":18.5, "y":3},
 | 
			
		||||
                {"label":"3", "x":19.5, "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},
 | 
			
		||||
                {"x":3.75, "y":4, "w":6.25},
 | 
			
		||||
                {"label":"Alt", "x":10, "y":4, "w":1.5},
 | 
			
		||||
                {"label":"Win", "x":11.5, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"Fn", "x":12.75, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"Left", "x":14.75, "y":4.5},
 | 
			
		||||
                {"label":"Down", "x":15.75, "y":4.5},
 | 
			
		||||
                {"label":"Right", "x":16.75, "y":4.5},
 | 
			
		||||
                {"label":"0", "x":18.5, "y":4},
 | 
			
		||||
                {"label":".", "x":19.5, "y":4},
 | 
			
		||||
                {"label":"Enter", "x":20.5, "y":3, "h":2}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_2x3u": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"Num Lock", "x":17.5, "y":0}, {"label":"/", "x":18.5, "y":0}, {"label":"*", "x":19.5, "y":0}, {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1}, {"label":"Del", "x":16.25, "y":1}, {"label":"7", "x":17.5, "y":1}, {"label":"8", "x":18.5, "y":1}, {"label":"9", "x":19.5, "y":1}, {"label":"+", "x":20.5, "y":1, "h":2},
 | 
			
		||||
                {"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":"4", "x":17.5, "y":2}, {"label":"5", "x":18.5, "y":2}, {"label":"6", "x":19.5, "y":2},
 | 
			
		||||
                {"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":"Up", "x":15.75, "y":3.5}, {"label":"1", "x":17.5, "y":3}, {"label":"2", "x":18.5, "y":3}, {"label":"3", "x":19.5, "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}, {"x":3.75, "y":4, "w":3}, {"x":6.75, "y":4, "w":3}, {"label":"Alt", "x":9.75, "y":4, "w":1.5}, {"label":"Win", "x":11.25, "y":4, "w":1.5}, {"label":"Fn", "x":12.75, "y":4, "w":1.25}, {"label":"Left", "x":14.75, "y":4.5}, {"label":"Down", "x":15.75, "y":4.5}, {"label":"Right", "x":16.75, "y":4.5}, {"label":"0", "x":18.5, "y":4}, {"label":".", "x":19.5, "y":4}, {"label":"Enter", "x":20.5, "y":3, "h":2}]
 | 
			
		||||
                {"label":"~", "x":0, "y":0},
 | 
			
		||||
                {"label":"!", "x":1, "y":0},
 | 
			
		||||
                {"label":"@", "x":2, "y":0},
 | 
			
		||||
                {"label":"#", "x":3, "y":0},
 | 
			
		||||
                {"label":"$", "x":4, "y":0},
 | 
			
		||||
                {"label":"%", "x":5, "y":0},
 | 
			
		||||
                {"label":"^", "x":6, "y":0},
 | 
			
		||||
                {"label":"&", "x":7, "y":0},
 | 
			
		||||
                {"label":"*", "x":8, "y":0},
 | 
			
		||||
                {"label":"(", "x":9, "y":0},
 | 
			
		||||
                {"label":")", "x":10, "y":0},
 | 
			
		||||
                {"label":"_", "x":11, "y":0},
 | 
			
		||||
                {"label":"+", "x":12, "y":0},
 | 
			
		||||
                {"label":"Backspace", "x":13, "y":0, "w":2},
 | 
			
		||||
                {"label":"Ins", "x":15.25, "y":0},
 | 
			
		||||
                {"label":"Home", "x":16.25, "y":0},
 | 
			
		||||
                {"label":"Num Lock", "x":17.5, "y":0},
 | 
			
		||||
                {"label":"/", "x":18.5, "y":0},
 | 
			
		||||
                {"label":"*", "x":19.5, "y":0},
 | 
			
		||||
                {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1},
 | 
			
		||||
                {"label":"Del", "x":16.25, "y":1},
 | 
			
		||||
                {"label":"7", "x":17.5, "y":1},
 | 
			
		||||
                {"label":"8", "x":18.5, "y":1},
 | 
			
		||||
                {"label":"9", "x":19.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":"Enter", "x":12.75, "y":2, "w":2.25},
 | 
			
		||||
                {"label":"4", "x":17.5, "y":2},
 | 
			
		||||
                {"label":"5", "x":18.5, "y":2},
 | 
			
		||||
                {"label":"6", "x":19.5, "y":2},
 | 
			
		||||
                {"label":"+", "x":20.5, "y":1, "h":2},
 | 
			
		||||
 | 
			
		||||
                {"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":"Up", "x":15.75, "y":3.5},
 | 
			
		||||
                {"label":"1", "x":17.5, "y":3},
 | 
			
		||||
                {"label":"2", "x":18.5, "y":3},
 | 
			
		||||
                {"label":"3", "x":19.5, "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},
 | 
			
		||||
                {"x":3.75, "y":4, "w":3},
 | 
			
		||||
                {"x":6.75, "y":4, "w":3},
 | 
			
		||||
                {"label":"Alt", "x":9.75, "y":4, "w":1.5},
 | 
			
		||||
                {"label":"Win", "x":11.25, "y":4, "w":1.5},
 | 
			
		||||
                {"label":"Fn", "x":12.75, "y":4, "w":1.25},
 | 
			
		||||
                {"label":"Left", "x":14.75, "y":4.5},
 | 
			
		||||
                {"label":"Down", "x":15.75, "y":4.5},
 | 
			
		||||
                {"label":"Right", "x":16.75, "y":4.5},
 | 
			
		||||
                {"label":"0", "x":18.5, "y":4},
 | 
			
		||||
                {"label":".", "x":19.5, "y":4},
 | 
			
		||||
                {"label":"Enter", "x":20.5, "y":3, "h":2}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,19 +4,19 @@
 | 
			
		|||
    "maintainer": "qmk", 
 | 
			
		||||
    "layouts":{
 | 
			
		||||
      "LAYOUT_ansi":{
 | 
			
		||||
        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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}, {"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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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}, {"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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
        }, 
 | 
			
		||||
 | 
			
		||||
      "LAYOUT_ansi_splitbs": {
 | 
			
		||||
         "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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}, {"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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
         "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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}, {"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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
      "LAYOUT_iso": {
 | 
			
		||||
         "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
         "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":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":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
     "LAYOUT_iso_splitbs": {
 | 
			
		||||
          "layout": [{"label":"Esc", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"\u00ac", "x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Mute", "x":16, "y":2}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Delete", "x":15.5, "y":3.5}, {"label":"PgUp", "x":16.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"PgDn", "x":16.5, "y":4.5}, {"label":"\u2191", "x":15.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.75}, {"label":"\u2193", "x":15.25, "y":5.75}, {"label":"\u2192", "x":16.25, "y":5.75}]
 | 
			
		||||
          "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"\u00ac", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":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":"\u2191", "x":15.25, "y":3.25}, {"label":"PgDn", "x":16.5, "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}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
     }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										83
									
								
								keyboards/sandwich/keeb68/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								keyboards/sandwich/keeb68/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,83 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard_name": "Keeb68 (PSE)",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "maintainer": "SandwichRising",
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_65_ansi": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"label":"ESC", "x":0, "y":0},
 | 
			
		||||
                {"label":"!", "x":1, "y":0},
 | 
			
		||||
                {"label":"@", "x":2, "y":0},
 | 
			
		||||
                {"label":"#", "x":3, "y":0},
 | 
			
		||||
                {"label":"$", "x":4, "y":0},
 | 
			
		||||
                {"label":"%", "x":5, "y":0},
 | 
			
		||||
                {"label":"^", "x":6, "y":0},
 | 
			
		||||
                {"label":"&", "x":7, "y":0},
 | 
			
		||||
                {"label":"*", "x":8, "y":0},
 | 
			
		||||
                {"label":"(", "x":9, "y":0},
 | 
			
		||||
                {"label":")", "x":10, "y":0},
 | 
			
		||||
                {"label":"_", "x":11, "y":0},
 | 
			
		||||
                {"label":"+", "x":12, "y":0},
 | 
			
		||||
                {"label":"Backspace", "x":13, "y":0, "w":2},
 | 
			
		||||
                {"label":"~", "x":15, "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":"DEL", "x":15, "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":"Enter", "x":12.75, "y":2, "w":2.25},
 | 
			
		||||
                {"label":"PG UP", "x":15, "y":2},
 | 
			
		||||
 | 
			
		||||
                {"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":"\u2191", "x":14, "y":3},
 | 
			
		||||
                {"label":"PG DN", "x":15, "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},
 | 
			
		||||
                {"x":3.75, "y":4, "w":6.25},
 | 
			
		||||
                {"label":"Alt", "x":10, "y":4},
 | 
			
		||||
                {"label":"Fn", "x":11, "y":4},
 | 
			
		||||
                {"label":"Ctrl", "x":12, "y":4},
 | 
			
		||||
                {"label":"\u2190", "x":13, "y":4},
 | 
			
		||||
                {"label":"\u2193", "x":14, "y":4},
 | 
			
		||||
                {"label":"\u2192", "x":15, "y":4}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -18,6 +18,8 @@
 | 
			
		|||
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#define ___ KC_NO
 | 
			
		||||
 | 
			
		||||
/* This is a shortcut to help you visually see your layout.
 | 
			
		||||
 *
 | 
			
		||||
 * The first section contains all of the arguments representing the physical
 | 
			
		||||
| 
						 | 
				
			
			@ -27,16 +29,15 @@
 | 
			
		|||
 * represents the switch matrix.
 | 
			
		||||
 */
 | 
			
		||||
#define LAYOUT_65_ansi( \
 | 
			
		||||
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
 | 
			
		||||
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
 | 
			
		||||
	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
 | 
			
		||||
	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
 | 
			
		||||
	K400, K401, K402,             K405, K406, K407, K408, K409, K410, K411, K412, K413 \
 | 
			
		||||
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K46, K0C, K0D, \
 | 
			
		||||
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K47, K1C, K1D, \
 | 
			
		||||
    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,                K45,           K48, K49, K4A, K4B, K4C, K4D  \
 | 
			
		||||
) { \
 | 
			
		||||
    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
 | 
			
		||||
    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
 | 
			
		||||
	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
 | 
			
		||||
	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
 | 
			
		||||
	{ K400, K401, K402, KC_NO , KC_NO , K405 , K406, K407, K408, K409, K410, K411, K412, K413 } \
 | 
			
		||||
    { 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, K2D }, \
 | 
			
		||||
    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
 | 
			
		||||
    { K40, K41, K42, ___, ___, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }  \
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,19 +24,17 @@ enum layer_names {
 | 
			
		|||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /* Base */
 | 
			
		||||
    [_BASE] = LAYOUT_65_ansi(
 | 
			
		||||
        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_BSPC,	KC_GRV,
 | 
			
		||||
		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_BSLS, 	KC_DEL,
 | 
			
		||||
        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_PGUP,
 | 
			
		||||
        KC_LSFT, 	KC_Z,  	 KC_X, 		KC_C,  	KC_V,  	KC_B,  	KC_N,  	KC_M, 	KC_COMM,KC_DOT,	KC_SLSH, KC_RSFT, 	KC_UP,   	KC_PGDN,
 | 
			
		||||
        KC_LCTL, 	KC_LGUI, KC_LALT,               	KC_SPC, KC_EQL,	KC_RBRC,KC_RALT,MO(_FN),KC_RCTL, KC_LEFT, 	KC_DOWN, 	KC_RGHT
 | 
			
		||||
		
 | 
			
		||||
        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_GRV,
 | 
			
		||||
        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_DEL,
 | 
			
		||||
        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_PGUP,
 | 
			
		||||
        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
    [_FN] = LAYOUT_65_ansi(
 | 
			
		||||
        _______, 	KC_F1,	 KC_F2, 	KC_F3, 	KC_F4, 	KC_F5, 	KC_F6, 	KC_F7, 	KC_F8,  KC_F9, 	KC_F10,  KC_F11, 	KC_DEL,		KC_PSCREEN,
 | 
			
		||||
		_______,	_______, BL_INC,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_PAUSE,
 | 
			
		||||
		_______,	BL_TOGG, BL_DEC,	BL_BRTG,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_HOME,
 | 
			
		||||
		_______,	_______, _______,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	KC_VOLU,	KC_END,
 | 
			
		||||
		_______,	RESET, 	 _______,					_______,KC_F12, _______,_______,MO(_FN),_______,_______,	KC_VOLD,	_______
 | 
			
		||||
		
 | 
			
		||||
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
 | 
			
		||||
        _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
 | 
			
		||||
        _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
 | 
			
		||||
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
 | 
			
		||||
        _______, RESET,   _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,19 +24,17 @@ enum layer_names {
 | 
			
		|||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /* Base */
 | 
			
		||||
    [_BASE] = LAYOUT_65_ansi(
 | 
			
		||||
        KC_GESC,   	KC_1,    KC_2,		KC_3,	KC_4,	KC_5,	KC_6,	KC_7,	KC_8,	KC_9,	KC_0,	 KC_MINS,	KC_BSPC,	KC_INS,
 | 
			
		||||
		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_BSLS, 	KC_DEL,
 | 
			
		||||
        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_PGUP,
 | 
			
		||||
        KC_LSFT, 	KC_Z,  	 KC_X, 		KC_C,  	KC_V,  	KC_B,  	KC_N,  	KC_M, 	KC_COMM,KC_DOT,	KC_SLSH, KC_RSFT, 	KC_UP,   	KC_PGDN,
 | 
			
		||||
        KC_LCTL, 	KC_LGUI, KC_LALT,               	KC_SPC, KC_EQL,	KC_RBRC,KC_RALT,MO(_FN),KC_RCTL, KC_LEFT, 	KC_DOWN, 	KC_RGHT
 | 
			
		||||
		
 | 
			
		||||
        KC_GESC, 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_INS,
 | 
			
		||||
        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_DEL,
 | 
			
		||||
        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_PGUP,
 | 
			
		||||
        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
 | 
			
		||||
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
    [_FN] = LAYOUT_65_ansi(
 | 
			
		||||
        _______, 	KC_F1,	 KC_F2, 	KC_F3, 	KC_F4, 	KC_F5, 	KC_F6, 	KC_F7, 	KC_F8,  KC_F9, 	KC_F10,  KC_F11, 	KC_DEL,		KC_PSCREEN,
 | 
			
		||||
		_______,	_______, BL_INC,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_PAUSE,
 | 
			
		||||
		_______,	BL_TOGG, BL_DEC,	BL_BRTG,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_HOME,
 | 
			
		||||
		_______,	_______, _______,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	KC_VOLU,	KC_END,
 | 
			
		||||
		_______,	RESET, 	 _______,					_______,KC_F12, _______,_______,MO(_FN),_______,_______,	KC_VOLD,	_______
 | 
			
		||||
		
 | 
			
		||||
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
 | 
			
		||||
        _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
 | 
			
		||||
        _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
 | 
			
		||||
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
 | 
			
		||||
        _______, RESET,   _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
 | 
			
		||||
    )
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,9 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 | 
			
		|||
EXTRAKEY_ENABLE = yes       # Audio control and System control
 | 
			
		||||
CONSOLE_ENABLE = no         # Console for debug
 | 
			
		||||
COMMAND_ENABLE = no         # Commands for debug and configuration
 | 
			
		||||
NKRO_ENABLE = yes            # Enable N-Key Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 | 
			
		||||
NKRO_ENABLE = yes           # Enable N-Key Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 | 
			
		||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
 | 
			
		||||
LAYOUTS = 65_ansi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@ from qmk.git import git_get_username
 | 
			
		|||
from qmk.json_schema import load_jsonschema
 | 
			
		||||
from qmk.path import keyboard
 | 
			
		||||
from qmk.json_encoders import InfoJSONEncoder
 | 
			
		||||
from qmk.json_schema import deep_update
 | 
			
		||||
from qmk.json_schema import deep_update, json_load
 | 
			
		||||
from qmk.constants import MCU2BOOTLOADER
 | 
			
		||||
 | 
			
		||||
COMMUNITY = Path('layouts/default/')
 | 
			
		||||
| 
						 | 
				
			
			@ -23,13 +23,14 @@ TEMPLATE = Path('data/templates/keyboard/')
 | 
			
		|||
# defaults
 | 
			
		||||
schema = dotty(load_jsonschema('keyboard'))
 | 
			
		||||
mcu_types = sorted(schema["properties.processor.enum"], key=str.casefold)
 | 
			
		||||
dev_boards = sorted(schema["properties.development_board.enum"], key=str.casefold)
 | 
			
		||||
available_layouts = sorted([x.name for x in COMMUNITY.iterdir() if x.is_dir()])
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def mcu_type(mcu):
 | 
			
		||||
    """Callable for argparse validation.
 | 
			
		||||
    """
 | 
			
		||||
    if mcu not in mcu_types:
 | 
			
		||||
    if mcu not in (dev_boards + mcu_types):
 | 
			
		||||
        raise ValueError
 | 
			
		||||
    return mcu
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -176,14 +177,14 @@ https://docs.qmk.fm/#/compatible_microcontrollers
 | 
			
		|||
 | 
			
		||||
MCU? """
 | 
			
		||||
    # remove any options strictly used for compatibility
 | 
			
		||||
    filtered_mcu = [x for x in mcu_types if not any(xs in x for xs in ['cortex', 'unknown'])]
 | 
			
		||||
    filtered_mcu = [x for x in (dev_boards + mcu_types) if not any(xs in x for xs in ['cortex', 'unknown'])]
 | 
			
		||||
 | 
			
		||||
    return choice(prompt, filtered_mcu, default=filtered_mcu.index("atmega32u4"))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@cli.argument('-kb', '--keyboard', help='Specify the name for the new keyboard directory', arg_only=True, type=keyboard_name)
 | 
			
		||||
@cli.argument('-l', '--layout', help='Community layout to bootstrap with', arg_only=True, type=layout_type)
 | 
			
		||||
@cli.argument('-t', '--type', help='Specify the keyboard MCU type', arg_only=True, type=mcu_type)
 | 
			
		||||
@cli.argument('-t', '--type', help='Specify the keyboard MCU type (or "development_board" preset)', arg_only=True, type=mcu_type)
 | 
			
		||||
@cli.argument('-u', '--username', help='Specify your username (default from Git config)', dest='name')
 | 
			
		||||
@cli.argument('-n', '--realname', help='Specify your real name if you want to use that. Defaults to username', arg_only=True)
 | 
			
		||||
@cli.subcommand('Creates a new keyboard directory')
 | 
			
		||||
| 
						 | 
				
			
			@ -198,7 +199,6 @@ def new_keyboard(cli):
 | 
			
		|||
    real_name = cli.args.realname or cli.config.new_keyboard.name if cli.args.realname or cli.config.new_keyboard.name else prompt_name(user_name)
 | 
			
		||||
    default_layout = cli.args.layout if cli.args.layout else prompt_layout()
 | 
			
		||||
    mcu = cli.args.type if cli.args.type else prompt_mcu()
 | 
			
		||||
    bootloader = select_default_bootloader(mcu)
 | 
			
		||||
 | 
			
		||||
    if not validate_keyboard_name(kb_name):
 | 
			
		||||
        cli.log.error('Keyboard names must contain only {fg_cyan}lowercase a-z{fg_reset}, {fg_cyan}0-9{fg_reset}, and {fg_cyan}_{fg_reset}! Please choose a different name.')
 | 
			
		||||
| 
						 | 
				
			
			@ -208,6 +208,16 @@ def new_keyboard(cli):
 | 
			
		|||
        cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
 | 
			
		||||
        return 1
 | 
			
		||||
 | 
			
		||||
    # Preprocess any development_board presets
 | 
			
		||||
    if mcu in dev_boards:
 | 
			
		||||
        defaults_map = json_load(Path('data/mappings/defaults.json'))
 | 
			
		||||
        board = defaults_map['development_board'][mcu]
 | 
			
		||||
 | 
			
		||||
        mcu = board['processor']
 | 
			
		||||
        bootloader = board['bootloader']
 | 
			
		||||
    else:
 | 
			
		||||
        bootloader = select_default_bootloader(mcu)
 | 
			
		||||
 | 
			
		||||
    tokens = {  # Comment here is to force multiline formatting
 | 
			
		||||
        'YEAR': str(date.today().year),
 | 
			
		||||
        'KEYBOARD': kb_name,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -68,7 +68,11 @@ def create_validator(schema):
 | 
			
		|||
    schema_store = compile_schema_store()
 | 
			
		||||
    resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store)
 | 
			
		||||
 | 
			
		||||
    return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
 | 
			
		||||
    # TODO: Remove this after the jsonschema>=4 requirement had time to reach users
 | 
			
		||||
    try:
 | 
			
		||||
        return jsonschema.Draft202012Validator(schema_store[schema], resolver=resolver).validate
 | 
			
		||||
    except AttributeError:
 | 
			
		||||
        return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def validate(data, schema):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ fnvhash
 | 
			
		|||
hid
 | 
			
		||||
hjson
 | 
			
		||||
Jinja2
 | 
			
		||||
jsonschema>=3
 | 
			
		||||
jsonschema>=4
 | 
			
		||||
milc>=1.4.2
 | 
			
		||||
pygments
 | 
			
		||||
pyusb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue