Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Keymap update: Use register_code16() and its variants in lieu of separate mod registration (#5333)

Browse source 
* use `register_code16` and relatives for tapdance code

* rename tapdance keys to more closely mirror the `KC` names in QMK

* additional naming change to match QMK style
This commit is contained in:
Dusty Pomerleau 2019-03-08 12:03:29 +11:00 committed by Drashna Jaelre
parent 6d4f6f3f49
commit 234c117613
1 changed files with 52 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
keyboards/minidox/keymaps/dustypomerleau/keymap.c
View file

@ -26,10 +26,10 @@ enum my_keycodes {
}; };
enum td_keycodes { enum td_keycodes {
ALT_OP, ALT_LP,
CTL_CCB, CTL_RCB,
GUI_CP, GUI_RP,
SFT_OCB, SFT_LCB,
SFT_PLS SFT_PLS
}; };
@ -41,14 +41,14 @@ typedef enum {
static td_state_t td_state; static td_state_t td_state;
int cur_dance (qk_tap_dance_state_t *state); int cur_dance (qk_tap_dance_state_t *state);
void altop_finished (qk_tap_dance_state_t *state, void *user_data); void altlp_finished (qk_tap_dance_state_t *state, void *user_data);
void altop_reset (qk_tap_dance_state_t *state, void *user_data); void altlp_reset (qk_tap_dance_state_t *state, void *user_data);
void ctlccb_finished (qk_tap_dance_state_t *state, void *user_data); void ctlrcb_finished (qk_tap_dance_state_t *state, void *user_data);
void ctlccb_reset (qk_tap_dance_state_t *state, void *user_data); void ctlrcb_reset (qk_tap_dance_state_t *state, void *user_data);
void guicp_finished (qk_tap_dance_state_t *state, void *user_data); void guirp_finished (qk_tap_dance_state_t *state, void *user_data);
void guicp_reset (qk_tap_dance_state_t *state, void *user_data); void guirp_reset (qk_tap_dance_state_t *state, void *user_data);
void sftocb_finished (qk_tap_dance_state_t *state, void *user_data); void sftlcb_finished (qk_tap_dance_state_t *state, void *user_data);
void sftocb_reset (qk_tap_dance_state_t *state, void *user_data); void sftlcb_reset (qk_tap_dance_state_t *state, void *user_data);
void sftpls_finished (qk_tap_dance_state_t *state, void *user_data); void sftpls_finished (qk_tap_dance_state_t *state, void *user_data);
void sftpls_reset (qk_tap_dance_state_t *state, void *user_data); void sftpls_reset (qk_tap_dance_state_t *state, void *user_data);
@ -58,7 +58,7 @@ void sftpls_reset (qk_tap_dance_state_t *state, void *user_data);
#define ALT_D LALT_T(KC_D) #define ALT_D LALT_T(KC_D)
#define ALT_E LALT_T(KC_E) #define ALT_E LALT_T(KC_E)
#define ALT_K LALT_T(KC_K) #define ALT_K LALT_T(KC_K)
#define ALT_OB LALT_T(KC_LBRC) #define ALT_LB LALT_T(KC_LBRC)
#define ALT_S LALT_T(KC_S) #define ALT_S LALT_T(KC_S)
#define CTRL_2 LCTL_T(KC_2) #define CTRL_2 LCTL_T(KC_2)
#define CTRL_4 LCTL_T(KC_4) #define CTRL_4 LCTL_T(KC_4)
@ -73,7 +73,7 @@ void sftpls_reset (qk_tap_dance_state_t *state, void *user_data);
#define GUI_1 LGUI_T(KC_1) #define GUI_1 LGUI_T(KC_1)
#define GUI_4 LGUI_T(KC_4) #define GUI_4 LGUI_T(KC_4)
#define GUI_7 LGUI_T(KC_7) #define GUI_7 LGUI_T(KC_7)
#define GUI_CB LGUI_T(KC_RBRC) #define GUI_RB LGUI_T(KC_RBRC)
#define GUI_F LGUI_T(KC_F) #define GUI_F LGUI_T(KC_F)
#define GUI_J LGUI_T(KC_J) #define GUI_J LGUI_T(KC_J)
#define GUI_N LGUI_T(KC_N) #define GUI_N LGUI_T(KC_N)
@ -252,7 +252,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[_SYM] = LAYOUT( \ [_SYM] = LAYOUT( \
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_QUOT, \ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUES, KC_QUOT, \
TD(SFT_PLS), CTRL_EQ, TD(ALT_OP), TD(GUI_CP), KC_DQT, KC_COLN, GUI_CB, ALT_OB, TD(CTL_CCB), TD(SFT_OCB), \ TD(SFT_PLS), CTRL_EQ, TD(ALT_LP), TD(GUI_RP), KC_DQT, KC_COLN, GUI_RB, ALT_LB, TD(CTL_RCB), TD(SFT_LCB), \
KC_LT, KC_PIPE, KC_MINS, KC_GT, KC_BSLS, KC_GRV, KC_UNDS, KC_SLSH, KC_TILD, KC_SCLN, \ KC_LT, KC_PIPE, KC_MINS, KC_GT, KC_BSLS, KC_GRV, KC_UNDS, KC_SLSH, KC_TILD, KC_SCLN, \
_______, MAC_EN, _______, _______, MAC_EM, _______ \ _______, MAC_EN, _______, _______, MAC_EM, _______ \
) )
@ -285,131 +285,115 @@ int cur_dance (qk_tap_dance_state_t *state) {
else return 3; else return 3;
} }
void altop_finished (qk_tap_dance_state_t *state, void *user_data) { void altlp_finished (qk_tap_dance_state_t *state, void *user_data) {
td_state = cur_dance(state); td_state = cur_dance(state);
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); register_code16(KC_LPRN);
register_code(KC_9);
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
register_mods(MOD_BIT(KC_LALT)); register_mods(MOD_BIT(KC_LALT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); tap_code16(KC_LPRN);
tap_code(KC_9); register_code16(KC_LPRN);
register_code(KC_9);
} }
} }
void altop_reset (qk_tap_dance_state_t *state, void *user_data) { void altlp_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code(KC_9); unregister_code16(KC_LPRN);
unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
unregister_mods(MOD_BIT(KC_LALT)); unregister_mods(MOD_BIT(KC_LALT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code(KC_9); unregister_code16(KC_LPRN);
unregister_mods(MOD_BIT(KC_LSFT));
} }
} }
void ctlccb_finished (qk_tap_dance_state_t *state, void *user_data) { void ctlrcb_finished (qk_tap_dance_state_t *state, void *user_data) {
td_state = cur_dance(state); td_state = cur_dance(state);
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); register_code16(KC_RCBR);
register_code(KC_RBRC);
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
register_mods(MOD_BIT(KC_LCTL)); register_mods(MOD_BIT(KC_LCTL));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); tap_code16(KC_RCBR);
tap_code(KC_RBRC); register_code16(KC_RCBR);
register_code(KC_RBRC);
} }
} }
void ctlccb_reset (qk_tap_dance_state_t *state, void *user_data) { void ctlrcb_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code(KC_RBRC); unregister_code16(KC_RCBR);
unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
unregister_mods(MOD_BIT(KC_LCTL)); unregister_mods(MOD_BIT(KC_LCTL));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code(KC_RBRC); unregister_code16(KC_RCBR);
unregister_mods(MOD_BIT(KC_LSFT));
} }
} }
void guicp_finished (qk_tap_dance_state_t *state, void *user_data) { void guirp_finished (qk_tap_dance_state_t *state, void *user_data) {
td_state = cur_dance(state); td_state = cur_dance(state);
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); register_code16(KC_RPRN);
register_code(KC_0);
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
register_mods(MOD_BIT(KC_LGUI)); register_mods(MOD_BIT(KC_LGUI));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); tap_code16(KC_RPRN);
tap_code(KC_0); register_code16(KC_RPRN);
register_code(KC_0);
} }
} }
void guicp_reset (qk_tap_dance_state_t *state, void *user_data) { void guirp_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code(KC_0); unregister_code16(KC_RPRN);
unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
unregister_mods(MOD_BIT(KC_LGUI)); unregister_mods(MOD_BIT(KC_LGUI));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code(KC_0); unregister_code16(KC_RPRN);
unregister_mods(MOD_BIT(KC_LSFT));
} }
} }
void sftocb_finished (qk_tap_dance_state_t *state, void *user_data) { void sftlcb_finished (qk_tap_dance_state_t *state, void *user_data) {
td_state = cur_dance(state); td_state = cur_dance(state);
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); register_code16(KC_LCBR);
register_code(KC_LBRC);
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
register_mods(MOD_BIT(KC_LSFT)); register_mods(MOD_BIT(KC_LSFT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); tap_code16(KC_LCBR);
tap_code(KC_LBRC); register_code16(KC_LCBR);
register_code(KC_LBRC);
} }
} }
void sftocb_reset (qk_tap_dance_state_t *state, void *user_data) { void sftlcb_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code(KC_LBRC); unregister_code16(KC_LCBR);
unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
unregister_mods(MOD_BIT(KC_LSFT)); unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code(KC_LBRC); unregister_code16(KC_LCBR);
unregister_mods(MOD_BIT(KC_LSFT));
} }
} }
@ -417,38 +401,34 @@ void sftpls_finished (qk_tap_dance_state_t *state, void *user_data) {
td_state = cur_dance(state); td_state = cur_dance(state);
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); register_code16(KC_PLUS);
register_code(KC_EQL);
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
register_mods(MOD_BIT(KC_LSFT)); register_mods(MOD_BIT(KC_LSFT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
register_mods(MOD_BIT(KC_LSFT)); tap_code16(KC_PLUS);
tap_code(KC_EQL); register_code16(KC_PLUS);
register_code(KC_EQL);
} }
} }
void sftpls_reset (qk_tap_dance_state_t *state, void *user_data) { void sftpls_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (td_state) { switch (td_state) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code(KC_EQL); unregister_code16(KC_PLUS);
unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case SINGLE_HOLD: case SINGLE_HOLD:
unregister_mods(MOD_BIT(KC_LSFT)); unregister_mods(MOD_BIT(KC_LSFT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code(KC_EQL); unregister_code16(KC_PLUS);
unregister_mods(MOD_BIT(KC_LSFT));
} }
} }
qk_tap_dance_action_t tap_dance_actions[] = { qk_tap_dance_action_t tap_dance_actions[] = {
[ALT_OP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altop_finished, altop_reset), [ALT_LP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altlp_finished, altlp_reset),
[CTL_CCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctlccb_finished, ctlccb_reset), [CTL_RCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctlrcb_finished, ctlrcb_reset),
[GUI_CP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, guicp_finished, guicp_reset), [GUI_RP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, guirp_finished, guirp_reset),
[SFT_OCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftocb_finished, sftocb_reset), [SFT_LCB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftlcb_finished, sftlcb_reset),
[SFT_PLS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftpls_finished, sftpls_reset) [SFT_PLS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, sftpls_finished, sftpls_reset)
}; };