Merge remote-tracking branch 'origin/master' into develop

2 files changed, 31 insertions, 1 deletions

diff --git a/users/dshields/config.h b/users/dshields/config.h
index 9a722b89e6..21a5c3500d 100644
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@@ -4,7 +4,10 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
 #define ONESHOT_TIMEOUT           3000
-#define RETRO_TAPPING
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD_PER_KEY
+#define TAPPING_FORCE_HOLD_PER_KEY
+#define TAPPING_TERM              200
 #define BACKLIGHT_BREATHING
 #define DYNAMIC_MACRO_NO_NESTING
 
diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c
index 13eab12d4a..46f0b33cd3 100644
--- a/users/dshields/dshields.c
+++ b/users/dshields/dshields.c
@@ -29,3 +29,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
+bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT_A:
+        case MT_S:
+        case MT_D:
+        case MT_F:
+        case MT_J:
+        case MT_K:
+        case MT_L:
+        case MT_SCLN:
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MT_SPC:
+        case MT_BSPC:
+        case MT_ESC:
+            return true;
+        default:
+            return false;
+    }
+}
+