3 files changed, 142 insertions, 75 deletions
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h
index 39450d680..d1c3002d2 100644
--- a/keyboards/whitefox/keymaps/konstantin/config.h
+++ b/keyboards/whitefox/keymaps/konstantin/config.h
@@ -2,6 +2,12 @@
 #define FORCE_NKRO
+#undef  IS_COMMAND
+#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))
+#define MAGIC_KEY_LAYER0_ALT1  BSLS
+#define MAGIC_KEY_BOOTLOADER   ESC
 #define MOUSEKEY_DELAY              50
 #define MOUSEKEY_INTERVAL           15
 #define MOUSEKEY_MAX_SPEED          4
@@ -12,6 +18,3 @@
 #define PERMISSIVE_HOLD
 #define TAPPING_TERM    200
 #define TAPPING_TOGGLE  2
-#undef  IS_COMMAND
-#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RCTL)))
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c
index edb049287..6732d9a01 100644
--- a/keyboards/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/whitefox/keymaps/konstantin/keymap.c
@@ -1,25 +1,29 @@
 #include QMK_KEYBOARD_H
-#define FN      MO(L_FN)
-#define FN_CAPS LT(L_FN, KC_CAPS)
-#define FN_RCTL TD(TD_FN_RCTL)    // Unused
-#define RLALT   TD(TD_RLALT)      // Unused
-#define DESKTOP TD(TD_DESKTOP)
-#define DESKT_L LCTL(LGUI(KC_LEFT))
-#define DESKT_R LCTL(LGUI(KC_RGHT))
 #define TOP     LCTL(KC_HOME)
 #define BOTTOM  LCTL(KC_END)
+#define DSKTP_L LCTL(LGUI(KC_LEFT))
+#define DSKTP_R LCTL(LGUI(KC_RGHT))
-#define UC_COMM UC(0x002C)
+#define FN      MO(L_FN)
-#define UC_LPRN UC(0x0028)
+#define FN_CAPS LT(L_FN, KC_CAPS)
-#define UC_RPRN UC(0x0029)
+#define FN_FNLK TT(L_FN)
-#define UC_EQLS UC(0x003D)
-#define UC_MULS UC(0x00D7)
-#define UC_DIVS UC(0x00F7)
-#define UC_MINS UC(0x2212)
-void matrix_init_user(void) {
+#define DESKTOP TD(TD_DESKTOP)
+#define FN_RCTL TD(TD_FN_RCTL)
+#define RAL_LAL TD(TD_RAL_LAL)
+#define RAL_RGU TD(TD_RAL_RGU)
+#define RCT_RSF TD(TD_RCT_RSF)
+#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)
+void eeconfig_init_user(void) {
  set_unicode_input_mode(UC_WINC);
 }
@@ -37,7 +41,9 @@ enum custom_keycodes {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
  case CLEAR:
-    if (record->event.pressed) { SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE)); }
+    if (record->event.pressed) {
+      SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
+    }
    return false;
  case NUMPAD:
@@ -55,90 +61,142 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
 }
-enum tap_dance {
+struct {
-  TD_FN_RCTL,
+  bool fn_on; // Layer state when tap dance started
-  TD_RLALT,
+  bool started;
-  TD_DESKTOP,
+} 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 > 2) && !td_fn_rctrl_data.fn_on) {
+    layer_off(L_FN);
+  }
+  if (state->count >= 2) {
+    unregister_code(KC_RCTL);
+  }
+  td_fn_rctrl_data.started = false;
+}
+#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_fn_rctl_finished(qk_tap_dance_state_t *state, void *user_data) {
+void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
-  // Single tap → Fn, double tap → RCtrl, triple tap → Fn+RCtrl etc.
+  qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data;
-  if (state->count & 1) { layer_on(L_FN); }
+  // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2
-  if (state->count & 2) { register_code(KC_RCTL); }
+  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_fn_rctl_reset(qk_tap_dance_state_t *state, void *user_data) {
+void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count & 1) { layer_off(L_FN); }
+  qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data;
-  if (state->count & 2) { unregister_code(KC_RCTL); }
+  if (state->count == 1 || state->count > 2) {
+    unregister_code(mods->kc1);
+  }
+  if (state->count >= 2) {
+    unregister_code(mods->kc2);
+  }
 }
