move KC expansion to separate macros
This commit is contained in:
		
							parent
							
								
									ac7d202d4f
								
							
						
					
					
						commit
						620e4f74d3
					
				
					 4 changed files with 66 additions and 23 deletions
				
			
		| 
						 | 
					@ -34,6 +34,20 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 | 
				
			||||||
    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
 | 
					    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, \
 | 
					    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
 | 
				
			||||||
    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D  \
 | 
					    K40, K41, K42,           K45,                K49, 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, K2D }, \
 | 
				
			||||||
 | 
					    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
 | 
				
			||||||
 | 
					    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    K49, K4A, K4B, K4C, K4D }  \
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define KC_KEYMAP( \
 | 
				
			||||||
 | 
					    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,                K49, K4A, K4B, K4C, K4D  \
 | 
				
			||||||
) { \
 | 
					) { \
 | 
				
			||||||
    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
					    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
				
			||||||
    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
					    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
				
			||||||
| 
						 | 
					@ -42,13 +56,28 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 | 
				
			||||||
    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
					    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ANSI valiant. No extra keys for ISO */
 | 
					/* ANSI variant. No extra keys for ISO */
 | 
				
			||||||
#define KEYMAP_ANSI( \
 | 
					#define KEYMAP_ANSI( \
 | 
				
			||||||
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
 | 
					    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, \
 | 
					    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,      K2D, \
 | 
					    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
 | 
				
			||||||
    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3D, \
 | 
					    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3D, \
 | 
				
			||||||
    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
 | 
					    K40, K41, K42,           K45,                     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, KC_NO,    K2D }, \
 | 
				
			||||||
 | 
					    { K30, KC_NO,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO,    K3D }, \
 | 
				
			||||||
 | 
					    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    KC_NO,    K4A, K4B, K4C, K4D }  \
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* ANSI variant with KC expansion */
 | 
				
			||||||
 | 
					#define KC_KEYMAP_ANSI( \
 | 
				
			||||||
 | 
					    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
 | 
				
			||||||
 | 
					    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
 | 
				
			||||||
 | 
					    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
 | 
				
			||||||
 | 
					    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3D, \
 | 
				
			||||||
 | 
					    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
 | 
				
			||||||
) { \
 | 
					) { \
 | 
				
			||||||
    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
					    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
				
			||||||
    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
					    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
				
			||||||
| 
						 | 
					@ -57,12 +86,28 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 | 
				
			||||||
    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
					    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* HHKB Variant */
 | 
				
			||||||
#define KEYMAP_HHKB( \
 | 
					#define KEYMAP_HHKB( \
 | 
				
			||||||
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
 | 
					    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
 | 
				
			||||||
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
 | 
					    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,      K2D, \
 | 
					    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
 | 
				
			||||||
    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3C, \
 | 
					    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3C, \
 | 
				
			||||||
    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
 | 
					    K40, K41, K42,           K45,                     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, KC_NO,    K2D }, \
 | 
				
			||||||
 | 
					    { K30, KC_NO,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
 | 
				
			||||||
 | 
					    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    KC_NO,    K49, K4A, K4B, K4C, K4D }  \
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* HHKB Variant with KC expansion */
 | 
				
			||||||
 | 
					#define KC_KEYMAP_HHKB( \
 | 
				
			||||||
 | 
					    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49,\
 | 
				
			||||||
 | 
					    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,      K2D, \
 | 
				
			||||||
 | 
					    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3C, \
 | 
				
			||||||
 | 
					    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \
 | 
				
			||||||
) { \
 | 
					) { \
 | 
				
			||||||
    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
					    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D }, \
 | 
				
			||||||
    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
					    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D }, \
 | 
				
			||||||
