From 6f386ca6ae82be9212700dbfeb73517d077bef5a Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 28 Jan 2019 09:04:47 +0100
Subject: Change how desktop commands work

---
 users/konstantin/konstantin.c | 12 ++++++++++++
 users/konstantin/konstantin.h |  7 +++++++
 users/konstantin/tap_dance.c  |  2 +-
 users/konstantin/tap_dance.h  |  6 ++----
 4 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 47596279c..bf92a503e 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -28,6 +28,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return false;
 
+  case DST_P_R:
+    (record->event.pressed ? register_code16 : unregister_code16)(
+      (get_mods() & MOD_MASK_CTRL) ? DST_RMV : DST_PRV
+    );
+    return false;
+
+  case DST_N_A:
+    (record->event.pressed ? register_code16 : unregister_code16)(
+      (get_mods() & MOD_MASK_CTRL) ? DST_ADD : DST_NXT
+    );
+    return false;
+
 #ifdef LAYER_FN
   static bool fn_lock;
 
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index f67f9f1b7..3ca4f401e 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -23,6 +23,11 @@
 #define PRV_TAB LCTL(KC_PGUP)
 #define NXT_TAB LCTL(KC_PGDN)
 
+#define DST_ADD LCTL(LGUI(KC_D))
+#define DST_RMV LCTL(LGUI(KC_F4))
+#define DST_PRV LCTL(LGUI(KC_LEFT))
+#define DST_NXT LCTL(LGUI(KC_RGHT))
+
 #define LCT_CPS LCTL_T(KC_CAPS)
 
 #ifdef SEND_STRING_CLEAN
@@ -37,6 +42,8 @@
 
 enum keycodes_user {
   CLEAR = SAFE_RANGE,
+  DST_P_R,
+  DST_N_A,
 #ifdef LAYER_NUMPAD
   NUMPAD,
 #endif
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index b13f33c02..e3f172946 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -82,7 +82,7 @@ void td_lsft_fn_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 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_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_RMV),
 
   [TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_LALT),
   [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_RGUI),
diff --git a/users/konstantin/tap_dance.h b/users/konstantin/tap_dance.h
index 922a63514..1757e9b11 100644
--- a/users/konstantin/tap_dance.h
+++ b/users/konstantin/tap_dance.h
@@ -2,9 +2,7 @@
 
 #include "quantum.h"
 
-#define DESKTOP TD(TD_DESKTOP)
-#define DSKTP_L LCTL(LGUI(KC_LEFT))
-#define DSKTP_R LCTL(LGUI(KC_RGHT))
+#define DST_A_R TD(TD_DST_A_R)
 
 #define RAL_LAL TD(TD_RAL_LAL)
 #define RAL_RGU TD(TD_RAL_RGU)
@@ -14,7 +12,7 @@
 #define LSFT_FN TD(TD_LSFT_FN)
 
 enum tap_dance {
-  TD_DESKTOP,
+  TD_DST_A_R,
 
   TD_RAL_LAL,
   TD_RAL_RGU,
-- 
cgit v1.2.3-24-g4f1b


From 6695c874fb8660989a129691bbffc6225be67362 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 28 Jan 2019 09:05:35 +0100
Subject: Add DST_MOD_MASK as a config option

---
 users/konstantin/konstantin.c | 4 ++--
 users/konstantin/konstantin.h | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index bf92a503e..5861574cb 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -30,13 +30,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   case DST_P_R:
     (record->event.pressed ? register_code16 : unregister_code16)(
-      (get_mods() & MOD_MASK_CTRL) ? DST_RMV : DST_PRV
+      (get_mods() & DST_MOD_MASK) ? DST_RMV : DST_PRV
     );
     return false;
 
   case DST_N_A:
     (record->event.pressed ? register_code16 : unregister_code16)(
-      (get_mods() & MOD_MASK_CTRL) ? DST_ADD : DST_NXT
+      (get_mods() & DST_MOD_MASK) ? DST_ADD : DST_NXT
     );
     return false;
 
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index 3ca4f401e..a649e4f79 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -27,6 +27,9 @@
 #define DST_RMV LCTL(LGUI(KC_F4))
 #define DST_PRV LCTL(LGUI(KC_LEFT))
 #define DST_NXT LCTL(LGUI(KC_RGHT))
+#ifndef DST_MOD_MASK
+  #define DST_MOD_MASK MOD_MASK_CTRL
+#endif
 
 #define LCT_CPS LCTL_T(KC_CAPS)
 
-- 
cgit v1.2.3-24-g4f1b


From f2543c3b9b63433f8f5f7aec9531f7ebddcce4fa Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Tue, 29 Jan 2019 00:37:10 +0100
Subject: DST_RMV → DST_REM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/konstantin/konstantin.c | 2 +-
 users/konstantin/konstantin.h | 2 +-
 users/konstantin/tap_dance.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 5861574cb..686ff32ec 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -30,7 +30,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   case DST_P_R:
     (record->event.pressed ? register_code16 : unregister_code16)(
-      (get_mods() & DST_MOD_MASK) ? DST_RMV : DST_PRV
+      (get_mods() & DST_MOD_MASK) ? DST_REM : DST_PRV
     );
     return false;
 
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index a649e4f79..48bd26cd5 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -24,7 +24,7 @@
 #define NXT_TAB LCTL(KC_PGDN)
 
 #define DST_ADD LCTL(LGUI(KC_D))
-#define DST_RMV LCTL(LGUI(KC_F4))
+#define DST_REM LCTL(LGUI(KC_F4))
 #define DST_PRV LCTL(LGUI(KC_LEFT))
 #define DST_NXT LCTL(LGUI(KC_RGHT))
 #ifndef DST_MOD_MASK
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index e3f172946..81f2d42e1 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -82,7 +82,7 @@ void td_lsft_fn_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_RMV),
+  [TD_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_REM),
 
   [TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_LALT),
   [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RALT, KC_RGUI),
