Fix keymap of gh60 and hhkb
This commit is contained in:
parent
59e073e82b
commit
75a92ff653
4 changed files with 40 additions and 52 deletions
|
@ -85,7 +85,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KEYMAP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
||||
CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS, UP, NO, BSPC, \
|
||||
LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \
|
||||
LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,FN0, \
|
||||
LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,TRNS, \
|
||||
LGUI,LALT, SPC, RALT,RGUI),
|
||||
|
||||
/* Layer 2: Vi mode (Slash)
|
||||
|
@ -104,7 +104,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
||||
TAB, HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, BSPC, \
|
||||
LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, \
|
||||
LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN0, RSFT,NO, \
|
||||
LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, TRNS,RSFT,NO, \
|
||||
LGUI,LALT, SPC, RALT,RGUI),
|
||||
|
||||
/* Layer 3: Mouse mode (Semicolon)
|
||||
|
@ -123,9 +123,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
*/
|
||||
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
||||
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
||||
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN0, QUOT,ENT, \
|
||||
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,TRNS,QUOT,ENT, \
|
||||
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,SLSH,RSFT,NO, \
|
||||
LGUI,LALT, BTN1, RALT,FN0),
|
||||
LGUI,LALT, BTN1, RALT,TRNS),
|
||||
|
||||
/* Layer 4: Matias half keyboard style (Space)
|
||||
* ,-----------------------------------------------------------.
|
||||
|
@ -144,7 +144,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
BSPC,P, O, I, U, Y, T, R, E, W, Q, NO, NO, TAB, \
|
||||
LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \
|
||||
LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \
|
||||
LGUI,LALT, FN0, RALT,RGUI),
|
||||
LGUI,LALT, TRNS, RALT,RGUI),
|
||||
|
||||
/* Layer5: another Mouse mode (Space)
|
||||
* ,-----------------------------------------------------------.
|
||||
|
@ -164,7 +164,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
||||
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,NO, NO, ENT, \
|
||||
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
||||
LGUI,LALT, FN0, RALT,RGUI),
|
||||
LGUI,LALT, TRNS, RALT,RGUI),
|
||||
};
|
||||
|
||||
|
||||
|
@ -182,26 +182,23 @@ enum function_id {
|
|||
*/
|
||||
// TODO: use [1] = KEYMAP(...) to prevent from changing index of element?
|
||||
static const uint16_t PROGMEM fn_actions[] = {
|
||||
ACTION_LAYER_DEFAULT, // FN0
|
||||
ACTION_LAYER_SET(1), // FN1
|
||||
ACTION_LAYER_SET_TAP_KEY(2, KC_SLASH), // FN2 Layer with Slash
|
||||
ACTION_LAYER_SET_TAP_KEY(3, KC_SCLN), // FN3 Layer with Semicolon
|
||||
ACTION_DEFAULT_LAYER, // FN0
|
||||
ACTION_KEYMAP(1), // FN1
|
||||
ACTION_KEYMAP_TAP_KEY(2, KC_SLASH), // FN2 Layer with Slash
|
||||
ACTION_KEYMAP_TAP_KEY(3, KC_SCLN), // FN3 Layer with Semicolon
|
||||
|
||||
ACTION_LAYER_SET(3), // FN4
|
||||
// ACTION_LAYER_SET_TOGGLE(3), // FN4
|
||||
ACTION_KEYMAP(3), // FN4
|
||||
// ACTION_KEYMAP_TOGGLE(3), // FN4
|
||||
// ACTION_FUNCTION(MACRO, 0), // FN4
|
||||
ACTION_LAYER_SET_TAP_KEY(5, KC_SPC), // FN5
|
||||
ACTION_KEYMAP_TAP_KEY(5, KC_SPC), // FN5
|
||||
// ACTION_LMOD_TAP_KEY(KC_LCTL, KC_BSPC), // FN6 Control with tap Backspace
|
||||
ACTION_LMOD_TAP_KEY(KC_LCTL, KC_ESC), // FN6 Control with tap Backspace
|
||||
ACTION_RMOD_TAP_KEY(KC_RCTL, KC_ENT), // FN7 Control with tap Enter
|
||||
ACTION_LMOD_ONESHOT(KC_LSFT), // FN8 Oneshot Shift
|
||||
ACTION_LAYER_SET_TAP_TOGGLE(1), // FN9
|
||||
ACTION_LAYER_BIT_TAP_KEY(1, KC_GRV), // FN10 Layer with Grave
|
||||
//ACTION_LAYER_BIT(1), // FN10
|
||||
//ACTION_LAYER_BIT_TAP_TOGGLE(1), // FN10
|
||||
ACTION_FUNCTION_TAP(LSHIFT_LPAREN), // FN11 Function: LShift with tap '('
|
||||
ACTION_FUNCTION_TAP(RSHIFT_RPAREN), // FN12 Function: RShift with tap ')'
|
||||
ACTION_FUNCTION(MACRO, 1), // FN13 Macro:
|
||||
[9] = ACTION_KEYMAP_TAP_TOGGLE(1), // FN9
|
||||
[11] = ACTION_FUNCTION_TAP(LSHIFT_LPAREN), // FN11 Function: LShift with tap '('
|
||||
[12] = ACTION_FUNCTION_TAP(RSHIFT_RPAREN), // FN12 Function: RShift with tap ')'
|
||||
[13] = ACTION_FUNCTION(MACRO, 1), // FN13 Macro:
|
||||
};
|
||||
|
||||
|
||||
|
@ -230,7 +227,7 @@ static const prog_macro_t *get_macro(uint8_t id, bool pressed)
|
|||
/*
|
||||
* user defined action function
|
||||
*/
|
||||
void keymap_call_function(keyrecord_t *record, uint8_t id, uint8_t opt)
|
||||
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
|
||||
{
|
||||
keyevent_t event = record->event;
|
||||
uint8_t tap_count = record->tap_count;
|
||||
|
@ -328,15 +325,3 @@ action_t keymap_fn_to_action(uint8_t keycode)
|
|||
}
|
||||
return action;
|
||||
}
|
||||
|
||||
/* convert key to action */
|
||||
action_t action_for_key(uint8_t layer, key_t key)
|
||||
{
|
||||
uint8_t keycode = keymap_key_to_keycode(layer, key);
|
||||
switch (keycode) {
|
||||
case KC_FN0 ... KC_FN31:
|
||||
return keymap_fn_to_action(keycode);
|
||||
default:
|
||||
return keymap_keycode_to_action(keycode);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue