summaryrefslogtreecommitdiff
path: root/keyboards/planck/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/planck/keymaps')
-rw-r--r--keyboards/planck/keymaps/adamtabrams/config.h8
-rw-r--r--keyboards/planck/keymaps/adamtabrams/keymap.c10
-rw-r--r--keyboards/planck/keymaps/altgr/common/keycode_functions.h62
-rw-r--r--keyboards/planck/keymaps/ariccb/keymap.c18
-rw-r--r--keyboards/planck/keymaps/circuit/keymap.c2
-rw-r--r--keyboards/planck/keymaps/copface/keymap.c2
-rw-r--r--keyboards/planck/keymaps/corvec/tapdance.c16
-rw-r--r--keyboards/planck/keymaps/davidrambo/keymap.c6
-rw-r--r--keyboards/planck/keymaps/dc/keymap.c2
-rw-r--r--keyboards/planck/keymaps/dodger/keymap.c2
-rw-r--r--keyboards/planck/keymaps/dr_notsokind/keymap.c2
-rw-r--r--keyboards/planck/keymaps/dvorak2space/keymap.c12
-rw-r--r--keyboards/planck/keymaps/hiea/common/keycode_functions.h62
-rw-r--r--keyboards/planck/keymaps/hieax/common/keycode_functions.h62
-rw-r--r--keyboards/planck/keymaps/jdelkins/keymap.c14
-rw-r--r--keyboards/planck/keymaps/jweickm/config.h2
-rw-r--r--keyboards/planck/keymaps/jweickm/keymap.c40
-rw-r--r--keyboards/planck/keymaps/mjuma/keymap.c2
-rw-r--r--keyboards/planck/keymaps/muppetjones/config.h2
-rw-r--r--keyboards/planck/keymaps/roguepullrequest/keymap.c30
-rw-r--r--keyboards/planck/keymaps/rootiest/config.h4
-rw-r--r--keyboards/planck/keymaps/rootiest/keymap.c56
-rw-r--r--keyboards/planck/keymaps/sdothum/common/keycode_functions.h62
-rw-r--r--keyboards/planck/keymaps/snowkuma/keymap.c8
-rw-r--r--keyboards/planck/keymaps/tylerwince/config.h2
-rw-r--r--keyboards/planck/keymaps/tylerwince/keymap.c2
-rw-r--r--keyboards/planck/keymaps/unagi/keymap.c2
-rw-r--r--keyboards/planck/keymaps/yhaliaw/keymap.c2
-rw-r--r--keyboards/planck/keymaps/zach/zach_common_functions.c16
29 files changed, 256 insertions, 254 deletions
diff --git a/keyboards/planck/keymaps/adamtabrams/config.h b/keyboards/planck/keymaps/adamtabrams/config.h
index 0c275f20c5..d47e552434 100644
--- a/keyboards/planck/keymaps/adamtabrams/config.h
+++ b/keyboards/planck/keymaps/adamtabrams/config.h
@@ -33,7 +33,7 @@
// Tap-Hold Configs
#define TAPPING_TERM 180
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-#define TAPPING_FORCE_HOLD
-#define TAPPING_FORCE_HOLD_PER_KEY
+#define HOLD_ON_OTHER_KEY_PRESS
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#define QUICK_TAP_TERM 0
+#define QUICK_TAP_TERM_PER_KEY
diff --git a/keyboards/planck/keymaps/adamtabrams/keymap.c b/keyboards/planck/keymaps/adamtabrams/keymap.c
index 3d4aa46963..ce1acd437b 100644
--- a/keyboards/planck/keymaps/adamtabrams/keymap.c
+++ b/keyboards/planck/keymaps/adamtabrams/keymap.c
@@ -229,7 +229,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case SHFTESC:
case NUMSPAC:
@@ -249,13 +249,13 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
case CTL__J:
case CTL__T:
case CTL__N:
- return true;
+ return 0;
default:
- return false;
+ return QUICK_TAP_TERM;
}
}
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case ALT__A:
case ALTSCLN:
@@ -272,7 +272,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
case CTL__J:
case CTL__T:
case CTL__N:
- return true;
+ return false;
default:
return false;
}
diff --git a/keyboards/planck/keymaps/altgr/common/keycode_functions.h b/keyboards/planck/keymaps/altgr/common/keycode_functions.h
index e0ae15089c..1aed08b37a 100644
--- a/keyboards/planck/keymaps/altgr/common/keycode_functions.h
+++ b/keyboards/planck/keymaps/altgr/common/keycode_functions.h
@@ -109,7 +109,7 @@ void double_shift(uint16_t keycode, uint8_t layer)
}
// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(qk_tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
+void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
{
// double tap plus down
if (state->count > 2) {
@@ -152,23 +152,23 @@ void tap_reset(uint16_t keycode, uint8_t layer)
}
// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(qk_tap_dance_state_t *state, void *user_data)
+void enter(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_ENT, _RSHIFT);
}
-void enter_reset(qk_tap_dance_state_t *state, void *user_data)
+void enter_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_ENT, _RSHIFT);
}
// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(qk_tap_dance_state_t *state, void *user_data)
+void space(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_SPC, _LSHIFT);
}
-void space_reset(qk_tap_dance_state_t *state, void *user_data)
+void space_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_SPC, _LSHIFT);
}
@@ -191,7 +191,7 @@ void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
}
}
-void colon(qk_tap_dance_state_t *state, void *user_data)
+void colon(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -205,7 +205,7 @@ void colon(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void eql(qk_tap_dance_state_t *state, void *user_data)
+void eql(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key(KC_SPC);
@@ -219,7 +219,7 @@ void eql(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void greater(qk_tap_dance_state_t *state, void *user_data)
+void greater(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -233,7 +233,7 @@ void greater(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void lesser(qk_tap_dance_state_t *state, void *user_data)
+void lesser(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -247,7 +247,7 @@ void lesser(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void tilde(qk_tap_dance_state_t *state, void *user_data)
+void tilde(tap_dance_state_t *state, void *user_data)
{
// double tap plus down: repeating keycode
if (state->count > 2) {
@@ -264,7 +264,7 @@ void tilde(qk_tap_dance_state_t *state, void *user_data)
}
}
-void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
+void tilde_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_GRV);
unregister_code(KC_LSFT);
@@ -293,7 +293,7 @@ void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
#define CLOSE 1
// tap dance symbol pairs
-void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
+void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
{
// triple tap: left right with cursor between symbol pair a la vim :-)
if (state->count > 2) {
@@ -324,69 +324,69 @@ void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_
}
}
-void doublequote(qk_tap_dance_state_t *state, void *user_data)
+void doublequote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
}
-void grave(qk_tap_dance_state_t *state, void *user_data)
+void grave(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
}
-void lbrace(qk_tap_dance_state_t *state, void *user_data)
+void lbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
}
-void lcurly(qk_tap_dance_state_t *state, void *user_data)
+void lcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
}
-void lparen(qk_tap_dance_state_t *state, void *user_data)
+void lparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
}
-void lparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void lparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
-void quote(qk_tap_dance_state_t *state, void *user_data)
+void quote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
}
-void rangle(qk_tap_dance_state_t *state, void *user_data)
+void rangle(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
}
-void rbrace(qk_tap_dance_state_t *state, void *user_data)
+void rbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rcurly(qk_tap_dance_state_t *state, void *user_data)
+void rcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rparen(qk_tap_dance_state_t *state, void *user_data)
+void rparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
}
-void rparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void rparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
// ............................................................ Tap Dance Insert
-void comma(qk_tap_dance_state_t *state, void *user_data)
+void comma(tap_dance_state_t *state, void *user_data)
{
tap_key(KC_COMM);
if (state->count > 1) {
@@ -395,7 +395,7 @@ void comma(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void dot(qk_tap_dance_state_t *state, void *user_data)
+void dot(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
shift_key(KC_COLN);
@@ -407,7 +407,7 @@ void dot(qk_tap_dance_state_t *state, void *user_data)
}
// compile time macro string, see functions/hardware planck script
-void private(qk_tap_dance_state_t *state, void *user_data)
+void private(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
#ifdef PRIVATE_STRING
@@ -418,7 +418,7 @@ void private(qk_tap_dance_state_t *state, void *user_data)
}
// config.h defined string
-void send(qk_tap_dance_state_t *state, void *user_data)
+void send(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
SEND_STRING(PUBLIC_STRING);
@@ -428,7 +428,7 @@ void send(qk_tap_dance_state_t *state, void *user_data)
// .......................................................... Tap Dance One Shot
-void caps(qk_tap_dance_state_t *state, void *user_data)
+void caps(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
tap_key(KC_CAPS);
@@ -439,14 +439,14 @@ void caps(qk_tap_dance_state_t *state, void *user_data)
}
}
-void caps_reset(qk_tap_dance_state_t *state, void *user_data)
+void caps_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LSFT);
}
// ................................................................... Tap Dance
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
,[_COLN] = ACTION_TAP_DANCE_FN (colon)
,[_COMM] = ACTION_TAP_DANCE_FN (comma)
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index c507a6fe5e..4237955bb5 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -98,11 +98,11 @@ enum {
// Declare the functions to be used with your tap dance key(s)
// Function associated with all tap dances
-td_state_t cur_dance(qk_tap_dance_state_t *state);
+td_state_t cur_dance(tap_dance_state_t *state);
// Functions associated with individual tap dances
-void usl_finished(qk_tap_dance_state_t *state, void *user_data);
-void usl_reset(qk_tap_dance_state_t *state, void *user_data);
+void usl_finished(tap_dance_state_t *state, void *user_data);
+void usl_reset(tap_dance_state_t *state, void *user_data);
/* ----------------------------------------------------------------------------------------------------------------------------- */
@@ -304,7 +304,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}
-// void dance_media (qk_tap_dance_state_t *state, void *user_data)
+// void dance_media (tap_dance_state_t *state, void *user_data)
// if (state->count == 1) {
// tap_code(KC_MPLY);
// } else if (state->count == 2) {
@@ -316,12 +316,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
// }
// }
-// qk_tap_dance_action_t tap_dance_actions[] = {
+// tap_dance_action_t tap_dance_actions[] = {
// [0] = ACTION_TAP_DANCE_FN (dance_media),
// };
// Determine the current tap dance state
-td_state_t cur_dance(qk_tap_dance_state_t *state) {
+td_state_t cur_dance(tap_dance_state_t *state) {
if (state->interrupted) return TD_SINGLE_HOLD;
if (state->count == 1) {
if (!state->pressed) return TD_SINGLE_TAP;
@@ -337,7 +337,7 @@ static td_tap_t usl_tap_state = {
};
// Functions that control what our tap dance key does
-void usl_finished(qk_tap_dance_state_t *state, void *user_data) {
+void usl_finished(tap_dance_state_t *state, void *user_data) {
usl_tap_state.state = cur_dance(state);
switch (usl_tap_state.state) {
case TD_SINGLE_TAP:
@@ -368,7 +368,7 @@ void usl_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void usl_reset(qk_tap_dance_state_t *state, void *user_data) {
+void usl_reset(tap_dance_state_t *state, void *user_data) {
// If the key was held down and now is released then switch off the layer
if (usl_tap_state.state == TD_SINGLE_HOLD) {
layer_off(_LOWER);
@@ -378,7 +378,7 @@ void usl_reset(qk_tap_dance_state_t *state, void *user_data) {
}
// Associate our tap dance key with its functionality
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, usl_finished, usl_reset)
};
diff --git a/keyboards/planck/keymaps/circuit/keymap.c b/keyboards/planck/keymaps/circuit/keymap.c
index d259914d8a..4b3db082a7 100644
--- a/keyboards/planck/keymaps/circuit/keymap.c
+++ b/keyboards/planck/keymaps/circuit/keymap.c
@@ -36,7 +36,7 @@ enum planck_keycodes {
// Tap Dance Definitions
#ifdef TAP_DANCE_ENABLE
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[0] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
};
#endif
diff --git a/keyboards/planck/keymaps/copface/keymap.c b/keyboards/planck/keymaps/copface/keymap.c
index da23715949..8435ef405d 100644
--- a/keyboards/planck/keymaps/copface/keymap.c
+++ b/keyboards/planck/keymaps/copface/keymap.c
@@ -53,7 +53,7 @@ enum tapdancers {
};
//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
[T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
[T_CU] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
diff --git a/keyboards/planck/keymaps/corvec/tapdance.c b/keyboards/planck/keymaps/corvec/tapdance.c
index a597fe29fa..35eef2d838 100644
--- a/keyboards/planck/keymaps/corvec/tapdance.c
+++ b/keyboards/planck/keymaps/corvec/tapdance.c
@@ -30,7 +30,7 @@ typedef struct {
int state;
} tap;
-int cur_dance (qk_tap_dance_state_t *state) {
+int cur_dance (tap_dance_state_t *state) {
if (state->count == 1) {
if (state->interrupted || !state->pressed) {
return SINGLE_TAP;
@@ -57,7 +57,7 @@ static tap quote_state = {
.state = 0
};
-void quote_finished(qk_tap_dance_state_t *state, void *user_data) {
+void quote_finished(tap_dance_state_t *state, void *user_data) {
quote_state.state = cur_dance(state);
switch(quote_state.state) {
case SINGLE_TAP: register_code(KC_QUOT); break;
@@ -66,7 +66,7 @@ void quote_finished(qk_tap_dance_state_t *state, void *user_data) {
case DOUBLE_SINGLE_TAP: register_code(KC_QUOT); unregister_code(KC_QUOT); register_code(KC_QUOT); break;
}
}
-void quote_reset(qk_tap_dance_state_t *state, void *user_data) {
+void quote_reset(tap_dance_state_t *state, void *user_data) {
switch(quote_state.state) {
case SINGLE_TAP: unregister_code(KC_QUOT); break;
case SINGLE_HOLD: layer_off(_LEANDOWN); break;
@@ -85,7 +85,7 @@ static tap ralt_state = {
.state = 0
};
-void ralt_finished(qk_tap_dance_state_t *state, void *user_data) {
+void ralt_finished(tap_dance_state_t *state, void *user_data) {
ralt_state.state = cur_dance(state);
switch(ralt_state.state) {
case SINGLE_TAP: register_code(KC_LBRC); break;
@@ -95,7 +95,7 @@ void ralt_finished(qk_tap_dance_state_t *state, void *user_data) {
case DOUBLE_SINGLE_TAP: register_code(KC_RALT); break;
}
}
-void ralt_reset(qk_tap_dance_state_t *state, void *user_data) {
+void ralt_reset(tap_dance_state_t *state, void *user_data) {
switch(ralt_state.state) {
case SINGLE_TAP: unregister_code(KC_LBRC); break;
case SINGLE_HOLD: unregister_code(KC_RALT); break;
@@ -114,7 +114,7 @@ static tap rgui_state = {
.state = 0
};
-void rgui_finished(qk_tap_dance_state_t *state, void *user_data) {
+void rgui_finished(tap_dance_state_t *state, void *user_data) {
rgui_state.state = cur_dance(state);
switch(rgui_state.state) {
case SINGLE_TAP: register_code(KC_RBRC); break;
@@ -124,7 +124,7 @@ void rgui_finished(qk_tap_dance_state_t *state, void *user_data) {
case DOUBLE_SINGLE_TAP: register_code(KC_RGUI); break;
}
}
-void rgui_reset(qk_tap_dance_state_t *state, void *user_data) {
+void rgui_reset(tap_dance_state_t *state, void *user_data) {
switch(rgui_state.state) {
case SINGLE_TAP: unregister_code(KC_RBRC); break;
case SINGLE_HOLD: unregister_code(KC_RGUI); break;
@@ -146,7 +146,7 @@ enum {
TD_RBRC_RGUI_RCBR
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
// Tap once for Alt, twice for Shift
[TD_ALT_SHIFT] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_RSFT),
[TD_QUOT_LEAN_MINS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quote_finished, quote_reset),
diff --git a/keyboards/planck/keymaps/davidrambo/keymap.c b/keyboards/planck/keymaps/davidrambo/keymap.c
index bd0603a760..2770bb60e3 100644
--- a/keyboards/planck/keymaps/davidrambo/keymap.c
+++ b/keyboards/planck/keymaps/davidrambo/keymap.c
@@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
+void caps_tap (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
register_code (KC_LSFT);
} else if (state->count == 2) {
@@ -99,7 +99,7 @@ void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
register_code (KC_CAPS);
}
}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
+void caps_tap_end (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
unregister_code (KC_LSFT);
} else {
@@ -108,7 +108,7 @@ void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
}
//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
//Tap once for Shift, twice for Caps Lock
[SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
};
diff --git a/keyboards/planck/keymaps/dc/keymap.c b/keyboards/planck/keymaps/dc/keymap.c
index 83b6f9eaad..6a4da9546f 100644
--- a/keyboards/planck/keymaps/dc/keymap.c
+++ b/keyboards/planck/keymaps/dc/keymap.c
@@ -26,7 +26,7 @@ enum tap_dance_codes {
CT_DEL_ESC
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[0] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_LPRN),
[1] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_LCBR),
[2] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_LBRC),
diff --git a/keyboards/planck/keymaps/dodger/keymap.c b/keyboards/planck/keymaps/dodger/keymap.c
index 1ef2645395..76493e714d 100644
--- a/keyboards/planck/keymaps/dodger/keymap.c
+++ b/keyboards/planck/keymaps/dodger/keymap.c
@@ -44,7 +44,7 @@ enum {
TD_ESC_CAPS
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
[TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS)
};
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index 901c7cc23e..0338e1806e 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -50,7 +50,7 @@ enum planck_keycodes {
// Tap Dance Definitions
#ifdef TAP_DANCE_ENABLE
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[0] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
};
#endif
diff --git a/keyboards/planck/keymaps/dvorak2space/keymap.c b/keyboards/planck/keymaps/dvorak2space/keymap.c
index 08d56dd97a..928f71ab1c 100644
--- a/keyboards/planck/keymaps/dvorak2space/keymap.c
+++ b/keyboards/planck/keymaps/dvorak2space/keymap.c
@@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { //X_KEY doesn'
};
//tapdance state evaluation
-int cur_dance(qk_tap_dance_state_t *state) {
+int cur_dance(tap_dance_state_t *state) {
int press = 0;
switch(state->count) {
case 1:
@@ -196,11 +196,11 @@ int cur_dance(qk_tap_dance_state_t *state) {
return press;
}
-void back_tap(qk_tap_dance_state_t *state, void *user_data) { tap_code(KC_BACKSPACE); }
+void back_tap(tap_dance_state_t *state, void *user_data) { tap_code(KC_BACKSPACE); }
-void back_finished(qk_tap_dance_state_t *state, void *user_data) { if(!(state->interrupted || !state->pressed)) tap_code16(LCTL(KC_BACKSPACE)); }
+void back_finished(tap_dance_state_t *state, void *user_data) { if(!(state->interrupted || !state->pressed)) tap_code16(LCTL(KC_BACKSPACE)); }
-void slash_finished(qk_tap_dance_state_t *state, void *user_data) {
+void slash_finished(tap_dance_state_t *state, void *user_data) {
int td_state = cur_dance(state);
switch(td_state) {
case SINGLE_TAP:
@@ -213,7 +213,7 @@ void slash_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void dash_finished(qk_tap_dance_state_t *state, void *user_data) {
+void dash_finished(tap_dance_state_t *state, void *user_data) {
int td_state = cur_dance(state);
switch(td_state) {
case SINGLE_TAP:
@@ -233,7 +233,7 @@ void dash_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[LPN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_LBRC),
[RPN] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC),
[FB] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, slash_finished, NULL),
diff --git a/keyboards/planck/keymaps/hiea/common/keycode_functions.h b/keyboards/planck/keymaps/hiea/common/keycode_functions.h
index e0ae15089c..1aed08b37a 100644
--- a/keyboards/planck/keymaps/hiea/common/keycode_functions.h
+++ b/keyboards/planck/keymaps/hiea/common/keycode_functions.h
@@ -109,7 +109,7 @@ void double_shift(uint16_t keycode, uint8_t layer)
}
// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(qk_tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
+void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
{
// double tap plus down
if (state->count > 2) {
@@ -152,23 +152,23 @@ void tap_reset(uint16_t keycode, uint8_t layer)
}
// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(qk_tap_dance_state_t *state, void *user_data)
+void enter(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_ENT, _RSHIFT);
}
-void enter_reset(qk_tap_dance_state_t *state, void *user_data)
+void enter_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_ENT, _RSHIFT);
}
// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(qk_tap_dance_state_t *state, void *user_data)
+void space(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_SPC, _LSHIFT);
}
-void space_reset(qk_tap_dance_state_t *state, void *user_data)
+void space_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_SPC, _LSHIFT);
}
@@ -191,7 +191,7 @@ void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
}
}
-void colon(qk_tap_dance_state_t *state, void *user_data)
+void colon(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -205,7 +205,7 @@ void colon(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void eql(qk_tap_dance_state_t *state, void *user_data)
+void eql(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key(KC_SPC);
@@ -219,7 +219,7 @@ void eql(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void greater(qk_tap_dance_state_t *state, void *user_data)
+void greater(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -233,7 +233,7 @@ void greater(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void lesser(qk_tap_dance_state_t *state, void *user_data)
+void lesser(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -247,7 +247,7 @@ void lesser(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void tilde(qk_tap_dance_state_t *state, void *user_data)
+void tilde(tap_dance_state_t *state, void *user_data)
{
// double tap plus down: repeating keycode
if (state->count > 2) {
@@ -264,7 +264,7 @@ void tilde(qk_tap_dance_state_t *state, void *user_data)
}
}
-void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
+void tilde_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_GRV);
unregister_code(KC_LSFT);
@@ -293,7 +293,7 @@ void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
#define CLOSE 1
// tap dance symbol pairs
-void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
+void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
{
// triple tap: left right with cursor between symbol pair a la vim :-)
if (state->count > 2) {
@@ -324,69 +324,69 @@ void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_
}
}
-void doublequote(qk_tap_dance_state_t *state, void *user_data)
+void doublequote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
}
-void grave(qk_tap_dance_state_t *state, void *user_data)
+void grave(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
}
-void lbrace(qk_tap_dance_state_t *state, void *user_data)
+void lbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
}
-void lcurly(qk_tap_dance_state_t *state, void *user_data)
+void lcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
}
-void lparen(qk_tap_dance_state_t *state, void *user_data)
+void lparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
}
-void lparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void lparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
-void quote(qk_tap_dance_state_t *state, void *user_data)
+void quote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
}
-void rangle(qk_tap_dance_state_t *state, void *user_data)
+void rangle(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
}
-void rbrace(qk_tap_dance_state_t *state, void *user_data)
+void rbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rcurly(qk_tap_dance_state_t *state, void *user_data)
+void rcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rparen(qk_tap_dance_state_t *state, void *user_data)
+void rparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
}
-void rparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void rparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
// ............................................................ Tap Dance Insert
-void comma(qk_tap_dance_state_t *state, void *user_data)
+void comma(tap_dance_state_t *state, void *user_data)
{
tap_key(KC_COMM);
if (state->count > 1) {
@@ -395,7 +395,7 @@ void comma(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void dot(qk_tap_dance_state_t *state, void *user_data)
+void dot(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
shift_key(KC_COLN);
@@ -407,7 +407,7 @@ void dot(qk_tap_dance_state_t *state, void *user_data)
}
// compile time macro string, see functions/hardware planck script
-void private(qk_tap_dance_state_t *state, void *user_data)
+void private(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
#ifdef PRIVATE_STRING
@@ -418,7 +418,7 @@ void private(qk_tap_dance_state_t *state, void *user_data)
}
// config.h defined string
-void send(qk_tap_dance_state_t *state, void *user_data)
+void send(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
SEND_STRING(PUBLIC_STRING);
@@ -428,7 +428,7 @@ void send(qk_tap_dance_state_t *state, void *user_data)
// .......................................................... Tap Dance One Shot
-void caps(qk_tap_dance_state_t *state, void *user_data)
+void caps(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
tap_key(KC_CAPS);
@@ -439,14 +439,14 @@ void caps(qk_tap_dance_state_t *state, void *user_data)
}
}
-void caps_reset(qk_tap_dance_state_t *state, void *user_data)
+void caps_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LSFT);
}
// ................................................................... Tap Dance
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
,[_COLN] = ACTION_TAP_DANCE_FN (colon)
,[_COMM] = ACTION_TAP_DANCE_FN (comma)
diff --git a/keyboards/planck/keymaps/hieax/common/keycode_functions.h b/keyboards/planck/keymaps/hieax/common/keycode_functions.h
index a26b562fff..ecf3636ae8 100644
--- a/keyboards/planck/keymaps/hieax/common/keycode_functions.h
+++ b/keyboards/planck/keymaps/hieax/common/keycode_functions.h
@@ -115,7 +115,7 @@ void double_shift(uint16_t keycode, uint8_t layer)
}
// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(qk_tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
+void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
{
// double tap plus down
if (state->count > 2) {
@@ -158,23 +158,23 @@ void tap_reset(uint16_t keycode, uint8_t layer)
}
// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(qk_tap_dance_state_t *state, void *user_data)
+void enter(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_ENT, _RSHIFT);
}
-void enter_reset(qk_tap_dance_state_t *state, void *user_data)
+void enter_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_ENT, _RSHIFT);
}
// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(qk_tap_dance_state_t *state, void *user_data)
+void space(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_SPC, _LSHIFT);
}
-void space_reset(qk_tap_dance_state_t *state, void *user_data)
+void space_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_SPC, _LSHIFT);
}
@@ -197,7 +197,7 @@ void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
}
}
-void colon(qk_tap_dance_state_t *state, void *user_data)
+void colon(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -211,7 +211,7 @@ void colon(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void eql(qk_tap_dance_state_t *state, void *user_data)
+void eql(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key(KC_SPC);
@@ -225,7 +225,7 @@ void eql(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void greater(qk_tap_dance_state_t *state, void *user_data)
+void greater(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -239,7 +239,7 @@ void greater(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void lesser(qk_tap_dance_state_t *state, void *user_data)
+void lesser(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -253,7 +253,7 @@ void lesser(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void tilde(qk_tap_dance_state_t *state, void *user_data)
+void tilde(tap_dance_state_t *state, void *user_data)
{
// double tap plus down: repeating keycode
if (state->count > 2) {
@@ -270,7 +270,7 @@ void tilde(qk_tap_dance_state_t *state, void *user_data)
}
}
-void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
+void tilde_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_GRV);
unregister_code(KC_LSFT);
@@ -299,7 +299,7 @@ void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
#define CLOSE 1
// tap dance symbol pairs
-void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
+void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
{
// triple tap: left right with cursor between symbol pair a la vim :-)
if (state->count > 2) {
@@ -330,69 +330,69 @@ void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_
}
}
-void doublequote(qk_tap_dance_state_t *state, void *user_data)
+void doublequote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
}
-void grave(qk_tap_dance_state_t *state, void *user_data)
+void grave(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
}
-void lbrace(qk_tap_dance_state_t *state, void *user_data)
+void lbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
}
-void lcurly(qk_tap_dance_state_t *state, void *user_data)
+void lcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
}
-void lparen(qk_tap_dance_state_t *state, void *user_data)
+void lparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
}
-void lparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void lparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
-void quote(qk_tap_dance_state_t *state, void *user_data)
+void quote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
}
-void rangle(qk_tap_dance_state_t *state, void *user_data)
+void rangle(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
}
-void rbrace(qk_tap_dance_state_t *state, void *user_data)
+void rbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rcurly(qk_tap_dance_state_t *state, void *user_data)
+void rcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rparen(qk_tap_dance_state_t *state, void *user_data)
+void rparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
}
-void rparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void rparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
// ............................................................ Tap Dance Insert
-void comma(qk_tap_dance_state_t *state, void *user_data)
+void comma(tap_dance_state_t *state, void *user_data)
{
tap_key(KC_COMM);
if (state->count > 1) {
@@ -401,7 +401,7 @@ void comma(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void dot(qk_tap_dance_state_t *state, void *user_data)
+void dot(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
shift_key(KC_COLN);
@@ -413,7 +413,7 @@ void dot(qk_tap_dance_state_t *state, void *user_data)
}
// compile time macro string, see functions/hardware planck script
-void private(qk_tap_dance_state_t *state, void *user_data)
+void private(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
#ifdef PRIVATE_STRING
@@ -424,7 +424,7 @@ void private(qk_tap_dance_state_t *state, void *user_data)
}
// config.h defined string
-void send(qk_tap_dance_state_t *state, void *user_data)
+void send(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
SEND_STRING(PUBLIC_STRING);
@@ -434,7 +434,7 @@ void send(qk_tap_dance_state_t *state, void *user_data)
// .......................................................... Tap Dance One Shot
-void caps(qk_tap_dance_state_t *state, void *user_data)
+void caps(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
tap_key(KC_CAPS);
@@ -445,14 +445,14 @@ void caps(qk_tap_dance_state_t *state, void *user_data)
}
}
-void caps_reset(qk_tap_dance_state_t *state, void *user_data)
+void caps_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LSFT);
}
// ................................................................... Tap Dance
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
,[_COLN] = ACTION_TAP_DANCE_FN (colon)
,[_COMM] = ACTION_TAP_DANCE_FN (comma)
diff --git a/keyboards/planck/keymaps/jdelkins/keymap.c b/keyboards/planck/keymaps/jdelkins/keymap.c
index 521ade05b9..9d306abc78 100644
--- a/keyboards/planck/keymaps/jdelkins/keymap.c
+++ b/keyboards/planck/keymaps/jdelkins/keymap.c
@@ -40,10 +40,10 @@ enum {
int ctl_state = 0;
-void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
+void ctl_finished(tap_dance_state_t *state, void *user_data) {
ctl_state = cur_dance(state);
switch (ctl_state) {
- case SINGLE_TAP: qk_leader_start(); break;
+ case SINGLE_TAP: leader_start(); break;
case SINGLE_HOLD: register_code(KC_LCTL); break;
case DOUBLE_TAP: tap_code(KC_RCTL); break;
case DOUBLE_HOLD: register_code(KC_RCTL); break;
@@ -52,7 +52,7 @@ void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
+void ctl_reset(tap_dance_state_t *state, void *user_data) {
switch (ctl_state) {
case SINGLE_HOLD: unregister_code(KC_LCTL); break;
case DOUBLE_HOLD:
@@ -61,7 +61,7 @@ void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
ctl_state = 0;
}
-void g_finished(qk_tap_dance_state_t *state, void *user_data) {
+void g_finished(tap_dance_state_t *state, void *user_data) {
switch (cur_dance(state)) {
case SINGLE_TAP:
tap_code16(C(KC_END));
@@ -74,7 +74,7 @@ void g_finished(qk_tap_dance_state_t *state, void *user_data) {
int kp_state = 0;
-void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
+void kp_finished(tap_dance_state_t *state, void *user_data) {
kp_state = hold_cur_dance(state);
switch (kp_state) {
case SINGLE_HOLD: layer_on(_KP); break;
@@ -82,7 +82,7 @@ void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void kp_reset(qk_tap_dance_state_t *state, void *user_data) {
+void kp_reset(tap_dance_state_t *state, void *user_data) {
switch (kp_state) {
case SINGLE_HOLD: layer_off(_KP); break;
case DOUBLE_HOLD: layer_off(_RPT); break;
@@ -96,7 +96,7 @@ enum {
TD_KP
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
[TD_G] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
[TD_KP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, kp_finished, kp_reset),
diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h
index 3b34ddf832..bd34fca202 100644
--- a/keyboards/planck/keymaps/jweickm/config.h
+++ b/keyboards/planck/keymaps/jweickm/config.h
@@ -58,7 +58,7 @@
#define TAPPING_TERM_PER_KEY
//#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD_PER_KEY
+#define QUICK_TAP_TERM_PER_KEY
// settings for LEADER key
#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/planck/keymaps/jweickm/keymap.c b/keyboards/planck/keymaps/jweickm/keymap.c
index b2c317f039..eb3391c171 100644
--- a/keyboards/planck/keymaps/jweickm/keymap.c
+++ b/keyboards/planck/keymaps/jweickm/keymap.c
@@ -290,7 +290,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// define the tap dance functions
-void dance_prn(qk_tap_dance_state_t *state, void *user_data) {
+void dance_prn(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_LPRN);
} else {
@@ -299,7 +299,7 @@ void dance_prn(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void dance_brc(qk_tap_dance_state_t *state, void *user_data) {
+void dance_brc(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_LBRC);
} else {
@@ -308,7 +308,7 @@ void dance_brc(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void dance_cbr(qk_tap_dance_state_t *state, void *user_data) {
+void dance_cbr(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_LCBR);
} else {
@@ -317,7 +317,7 @@ void dance_cbr(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void dance_prn_de(qk_tap_dance_state_t *state, void *user_data) {
+void dance_prn_de(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_ASTR);
} else {
@@ -326,7 +326,7 @@ void dance_prn_de(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void dance_brc_de(qk_tap_dance_state_t *state, void *user_data) {
+void dance_brc_de(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(RALT(KC_8));
} else {
@@ -335,7 +335,7 @@ void dance_brc_de(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void dance_cbr_de(qk_tap_dance_state_t *state, void *user_data) {
+void dance_cbr_de(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(RALT(KC_7));
} else {
@@ -344,7 +344,7 @@ void dance_cbr_de(qk_tap_dance_state_t *state, void *user_data) {
tap_code(KC_LEFT);
}
}
-void vim_gg(qk_tap_dance_state_t *state, void *user_data) {
+void vim_gg(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(LCTL(KC_END));
} else {
@@ -352,7 +352,7 @@ void vim_gg(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
// declare tap dance actions here
[TD_PRN] = ACTION_TAP_DANCE_FN(dance_prn), [TD_BRC] = ACTION_TAP_DANCE_FN(dance_brc), [TD_CBR] = ACTION_TAP_DANCE_FN(dance_cbr), [TD_PRN_DE] = ACTION_TAP_DANCE_FN(dance_prn_de), [TD_BRC_DE] = ACTION_TAP_DANCE_FN(dance_brc_de), [TD_CBR_DE] = ACTION_TAP_DANCE_FN(dance_cbr_de), [TD_VIM_GG] = ACTION_TAP_DANCE_FN(vim_gg)};
@@ -1039,30 +1039,30 @@ bool music_mask_user(uint16_t keycode) {
}
}
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case LSFT_T(KC_S):
- return true;
+ return 0;
case RSFT_T(KC_E):
- return true;
+ return 0;
case LSFT_T(KC_D):
- return true;
+ return 0;
case RSFT_T(KC_K):
- return true;
+ return 0;
case LSFT_T(KC_F):
- return true;
+ return 0;
case RSFT_T(KC_U):
- return true;
+ return 0;
case LT(_RAISE, KC_ENT):
- return true;
+ return 0;
case LT(_RAISE_DE, KC_ENT):
- return true;
+ return 0;
case LT(_LOWER, KC_BSPC):
- return true;
+ return 0;
case LT(_LOWER_DE, KC_BSPC):
- return true;
+ return 0;
default:
- return false;
+ return QUICK_TAP_TERM;
}
}
diff --git a/keyboards/planck/keymaps/mjuma/keymap.c b/keyboards/planck/keymaps/mjuma/keymap.c
index d449b28e51..c5faeb4385 100644
--- a/keyboards/planck/keymaps/mjuma/keymap.c
+++ b/keyboards/planck/keymaps/mjuma/keymap.c
@@ -36,7 +36,7 @@ enum taps {
TD_SHIFT_CAPS = 0
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_SHIFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
};
diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h
index 1046d21499..1a05bfc837 100644
--- a/keyboards/planck/keymaps/muppetjones/config.h
+++ b/keyboards/planck/keymaps/muppetjones/config.h
@@ -53,4 +53,4 @@
#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c
index 53171593b2..61221601e6 100644
--- a/keyboards/planck/keymaps/roguepullrequest/keymap.c
+++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c
@@ -31,12 +31,12 @@ enum {
SLASH
};
-int cur_dance (qk_tap_dance_state_t *state);
+int cur_dance (tap_dance_state_t *state);
-void x_finished (qk_tap_dance_state_t *state, void *user_data);
-void x_reset (qk_tap_dance_state_t *state, void *user_data);
-void lshift_finished (qk_tap_dance_state_t *state, void *user_data);
-void lshift_reset(qk_tap_dance_state_t *state, void *user_data);
+void x_finished (tap_dance_state_t *state, void *user_data);
+void x_reset (tap_dance_state_t *state, void *user_data);
+void lshift_finished (tap_dance_state_t *state, void *user_data);
+void lshift_reset(tap_dance_state_t *state, void *user_data);
bool is_alt_tab_active = false;
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Super crazy tap dancing stuff - see quad dance in feature_tap_dance.md
-int cur_dance (qk_tap_dance_state_t *state) {
+int cur_dance (tap_dance_state_t *state) {
if (state->count == 1) {
if (state->interrupted || !state->pressed) return SINGLE_TAP;
// key not interrupted, but still held sends 'HOLD'
@@ -166,7 +166,7 @@ static tap xtap_state = {
};
// registering keypresses
-void x_finished (qk_tap_dance_state_t *state, void *user_data) {
+void x_finished (tap_dance_state_t *state, void *user_data) {
xtap_state.state = cur_dance(state);
switch (xtap_state.state) {
case SINGLE_TAP: register_code16(KC_AT); break;
@@ -176,7 +176,7 @@ void x_finished (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void lshift_finished (qk_tap_dance_state_t *state, void *user_data) {
+void lshift_finished (tap_dance_state_t *state, void *user_data) {
xtap_state.state = cur_dance(state);
switch (xtap_state.state) {
case SINGLE_TAP: register_code16(KC_LSFT); register_code16(KC_9); break;
@@ -185,7 +185,7 @@ void lshift_finished (qk_tap_dance_state_t *state, void *user_data) {
case TRIPLE_TAP: register_code16(KC_LSFT); register_code16(KC_LBRC); break;
}
}
-void s_finished (qk_tap_dance_state_t *state, void *user_data) {
+void s_finished (tap_dance_state_t *state, void *user_data) {
xtap_state.state = cur_dance(state);
switch (xtap_state.state) {
case SINGLE_TAP: register_code16(KC_S); break;
@@ -194,7 +194,7 @@ void s_finished (qk_tap_dance_state_t *state, void *user_data) {
}
}
-void rshift_finished (qk_tap_dance_state_t *state, void *user_data) {
+void rshift_finished (tap_dance_state_t *state, void *user_data) {
xtap_state.state = cur_dance(state);
switch (xtap_state.state) {
case SINGLE_TAP: register_code16(KC_LSFT); register_code16(KC_0); break;
@@ -206,7 +206,7 @@ void rshift_finished (qk_tap_dance_state_t *state, void *user_data) {
// forgetting keypresses
-void x_reset (qk_tap_dance_state_t *state, void *user_data) {
+void x_reset (tap_dance_state_t *state, void *user_data) {
switch (xtap_state.state) {
case SINGLE_TAP: unregister_code16(KC_AT); break;
case SINGLE_HOLD: clear_oneshot_layer_state(ONESHOT_PRESSED); break;
@@ -215,7 +215,7 @@ void x_reset (qk_tap_dance_state_t *state, void *user_data) {
}
xtap_state.state = 0;
}
-void lshift_reset (qk_tap_dance_state_t *state, void *user_data) {
+void lshift_reset (tap_dance_state_t *state, void *user_data) {
switch (xtap_state.state) {
case SINGLE_TAP: unregister_code16(KC_9); unregister_code16(KC_LSFT); break;
case SINGLE_HOLD: unregister_code16(KC_LSFT); break;
@@ -225,7 +225,7 @@ void lshift_reset (qk_tap_dance_state_t *state, void *user_data) {
xtap_state.state = 0;
}
-void rshift_reset (qk_tap_dance_state_t *state, void *user_data) {
+void rshift_reset (tap_dance_state_t *state, void *user_data) {
switch (xtap_state.state) {
case SINGLE_TAP: unregister_code16(KC_0); unregister_code16(KC_LSFT); break;
case SINGLE_HOLD: unregister_code16(KC_RSFT); break;
@@ -234,7 +234,7 @@ void rshift_reset (qk_tap_dance_state_t *state, void *user_data) {
}
xtap_state.state = 0;
}
-void s_reset (qk_tap_dance_state_t *state, void *user_data) {
+void s_reset (tap_dance_state_t *state, void *user_data) {
switch (xtap_state.state) {
case SINGLE_TAP: unregister_code16(KC_S); break;
case DOUBLE_TAP: unregister_code16(KC_MINUS); break;
@@ -242,7 +242,7 @@ void s_reset (qk_tap_dance_state_t *state, void *user_data) {
}
xtap_state.state = 0;
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[X_AT_FUN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset),
[LSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
[RSHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index 4de638ce29..1cca7e5ba9 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -117,8 +117,8 @@
* MACRO per-key options
*/
#define RETRO_TAPPING_PER_KEY // Control Retro-Tap individually by key
-#define TAPPING_FORCE_HOLD_PER_KEY // Control Force-Hold individually by key
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Control Mod-Tap-Interrupt individually by key
+#define QUICK_TAP_TERM_PER_KEY // Control Quick-Tap individually by key
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Control Hold-on-Other-Key-Press individually by key
#define PERMISSIVE_HOLD_PER_KEY // Control Permissive-Hold individually by key
#define MK_KINETIC_SPEED // Use kinetic acceleration for mouse-keys
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index 097f313cca..20034c97e1 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -243,15 +243,15 @@ bool did_leader_succeed;
LEADER_EXTERNS();
// Tap-Dance stuffs, initializing functions that are coded further below
-td_state_t cur_dance(qk_tap_dance_state_t* state);
-void sml_finished(qk_tap_dance_state_t* state, void* user_data);
-void sml_reset(qk_tap_dance_state_t* state, void* user_data);
-void scap_finished(qk_tap_dance_state_t* state, void* user_data);
-void scap_reset(qk_tap_dance_state_t* state, void* user_data);
-void slctl_finished(qk_tap_dance_state_t* state, void* user_data);
-void slctl_reset(qk_tap_dance_state_t* state, void* user_data);
-void slalt_finished(qk_tap_dance_state_t* state, void* user_data);
-void slalt_reset(qk_tap_dance_state_t* state, void* user_data);
+td_state_t cur_dance(tap_dance_state_t* state);
+void sml_finished(tap_dance_state_t* state, void* user_data);
+void sml_reset(tap_dance_state_t* state, void* user_data);
+void scap_finished(tap_dance_state_t* state, void* user_data);
+void scap_reset(tap_dance_state_t* state, void* user_data);
+void slctl_finished(tap_dance_state_t* state, void* user_data);
+void slctl_reset(tap_dance_state_t* state, void* user_data);
+void slalt_finished(tap_dance_state_t* state, void* user_data);
+void slalt_reset(tap_dance_state_t* state, void* user_data);
bool lctl_sticky = false;
bool lalt_sticky = false;
@@ -1325,7 +1325,7 @@ void rgb_wakeup_sequence(void) {
}
// Spits out some unicode special characters in response to a tap-dance
-void send_degree_symbol(qk_tap_dance_state_t* state, void* user_data) {
+void send_degree_symbol(tap_dance_state_t* state, void* user_data) {
switch (state->count) {
case 4:
// ℃
@@ -1369,18 +1369,20 @@ bool get_retro_tapping(uint16_t keycode, keyrecord_t* record) {
return false;
}
}
-// Handles per-key configuration of Mod-Tap-Interrupt
-bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t* record) {
+// Handles per-key configuration of Hold-on-Other-Key-Press
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t* record) {
switch (keycode) {
+ case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+ return true;
default:
return false;
}
}
-// Handles per-key configuration of Tapping Force-Hold
-bool get_tapping_force_hold(uint16_t keycode, keyrecord_t* record) {
+// Handles per-key configuration of Quick-Tap
+uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record) {
switch (keycode) {
default:
- return false;
+ return QUICK_TAP_TERM;
}
}
// Handles per-key configuration of Permissive-Hold
@@ -1395,13 +1397,13 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t* record) {
* by playing sound at different stages of the leader chord
*/
// Called when you tap the Leader key
-void leader_start(void) {
+void leader_start_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_started);
#endif
}
// Called when either the leader sequence is completed, or the leader timeout is hit
-void leader_end(void) {
+void leader_end_user(void) {
if (did_leader_succeed) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_succeed);
@@ -1414,7 +1416,7 @@ void leader_end(void) {
}
// Monitors and labels the current state of any tap-dances
-td_state_t cur_dance(qk_tap_dance_state_t* state) {
+td_state_t cur_dance(tap_dance_state_t* state) {
if (state->count == 1) {
if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
// Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
@@ -1444,7 +1446,7 @@ static td_tap_t slctl_state = {.is_press_action = true, .state = TD_NONE};
static td_tap_t slalt_state = {.is_press_action = true, .state = TD_NONE};
// Left-Shift->Sticky-Caps tap-dance finished
-void scap_finished(qk_tap_dance_state_t* state, void* user_data) {
+void scap_finished(tap_dance_state_t* state, void* user_data) {
scap_state.state = cur_dance(state);
switch (scap_state.state) {
case TD_SINGLE_HOLD:
@@ -1469,13 +1471,13 @@ void scap_finished(qk_tap_dance_state_t* state, void* user_data) {
}
// Left-Shift->Sticky-Caps tap-dance reset
-void scap_reset(qk_tap_dance_state_t* state, void* user_data) {
+void scap_reset(tap_dance_state_t* state, void* user_data) {
unregister_code(KC_LSFT);
scap_state.state = TD_NONE;
}
// Sticky-Left-Control tap-dance finished
-void slctl_finished(qk_tap_dance_state_t* state, void* user_data) {
+void slctl_finished(tap_dance_state_t* state, void* user_data) {
slctl_state.state = cur_dance(state);
switch (slctl_state.state) {
case TD_SINGLE_HOLD:
@@ -1505,7 +1507,7 @@ void slctl_finished(qk_tap_dance_state_t* state, void* user_data) {
}
// Sticky-Left-Control tap-dance reset
-void slctl_reset(qk_tap_dance_state_t* state, void* user_data) {
+void slctl_reset(tap_dance_state_t* state, void* user_data) {
if (!lctl_sticky) {
unregister_code(KC_LCTL);
slctl_state.state = TD_NONE;
@@ -1515,7 +1517,7 @@ void slctl_reset(qk_tap_dance_state_t* state, void* user_data) {
}
// Sticky-Left-Alt tap-dance finished
-void slalt_finished(qk_tap_dance_state_t* state, void* user_data) {
+void slalt_finished(tap_dance_state_t* state, void* user_data) {
slalt_state.state = cur_dance(state);
switch (slalt_state.state) {
case TD_SINGLE_HOLD:
@@ -1545,7 +1547,7 @@ void slalt_finished(qk_tap_dance_state_t* state, void* user_data) {
}
// Sticky-Left-Alt tap-dance reset
-void slalt_reset(qk_tap_dance_state_t* state, void* user_data) {
+void slalt_reset(tap_dance_state_t* state, void* user_data) {
if (!lalt_sticky) {
unregister_code(KC_LALT);
slalt_state.state = TD_NONE;
@@ -1555,7 +1557,7 @@ void slalt_reset(qk_tap_dance_state_t* state, void* user_data) {
}
// Smiley key tap-dance finished
-void sml_finished(qk_tap_dance_state_t* state, void* user_data) {
+void sml_finished(tap_dance_state_t* state, void* user_data) {
sml_state.state = cur_dance(state);
switch (sml_state.state) {
default:
@@ -1651,10 +1653,10 @@ void sml_finished(qk_tap_dance_state_t* state, void* user_data) {
break;
}
}
-void sml_reset(qk_tap_dance_state_t* state, void* user_data) { sml_state.state = TD_NONE; }
+void sml_reset(tap_dance_state_t* state, void* user_data) { sml_state.state = TD_NONE; }
// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
// Tap once for °, twice for ℉, thrice for ℃
[TD_DEG_DEGF] = ACTION_TAP_DANCE_FN(send_degree_symbol), //
[TD_LSHFT_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, scap_finished, scap_reset), //
diff --git a/keyboards/planck/keymaps/sdothum/common/keycode_functions.h b/keyboards/planck/keymaps/sdothum/common/keycode_functions.h
index 08c5deca51..86d2645b4c 100644
--- a/keyboards/planck/keymaps/sdothum/common/keycode_functions.h
+++ b/keyboards/planck/keymaps/sdothum/common/keycode_functions.h
@@ -109,7 +109,7 @@ void double_shift(uint16_t keycode, uint8_t layer)
}
// tap dance LT (LAYER, KEY) emulation with <KEY><DOWN> -> <KEY><SHIFT> and auto-repeat extensions!
-void tap_shift(qk_tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
+void tap_shift(tap_dance_state_t *state, uint16_t keycode, uint8_t layer)
{
// double tap plus down
if (state->count > 2) {
@@ -152,23 +152,23 @@ void tap_reset(uint16_t keycode, uint8_t layer)
}
// augment pseudo LT (_RSHIFT, KC_ENT) handling below for rapid <ENTER><SHIFT> sequences
-void enter(qk_tap_dance_state_t *state, void *user_data)
+void enter(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_ENT, _RSHIFT);
}
-void enter_reset(qk_tap_dance_state_t *state, void *user_data)
+void enter_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_ENT, _RSHIFT);
}
// augment pseudo LT (_LSHIFT, KC_SPC) handling below for rapid <SPACE><SHIFT> sequences
-void space(qk_tap_dance_state_t *state, void *user_data)
+void space(tap_dance_state_t *state, void *user_data)
{
tap_shift(state, KC_SPC, _LSHIFT);
}
-void space_reset(qk_tap_dance_state_t *state, void *user_data)
+void space_reset(tap_dance_state_t *state, void *user_data)
{
tap_reset(KC_SPC, _LSHIFT);
}
@@ -191,7 +191,7 @@ void double_max(uint8_t count, uint8_t shift, uint16_t keycode)
}
}
-void colon(qk_tap_dance_state_t *state, void *user_data)
+void colon(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -205,7 +205,7 @@ void colon(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void eql(qk_tap_dance_state_t *state, void *user_data)
+void eql(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key(KC_SPC);
@@ -219,7 +219,7 @@ void eql(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void greater(qk_tap_dance_state_t *state, void *user_data)
+void greater(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -233,7 +233,7 @@ void greater(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void lesser(qk_tap_dance_state_t *state, void *user_data)
+void lesser(tap_dance_state_t *state, void *user_data)
{
if (state->count > 2) {
tap_key (KC_SPC);
@@ -247,7 +247,7 @@ void lesser(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void tilde(qk_tap_dance_state_t *state, void *user_data)
+void tilde(tap_dance_state_t *state, void *user_data)
{
// double tap plus down: repeating keycode
if (state->count > 2) {
@@ -264,7 +264,7 @@ void tilde(qk_tap_dance_state_t *state, void *user_data)
}
}
-void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
+void tilde_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_GRV);
unregister_code(KC_LSFT);
@@ -293,7 +293,7 @@ void symbol_pair(uint8_t shift, uint16_t left, uint16_t right)
#define CLOSE 1
// tap dance symbol pairs
-void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
+void tap_pair(tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_t right, uint16_t modifier, uint8_t close)
{
// triple tap: left right with cursor between symbol pair a la vim :-)
if (state->count > 2) {
@@ -324,69 +324,69 @@ void tap_pair(qk_tap_dance_state_t *state, uint8_t shift, uint16_t left, uint16_
}
}
-void doublequote(qk_tap_dance_state_t *state, void *user_data)
+void doublequote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_QUOT, KC_QUOT, 0, 0);
}
-void grave(qk_tap_dance_state_t *state, void *user_data)
+void grave(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_GRV, KC_GRV, 0, 0);
}
-void lbrace(qk_tap_dance_state_t *state, void *user_data)
+void lbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, 0);
}
-void lcurly(qk_tap_dance_state_t *state, void *user_data)
+void lcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, 0);
}
-void lparen(qk_tap_dance_state_t *state, void *user_data)
+void lparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, KC_LCTL, 0);
}
-void lparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void lparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
-void quote(qk_tap_dance_state_t *state, void *user_data)
+void quote(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_QUOT, KC_QUOT, 0, 0);
}
-void rangle(qk_tap_dance_state_t *state, void *user_data)
+void rangle(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_COMM, KC_DOT, 0, CLOSE);
}
-void rbrace(qk_tap_dance_state_t *state, void *user_data)
+void rbrace(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_NEVER, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rcurly(qk_tap_dance_state_t *state, void *user_data)
+void rcurly(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_LBRC, KC_RBRC, 0, CLOSE);
}
-void rparen(qk_tap_dance_state_t *state, void *user_data)
+void rparen(tap_dance_state_t *state, void *user_data)
{
tap_pair(state, S_ALWAYS, KC_9, KC_0, 0, CLOSE);
}
-void rparen_reset(qk_tap_dance_state_t *state, void *user_data)
+void rparen_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LCTL);
}
// ............................................................ Tap Dance Insert
-void comma(qk_tap_dance_state_t *state, void *user_data)
+void comma(tap_dance_state_t *state, void *user_data)
{
tap_key(KC_COMM);
if (state->count > 1) {
@@ -395,7 +395,7 @@ void comma(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
}
-void dot(qk_tap_dance_state_t *state, void *user_data)
+void dot(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
shift_key(KC_COLN);
@@ -407,7 +407,7 @@ void dot(qk_tap_dance_state_t *state, void *user_data)
}
// compile time macro string, see functions/hardware planck script
-void private(qk_tap_dance_state_t *state, void *user_data)
+void private(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
#ifdef PRIVATE_STRING
@@ -418,7 +418,7 @@ void private(qk_tap_dance_state_t *state, void *user_data)
}
// config.h defined string
-void send(qk_tap_dance_state_t *state, void *user_data)
+void send(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
SEND_STRING(PUBLIC_STRING);
@@ -428,7 +428,7 @@ void send(qk_tap_dance_state_t *state, void *user_data)
// .......................................................... Tap Dance One Shot
-void caps(qk_tap_dance_state_t *state, void *user_data)
+void caps(tap_dance_state_t *state, void *user_data)
{
if (state->count > 1) {
tap_key(KC_CAPS);
@@ -439,14 +439,14 @@ void caps(qk_tap_dance_state_t *state, void *user_data)
}
}
-void caps_reset(qk_tap_dance_state_t *state, void *user_data)
+void caps_reset(tap_dance_state_t *state, void *user_data)
{
unregister_code(KC_LSFT);
}
// ................................................................... Tap Dance
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, caps_reset)
,[_COLN] = ACTION_TAP_DANCE_FN (colon)
,[_COMM] = ACTION_TAP_DANCE_FN (comma)
diff --git a/keyboards/planck/keymaps/snowkuma/keymap.c b/keyboards/planck/keymaps/snowkuma/keymap.c
index ecf6b0725a..0df04d87fc 100644
--- a/keyboards/planck/keymaps/snowkuma/keymap.c
+++ b/keyboards/planck/keymaps/snowkuma/keymap.c
@@ -63,13 +63,13 @@ enum {
};
// Tap Dance Definitions
-void safe_reset(qk_tap_dance_state_t *state, void *user_data) {
+void safe_reset(tap_dance_state_t *state, void *user_data) {
if (state->count >=3) {
// Reset the keyboard if you tap the key more than three times
reset_keyboard();
reset_tap_dance(state);
}
-}; void tilde_home(qk_tap_dance_state_t *state, void *user_data) {
+}; void tilde_home(tap_dance_state_t *state, void *user_data) {
if (state->count > 2) {
register_code(KC_LSFT);
register_code(KC_GRV);
@@ -86,7 +86,7 @@ void safe_reset(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
+void tilde_reset(tap_dance_state_t *state, void *user_data)
{
if (state->count == 2) {
unregister_code(KC_SLSH);
@@ -97,7 +97,7 @@ void tilde_reset(qk_tap_dance_state_t *state, void *user_data)
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_RESET] = ACTION_TAP_DANCE_FN (safe_reset),
[TD_TILD] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, tilde_home, tilde_reset)
};
diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h
index 24adad94f3..52c1494a1d 100644
--- a/keyboards/planck/keymaps/tylerwince/config.h
+++ b/keyboards/planck/keymaps/tylerwince/config.h
@@ -12,7 +12,7 @@
Set any config.h overrides for your specific keymap here.
See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
*/
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
#define IGNORE_MOD_TAP_INTERRUPT
#define EECONFIG_RGB_MATRIX (uint32_t *)16
diff --git a/keyboards/planck/keymaps/tylerwince/keymap.c b/keyboards/planck/keymaps/tylerwince/keymap.c
index ae9211f5a5..5477dab6a1 100644
--- a/keyboards/planck/keymaps/tylerwince/keymap.c
+++ b/keyboards/planck/keymaps/tylerwince/keymap.c
@@ -19,7 +19,7 @@ enum {
TD_SEMI_COLON,
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_SEMI_COLON] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN),
};
diff --git a/keyboards/planck/keymaps/unagi/keymap.c b/keyboards/planck/keymaps/unagi/keymap.c
index 0424c5b520..6227a73e4f 100644
--- a/keyboards/planck/keymaps/unagi/keymap.c
+++ b/keyboards/planck/keymaps/unagi/keymap.c
@@ -178,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[SFT_CAP] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
};
diff --git a/keyboards/planck/keymaps/yhaliaw/keymap.c b/keyboards/planck/keymaps/yhaliaw/keymap.c
index 54bf431f22..62d856e9f2 100644
--- a/keyboards/planck/keymaps/yhaliaw/keymap.c
+++ b/keyboards/planck/keymaps/yhaliaw/keymap.c
@@ -187,7 +187,7 @@ void matrix_scan_user(void) {
}
}
-void leader_end(void) {
+void leader_end_user(void) {
// Plays sound on if leader sequence found.
if (leader_found) {
#ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c
index 7a594b567f..b6e8d9be47 100644
--- a/keyboards/planck/keymaps/zach/zach_common_functions.c
+++ b/keyboards/planck/keymaps/zach/zach_common_functions.c
@@ -68,7 +68,7 @@ float unilin[][2] = SONG(UNICODE_LINUX);
#ifdef TAP_DANCE_ENABLE
#define TAPPING_TERM 200
-void dance_raise_press(qk_tap_dance_state_t *state, void *user_data){// Called on each tap
+void dance_raise_press(tap_dance_state_t *state, void *user_data){// Called on each tap
switch(state->count){ // Only turn the layer on once
case 1:
layer_off(_UNICODES);
@@ -77,7 +77,7 @@ void dance_raise_press(qk_tap_dance_state_t *state, void *user_data){// Called o
break;
}
};
-void dance_raise_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on release
+void dance_raise_lift(tap_dance_state_t *state, void *user_data){ // Called on release
switch(state->count){
case 1: // Normal action. Turn off layers
layer_off(_RAISE);
@@ -87,7 +87,7 @@ void dance_raise_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
}
};
/////////////////////////////////////////////////////////////////////
-void dance_lower_press(qk_tap_dance_state_t *state, void *user_data){// Called on tap
+void dance_lower_press(tap_dance_state_t *state, void *user_data){// Called on tap
switch(state->count){
case 1: // Turn on lower
layer_off(_UNICODES);
@@ -96,7 +96,7 @@ void dance_lower_press(qk_tap_dance_state_t *state, void *user_data){// Called o
break;
}
};
-void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on release
+void dance_lower_lift(tap_dance_state_t *state, void *user_data){ // Called on release
switch(state->count){
case 1: // Normal action. Turn off layers
layer_off(_LOWER);
@@ -114,12 +114,12 @@ void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
}
};
/////////////////////////////////////////////////////////////////////
-void dance_super_press(qk_tap_dance_state_t *state, void *user_data){ // Called on down
+void dance_super_press(tap_dance_state_t *state, void *user_data){ // Called on down
if(state->count == 1){
register_code(KC_LGUI);
}
}
-void dance_super_done(qk_tap_dance_state_t *state, void *user_data){ // Called on timeout
+void dance_super_done(tap_dance_state_t *state, void *user_data){ // Called on timeout
switch(state->count){
case 2:
register_code(KC_LGUI);
@@ -128,11 +128,11 @@ void dance_super_done(qk_tap_dance_state_t *state, void *user_data){ // Calle
break;
}
}
-void dance_super_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on up
+void dance_super_lift(tap_dance_state_t *state, void *user_data){ // Called on up
unregister_code(KC_LGUI);
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[RAI] = ACTION_TAP_DANCE_FN_ADVANCED(dance_raise_press, NULL, dance_raise_lift),
[LOW] = ACTION_TAP_DANCE_FN_ADVANCED(dance_lower_press, NULL, dance_lower_lift),
[SUP] = ACTION_TAP_DANCE_FN_ADVANCED(dance_super_press, dance_super_done, dance_super_lift)