-- 
cgit v1.2.3-24-g4f1b


From 012c5ef9bdccc8d752481c3c1d35a0ef47b075c2 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Thu, 31 Jan 2019 16:02:24 +0100
Subject: Update custom SEND_STRING

---
 users/konstantin/konstantin.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index 48bd26cd5..989854c2e 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -35,11 +35,11 @@
 
 #ifdef SEND_STRING_CLEAN
   #undef  SEND_STRING
-  #define SEND_STRING(...) {            \
-      uint8_t ss_mods = get_mods();     \
-      clear_mods();                     \
-      send_string_P(PSTR(__VA_ARGS__)); \
-      set_mods(ss_mods);                \
+  #define SEND_STRING(string) {     \
+      uint8_t ss_mods = get_mods(); \
+      clear_mods();                 \
+      send_string_P(PSTR(string));  \
+      set_mods(ss_mods);            \
     }
 #endif
 
-- 
cgit v1.2.3-24-g4f1b


From ef189da2439d8f0cf20a83756400a38310c1caeb Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 9 Feb 2019 21:45:25 +0100
Subject: Move feature flags from userspace into keyboard rules

---
 users/konstantin/rules.mk | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
index d2522b952..4af256e1e 100644
--- a/users/konstantin/rules.mk
+++ b/users/konstantin/rules.mk
@@ -1,12 +1,3 @@
-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
-
 SRC += konstantin.c
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
   SRC += tap_dance.c
-- 
cgit v1.2.3-24-g4f1b


From 2f07627a5dd38ab1370804f4feb1972250928803 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 11 Feb 2019 22:41:51 +0100
Subject: Add RGB_SET keycode to Melody96 and RGB files to userspace

---
 users/konstantin/konstantin.h |  3 +++
 users/konstantin/rgb.c        |  3 +++
 users/konstantin/rgb.h        | 17 +++++++++++++++++
 users/konstantin/rules.mk     |  3 +++
 4 files changed, 26 insertions(+)
 create mode 100644 users/konstantin/rgb.c
 create mode 100644 users/konstantin/rgb.h

(limited to 'users')

diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index 989854c2e..d8b00c4c8 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -1,6 +1,9 @@
 #pragma once
 
 #include "quantum.h"
+#if defined(RGBLIGHT_ENABLE) || defined(RGBMATRIX_ENABLE)
+  #include "rgb.h"
+#endif
 #ifdef TAP_DANCE_ENABLE
   #include "tap_dance.h"
 #endif
diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
new file mode 100644
index 000000000..a09057d28
--- /dev/null
+++ b/users/konstantin/rgb.c
@@ -0,0 +1,3 @@
+#include "rgb.h"
+
+const hsv_t GODSPEED_BLUE = { .h = 214, .s = 17, .v = 73 };
diff --git a/users/konstantin/rgb.h b/users/konstantin/rgb.h
new file mode 100644
index 000000000..2ea10c67a
--- /dev/null
+++ b/users/konstantin/rgb.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "quantum.h"
+
+typedef struct {
+  uint16_t h;
+  uint8_t  s;
+  uint8_t  v;
+} hsv_t;
+
+typedef struct {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+} rgb_t;
+
+extern const hsv_t GODSPEED_BLUE;
diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
index 4af256e1e..8913e5755 100644
--- a/users/konstantin/rules.mk
+++ b/users/konstantin/rules.mk
@@ -1,4 +1,7 @@
 SRC += konstantin.c
+ifneq (,$(filter yes,$(RGBLIGHT_ENABLE) $(RGB_MATRIX_ENABLE)))  # if either is yes
+  SRC += rgb.c
+endif
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
   SRC += tap_dance.c
 endif
-- 
cgit v1.2.3-24-g4f1b


From ddb0f39ebf317c7a23c69ed45efb1882746a01b0 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 11 Feb 2019 23:21:41 +0100
Subject: Generate UNICODE and UNICODEMAP constants using macros

---
 users/konstantin/konstantin.h |  2 +-
 users/konstantin/rules.mk     |  3 +++
 users/konstantin/unicode.c    |  7 +++++++
 users/konstantin/unicode.h    | 37 ++++++++++++++++++++++++++++++-------
 4 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 users/konstantin/unicode.c

(limited to 'users')

diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index d8b00c4c8..c32d674e8 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -7,7 +7,7 @@
 #ifdef TAP_DANCE_ENABLE
   #include "tap_dance.h"
 #endif