+enum tap_dance {
+  TD_DESKTOP,
+  TD_FN_RCTL,
+  TD_RAL_LAL,
+  TD_RAL_RGU,
+  TD_RCT_RSF,
+};
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_fn_rctl_finished, td_fn_rctl_reset),
-  [TD_RLALT]   = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_LALT),
  [TD_DESKTOP] = ACTION_TAP_DANCE_DOUBLE(LCTL(LGUI(KC_D)), LCTL(LGUI(KC_F4))), // Add/close virtual desktop
+  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset),
+  [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),
 };
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Base layer
-   * ,---------------------------------------------------------------.
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |PSc|
+   * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │PSc│
-   * |---------------------------------------------------------------|
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-   * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] |Bspc |Del|
+   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
-   * |---------------------------------------------------------------|
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * |FnCaps| A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PgU|
+   * │FnCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
-   * |---------------------------------------------------------------|
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * | LShift | Z | X | C | V | B | N | M | , | . | / |RCtrl | ↑ |PgD|
+   * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │CtlSft│ ↑ │PgD│
-   * |---------------------------------------------------------------|
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-   * |LCtl|LGui|LAlt|         Space          |RAlt| Fn | | ← | ↓ | → |
+   * │LCtl│LGui│LAlt│         Space          │AlGu│FnLk│ │ ← │ ↓ │ → │
-   * `---------------------------------------------------------------'
+   * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
   */
  [L_BASE] = LAYOUT_truefox( \
    KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_PSCR, \
    KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,        KC_DEL,  \
    FN_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_ENT,         KC_PGUP, \
-    KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RCTL,        KC_UP,  KC_PGDN, \
+    KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,RCT_RSF,        KC_UP,  KC_PGDN, \
-    KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                 KC_RALT,FN,                     KC_LEFT,KC_DOWN,KC_RGHT  \
+    KC_LCTL,KC_LGUI,KC_LALT,                        KC_SPC,                 RAL_RGU,FN_FNLK,                KC_LEFT,KC_DOWN,KC_RGHT  \
  ),
  /* Function layer
-   * ,---------------------------------------------------------------.
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Num|Scr|Pau|
+   * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Num│Scr│Pau│
-   * |---------------------------------------------------------------|
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-   * | M4  |M2 |M↑ |M1 |M3 |M5 |   |   |   |Stp|Ply|Prv|Nxt|Clear|Ins|
+   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │   │   │Stp│Ply│Prv│Nxt│Clear│Ins│
-   * |---------------------------------------------------------------|
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * |      |M← |M↓ |M→ |MW↑|   |   |   |   |   |   |   |        |Top|
+   * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │Top│
-   * |---------------------------------------------------------------|
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * |        |MA0|MA2|MW←|MW→|   |   |   |VoD|VoU|Mut| App  |PgU|Btm|
+   * │        │MA0│MA2│MW←│MW→│   │   │   │VoD│VoU│Mut│ App  │PgU│Btm│
-   * |---------------------------------------------------------------|
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-   * |    |Dstp|Dst←|          MW↓           |Dst→|    | |Hom|PgD|End|
+   * │    │Dstp│Dst←│          MW↓           │Dst→│    │ │Hom│PgD│End│
-   * `---------------------------------------------------------------'
+   * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
   */
  [L_FN] = LAYOUT_truefox( \
    _______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK,KC_PAUS, \
    KC_BTN4,KC_BTN2,KC_MS_U,KC_BTN1,KC_BTN3,KC_BTN5,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,CLEAR,          KC_INS,  \
    _______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_U,_______,_______,_______,_______,_______,_______,_______,        _______,        TOP,     \
    _______,        KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_APP,         KC_PGUP,BOTTOM,  \
-    _______,DESKTOP,DESKT_L,                        KC_WH_D,                DESKT_R,_______,                KC_HOME,KC_PGDN,KC_END   \
+    _______,DESKTOP,DSKTP_L,                        KC_WH_D,                DSKTP_R,_______,                KC_HOME,KC_PGDN,KC_END   \
  ),
  /* Numpad layer
-   * ,---------------------------------------------------------------.
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * |Num|   |   |   |   |   |   |P7 |P8 |P9 |P- | − | = |Num|   |   |
+   * │Num│   │   │   │   │   │   │P7 │P8 │P9 │P- │ − │ = │Num│   │   │
-   * |---------------------------------------------------------------|
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-   * |     |   |   |   |   |   |   |P4 |P5 |P6 |P+ | ( | ) |     |   |
+   * │     │   │   │   │   │   │   │P4 │P5 │P6 │P+ │ ( │ ) │     │   │
-   * |---------------------------------------------------------------|
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-   * |      |   |   |   |   |   |   |P1 |P2 |P3 |P* | × | PEnter |   |
+   * │      │   │   │   │   │   │   │P1 │P2 │P3 │P* │ × │ PEnter │   │
-   * |---------------------------------------------------------------|
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * |        |   |   |   |   |   |P0 |P0 | , |P. |P/ |  ÷   |   |   |
+   * │        │   │   │   │   │   │P0 │P0 │ , │P. │P/ │  ÷   │   │   │
-   * |---------------------------------------------------------------|
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-   * |    |    |    |                        |    |    | |   |   |   |
+   * │    │    │    │                        │    │    │ │   │   │   │
-   * `---------------------------------------------------------------'
+   * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
   */
  [L_NUMPAD] = LAYOUT_truefox( \
-    NUMPAD, _______,_______,_______,_______,_______,_______,KC_P7,  KC_P8,  KC_P9,  KC_PMNS,UC_MINS,UC_EQLS,NUMPAD, _______,_______, \
+    NUMPAD, _______,_______,_______,_______,_______,_______,KC_P7,  KC_P8,  KC_P9,  KC_PMNS,MINUS,  EQUALS, NUMPAD, _______,_______, \
-    _______,_______,_______,_______,_______,_______,_______,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,UC_LPRN,UC_RPRN,_______,        _______, \
+    _______,_______,_______,_______,_______,_______,_______,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,L_PAREN,R_PAREN,_______,        _______, \
-    _______,_______,_______,_______,_______,_______,_______,KC_P1,  KC_P2,  KC_P3,  KC_PAST,UC_MULS,        KC_PENT,        _______, \
+    _______,_______,_______,_______,_______,_______,_______,KC_P1,  KC_P2,  KC_P3,  KC_PAST,TIMES,          KC_PENT,        _______, \
-    _______,        _______,_______,_______,_______,_______,KC_P0,  KC_P0,  UC_COMM,KC_PDOT,KC_PSLS,UC_DIVS,        _______,_______, \
+    _______,        _______,_______,_______,_______,_______,KC_P0,  KC_P0,  COMMA,  KC_PDOT,KC_PSLS,DIVIDE,         _______,_______, \
    _______,_______,_______,                        _______,                _______,_______,                _______,_______,_______  \
  ),
 };
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk
index f1f3d2378..abf92c2c4 100644
--- a/keyboards/whitefox/keymaps/konstantin/rules.mk
+++ b/keyboards/whitefox/keymaps/konstantin/rules.mk
@@ -1,4 +1,10 @@
+BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = no
+COMMAND_ENABLE = yes
 CONSOLE_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+NKRO_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 UNICODE_ENABLE = yes
