diff options
Diffstat (limited to 'keyboards/ergodox_ez')
22 files changed, 73 insertions, 82 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 3e00932817..392d2fd07b 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 14 @@ -49,9 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -66,7 +62,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -/* number of backlight levels */ #define BACKLIGHT_LEVELS 3 #ifndef LED_BRIGHTNESS_LO diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index 46a0fbbacd..c48bdea8bc 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -6,6 +6,7 @@ "vid": "0x3297", "device_version": "0.0.1" }, + "community_layouts": ["ergodox"], "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c index 6949261980..45a101ec81 100755 --- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c +++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/keymap.c @@ -196,7 +196,7 @@ layer_state_t layer_state_set_user(layer_state_t state); // Method called at the end of the tap dance on the TAP_MACRO key. That key is // used to start recording a macro (double tap or more), to stop recording (any // number of tap), or to play the recorded macro (1 tap). -void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) { +void macro_tapdance_fn(tap_dance_state_t *state, void *user_data) { uint16_t keycode; keyrecord_t record; dprintf("macro_tap_dance_fn %d\n", state->count); @@ -219,7 +219,7 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) { } // The definition of the tap dance actions: -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // This Tap dance plays the macro 1 on TAP and records it on double tap. [TAP_MACRO] = ACTION_TAP_DANCE_FN(macro_tapdance_fn), }; diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c index b2065bca83..87ad7e63e4 100644 --- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c +++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/keymap.c @@ -104,7 +104,7 @@ layer_state_t layer_state_set_user(layer_state_t state); // Method called at the end of the tap dance on the TAP_MACRO key. That key is // used to start recording a macro (double tap or more), to stop recording (any // number of tap), or to play the recorded macro (1 tap). -void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) { +void macro_tapdance_fn(tap_dance_state_t *state, void *user_data) { uint16_t keycode; keyrecord_t record; dprintf("macro_tap_dance_fn %d\n", state->count); @@ -127,7 +127,7 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) { } // The definition of the tap dance actions: -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // This Tap dance plays the macro 1 on TAP and records it on double tap. [TAP_MACRO] = ACTION_TAP_DANCE_FN(macro_tapdance_fn) }; diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h index acd3a44e16..3f8c68ceb7 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h @@ -78,7 +78,7 @@ // #define NO_PRINT // #define RETRO_TAPPING -// #define TAPPING_FORCE_HOLD +// #define QUICK_TAP_TERM 0 // #define AUTO_SHIFT_TIMEOUT 150 // #define NO_AUTO_SHIFT_SPECIAL diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c index cbfbcdaf9f..e96c7c275e 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/dot_comm.c @@ -4,7 +4,7 @@ static tap dot_comm_state = { .state = 0 }; -void dot_comm_finished(qk_tap_dance_state_t *state, void *user_data) { +void dot_comm_finished(tap_dance_state_t *state, void *user_data) { dot_comm_state.state = current_dance(state); switch (dot_comm_state.state) { case SINGLE_TAP: @@ -22,7 +22,7 @@ void dot_comm_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dot_comm_reset(qk_tap_dance_state_t *state, void *user_data) { +void dot_comm_reset(tap_dance_state_t *state, void *user_data) { switch (dot_comm_state.state) { case SINGLE_TAP: unregister_code(KC_DOT); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c index 76dda6eb32..0589128a58 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/h_mouse_gui.c @@ -4,7 +4,7 @@ static tap h_mouse_gui_state = { .state = 0 }; -void h_mouse_gui_finished(qk_tap_dance_state_t *state, void *user_data) { +void h_mouse_gui_finished(tap_dance_state_t *state, void *user_data) { h_mouse_gui_state.state = current_dance(state); switch (h_mouse_gui_state.state) { case SINGLE_TAP: @@ -21,7 +21,7 @@ void h_mouse_gui_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void h_mouse_gui_reset(qk_tap_dance_state_t *state, void *user_data) { +void h_mouse_gui_reset(tap_dance_state_t *state, void *user_data) { switch (h_mouse_gui_state.state) { case SINGLE_TAP: unregister_code(KC_H); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c index daf7be1f6f..a1400236dc 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/j_media_meh.c @@ -4,7 +4,7 @@ static tap j_media_meh_state = { .state = 0 }; -void j_media_meh_finished(qk_tap_dance_state_t *state, void *user_data) { +void j_media_meh_finished(tap_dance_state_t *state, void *user_data) { j_media_meh_state.state = current_dance(state); switch (j_media_meh_state.state) { case SINGLE_TAP: @@ -23,7 +23,7 @@ void j_media_meh_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void j_media_meh_reset(qk_tap_dance_state_t *state, void *user_data) { +void j_media_meh_reset(tap_dance_state_t *state, void *user_data) { switch (j_media_meh_state.state) { case SINGLE_TAP: unregister_code(KC_J); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c index 609e9f5539..c405e65091 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/k_numpad_hyper.c @@ -4,7 +4,7 @@ static tap k_numpad_hyper_state = { .state = 0 }; -void k_numpad_hyper_finished(qk_tap_dance_state_t *state, void *user_data) { +void k_numpad_hyper_finished(tap_dance_state_t *state, void *user_data) { k_numpad_hyper_state.state = current_dance(state); switch (k_numpad_hyper_state.state) { case SINGLE_TAP: @@ -24,7 +24,7 @@ void k_numpad_hyper_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void k_numpad_hyper_reset(qk_tap_dance_state_t *state, void *user_data) { +void k_numpad_hyper_reset(tap_dance_state_t *state, void *user_data) { switch (k_numpad_hyper_state.state) { case SINGLE_TAP: unregister_code(KC_K); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c index e7df3aef14..736074e751 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/m_chords_hyper.c @@ -4,7 +4,7 @@ static tap m_chords_hyper_state = { .state = 0 }; -void m_chords_hyper_finished(qk_tap_dance_state_t *state, void *user_data) { +void m_chords_hyper_finished(tap_dance_state_t *state, void *user_data) { m_chords_hyper_state.state = current_dance(state); switch (m_chords_hyper_state.state) { case SINGLE_TAP: @@ -24,7 +24,7 @@ void m_chords_hyper_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void m_chords_hyper_reset(qk_tap_dance_state_t *state, void *user_data) { +void m_chords_hyper_reset(tap_dance_state_t *state, void *user_data) { switch (m_chords_hyper_state.state) { case SINGLE_TAP: unregister_code(KC_M); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c index 0ba31cec81..a553f874cc 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c @@ -4,7 +4,7 @@ static tap none_lead_state = { .state = 0 }; -void none_lead_finished(qk_tap_dance_state_t *state, void *user_data) { +void none_lead_finished(tap_dance_state_t *state, void *user_data) { none_lead_state.state = current_dance(state); switch (none_lead_state.state) { case SINGLE_TAP: @@ -17,12 +17,12 @@ void none_lead_finished(qk_tap_dance_state_t *state, void *user_data) { break; case DOUBLE_TAP: - qk_leader_start(); + leader_start(); break; } } -void none_lead_reset(qk_tap_dance_state_t *state, void *user_data) { +void none_lead_reset(tap_dance_state_t *state, void *user_data) { switch (none_lead_state.state) { case SINGLE_TAP: unregister_code(KC_NO); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c index ac6da9e00e..8b1af61cac 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/quot_dquot.c @@ -4,7 +4,7 @@ static tap quot_dquot_state = { .state = 0 }; -void quot_dquot_finished(qk_tap_dance_state_t *state, void *user_data) { +void quot_dquot_finished(tap_dance_state_t *state, void *user_data) { quot_dquot_state.state = current_dance(state); switch (quot_dquot_state.state) { case SINGLE_TAP: @@ -22,7 +22,7 @@ void quot_dquot_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void quot_dquot_reset(qk_tap_dance_state_t *state, void *user_data) { +void quot_dquot_reset(tap_dance_state_t *state, void *user_data) { switch (quot_dquot_state.state) { case SINGLE_TAP: unregister_code(KC_QUOT); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c index 513c932663..8cc3b6dfe1 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/scln_coln.c @@ -4,7 +4,7 @@ static tap scln_coln_state = { .state = 0 }; -void scln_coln_finished(qk_tap_dance_state_t *state, void *user_data) { +void scln_coln_finished(tap_dance_state_t *state, void *user_data) { scln_coln_state.state = current_dance(state); switch (scln_coln_state.state) { case SINGLE_TAP: @@ -23,7 +23,7 @@ void scln_coln_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void scln_coln_reset(qk_tap_dance_state_t *state, void *user_data) { +void scln_coln_reset(tap_dance_state_t *state, void *user_data) { switch (scln_coln_state.state) { case SINGLE_TAP: unregister_code(KC_SCLN); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c index e57502a790..b9a213ef08 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/u_arrows_gui.c @@ -4,7 +4,7 @@ static tap u_arrows_gui_state = { .state = 0 }; -void u_arrows_gui_finished(qk_tap_dance_state_t *state, void *user_data) { +void u_arrows_gui_finished(tap_dance_state_t *state, void *user_data) { u_arrows_gui_state.state = current_dance(state); switch (u_arrows_gui_state.state) { case SINGLE_TAP: @@ -21,7 +21,7 @@ void u_arrows_gui_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void u_arrows_gui_reset(qk_tap_dance_state_t *state, void *user_data) { +void u_arrows_gui_reset(tap_dance_state_t *state, void *user_data) { switch (u_arrows_gui_state.state) { case SINGLE_TAP: unregister_code(KC_U); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c index c26980526c..5f2bb2a69a 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/w_media_meh.c @@ -4,7 +4,7 @@ static tap w_media_meh_state = { .state = 0 }; -void w_media_meh_finished(qk_tap_dance_state_t *state, void *user_data) { +void w_media_meh_finished(tap_dance_state_t *state, void *user_data) { w_media_meh_state.state = current_dance(state); switch (w_media_meh_state.state) { case SINGLE_TAP: @@ -23,7 +23,7 @@ void w_media_meh_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void w_media_meh_reset(qk_tap_dance_state_t *state, void *user_data) { +void w_media_meh_reset(tap_dance_state_t *state, void *user_data) { switch (w_media_meh_state.state) { case SINGLE_TAP: unregister_code(KC_W); diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c index 1d5e1cee00..fe13023d45 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_actions.c @@ -1,5 +1,5 @@ // Register the double tap dances: -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [EQL_PLUS] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS), [MINS_UNDS] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS), [SLSH_BSLS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c index 340ccca133..d733123230 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/tap_dance_setup.c @@ -41,7 +41,7 @@ enum { * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested * */ -int current_dance(qk_tap_dance_state_t *state) { +int current_dance(tap_dance_state_t *state) { int current_state = 0; if (state->count == 1) { if (state->interrupted || !state->pressed) { diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c index a568ce30fc..6d466cc0de 100644 --- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c +++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c @@ -53,15 +53,15 @@ static td_state_t td_state; // declare your tapdance functions: // function to determine the current tapdance state -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); // `finished` and `reset` functions for each tapdance keycode -void ctrlto12_finished (qk_tap_dance_state_t *state, void *user_data); -void ctrlto12_reset (qk_tap_dance_state_t *state, void *user_data); -void altto11_finished (qk_tap_dance_state_t *state, void *user_data); -void altto11_reset (qk_tap_dance_state_t *state, void *user_data); -void shiftto13_finished (qk_tap_dance_state_t *state, void *user_data); -void shiftto13_reset (qk_tap_dance_state_t *state, void *user_data); +void ctrlto12_finished (tap_dance_state_t *state, void *user_data); +void ctrlto12_reset (tap_dance_state_t *state, void *user_data); +void altto11_finished (tap_dance_state_t *state, void *user_data); +void altto11_reset (tap_dance_state_t *state, void *user_data); +void shiftto13_finished (tap_dance_state_t *state, void *user_data); +void shiftto13_reset (tap_dance_state_t *state, void *user_data); const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -257,7 +257,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { }; // determine the tapdance state to return -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 && state->interrupting_keycode == KC_MS_BTN1) {return SINGLE_HOLD;} if (state->interrupted && state->pressed && state->interrupting_keycode == 22273) {return SINGLE_HOLD;} @@ -277,7 +277,7 @@ int cur_dance (qk_tap_dance_state_t *state) { else { return 2; } // any number higher than the maximum state value you return above } // /* Backup in case previous code is hard to piece together. */ -// 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; } // else { return SINGLE_HOLD; } @@ -285,7 +285,7 @@ int cur_dance (qk_tap_dance_state_t *state) { // else { return 2; } // any number higher than the maximum state value you return above // } -void ctrlto12_finished (qk_tap_dance_state_t *state, void *user_data) { +void ctrlto12_finished (tap_dance_state_t *state, void *user_data) { td_state = cur_dance(state); switch (td_state) { case SINGLE_TAP: @@ -304,7 +304,7 @@ void ctrlto12_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void ctrlto12_reset (qk_tap_dance_state_t *state, void *user_data) { +void ctrlto12_reset (tap_dance_state_t *state, void *user_data) { switch (td_state) { case SINGLE_TAP: break; @@ -321,7 +321,7 @@ void ctrlto12_reset (qk_tap_dance_state_t *state, void *user_data) { } } -void shiftto13_finished (qk_tap_dance_state_t *state, void *user_data) { +void shiftto13_finished (tap_dance_state_t *state, void *user_data) { td_state = cur_dance(state); switch (td_state) { case SINGLE_TAP: @@ -340,7 +340,7 @@ void shiftto13_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void shiftto13_reset (qk_tap_dance_state_t *state, void *user_data) { +void shiftto13_reset (tap_dance_state_t *state, void *user_data) { switch (td_state) { case SINGLE_TAP: break; @@ -357,7 +357,7 @@ void shiftto13_reset (qk_tap_dance_state_t *state, void *user_data) { } } -void altto11_finished (qk_tap_dance_state_t *state, void *user_data) { +void altto11_finished (tap_dance_state_t *state, void *user_data) { td_state = cur_dance(state); switch (td_state) { case SINGLE_TAP: @@ -372,7 +372,7 @@ void altto11_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void altto11_reset (qk_tap_dance_state_t *state, void *user_data) { +void altto11_reset (tap_dance_state_t *state, void *user_data) { switch (td_state) { case SINGLE_TAP: break; @@ -386,7 +386,7 @@ void altto11_reset (qk_tap_dance_state_t *state, void *user_data) { } // define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [CTRL_TO12] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctrlto12_finished, ctrlto12_reset), [SHIFT_TO13] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, shiftto13_finished, shiftto13_reset), [ALT_TO11] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altto11_finished, altto11_reset), diff --git a/keyboards/ergodox_ez/keymaps/pvinis/keymap.c b/keyboards/ergodox_ez/keymaps/pvinis/keymap.c index c69621ab98..dcdaa7098b 100644 --- a/keyboards/ergodox_ez/keymaps/pvinis/keymap.c +++ b/keyboards/ergodox_ez/keymaps/pvinis/keymap.c @@ -268,7 +268,7 @@ layer_state_t layer_state_set_user_keymap(layer_state_t state) { // tap dances // flash keyboard on 4x tap, with leds -// void flash_each_tap(qk_tap_dance_state_t *state, void *user_data) { +// void flash_each_tap(tap_dance_state_t *state, void *user_data) { // switch (state->count) { // case 1: // ergodox_right_led_3_on(); @@ -289,14 +289,14 @@ layer_state_t layer_state_set_user_keymap(layer_state_t state) { // } // } -// void flash_dance_finished(qk_tap_dance_state_t *state, void *user_data) { +// void flash_dance_finished(tap_dance_state_t *state, void *user_data) { // if (state->count >= 4) { // reset_keyboard(); // reset_tap_dance(state); // } // } -// void flash_dance_reset(qk_tap_dance_state_t *state, void *user_data) { +// void flash_dance_reset(tap_dance_state_t *state, void *user_data) { // ergodox_right_led_1_off(); // wait_ms(50); // ergodox_right_led_2_off(); @@ -305,7 +305,7 @@ layer_state_t layer_state_set_user_keymap(layer_state_t state) { // } // SYSCTL on first tap, MOUSE ON second tap -// void layers_dance_finished(qk_tap_dance_state_t *state, void *user_data) { +// void layers_dance_finished(tap_dance_state_t *state, void *user_data) { // uint8_t layer = get_highest_layer(layer_state); // switch(state->count) { @@ -328,7 +328,7 @@ layer_state_t layer_state_set_user_keymap(layer_state_t state) { // } // } -// qk_tap_dance_action_t tap_dance_actions[] = { +// tap_dance_action_t tap_dance_actions[] = { // [TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED( flash_each_tap, flash_dance_finished, flash_dance_reset ), // [TD_LAYR] = ACTION_TAP_DANCE_FN_ADVANCED( NULL, layers_dance_finished, NULL ), // }; diff --git a/keyboards/ergodox_ez/keymaps/stamm/config.h b/keyboards/ergodox_ez/keymaps/stamm/config.h index e1db3d9002..1262ce6559 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/config.h +++ b/keyboards/ergodox_ez/keymaps/stamm/config.h @@ -29,11 +29,11 @@ #define PERMISSIVE_HOLD /* #define PERMISSIVE_HOLD_PER_KEY */ -#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#define TAPPING_FORCE_HOLD -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM 0 +#define QUICK_TAP_TERM_PER_KEY /* #define RETRO_TAPPING */ #undef LED_BRIGHTNESS_DEFAULT diff --git a/keyboards/ergodox_ez/keymaps/stamm/keymap.c b/keyboards/ergodox_ez/keymaps/stamm/keymap.c index 2b0aff6362..8a3e30f5f6 100644 --- a/keyboards/ergodox_ez/keymaps/stamm/keymap.c +++ b/keyboards/ergodox_ez/keymaps/stamm/keymap.c @@ -206,7 +206,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { return TAPPING_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 E_NUMBERS: case R_MOUSE: @@ -219,34 +219,31 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { case RCTL_T(KC_L): case RSFT_T(KC_SEMICOLON): case ARROWS: - return true; + return false; default: return false; } } - -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LT(_1_NUMBERS, KC_E): - case R_MOUSE: - case LSFT_T(KC_A): - case LCTL_T(KC_S): - case LALT_T(KC_D): - case LGUI_T(KC_F): - case RGUI_T(KC_J): - case RALT_T(KC_K): - case RCTL_T(KC_L): - case RSFT_T(KC_SEMICOLON): - case ARROWS: - return false; - default: - return true; - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LT(_1_NUMBERS, KC_E): + case R_MOUSE: + case LSFT_T(KC_A): + case LCTL_T(KC_S): + case LALT_T(KC_D): + case LGUI_T(KC_F): + case RGUI_T(KC_J): + case RALT_T(KC_K): + case RCTL_T(KC_L): + case RSFT_T(KC_SEMICOLON): + case ARROWS: + return QUICK_TAP_TERM; + default: + return 0; + } } - - LEADER_EXTERNS(); void matrix_scan_user(void) { diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index 021ea0f130..20c6b2529b 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -31,8 +31,6 @@ SRC += matrix.c \ led_i2c.c QUANTUM_LIB_SRC += i2c_master.c -LAYOUTS = ergodox - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no |