-#ifdef UNICODE_ENABLE
+#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE)
   #include "unicode.h"
 #endif
 
diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
index 8913e5755..6bda030fb 100644
--- a/users/konstantin/rules.mk
+++ b/users/konstantin/rules.mk
@@ -5,5 +5,8 @@ endif
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
   SRC += tap_dance.c
 endif
+ifneq (,$(filter yes,$(UNICODE_ENABLE) $(UNICODEMAP_ENABLE)))  # if either is yes
+  SRC += unicode.c
+endif
 
 EXTRAFLAGS += -flto
diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c
new file mode 100644
index 000000000..3b6164bc5
--- /dev/null
+++ b/users/konstantin/unicode.c
@@ -0,0 +1,7 @@
+#include "unicode.h"
+
+#ifdef UNICODEMAP_ENABLE
+  const uint32_t PROGMEM unicode_map[] = {
+    FOREACH_UNICODE(X_ENTRY)
+  };
+#endif
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index 09af7e1c7..d76f2a170 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -2,10 +2,33 @@
 
 #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)
+#define FOREACH_UNICODE(M) \
+  M(COMMA,   0x002C)       \
+  M(L_PAREN, 0x0028)       \
+  M(R_PAREN, 0x0029)       \
+  M(EQUALS,  0x003D)       \
+  M(TIMES,   0x00D7)       \
+  M(DIVIDE,  0x00F7)       \
+  M(MINUS,   0x2212)
+
+#define UC_KEYCODE(name, code)  name = UC(code),
+
+#define X_NAME(name, code)    X_ ## name,
+#define X_ENTRY(name, code)   [X_ ## name] = code,
+#define X_KEYCODE(name, code) name = X(X_ ## name),
+
+#if defined(UNICODE_ENABLE)
+  enum unicode_keycodes {
+    FOREACH_UNICODE(UC_KEYCODE)
+  };
+#elif defined(UNICODEMAP_ENABLE)
+  enum unicode_names {
+    FOREACH_UNICODE(X_NAME)
+  };
+
+  extern const uint32_t PROGMEM unicode_map[];
+
+  enum unicode_keycodes {
+    FOREACH_UNICODE(X_KEYCODE)
+  };
+#endif
-- 
cgit v1.2.3-24-g4f1b


From 7b11d740eaad1aade1a8d1914aab54f2720ab7ba Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Tue, 12 Feb 2019 00:18:52 +0100
Subject: Avoid collisions with X_* send string constants

---
 users/konstantin/unicode.c |  2 +-
 users/konstantin/unicode.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c
index 3b6164bc5..44b5be6c9 100644
--- a/users/konstantin/unicode.c
+++ b/users/konstantin/unicode.c
@@ -2,6 +2,6 @@
 
 #ifdef UNICODEMAP_ENABLE
   const uint32_t PROGMEM unicode_map[] = {
-    FOREACH_UNICODE(X_ENTRY)
+    FOREACH_UNICODE(UCM_ENTRY)
   };
 #endif
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index d76f2a170..6bb908e0e 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -13,9 +13,9 @@
 
 #define UC_KEYCODE(name, code)  name = UC(code),
 
-#define X_NAME(name, code)    X_ ## name,
-#define X_ENTRY(name, code)   [X_ ## name] = code,
-#define X_KEYCODE(name, code) name = X(X_ ## name),
+#define UCM_NAME(name, code)    UCM_ ## name,
+#define UCM_ENTRY(name, code)   [UCM_ ## name] = code,
+#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
 
 #if defined(UNICODE_ENABLE)
   enum unicode_keycodes {
@@ -23,12 +23,12 @@
   };
 #elif defined(UNICODEMAP_ENABLE)
   enum unicode_names {
-    FOREACH_UNICODE(X_NAME)
+    FOREACH_UNICODE(UCM_NAME)
   };
 
   extern const uint32_t PROGMEM unicode_map[];
 
   enum unicode_keycodes {
-    FOREACH_UNICODE(X_KEYCODE)
+    FOREACH_UNICODE(UCM_KEYCODE)
   };
 #endif
-- 
cgit v1.2.3-24-g4f1b


From bd43df53bdf0009a152251582a05046bbefb0858 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 16 Feb 2019 15:26:14 +0100
Subject: Use two spaces before inline comments

---
 users/konstantin/konstantin.c |  4 ++--
 users/konstantin/rgb.h        | 12 ++++++------
 users/konstantin/tap_dance.c  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 686ff32ec..239252d9c 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -6,7 +6,7 @@ static void toggle_numpad(void) {
   bool numpad_on = IS_LAYER_ON(L_NUMPAD);
   bool num_lock_on = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
   if (num_lock_on != numpad_on) {
-    tap_code(KC_NLCK); // Toggle Num Lock to match layer state
+    tap_code(KC_NLCK);  // Toggle Num Lock to match layer state
   }
 }
 #endif
@@ -45,7 +45,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   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
+      fn_lock = !IS_LAYER_ON(L_FN);  // Fn layer will be toggled after this
     }
     return true;
 #endif
diff --git a/users/konstantin/rgb.h b/users/konstantin/rgb.h
index 2ea10c67a..e296cf12e 100644
--- a/users/konstantin/rgb.h
+++ b/users/konstantin/rgb.h
@@ -3,15 +3,15 @@
 #include "quantum.h"
 
 typedef struct {
-  uint16_t h;
-  uint8_t  s;
-  uint8_t  v;
+  uint16_t h;  // 0–360
+  uint8_t  s;  // 0–255
+  uint8_t  v;  // 0–255
 } hsv_t;
 
 typedef struct {
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
+  uint8_t r;  // 0–255
+  uint8_t g;  // 0–255
+  uint8_t b;  // 0–255
 } rgb_t;
 
 extern const hsv_t GODSPEED_BLUE;
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index 81f2d42e1..dffaeb206 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -30,7 +30,7 @@ void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 struct {
-  bool fn_on; // Layer state when tap dance started
+  bool fn_on;  // Layer state when tap dance started
   bool started;
 } td_fn_rctrl_data;
 
-- 
cgit v1.2.3-24-g4f1b


From be65a0cc7921a0f6a6397bd7682720b5bd7d9128 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 16 Feb 2019 18:03:59 +0100
Subject: Add _keymap versions of other custom Quantum functions

Not added: eeconfig_update_keymap, eeconfig_read_keymap
---
 users/konstantin/konstantin.c | 80 ++++++++++++++++++++++++++++++++++++++++---
 users/konstantin/konstantin.h | 12 +++++++
 2 files changed, 87 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 239252d9c..f5c59f9eb 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -1,5 +1,45 @@
 #include "konstantin.h"
 
