Skip to content

Commit

Permalink
apply new zmk update, dropping supprt for global-quick-tap-ms
Browse files Browse the repository at this point in the history 
zmkfirmware/zmk#1387
  • Loading branch information
barko committed Nov 13, 2023
1 parent 1474ad3 commit b2038f7
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions config/includes/behaviours_homerow_mods.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
flavor = "balanced";
tapping-term-ms = <HM_TAPPING_TERM>;
quick-tap-ms = <175>; // repeat on tap-into-hold
global-quick-tap-ms = <150>; // requires PR #1387
require-prior-idle-ms = <150>; // requires PR #1387
hold-trigger-key-positions = <KEYS_R KEYS_T>;
hold-trigger-on-release; // requires PR #1423
};
Expand All @@ -46,7 +46,7 @@
flavor = "balanced";
tapping-term-ms = <HM_TAPPING_TERM>;
quick_tap_ms = <175>;
global-quick-tap-ms = <150>; // requires PR #1387
require-prior-idle-ms = <150>; // requires PR #1387
hold-trigger-key-positions = <KEYS_L KEYS_T>;
hold-trigger-on-release; // requires PR #1423
};
Expand All @@ -64,7 +64,7 @@
flavor = "balanced";
tapping-term-ms = <HM_TAPPING_TERM_FAST>;
quick_tap_ms = <175>;
// global-quick-tap-ms = <150>; // requires PR #1387
// require-prior-idle-ms = <150>; // requires PR #1387
hold-trigger-key-positions = <KEYS_R KEYS_T>;
// hold-trigger-on-release; // requires PR #1423
};
Expand All @@ -78,7 +78,7 @@
flavor = "balanced";
tapping-term-ms = <HM_TAPPING_TERM_FAST>;
quick_tap_ms = <175>;
// global-quick-tap-ms = <150>; // requires PR #1387
// require-prior-idle-ms = <150>; // requires PR #1387
hold-trigger-key-positions = <KEYS_L KEYS_T>;
// hold-trigger-on-release; // requires PR #1423
};
Expand Down
46 changes: 23 additions & 23 deletions config/includes/combos.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// combo_bracket_round_l {
// timeout-ms = <COMBO_TERM_FAST>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <LM2 LM1>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -19,7 +19,7 @@

// combo_bracket_round_r {
// timeout-ms = <COMBO_TERM_FAST>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RM1 RM2>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -28,7 +28,7 @@

// combo_bracket_square_l {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <LB2 LB1>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -37,7 +37,7 @@

// combo_bracket_square_r {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RB1 RB2>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -46,7 +46,7 @@

// combo_bracket_curly_l {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <LT2 LT1>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -55,7 +55,7 @@

// combo_bracket_curly_r {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RT2 RT1>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -64,7 +64,7 @@

// combo_bracket_angled_l {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <LM3 LM2>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -73,7 +73,7 @@

// combo_bracket_angled_r {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RM3 RM2>;
// layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -82,7 +82,7 @@

combo_bracket_v_round_l {
timeout-ms = <COMBO_TERM_FAST>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LT1 LM1>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -91,7 +91,7 @@

combo_bracket_v_round_r {
timeout-ms = <COMBO_TERM_FAST>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <RT1 RM1>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -100,7 +100,7 @@

combo_bracket_v_square_l {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LT2 LM2>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -109,7 +109,7 @@

combo_bracket_v_square_r {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <RT2 RM2>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -118,7 +118,7 @@

combo_bracket_v_curly_l {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LT3 LM3>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -127,7 +127,7 @@

combo_bracket_v_curly_r {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <RT3 RM3>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -136,7 +136,7 @@

combo_bracket_v_angled_l {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LM1 LB1>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -145,7 +145,7 @@

combo_bracket_v_angled_r {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <RM1 RB1>;
layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
Expand All @@ -154,7 +154,7 @@

/* combo_capsword { */
/* timeout-ms = <COMBO_TERM_SLOW>; */
/* global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>; */
/* require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>; */

/* key-positions = <LM1 RM1>; */
/* layers = <BASE BASE_QWERTY>; */
Expand All @@ -163,7 +163,7 @@

combo_return {
timeout-ms = <COMBO_TERM_FAST>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LH2 LH1 LH0>;
layers = <BASE BASE_QWERTY NAV NUM SYM>;
Expand All @@ -172,7 +172,7 @@

combo_bspc {
timeout-ms = <COMBO_TERM_FAST>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LH1 LH0>;
layers = <BASE BASE_QWERTY NAV NUM SYM>;
Expand All @@ -181,7 +181,7 @@

// combo_grave {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RM3 RM4>;
// layers = <>;
Expand All @@ -190,7 +190,7 @@

// combo_md_code_block {
// timeout-ms = <COMBO_TERM_SLOW>;
// global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
// require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

// key-positions = <RM2 RM3 RM4>;
// layers = <>;
Expand All @@ -199,7 +199,7 @@

combo_tog_nav_word {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LM3 LM2 LM1>;
layers = <BASE BASE_QWERTY NUM NUM_WORD>;
Expand All @@ -208,7 +208,7 @@

combo_tog_num_word {
timeout-ms = <COMBO_TERM_SLOW>;
global-quick-tap-ms = <COMBO_GLOBAL_QUICKTAP>;
require-prior-idle-ms = <COMBO_GLOBAL_QUICKTAP>;

key-positions = <LB3 LB2 LB1>;
layers = <BASE BASE_QWERTY NAV NAV_WORD>;
Expand Down

0 comments on commit b2038f7

Please sign in to comment.