+VISUALIZER_ENABLE = no

diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/whitefox/keymaps/konstantin/config.h index 39450d680..d1c3002d2 100644 --- a/keyboards/whitefox/keymaps/konstantin/config.h +++ b/keyboards/whitefox/keymaps/konstantin/config.h
@@ -2,6 +2,12 @@
2		2
3	#define FORCE_NKRO	3	#define FORCE_NKRO
4		4
		5	#undef IS_COMMAND
		6	#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) \| MOD_BIT(KC_RCTL)))
		7
		8	#define MAGIC_KEY_LAYER0_ALT1 BSLS
		9	#define MAGIC_KEY_BOOTLOADER ESC
		10
5	#define MOUSEKEY_DELAY 50	11	#define MOUSEKEY_DELAY 50
6	#define MOUSEKEY_INTERVAL 15	12	#define MOUSEKEY_INTERVAL 15
7	#define MOUSEKEY_MAX_SPEED 4	13	#define MOUSEKEY_MAX_SPEED 4
@@ -12,6 +18,3 @@
12	#define PERMISSIVE_HOLD	18	#define PERMISSIVE_HOLD
13	#define TAPPING_TERM 200	19	#define TAPPING_TERM 200
14	#define TAPPING_TOGGLE 2	20	#define TAPPING_TOGGLE 2
15
16	#undef IS_COMMAND
17	#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSFT) \| MOD_BIT(KC_RCTL)))


diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c index edb049287..6732d9a01 100644 --- a/keyboards/whitefox/keymaps/konstantin/keymap.c +++ b/keyboards/whitefox/keymaps/konstantin/keymap.c
@@ -1,25 +1,29 @@
1	#include QMK_KEYBOARD_H	1	#include QMK_KEYBOARD_H
2		2
3	#define FN MO(L_FN)
4	#define FN_CAPS LT(L_FN, KC_CAPS)
5	#define FN_RCTL TD(TD_FN_RCTL) // Unused
6	#define RLALT TD(TD_RLALT) // Unused
7	#define DESKTOP TD(TD_DESKTOP)
8
9	#define DESKT_L LCTL(LGUI(KC_LEFT))
10	#define DESKT_R LCTL(LGUI(KC_RGHT))
11	#define TOP LCTL(KC_HOME)	3	#define TOP LCTL(KC_HOME)
12	#define BOTTOM LCTL(KC_END)	4	#define BOTTOM LCTL(KC_END)
		5	#define DSKTP_L LCTL(LGUI(KC_LEFT))
		6	#define DSKTP_R LCTL(LGUI(KC_RGHT))
13		7
14	#define UC_COMM UC(0x002C)	8	#define FN MO(L_FN)
15	#define UC_LPRN UC(0x0028)	9	#define FN_CAPS LT(L_FN, KC_CAPS)
16	#define UC_RPRN UC(0x0029)	10	#define FN_FNLK TT(L_FN)
17	#define UC_EQLS UC(0x003D)
18	#define UC_MULS UC(0x00D7)
19	#define UC_DIVS UC(0x00F7)
20	#define UC_MINS UC(0x2212)
21		11
22	void matrix_init_user(void) {	12	#define DESKTOP TD(TD_DESKTOP)
		13	#define FN_RCTL TD(TD_FN_RCTL)
		14	#define RAL_LAL TD(TD_RAL_LAL)
		15	#define RAL_RGU TD(TD_RAL_RGU)
		16	#define RCT_RSF TD(TD_RCT_RSF)
		17
		18	#define COMMA UC(0x002C)
		19	#define L_PAREN UC(0x0028)
		20	#define R_PAREN UC(0x0029)
		21	#define EQUALS UC(0x003D)
		22	#define TIMES UC(0x00D7)
		23	#define DIVIDE UC(0x00F7)
		24	#define MINUS UC(0x2212)
		25
		26	void eeconfig_init_user(void) {
23	set_unicode_input_mode(UC_WINC);	27	set_unicode_input_mode(UC_WINC);
24	}	28	}
25		29
@@ -37,7 +41,9 @@ enum custom_keycodes {
37	bool process_record_user(uint16_t keycode, keyrecord_t *record) {	41	bool process_record_user(uint16_t keycode, keyrecord_t *record) {
38	switch (keycode) {	42	switch (keycode) {
39	case CLEAR:	43	case CLEAR:
40	if (record->event.pressed) { SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE)); }	44	if (record->event.pressed) {
		45	SEND_STRING(SS_LCTRL("a") SS_TAP(X_DELETE));
		46	}
41	return false;	47	return false;
42		48
43	case NUMPAD:	49	case NUMPAD:
@@ -55,90 +61,142 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
55	}	61	}
56	}	62	}
57		63
58	enum tap_dance {	64	struct {
59	TD_FN_RCTL,	65	bool fn_on; // Layer state when tap dance started
60	TD_RLALT,	66	bool started;
61	TD_DESKTOP,	67	} td_fn_rctrl_data;
62	};	68
		69	void td_fn_rctrl_each(qk_tap_dance_state_t state, void user_data) {
		70	if (!td_fn_rctrl_data.started) {
		71	td_fn_rctrl_data.fn_on = IS_LAYER_ON(L_FN);
		72	td_fn_rctrl_data.started = true;
		73	}
		74	// Single tap → Fn, double tap → RCtrl, triple tap etc. → Fn+RCtrl
		75	if (state->count == 1 \|\| state->count == 3) {
		76	layer_on(L_FN);
		77	} else if (state->count == 2) {
		78	if (!td_fn_rctrl_data.fn_on) {
		79	layer_off(L_FN);
		80	}
		81	register_code(KC_RCTL);
		82	}
		83	}
		84
		85	void td_fn_rctrl_reset(qk_tap_dance_state_t state, void user_data) {
		86	if ((state->count == 1 \|\| state->count > 2) && !td_fn_rctrl_data.fn_on) {
		87	layer_off(L_FN);
		88	}
		89	if (state->count >= 2) {
		90	unregister_code(KC_RCTL);
		91	}
		92	td_fn_rctrl_data.started = false;
		93	}
		94
		95	#define ACTION_TAP_DANCE_DOUBLE_MODS(mod1, mod2) { \
		96	.fn = { td_double_mods_each, NULL, td_double_mods_reset }, \
		97	.user_data = &(qk_tap_dance_pair_t){ mod1, mod2 }, \
		98	}
63		99
64	void td_fn_rctl_finished(qk_tap_dance_state_t state, void user_data) {	100	void td_double_mods_each(qk_tap_dance_state_t state, void user_data) {
65	// Single tap → Fn, double tap → RCtrl, triple tap → Fn+RCtrl etc.	101	qk_tap_dance_pair_t mods = (qk_tap_dance_pair_t )user_data;
66	if (state->count & 1) { layer_on(L_FN); }	102	// Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2
67	if (state->count & 2) { register_code(KC_RCTL); }	103	if (state->count == 1 \|\| state->count == 3) {
		104	register_code(mods->kc1);
		105	} else if (state->count == 2) {
		106	unregister_code(mods->kc1);
		107	register_code(mods->kc2);
		108	}
		109	// Prevent tap dance from sending kc1 and kc2 as weak mods
		110	state->weak_mods &= ~(MOD_BIT(mods->kc1) \| MOD_BIT(mods->kc2));
68	}	111	}
69		112
70	void td_fn_rctl_reset(qk_tap_dance_state_t state, void user_data) {	113	void td_double_mods_reset(qk_tap_dance_state_t state, void user_data) {
71	if (state->count & 1) { layer_off(L_FN); }	114	qk_tap_dance_pair_t mods = (qk_tap_dance_pair_t )user_data;
72	if (state->count & 2) { unregister_code(KC_RCTL); }	115	if (state->count == 1 \|\| state->count > 2) {
		116	unregister_code(mods->kc1);
		117	}
		118	if (state->count >= 2) {
		119	unregister_code(mods->kc2);
		120	}
73	}	121	}
74		122
		123	enum tap_dance {
		124	TD_DESKTOP,
		125	TD_FN_RCTL,
		126	TD_RAL_LAL,
		127	TD_RAL_RGU,
		128	TD_RCT_RSF,
		129	};
		130
75	qk_tap_dance_action_t tap_dance_actions[] = {	131	qk_tap_dance_action_t tap_dance_actions[] = {
76	[TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_fn_rctl_finished, td_fn_rctl_reset),
77	[TD_RLALT] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_LALT),
78	[TD_DESKTOP] = ACTION_TAP_DANCE_DOUBLE(LCTL(LGUI(KC_D)), LCTL(LGUI(KC_F4))), // Add/close virtual desktop	132	[TD_DESKTOP] = ACTION_TAP_DANCE_DOUBLE(LCTL(LGUI(KC_D)), LCTL(LGUI(KC_F4))), // Add/close virtual desktop
		133	[TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset),
		134	[TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_LALT),
		135	[TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_RGUI),
		136	[TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RCTL, KC_RSFT),
79	};	137	};
80		138
81	const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	139	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82	/* Base layer	140	/* Base layer
83	* ,---------------------------------------------------------------.	141	* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
84	* \|Esc\| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| - \| = \| \ \| ` \|PSc\|	142	* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │PSc│
85	* \|---------------------------------------------------------------\|	143	* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
86	* \| Tab \| Q \| W \| E \| R \| T \| Y \| U \| I \| O \| P \| [ \| ] \|Bspc \|Del\|	144	* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
87	* \|---------------------------------------------------------------\|	145	* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
88	* \|FnCaps\| A \| S \| D \| F \| G \| H \| J \| K \| L \| ; \| ' \| Enter \|PgU\|	146	* │FnCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgU│
89	* \|---------------------------------------------------------------\|	147	* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
90	* \| LShift \| Z \| X \| C \| V \| B \| N \| M \| , \| . \| / \|RCtrl \| ↑ \|PgD\|	148	* │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │CtlSft│ ↑ │PgD│
91	* \|---------------------------------------------------------------\|	149	* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
92	* \|LCtl\|LGui\|LAlt\| Space \|RAlt\| Fn \| \| ← \| ↓ \| → \|	150	* │LCtl│LGui│LAlt│ Space │AlGu│FnLk│ │ ← │ ↓ │ → │
93	* `---------------------------------------------------------------'	151	* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
94	*/	152	*/
95	[L_BASE] = LAYOUT_truefox( \	153	[L_BASE] = LAYOUT_truefox( \
96	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_PSCR, \	154	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_PSCR, \
97	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, KC_DEL, \	155	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, KC_DEL, \
98	FN_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, KC_PGUP, \	156	FN_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, KC_PGUP, \
99	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RCTL, KC_UP, KC_PGDN, \	157	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,RCT_RSF, KC_UP, KC_PGDN, \
100	KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,FN, KC_LEFT,KC_DOWN,KC_RGHT \	158	KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, RAL_RGU,FN_FNLK, KC_LEFT,KC_DOWN,KC_RGHT \
101	),	159	),
102		160
103	/* Function layer	161	/* Function layer
104	* ,---------------------------------------------------------------.	162	* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
105	* \| \|F1 \|F2 \|F3 \|F4 \|F5 \|F6 \|F7 \|F8 \|F9 \|F10\|F11\|F12\|Num\|Scr\|Pau\|	163	* │ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Num│Scr│Pau│
106	* \|---------------------------------------------------------------\|	164	* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
107	* \| M4 \|M2 \|M↑ \|M1 \|M3 \|M5 \| \| \| \|Stp\|Ply\|Prv\|Nxt\|Clear\|Ins\|	165	* │ M4 │M2 │M↑ │M1 │M3 │M5 │ │ │ │Stp│Ply│Prv│Nxt│Clear│Ins│
108	* \|---------------------------------------------------------------\|	166	* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
109	* \| \|M← \|M↓ \|M→ \|MW↑\| \| \| \| \| \| \| \| \|Top\|	167	* │ │M← │M↓ │M→ │MW↑│ │ │ │ │ │ │ │ │Top│
110	* \|---------------------------------------------------------------\|	168	* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
111	* \| \|MA0\|MA2\|MW←\|MW→\| \| \| \|VoD\|VoU\|Mut\| App \|PgU\|Btm\|	169	* │ │MA0│MA2│MW←│MW→│ │ │ │VoD│VoU│Mut│ App │PgU│Btm│
112	* \|---------------------------------------------------------------\|	170	* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
113	* \| \|Dstp\|Dst←\| MW↓ \|Dst→\| \| \|Hom\|PgD\|End\|	171	* │ │Dstp│Dst←│ MW↓ │Dst→│ │ │Hom│PgD│End│
114	* `---------------------------------------------------------------'	172	* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
115	*/	173	*/
116	[L_FN] = LAYOUT_truefox( \	174	[L_FN] = LAYOUT_truefox( \
117	_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK,KC_PAUS, \	175	_______,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, NUMPAD, KC_SLCK,KC_PAUS, \
118	KC_BTN4,KC_BTN2,KC_MS_U,KC_BTN1,KC_BTN3,KC_BTN5,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,CLEAR, KC_INS, \	176	KC_BTN4,KC_BTN2,KC_MS_U,KC_BTN1,KC_BTN3,KC_BTN5,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,CLEAR, KC_INS, \
119	_______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_U,_______,_______,_______,_______,_______,_______,_______, _______, TOP, \	177	_______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_U,_______,_______,_______,_______,_______,_______,_______, _______, TOP, \
120	_______, KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_APP, KC_PGUP,BOTTOM, \	178	_______, KC_ACL0,KC_ACL2,KC_WH_L,KC_WH_R,_______,_______,_______,KC_VOLD,KC_VOLU,KC_MUTE,KC_APP, KC_PGUP,BOTTOM, \
121	_______,DESKTOP,DESKT_L, KC_WH_D, DESKT_R,_______, KC_HOME,KC_PGDN,KC_END \	179	_______,DESKTOP,DSKTP_L, KC_WH_D, DSKTP_R,_______, KC_HOME,KC_PGDN,KC_END \
122	),	180	),
123		181
124	/* Numpad layer	182	/* Numpad layer
125	* ,---------------------------------------------------------------.	183	* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
126	* \|Num\| \| \| \| \| \| \|P7 \|P8 \|P9 \|P- \| − \| = \|Num\| \| \|	184	* │Num│ │ │ │ │ │ │P7 │P8 │P9 │P- │ − │ = │Num│ │ │
127	* \|---------------------------------------------------------------\|	185	* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
128	* \| \| \| \| \| \| \| \|P4 \|P5 \|P6 \|P+ \| ( \| ) \| \| \|	186	* │ │ │ │ │ │ │ │P4 │P5 │P6 │P+ │ ( │ ) │ │ │
129	* \|---------------------------------------------------------------\|	187	* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
130	* \| \| \| \| \| \| \| \|P1 \|P2 \|P3 \|P* \| × \| PEnter \| \|	188	* │ │ │ │ │ │ │ │P1 │P2 │P3 │P* │ × │ PEnter │ │
131	* \|---------------------------------------------------------------\|	189	* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
132	* \| \| \| \| \| \| \|P0 \|P0 \| , \|P. \|P/ \| ÷ \| \| \|	190	* │ │ │ │ │ │ │P0 │P0 │ , │P. │P/ │ ÷ │ │ │
133	* \|---------------------------------------------------------------\|	191	* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
134	* \| \| \| \| \| \| \| \| \| \| \|	192	* │ │ │ │ │ │ │ │ │ │ │
135	* `---------------------------------------------------------------'	193	* └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
136	*/	194	*/
137	[L_NUMPAD] = LAYOUT_truefox( \	195	[L_NUMPAD] = LAYOUT_truefox( \
138	NUMPAD, _______,_______,_______,_______,_______,_______,KC_P7, KC_P8, KC_P9, KC_PMNS,UC_MINS,UC_EQLS,NUMPAD, _______,_______, \	196	NUMPAD, _______,_______,_______,_______,_______,_______,KC_P7, KC_P8, KC_P9, KC_PMNS,MINUS, EQUALS, NUMPAD, _______,_______, \
139	_______,_______,_______,_______,_______,_______,_______,KC_P4, KC_P5, KC_P6, KC_PPLS,UC_LPRN,UC_RPRN,_______, _______, \	197	_______,_______,_______,_______,_______,_______,_______,KC_P4, KC_P5, KC_P6, KC_PPLS,L_PAREN,R_PAREN,_______, _______, \
140	_______,_______,_______,_______,_______,_______,_______,KC_P1, KC_P2, KC_P3, KC_PAST,UC_MULS, KC_PENT, _______, \	198	_______,_______,_______,_______,_______,_______,_______,KC_P1, KC_P2, KC_P3, KC_PAST,TIMES, KC_PENT, _______, \
141	_______, _______,_______,_______,_______,_______,KC_P0, KC_P0, UC_COMM,KC_PDOT,KC_PSLS,UC_DIVS, _______,_______, \	199	_______, _______,_______,_______,_______,_______,KC_P0, KC_P0, COMMA, KC_PDOT,KC_PSLS,DIVIDE, _______,_______, \
142	_______,_______,_______, _______, _______,_______, _______,_______,_______ \	200	_______,_______,_______, _______, _______,_______, _______,_______,_______ \
143	),	201	),
144	};	202	};


diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk index f1f3d2378..abf92c2c4 100644 --- a/keyboards/whitefox/keymaps/konstantin/rules.mk +++ b/keyboards/whitefox/keymaps/konstantin/rules.mk
@@ -1,4 +1,10 @@
		1	BACKLIGHT_ENABLE = no
1	BOOTMAGIC_ENABLE = no	2	BOOTMAGIC_ENABLE = no
		3	COMMAND_ENABLE = yes
2	CONSOLE_ENABLE = yes	4	CONSOLE_ENABLE = yes
		5	EXTRAKEY_ENABLE = yes
		6	MOUSEKEY_ENABLE = yes
		7	NKRO_ENABLE = yes
3	TAP_DANCE_ENABLE = yes	8	TAP_DANCE_ENABLE = yes
4	UNICODE_ENABLE = yes	9	UNICODE_ENABLE = yes
		10	VISUALIZER_ENABLE = no