+__attribute__((weak))
+void keyboard_pre_init_keymap(void) {}
+
+void keyboard_pre_init_user(void) {
+  keyboard_pre_init_keymap();
+}
+
+__attribute__((weak))
+void eeconfig_init_keymap(void) {}
+
+void eeconfig_init_user(void) {
+  eeconfig_init_keymap();
+}
+
+__attribute__((weak))
+void matrix_init_keymap(void) {}
+
+void matrix_init_user(void) {
+  matrix_init_keymap();
+}
+
+__attribute__((weak))
+void keyboard_post_init_keymap(void) {}
+
+void keyboard_post_init_user(void) {
+  keyboard_post_init_keymap();
+}
+
+__attribute__((weak))
+void matrix_scan_keymap(void) {}
+
+void matrix_scan_user(void) {
+  matrix_scan_keymap();
+}
+
+__attribute__((weak))
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
 #ifdef LAYER_NUMPAD
 static void toggle_numpad(void) {
   layer_invert(L_NUMPAD);
@@ -11,11 +51,6 @@ static void toggle_numpad(void) {
 }
 #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;
@@ -88,3 +123,38 @@ uint32_t layer_state_set_keymap(uint32_t state) {
 uint32_t layer_state_set_user(uint32_t state) {
   return layer_state_set_keymap(state);
 }
+
+__attribute__((weak))
+void led_set_keymap(uint8_t usb_led) {}
+
+void led_set_user(uint8_t usb_led) {
+  led_set_keymap(usb_led);
+}
+
+__attribute__((weak))
+void suspend_power_down_keymap(void) {}
+
+void suspend_power_down_user(void) {
+  suspend_power_down_keymap();
+}
+
+__attribute__((weak))
+void suspend_wakeup_init_keymap(void) {}
+
+void suspend_wakeup_init_user(void) {
+  suspend_wakeup_init_keymap();
+}
+
+__attribute__((weak))
+void startup_keymap(void) {}
+
+void startup_user(void) {  // Currently not called anywhere
+  startup_keymap();
+}
+
+__attribute__((weak))
+void shutdown_keymap(void) {}
+
+void shutdown_user(void) {
+  shutdown_keymap();
+}
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index c32d674e8..db90c4ef6 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -69,5 +69,17 @@ enum layers_user {
   L_RANGE_KEYMAP,
 };
 
+void keyboard_pre_init_keymap(void);
+void eeconfig_init_keymap(void);
+void matrix_init_keymap(void);
+void keyboard_post_init_keymap(void);
+
+void matrix_scan_keymap(void);
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 uint32_t layer_state_set_keymap(uint32_t state);
+void led_set_keymap(uint8_t usb_led);
+
+void suspend_power_down_keymap(void);
+void suspend_wakeup_init_keymap(void);
+void startup_keymap(void);
+void shutdown_keymap(void);
-- 
cgit v1.2.3-24-g4f1b


From 784e2af062a9ef0c6d1a4ef7fcc20df79ad4fab1 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 16 Feb 2019 18:05:01 +0100
Subject: Make toggle_numpad a nested function in process_record_user

---
 users/konstantin/konstantin.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index f5c59f9eb..a567d9166 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -40,22 +40,21 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-#ifdef LAYER_NUMPAD
-static void toggle_numpad(void) {
-  layer_invert(L_NUMPAD);
-  bool numpad_on = IS_LAYER_ON(L_NUMPAD);
-  bool num_lock_on = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
-  if (num_lock_on != numpad_on) {
-    tap_code(KC_NLCK);  // Toggle Num Lock to match layer state
-  }
-}
-#endif
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (!process_record_keymap(keycode, record)) {
     return false;
   }
 
+#ifdef LAYER_NUMPAD
+  void toggle_numpad(void) {
+    layer_invert(L_NUMPAD);
+    bool numpad = IS_LAYER_ON(L_NUMPAD), num_lock = IS_HOST_LED_ON(USB_LED_NUM_LOCK);
+    if (num_lock != numpad) {
+      tap_code(KC_NLCK);  // Toggle Num Lock to match layer state
+    }
+  }
+#endif
+
   switch (keycode) {
   case CLEAR:
     if (record->event.pressed) {
-- 
cgit v1.2.3-24-g4f1b


From f09a237a07f2a3a341f6c6972d2f87eec3235254 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 00:44:31 +0100
Subject: Remove most _keymap and _user definitions in userspace

Some keyboards misuse _user functions by defining them in the base files
instead of the corresponding _kb functions (especially led_set_user and
matrix_init_user). Until this is fixed (#5148), I've removed definitions
in my userspace that could cause linking collisions.
---
 users/konstantin/konstantin.c | 49 -------------------------------------------
 users/konstantin/konstantin.h |  8 -------
 2 files changed, 57 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index a567d9166..a8f2a5f2c 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -14,13 +14,6 @@ void eeconfig_init_user(void) {
   eeconfig_init_keymap();
 }
 
-__attribute__((weak))
-void matrix_init_keymap(void) {}
-
-void matrix_init_user(void) {
-  matrix_init_keymap();
-}
-
 __attribute__((weak))
 void keyboard_post_init_keymap(void) {}
 
@@ -28,13 +21,6 @@ void keyboard_post_init_user(void) {
   keyboard_post_init_keymap();
 }
 
-__attribute__((weak))
-void matrix_scan_keymap(void) {}
-
-void matrix_scan_user(void) {
-  matrix_scan_keymap();
-}
-
 __attribute__((weak))
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   return true;
@@ -122,38 +108,3 @@ uint32_t layer_state_set_keymap(uint32_t state) {
 uint32_t layer_state_set_user(uint32_t state) {
   return layer_state_set_keymap(state);
 }
-
-__attribute__((weak))
-void led_set_keymap(uint8_t usb_led) {}
-
-void led_set_user(uint8_t usb_led) {
-  led_set_keymap(usb_led);
-}
-
-__attribute__((weak))
-void suspend_power_down_keymap(void) {}
-
-void suspend_power_down_user(void) {
-  suspend_power_down_keymap();
-}
-
-__attribute__((weak))
-void suspend_wakeup_init_keymap(void) {}
-
-void suspend_wakeup_init_user(void) {
-  suspend_wakeup_init_keymap();
-}
-
-__attribute__((weak))
-void startup_keymap(void) {}
-
-void startup_user(void) {  // Currently not called anywhere
-  startup_keymap();
-}
-
-__attribute__((weak))
-void shutdown_keymap(void) {}
-
-void shutdown_user(void) {
-  shutdown_keymap();
-}
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index db90c4ef6..d4e0e1899 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -71,15 +71,7 @@ enum layers_user {
 
 void keyboard_pre_init_keymap(void);
 void eeconfig_init_keymap(void);
-void matrix_init_keymap(void);
 void keyboard_post_init_keymap(void);
 
-void matrix_scan_keymap(void);
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 uint32_t layer_state_set_keymap(uint32_t state);
-void led_set_keymap(uint8_t usb_led);
-
-void suspend_power_down_keymap(void);
-void suspend_wakeup_init_keymap(void);
-void startup_keymap(void);
-void shutdown_keymap(void);
-- 
cgit v1.2.3-24-g4f1b


From de2e03650bd4d6056513991d4481679e246667bb Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 16 Feb 2019 17:26:39 +0100
Subject: Update GODSPEED_BLUE values and RGB mode keys

---
 users/konstantin/rgb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index a09057d28..b69123be0 100644
--- a/users/konstantin/rgb.c
+++ b/users/konstantin/rgb.c
@@ -1,3 +1,3 @@
 #include "rgb.h"
 
-const hsv_t GODSPEED_BLUE = { .h = 214, .s = 17, .v = 73 };
+const hsv_t GODSPEED_BLUE = { .h = 300, .s = 68, .v = RGBLIGHT_LIMIT_VAL };
-- 
cgit v1.2.3-24-g4f1b


From fbe2eba4729a1d7b00b76243e146b5324d65976b Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 03:16:21 +0100
Subject: Add GODSPEED_YELLOW color

---
 users/konstantin/konstantin.c | 2 +-
 users/konstantin/rgb.c        | 3 ++-
 users/konstantin/rgb.h        | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index a8f2a5f2c..753742fa7 100644
--- a/users/konstantin/konstantin.c
+++ b/users/konstantin/konstantin.c
@@ -61,7 +61,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return false;
 
 #ifdef LAYER_FN
-  static bool fn_lock;
+    static bool fn_lock;
 
   case FN_FNLK:
     if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index b69123be0..37b1ab3d5 100644
--- a/users/konstantin/rgb.c
+++ b/users/konstantin/rgb.c
@@ -1,3 +1,4 @@
 #include "rgb.h"
 
-const hsv_t GODSPEED_BLUE = { .h = 300, .s = 68, .v = RGBLIGHT_LIMIT_VAL };
+const hsv_t GODSPEED_BLUE   = { .h = 300, .s = 68,  .v = RGBLIGHT_LIMIT_VAL };
+const hsv_t GODSPEED_YELLOW = { .h = 35,  .s = 165, .v = RGBLIGHT_LIMIT_VAL };
diff --git a/users/konstantin/rgb.h b/users/konstantin/rgb.h
index e296cf12e..53b5821b0 100644
--- a/users/konstantin/rgb.h
+++ b/users/konstantin/rgb.h
@@ -15,3 +15,4 @@ typedef struct {
 } rgb_t;
 
 extern const hsv_t GODSPEED_BLUE;
+extern const hsv_t GODSPEED_YELLOW;
-- 
cgit v1.2.3-24-g4f1b


From 45dddfa6c27123ec6b598d561d3c3859882ccbad Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 04:34:55 +0100
Subject: Set preferred intervals for rgblight effects

---
 users/konstantin/rgb.c     | 20 ++++++++++++++++++++
 users/konstantin/unicode.c |  6 +++---
 users/konstantin/unicode.h | 20 ++++++++++----------
 3 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index 37b1ab3d5..ed6efe87a 100644
--- a/users/konstantin/rgb.c
+++ b/users/konstantin/rgb.c
@@ -1,4 +1,24 @@
 #include "rgb.h"
 
+#ifdef RGBLIGHT_EFFECT_BREATHING
+const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {20, 30, 5, 10};
+#endif
+
+#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
+const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {20, 50, 100};
+#endif
+
+#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 50, 100};
+#endif
+
+#ifdef RGBLIGHT_EFFECT_SNAKE
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {20, 50, 100};
+#endif
+
+#ifdef RGBLIGHT_EFFECT_KNIGHT
+const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {20, 50, 100};
+#endif
+
 const hsv_t GODSPEED_BLUE   = { .h = 300, .s = 68,  .v = RGBLIGHT_LIMIT_VAL };
 const hsv_t GODSPEED_YELLOW = { .h = 35,  .s = 165, .v = RGBLIGHT_LIMIT_VAL };
diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c
index 44b5be6c9..144c0aaf7 100644
--- a/users/konstantin/unicode.c
+++ b/users/konstantin/unicode.c
@@ -1,7 +1,7 @@
 #include "unicode.h"
 
 #ifdef UNICODEMAP_ENABLE
-  const uint32_t PROGMEM unicode_map[] = {
-    FOREACH_UNICODE(UCM_ENTRY)
-  };
+const uint32_t PROGMEM unicode_map[] = {
+  FOREACH_UNICODE(UCM_ENTRY)
+};
 #endif
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index 6bb908e0e..c8eddabb7 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -18,17 +18,17 @@
 #define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
 
 #if defined(UNICODE_ENABLE)
-  enum unicode_keycodes {
-    FOREACH_UNICODE(UC_KEYCODE)
-  };
+enum unicode_keycodes {
+  FOREACH_UNICODE(UC_KEYCODE)
+};
 #elif defined(UNICODEMAP_ENABLE)
-  enum unicode_names {
-    FOREACH_UNICODE(UCM_NAME)
-  };
+enum unicode_names {
+  FOREACH_UNICODE(UCM_NAME)
+};
 
-  extern const uint32_t PROGMEM unicode_map[];
+extern const uint32_t PROGMEM unicode_map[];
 
-  enum unicode_keycodes {
-    FOREACH_UNICODE(UCM_KEYCODE)
-  };
+enum unicode_keycodes {
+  FOREACH_UNICODE(UCM_KEYCODE)
+};
 #endif
-- 
cgit v1.2.3-24-g4f1b


From 1b3b9414b75e78db14daf61475c54007e8e5e0b9 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 05:26:54 +0100
Subject: Update tap dance function names

---
 users/konstantin/tap_dance.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index dffaeb206..cdf7b731c 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -60,7 +60,7 @@ void td_fn_rctrl_reset(qk_tap_dance_state_t *state, void *user_data) {
   td_fn_rctrl_data.started = false;
 }
 
-void td_lsft_fn_each(qk_tap_dance_state_t *state, void *user_data) {
+void td_lshift_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);
@@ -72,7 +72,7 @@ void td_lsft_fn_each(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-void td_lsft_fn_reset(qk_tap_dance_state_t *state, void *user_data) {
+void td_lshift_fn_reset(qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1 || state->count >= 3) {
     unregister_code(KC_LSFT);
   }
@@ -88,6 +88,6 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [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),
+  [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_lshift_fn_each, NULL, td_lshift_fn_reset),
 };
-- 
cgit v1.2.3-24-g4f1b


From b05a4b1a4be36e00095eac3188b3b748c5fe1362 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 05:41:03 +0100
Subject: Replace td_lshift_fn with generic td_mod_layer, add TD_RCTL_FN

Move TD_FN_RCTL after TD_RCTL_FN
---
 users/konstantin/tap_dance.c | 78 ++++++++++++++++++++++++--------------------
 users/konstantin/tap_dance.h |  6 ++--
 2 files changed, 47 insertions(+), 37 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index cdf7b731c..166bb10a6 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -1,31 +1,59 @@
 #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 }, \
+#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;
+  qk_tap_dance_pair_t *data = (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);
+    register_code(data->kc1);
   } else if (state->count == 2) {
-    unregister_code(mods->kc1);
-    register_code(mods->kc2);
+    unregister_code(data->kc1);
+    register_code(data->kc2);
   }
-  // Prevent tap dance from sending kc1 and kc2 as weak mods
-  state->weak_mods &= ~(MOD_BIT(mods->kc1) | MOD_BIT(mods->kc2));
+  // Prevent tap dance from sending the mods as weak mods
+  state->weak_mods &= ~(MOD_BIT(data->kc1) | MOD_BIT(data->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;
+  qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
   if (state->count == 1 || state->count >= 3) {
-    unregister_code(mods->kc1);
+    unregister_code(data->kc1);
   }
   if (state->count >= 2) {
-    unregister_code(mods->kc2);
+    unregister_code(data->kc2);
+  }
+}
+
+#define ACTION_TAP_DANCE_MOD_LAYER(mod, layer) {                  \
+    .fn        = { td_mod_layer_each, NULL, td_mod_layer_reset }, \
+    .user_data = &(qk_tap_dance_dual_role_t){ mod, layer },       \
+  }
+
+void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+  // Single tap → mod, double tap → layer, triple tap etc. → mod+layer
+  if (state->count == 1 || state->count == 3) {
+    register_code(data->kc);
+  } else if (state->count == 2) {
+    unregister_code(data->kc);
+    // Prevent tap dance from sending the mod as a weak mod
+    state->weak_mods &= ~MOD_BIT(data->kc);
+    layer_on(data->layer);
+  }
+}
+
+void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+  if (state->count == 1 || state->count >= 3) {
+    unregister_code(data->kc);
+  }
+  if (state->count >= 2) {
+    layer_off(data->layer);
   }
 }
 
@@ -60,27 +88,6 @@ void td_fn_rctrl_reset(qk_tap_dance_state_t *state, void *user_data) {
   td_fn_rctrl_data.started = false;
 }
 
-void td_lshift_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_lshift_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_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_REM),
 
@@ -88,6 +95,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [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_lshift_fn_each, NULL, td_lshift_fn_reset),
+  [TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
+  [TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
+  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset),
 };
diff --git a/users/konstantin/tap_dance.h b/users/konstantin/tap_dance.h
index 1757e9b11..ad7c04cb7 100644
--- a/users/konstantin/tap_dance.h
+++ b/users/konstantin/tap_dance.h
@@ -8,8 +8,9 @@
 #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)
+#define RCTL_FN TD(TD_RCTL_FN)
+#define FN_RCTL TD(TD_FN_RCTL)
 
 enum tap_dance {
   TD_DST_A_R,
@@ -18,6 +19,7 @@ enum tap_dance {
   TD_RAL_RGU,
   TD_RCT_RSF,
 
-  TD_FN_RCTL,
   TD_LSFT_FN,
+  TD_RCTL_FN,
+  TD_FN_RCTL,
 };
-- 
cgit v1.2.3-24-g4f1b


From 14908f86fb97bb7ddc269515a48e681799baccf3 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 06:00:05 +0100
Subject: Replace td_fn_rctrl with generic td_layer_mod

---
 users/konstantin/tap_dance.c | 47 ++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index 166bb10a6..377a0889f 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -57,35 +57,44 @@ void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-struct {
-  bool fn_on;  // Layer state when tap dance started
-  bool started;
-} td_fn_rctrl_data;
+#define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) {                  \
+    .fn        = { td_layer_mod_each, NULL, td_layer_mod_reset }, \
+    .user_data = &(qk_tap_dance_layer_mod_t){ layer, mod },       \
+  }
+
+typedef struct {
+  uint8_t  layer;
+  uint16_t kc;
+  bool     layer_on;  // Layer state when tap dance started
+  bool     started;
+} qk_tap_dance_layer_mod_t;
 
-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;
+void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
+  if (!data->started) {
+    data->layer_on = IS_LAYER_ON(data->layer);
+    data->started = true;
   }
-  // Single tap → Fn, double tap → RCtrl, triple tap etc. → Fn+RCtrl
+  // Single tap → layer, double tap → mod, triple tap etc. → layer+mod
   if (state->count == 1 || state->count == 3) {
-    layer_on(L_FN);
+    layer_on(data->layer);
   } else if (state->count == 2) {
-    if (!td_fn_rctrl_data.fn_on) {
-      layer_off(L_FN);
+    if (!data->layer_on) {
+      layer_off(data->layer);
     }
-    register_code(KC_RCTL);
+    register_code(data->kc);
   }
 }
 
-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);
+void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
+  qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
+  if ((state->count == 1 || state->count >= 3) && !data->layer_on) {
+    layer_off(data->layer);
   }
   if (state->count >= 2) {
-    unregister_code(KC_RCTL);
+    unregister_code(data->kc);
   }
-  td_fn_rctrl_data.started = false;
+  data->started = false;
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
@@ -97,5 +106,5 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
   [TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
   [TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
-  [TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset),
+  [TD_FN_RCTL] = ACTION_TAP_DANCE_LAYER_MOD(L_FN, KC_RCTL),
 };
-- 
cgit v1.2.3-24-g4f1b


From 6a088f7ff6b6e001fdac46252d75863b7611fd0d Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 06:08:52 +0100
Subject: Add blank lines, prefer explicit initialization

---
 users/konstantin/tap_dance.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index 377a0889f..c01b29bd5 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -8,6 +8,7 @@
 
 void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_pair_t *data = (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(data->kc1);
@@ -21,6 +22,7 @@ void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
 
 void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
+
   if (state->count == 1 || state->count >= 3) {
     unregister_code(data->kc1);
   }
@@ -36,6 +38,7 @@ void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+
   // Single tap → mod, double tap → layer, triple tap etc. → mod+layer
   if (state->count == 1 || state->count == 3) {
     register_code(data->kc);
@@ -49,6 +52,7 @@ void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) {
 
 void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+
   if (state->count == 1 || state->count >= 3) {
     unregister_code(data->kc);
   }
@@ -59,7 +63,7 @@ void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
 
 #define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) {                  \
     .fn        = { td_layer_mod_each, NULL, td_layer_mod_reset }, \
-    .user_data = &(qk_tap_dance_layer_mod_t){ layer, mod },       \
+    .user_data = &(qk_tap_dance_layer_mod_t){ layer, mod, 0, 0 }, \
   }
 
 typedef struct {
@@ -75,6 +79,7 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
     data->layer_on = IS_LAYER_ON(data->layer);
     data->started = true;
   }
+
   // Single tap → layer, double tap → mod, triple tap etc. → layer+mod
   if (state->count == 1 || state->count == 3) {
     layer_on(data->layer);
@@ -88,12 +93,14 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
 
 void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
+
   if ((state->count == 1 || state->count >= 3) && !data->layer_on) {
     layer_off(data->layer);
   }
   if (state->count >= 2) {
     unregister_code(data->kc);
   }
+
   data->started = false;
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 9baee84b36fbb9c506e593a2a9bca851ed67b8e8 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 12:11:37 +0100
Subject: ACTION_TAP_DANCE_DOUBLE_MODS → ACTION_TAP_DANCE_DOUBLE_MOD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/konstantin/tap_dance.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index c01b29bd5..0b405939b 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -1,12 +1,12 @@
 #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 },                \
+#define ACTION_TAP_DANCE_DOUBLE_MOD(mod1, mod2) {                   \
+    .fn        = { td_double_mod_each, NULL, td_double_mod_reset }, \
+    .user_data = &(qk_tap_dance_pair_t){ mod1, mod2 },              \
   }
 
-void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
+void td_double_mod_each(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
 
   // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2
@@ -20,7 +20,7 @@ void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
   state->weak_mods &= ~(MOD_BIT(data->kc1) | MOD_BIT(data->kc2));
 }
 
-void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
+void td_double_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
   qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
 
   if (state->count == 1 || state->count >= 3) {
@@ -107,9 +107,9 @@ void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
 qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_REM),
 
-  [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_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_LALT),
+  [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_RGUI),
+  [TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RCTL, KC_RSFT),
 
   [TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
   [TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
-- 
cgit v1.2.3-24-g4f1b


From f9c070e1a492b60f1c475302e82b17d9bcfc298c Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Tue, 19 Feb 2019 15:20:11 +0100
Subject: Update Godspeed colors

---
 users/konstantin/rgb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index ed6efe87a..0f0c73c49 100644
--- a/users/konstantin/rgb.c
+++ b/users/konstantin/rgb.c
@@ -20,5 +20,5 @@ const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {20, 50, 100};
 const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {20, 50, 100};
 #endif
 
-const hsv_t GODSPEED_BLUE   = { .h = 300, .s = 68,  .v = RGBLIGHT_LIMIT_VAL };
-const hsv_t GODSPEED_YELLOW = { .h = 35,  .s = 165, .v = RGBLIGHT_LIMIT_VAL };
+const hsv_t GODSPEED_BLUE   = { .h = 280, .s = 68,  .v = RGBLIGHT_LIMIT_VAL };
+const hsv_t GODSPEED_YELLOW = { .h = 38,  .s = 153, .v = RGBLIGHT_LIMIT_VAL };
-- 
cgit v1.2.3-24-g4f1b


From be1d5c66093faa8885855a2d133ef20a408233bd Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 23 Feb 2019 00:47:42 +0100
Subject: Add SysRq, Break combos and other keys to Melody96 keymap

---
 users/konstantin/konstantin.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'users')

diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index d4e0e1899..0639b93a6 100644
--- a/users/konstantin/konstantin.h
+++ b/users/konstantin/konstantin.h
@@ -17,6 +17,10 @@
   #define FN_FNLK TT(L_FN)
 #endif
 
+#define KC_SYSR LALT(KC_PSCR)
+#undef  KC_BRK
+#define KC_BRK  LCTL(KC_PAUS)
+
 #define MV_UP   LCTL(KC_UP)
 #define MV_DOWN LCTL(KC_DOWN)
 #define MV_LEFT LCTL(KC_LEFT)
-- 
cgit v1.2.3-24-g4f1b