Merge branch 'master' of https://github.com/qmk/qmk_firmware

11 files changed, 303 insertions, 6 deletions

diff --git a/users/konstantin/config.h b/users/konstantin/config.h
new file mode 100644
index 0000000000..d03333f05d
--- /dev/null
+++ b/users/konstantin/config.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#define FORCE_NKRO
+
+#define MAGIC_KEY_LAYER0_ALT1 BSLS
+#define MAGIC_KEY_BOOTLOADER  ESC
+
+#define MOUSEKEY_DELAY             50
+#define MOUSEKEY_INTERVAL          15
+#define MOUSEKEY_MAX_SPEED         4
+#define MOUSEKEY_TIME_TO_MAX       50
+#define MOUSEKEY_WHEEL_MAX_SPEED   1
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
+
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_MACRO
+
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM    200
+#define TAPPING_TOGGLE  2
+
+#define UNICODE_CYCLE_PERSIST  false
+#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX
+#define UNICODE_WINC_KEY       KC_RGUI
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
new file mode 100644
index 0000000000..977111c1f9
--- /dev/null
+++ b/users/konstantin/konstantin.c
@@ -0,0 +1,77 @@
+#include "konstantin.h"
+
+#ifdef LAYER_NUMPAD
+static void toggle_numpad(void) {
+  layer_invert(L_NUMPAD);
+  bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK;
+  if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) {
+    tap_code(KC_NLCK); // Toggle Num Lock to match layer state
+  }
+}
+#endif
+
+__attribute__((weak))
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (!process_record_keymap(keycode, record)) {
+    return false;
+  }
+
+  switch (keycode) {
+  case CLEAR:
+    if (record->event.pressed) {
+      SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
+    }
+    return false;
+
+#ifdef LAYER_FN
+  static bool fn_lock;
+
+  case FN_FNLK:
+    if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+      fn_lock = !IS_LAYER_ON(L_FN); // Fn layer will be toggled after this
+    }
+    return true;
+#endif
+
+#ifdef LAYER_NUMPAD
+  case NUMPAD:
+    if (record->event.pressed) {
+      toggle_numpad();
+    }
+    return false;
+#endif
+
+  case KC_ESC:
+    if (record->event.pressed) {
+#ifdef LAYER_NUMPAD
+      if (IS_LAYER_ON(L_NUMPAD)) {
+        toggle_numpad();
+        return false;
+      }
+#endif
+#ifdef LAYER_FN
+      if (IS_LAYER_ON(L_FN) && fn_lock) {
+        layer_off(L_FN);
+        return fn_lock = false;
+      }
+#endif
+    }
+    return true;
+
+  default:
+    return true;
+  }
+}
+
+__attribute__((weak))
+uint32_t layer_state_set_keymap(uint32_t state) {
+  return state;
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return layer_state_set_keymap(state);
+}
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
new file mode 100644
index 0000000000..06081496b6
--- /dev/null
+++ b/users/konstantin/konstantin.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "quantum.h"
+#ifdef TAP_DANCE_ENABLE
+  #include "tap_dance.h"
+#endif
+#ifdef UNICODE_ENABLE
+  #include "unicode.h"
+#endif
+
+#ifdef LAYER_FN
+  #define FN      MO(L_FN)
+  #define FN_CAPS LT(L_FN, KC_CAPS)
+  #define FN_FNLK TT(L_FN)
+#endif
+
+#define MV_UP   LCTL(KC_UP)
+#define MV_DOWN LCTL(KC_DOWN)
+#define MV_LEFT LCTL(KC_LEFT)
+#define MV_RGHT LCTL(KC_RGHT)
+#define TOP     LCTL(KC_HOME)
+#define BOTTOM  LCTL(KC_END)
+#define PRV_TAB LCTL(KC_PGUP)
+#define NXT_TAB LCTL(KC_PGDN)
+
+#define LCT_CPS LCTL_T(KC_CAPS)
+
+enum keycodes_user {
+  CLEAR = SAFE_RANGE,
+#ifdef LAYER_NUMPAD
+  NUMPAD,
+#endif
+
+  RANGE_KEYMAP,
+};
+
+enum layers_user {
+  L_BASE,
+#ifdef LAYER_FN
+  L_FN,
+#endif
+#ifdef LAYER_NUMPAD
+  L_NUMPAD,
+#endif
+
+  L_RANGE_KEYMAP,
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
+uint32_t layer_state_set_keymap(uint32_t state);
diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
new file mode 100644
index 0000000000..7f25a8107a
--- /dev/null
+++ b/users/konstantin/rules.mk
@@ -0,0 +1,16 @@
+BOOTMAGIC_ENABLE   = no
+COMMAND_ENABLE     = yes
+CONSOLE_ENABLE     = yes
+EXTRAKEY_ENABLE    = yes
+KEYBOARD_SHARED_EP = yes # TODO: Disable once Command is fixed
+MOUSEKEY_ENABLE    = yes
+NKRO_ENABLE        = yes
+TAP_DANCE_ENABLE   = yes
+UNICODE_ENABLE     = yes
+
+SRC += konstantin.c
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+  SRC += tap_dance.c
+endif
+
+EXTRAFLAGS += -flto
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
new file mode 100644
index 0000000000..b13f33c024
--- /dev/null
+++ b/users/konstantin/tap_dance.c
@@ -0,0 +1,93 @@
+#include "tap_dance.h"
+#include "konstantin.h"
+
+#define ACTION_TAP_DANCE_DOUBLE_MODS(mod1, mod2) { \
+    .fn = { td_double_mods_each, NULL, td_double_mods_reset }, \
+    .user_data = &(qk_tap_dance_pair_t){ mod1, mod2 }, \
+  }
+
+void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data;
+  // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2
+  if (state->count == 1 || state->count == 3) {
+    register_code(mods->kc1);
+  } else if (state->count == 2) {
+    unregister_code(mods->kc1);
+    register_code(mods->kc2);
+  }
+  // Prevent tap dance from sending kc1 and kc2 as weak mods
+  state->weak_mods &= ~(MOD_BIT(mods->kc1) | MOD_BIT(mods->kc2));
+}
+
+void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data;
+  if (state->count == 1 || state->count >= 3) {
+    unregister_code(mods->kc1);
+  }
+  if (state->count >= 2) {
+    unregister_code(mods->kc2);
+  }
+}
+
+struct {
+  bool fn_on; // Layer state when tap dance started
+  bool started;
+} td_fn_rctrl_data;
+
+void td_fn_rctrl_each(qk_tap_dance_state_t *state, void *user_data) {
+  if (!td_fn_rctrl_data.started) {
+    td_fn_rctrl_data.fn_on = IS_LAYER_ON(L_FN);
+    td_fn_rctrl_data.started = true;
+  }
+  // Single tap → Fn, double tap → RCtrl, triple tap etc. → Fn+RCtrl
+  if (state->count == 1 || state->count == 3) {
+    layer_on(L_FN);
+  } else if (state->count == 2) {
+    if (!td_fn_rctrl_data.fn_on) {
+      layer_off(L_FN);
+    }
+    register_code(KC_RCTL);
+  }
+}
+
+void td_fn_rctrl_reset(qk_tap_dance_state_t *state, void *user_data) {
+  if ((state->count == 1 || state->count >= 3) && !td_fn_rctrl_data.fn_on) {
+    layer_off(L_FN);
+  }
+  if (state->count >= 2) {
+    unregister_code(KC_RCTL);
+  }
+  td_fn_rctrl_data.started = false;
+}
+
+void td_lsft_fn_each(qk_tap_dance_state_t *state, void *user_data) {
+  // Single tap → LShift, double tap → Fn, triple tap etc. → Fn+LShift
+  if (state->count == 1 || state->count == 3) {
+    register_code(KC_LSFT);
+  } else if (state->count == 2) {
+    unregister_code(KC_LSFT);
+    // Prevent tap dance from sending LShift as a weak mod
+    state->weak_mods &= ~MOD_BIT(KC_LSFT);
+    layer_on(L_FN);
+  }
+}
+
+void td_lsft_fn_reset(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1 || state->count >= 3) {
+    unregister_code(KC_LSFT);
+  }
+  if (state->count >= 2) {
+    layer_off(L_FN);
+  }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_DESKTOP] = ACTION_TAP_DANCE_DOUBLE(LCTL(LGUI(KC_D)), LCTL(LGUI(KC_F4))), // Add/close virtual desktop
+
+  [TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_LALT),
+  [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_RGUI),
+  [TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RCTL, KC_RSFT),
+
+  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset),
+  [TD_LSFT_FN] = ACTION_TAP_DANCE_FN_ADVANCED(td_lsft_fn_each, NULL, td_lsft_fn_reset),
+};
diff --git a/users/konstantin/tap_dance.h b/users/konstantin/tap_dance.h
new file mode 100644
index 0000000000..922a635141
--- /dev/null
+++ b/users/konstantin/tap_dance.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "quantum.h"
+
+#define DESKTOP TD(TD_DESKTOP)
+#define DSKTP_L LCTL(LGUI(KC_LEFT))
+#define DSKTP_R LCTL(LGUI(KC_RGHT))
+
+#define RAL_LAL TD(TD_RAL_LAL)
+#define RAL_RGU TD(TD_RAL_RGU)
+#define RCT_RSF TD(TD_RCT_RSF)
+
+#define FN_RCTL TD(TD_FN_RCTL)
+#define LSFT_FN TD(TD_LSFT_FN)
+
+enum tap_dance {
+  TD_DESKTOP,
+
+  TD_RAL_LAL,
+  TD_RAL_RGU,
+  TD_RCT_RSF,
+
+  TD_FN_RCTL,
+  TD_LSFT_FN,
+};
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
new file mode 100644
index 0000000000..09af7e1c7f
--- /dev/null
+++ b/users/konstantin/unicode.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#define COMMA   UC(0x002C)
+#define L_PAREN UC(0x0028)
+#define R_PAREN UC(0x0029)
+#define EQUALS  UC(0x003D)
+#define TIMES   UC(0x00D7)
+#define DIVIDE  UC(0x00F7)
+#define MINUS   UC(0x2212)
diff --git a/users/losinggeneration/rules.mk b/users/losinggeneration/rules.mk
index 75277116b2..295367fbca 100644
--- a/users/losinggeneration/rules.mk
+++ b/users/losinggeneration/rules.mk
@@ -11,6 +11,3 @@ MOUSEKEY_ENABLE  = yes   # Mouse keys(+4700)
 TAP_DANCE_ENABLE = yes   # Enable tap dancing
 #UNICODE_ENABLE   = no    # Unicode
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/users/spacebarracecar/config.h b/users/spacebarracecar/config.h
index e69de29bb2..748c047155 100644
--- a/users/spacebarracecar/config.h
+++ b/users/spacebarracecar/config.h
@@ -0,0 +1,2 @@
+#pragma once
+#define TAPPING_TERM 200
diff --git a/users/spacebarracecar/spacebarracecar.c b/users/spacebarracecar/spacebarracecar.c
index 130d7dc2d4..2ab10d9459 100644
--- a/users/spacebarracecar/spacebarracecar.c
+++ b/users/spacebarracecar/spacebarracecar.c
@@ -96,7 +96,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       navesc_timer = timer_read();
       layer_on(_NAV);
     } else {
-      if (timer_elapsed(navesc_timer) < 200 && navesc) {
+      if (timer_elapsed(navesc_timer) < TAPPING_TERM && navesc) {
         register_code(KC_ESC);
         unregister_code(KC_ESC);
       }
@@ -134,7 +134,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       register_code(KC_LSFT);
       lshift = true;
     } else {
-      if (timer_elapsed(lshift_timer) < 200 && lshiftp && !game) {
+      if (timer_elapsed(lshift_timer) < TAPPING_TERM && lshiftp && !game) {
         register_code(KC_LSFT);
         register_code(KC_8);
         unregister_code(KC_8);
@@ -154,7 +154,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       register_code(KC_LSFT);
       rshift = true;
     } else {
-      if (timer_elapsed(rshift_timer) < 200 && rshiftp && !game) {
+      if (timer_elapsed(rshift_timer) < TAPPING_TERM && rshiftp && !game) {
         register_code(KC_LSFT);
         register_code(KC_9);
         unregister_code(KC_9);
diff --git a/users/spacebarracecar/spacebarracecar.h b/users/spacebarracecar/spacebarracecar.h
index d0259b73cc..b57cbed824 100644
--- a/users/spacebarracecar/spacebarracecar.h
+++ b/users/spacebarracecar/spacebarracecar.h
@@ -88,6 +88,8 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #define GUIL LGUI(KC_LEFT)
 #define GUIR RGUI(KC_RIGHT)
 
+#define CTLENT CTL_T(KC_ENT)
+
 /*
 Templates for Keys, with custom shifted and non shifted Characters
 */