From b2038f79f6b0dfbc4e18102d3999f6959f7572ea Mon Sep 17 00:00:00 2001
From: barko <barko>
Date: Mon, 13 Nov 2023 14:32:03 +0200
Subject: [PATCH] apply new zmk update, dropping supprt for global-quick-tap-ms

https://github.com/zmkfirmware/zmk/pull/1387
---
 config/includes/behaviours_homerow_mods.dtsi |  8 ++--
 config/includes/combos.dtsi                  | 46 ++++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/config/includes/behaviours_homerow_mods.dtsi b/config/includes/behaviours_homerow_mods.dtsi
index 27afaf2..aa0c257 100644
--- a/config/includes/behaviours_homerow_mods.dtsi
+++ b/config/includes/behaviours_homerow_mods.dtsi
@@ -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
         };
@@ -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
         };
@@ -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
         };
@@ -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
         };
diff --git a/config/includes/combos.dtsi b/config/includes/combos.dtsi
index 0194ae5..582ddd6 100644
--- a/config/includes/combos.dtsi
+++ b/config/includes/combos.dtsi
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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>; */
@@ -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>;
@@ -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>;
@@ -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 = <>;
@@ -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 = <>;
@@ -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>;
@@ -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>;