| 
						 | 
					@ -71,6 +116,4 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 | 
				
			||||||
    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
					    { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_##K45, KC_NO,    KC_NO,    KC_NO,    KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D }  \
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,21 +3,21 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
    /* 0: qwerty */
 | 
					    /* 0: qwerty */
 | 
				
			||||||
    KEYMAP(
 | 
					    KC_KEYMAP(
 | 
				
			||||||
	ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, GRV,  \
 | 
						ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, GRV,  \
 | 
				
			||||||
        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
 | 
					        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
 | 
				
			||||||
        CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NO,  ENT,  \
 | 
					        CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NO,  ENT,  \
 | 
				
			||||||
        LSFT,FN1, Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,FN0, RSFT, \
 | 
					        LSFT,FN1, Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,FN0, RSFT, \
 | 
				
			||||||
        LCTL,LGUI,LALT,          SPC,                BSLS,RALT,RGUI,APP, RCTL),
 | 
					        LCTL,LGUI,LALT,          SPC,                BSLS,RALT,RGUI,APP, RCTL),
 | 
				
			||||||
    /* 1: fn */
 | 
					    /* 1: fn */
 | 
				
			||||||
	KEYMAP(
 | 
						KC_KEYMAP(
 | 
				
			||||||
        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
 | 
					        ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, \
 | 
				
			||||||
        TRNS,TRNS,UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,UP,  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
					        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
				
			||||||
    /* 2: arrows */
 | 
					    /* 2: arrows */
 | 
				
			||||||
	KEYMAP(
 | 
						KC_KEYMAP(
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
| 
						 | 
					@ -49,7 +49,7 @@ void matrix_scan_user(void) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//Layer LED indicators
 | 
					//Layer LED indicators
 | 
				
			||||||
    uint32_t layer = layer_state;
 | 
					    uint32_t layer = layer_state;
 | 
				
			||||||
	
 | 
					
 | 
				
			||||||
    if (layer & (1<<1)) {
 | 
					    if (layer & (1<<1)) {
 | 
				
			||||||
        gh60_wasd_leds_on();
 | 
					        gh60_wasd_leds_on();
 | 
				
			||||||
        gh60_fn_led_on();
 | 
					        gh60_fn_led_on();
 | 
				
			||||||
| 
						 | 
					@ -57,7 +57,7 @@ void matrix_scan_user(void) {
 | 
				
			||||||
        gh60_wasd_leds_off();
 | 
					        gh60_wasd_leds_off();
 | 
				
			||||||
        gh60_fn_led_off();
 | 
					        gh60_fn_led_off();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
	
 | 
					
 | 
				
			||||||
    if (layer & (1<<2)) {
 | 
					    if (layer & (1<<2)) {
 | 
				
			||||||
        gh60_poker_leds_on();
 | 
					        gh60_poker_leds_on();
 | 
				
			||||||
        gh60_esc_led_on();
 | 
					        gh60_esc_led_on();
 | 
				
			||||||
| 
						 | 
					@ -65,5 +65,5 @@ void matrix_scan_user(void) {
 | 
				
			||||||
        gh60_poker_leds_off();
 | 
					        gh60_poker_leds_off();
 | 
				
			||||||
        gh60_esc_led_off();
 | 
					        gh60_esc_led_off();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
	
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
   /*
 | 
					   /*
 | 
				
			||||||
   *  Base layer, pretty standard ANSI layout. 
 | 
					   *  Base layer, pretty standard ANSI layout.
 | 
				
			||||||
   * ,-----------------------------------------------------------.
 | 
					   * ,-----------------------------------------------------------.
 | 
				
			||||||
   * |FN12| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
 | 
					   * |FN12| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
 | 
				
			||||||
   * |-----------------------------------------------------------|
 | 
					   * |-----------------------------------------------------------|
 | 
				
			||||||
| 
						 | 
					@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
   * |Ctrl|Gui |Alt |      Space             |Alt |Fn  |Menu|Ctrl|
 | 
					   * |Ctrl|Gui |Alt |      Space             |Alt |Fn  |Menu|Ctrl|
 | 
				
			||||||
   * `-----------------------------------------------------------'
 | 
					   * `-----------------------------------------------------------'
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
	[_BL] = KEYMAP(
 | 
						[_BL] = KC_KEYMAP(
 | 
				
			||||||
        FN12,1,2,3,4,5,6,7,8,9,0,MINS,EQL,BSPC, \
 | 
					        FN12,1,2,3,4,5,6,7,8,9,0,MINS,EQL,BSPC, \
 | 
				
			||||||
	TAB,Q,W,E,R,T,Y,U,I,O,P,LBRC,RBRC,BSLS, \
 | 
						TAB,Q,W,E,R,T,Y,U,I,O,P,LBRC,RBRC,BSLS, \
 | 
				
			||||||
        FN2,A,S,D,F,G,H,J,K,L,SCLN,QUOT,NO,ENT,  \
 | 
					        FN2,A,S,D,F,G,H,J,K,L,SCLN,QUOT,NO,ENT,  \
 | 
				
			||||||
        LSFT,NO,Z,X,C,V,B,N,M,COMM,DOT,SLSH,NO,RSFT, \
 | 
					        LSFT,NO,Z,X,C,V,B,N,M,COMM,DOT,SLSH,NO,RSFT, \
 | 
				
			||||||
        LCTL,LGUI,LALT,        SPC,      NO,RALT,FN0,APP, RCTL),
 | 
					        LCTL,LGUI,LALT,        SPC,      NO,RALT,FN0,APP, RCTL),
 | 
				
			||||||
   
 | 
					
 | 
				
			||||||
   /*  
 | 
					   /*
 | 
				
			||||||
   * Locking arrow keys to WASD for when you need dedicated arrow keys
 | 
					   * Locking arrow keys to WASD for when you need dedicated arrow keys
 | 
				
			||||||
   * ,-----------------------------------------------------------.
 | 
					   * ,-----------------------------------------------------------.
 | 
				
			||||||
   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
 | 
					   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
   * |    |    |    |                        |    |    |    |    |
 | 
					   * |    |    |    |                        |    |    |    |    |
 | 
				
			||||||
   * `-----------------------------------------------------------'
 | 
					   * `-----------------------------------------------------------'
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
	[_AL] = KEYMAP(
 | 
						[_AL] = KC_KEYMAP(
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,UP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,UP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
| 
						 | 
					@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
					        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   /* 
 | 
					   /*
 | 
				
			||||||
   * Primary function layer, mostly the same as the traditional Pok3r layout.
 | 
					   * Primary function layer, mostly the same as the traditional Pok3r layout.
 | 
				
			||||||
   * ,-------------------------------------------------------------.
 | 
					   * ,-------------------------------------------------------------.
 | 
				
			||||||
   * |`~ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|DEL   |
 | 
					   * |`~ | F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|DEL   |
 | 
				
			||||||
| 
						 | 
					@ -64,16 +64,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
   * |    |    |    |                          |    |    |    |    |
 | 
					   * |    |    |    |                          |    |    |    |    |
 | 
				
			||||||
   * `-------------------------------------------------------------'
 | 
					   * `-------------------------------------------------------------'
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
	[_FL] = KEYMAP(
 | 
						[_FL] = KC_KEYMAP(
 | 
				
			||||||
        GRAVE,F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12, DELETE, \
 | 
					        GRAVE,F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12, DELETE, \
 | 
				
			||||||
        TRNS,FN1,TRNS,TRNS,TRNS,TRNS,CALC,PGUP,UP,PGDN,PSCR,SLCK,PAUS,TRNS, \
 | 
					        TRNS,FN1,TRNS,TRNS,TRNS,TRNS,CALC,PGUP,UP,PGDN,PSCR,SLCK,PAUS,TRNS, \
 | 
				
			||||||
        TRNS,MUTE,_VOLDOWN,_VOLUP,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,MUTE,_VOLDOWN,_VOLUP,TRNS,TRNS,HOME,LEFT,DOWN,RGHT,INS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,FN3,TRNS,TRNS,TRNS,TRNS,END,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,FN3,TRNS,TRNS,TRNS,TRNS,END,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
					        TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS,TRNS),
 | 
				
			||||||
   
 | 
					
 | 
				
			||||||
   /* 
 | 
					   /*
 | 
				
			||||||
   * Locking layer for controlling the underglow.
 | 
					   * Locking layer for controlling the underglow.
 | 
				
			||||||
   * 
 | 
					   *
 | 
				
			||||||
   * ,-----------------------------------------------------------.
 | 
					   * ,-----------------------------------------------------------.
 | 
				
			||||||
   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
 | 
					   * |    |  |   |   |   |   |   |   |   |   |   |   |   |       |
 | 
				
			||||||
   * |-----------------------------------------------------------|
 | 
					   * |-----------------------------------------------------------|
 | 
				
			||||||
| 
						 | 
					@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
   * |    |    |    |                        |    |    |    |    |
 | 
					   * |    |    |    |                        |    |    |    |    |
 | 
				
			||||||
   * `-----------------------------------------------------------'
 | 
					   * `-----------------------------------------------------------'
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
	[_UL] = KEYMAP(
 | 
						[_UL] = KC_KEYMAP(
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,FN4,FN5,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
					        TRNS,FN4,FN5,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
 | 
				
			||||||
| 
						 | 
					@ -124,7 +124,7 @@ const uint16_t PROGMEM fn_actions[] = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
					const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  // MACRODOWN only works in this function 
 | 
					  // MACRODOWN only works in this function
 | 
				
			||||||
      switch(id) {
 | 
					      switch(id) {
 | 
				
			||||||
        case 0:
 | 
					        case 0:
 | 
				
			||||||
          if (record->event.pressed) {
 | 
					          if (record->event.pressed) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,14 +6,14 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
    /* 0: qwerty */
 | 
					    /* 0: qwerty */
 | 
				
			||||||
  KEYMAP_HHKB(
 | 
					  KC_KEYMAP_HHKB(
 | 
				
			||||||
	      FN0, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS, GRV,  \
 | 
						      FN0, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS, GRV,  \
 | 
				
			||||||
        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
 | 
					        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
 | 
				
			||||||
        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,ENT,  \
 | 
					        LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,ENT,  \
 | 
				
			||||||
        LSFT, Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT, FN1, \
 | 
					        LSFT, Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT, FN1, \
 | 
				
			||||||
        LCTL,LALT,LGUI,          SPC,                RGUI,RALT,APP, RCTL),
 | 
					        LCTL,LALT,LGUI,          SPC,                RGUI,RALT,APP, RCTL),
 | 
				
			||||||
    /* 1: fn */
 | 
					    /* 1: fn */
 | 
				
			||||||
	KEYMAP_HHKB(
 | 
						KC_KEYMAP_HHKB(
 | 
				
			||||||
        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, TRNS, \
 | 
					        GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS, TRNS, \
 | 
				
			||||||
        CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,UP,TRNS,TRNS, \
 | 
					        CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,UP,TRNS,TRNS, \
 | 
				
			||||||
        TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RIGHT,PENT, \
 | 
					        TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RIGHT,PENT, \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue