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

---
 keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c | 8 ++++----
 keyboards/whitefox/keymaps/konstantin/keymap.c      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index fa324be9a1..707515abb4 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
    * │        │Mut│VoD│VoU│Ply│Prv│Nxt│MW←│MW→│M4 │M5 │      │   │
    * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
-   *       │   │     │            MW↓            │MAcl2│   │
+   *       │DPR│DstNA│            MW↓            │MAcl2│   │
    *       └───┴─────┴───────────────────────────┴─────┴───┘
    */
   [L_FN] = LAYOUT(
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, KC_DEL,
     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, _______,
     _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_WH_L, KC_WH_R, KC_BTN4, KC_BTN5, _______, _______,
-    XXXXXXX, _______, _______,                   KC_WH_D,                   KC_ACL2, _______, XXXXXXX
+    XXXXXXX, DST_P_R, DST_N_A,                   KC_WH_D,                   KC_ACL2, _______, XXXXXXX
   ),
 
   /* RCtrl layer
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
    * │        │   │   │   │   │   │   │   │   │   │   │      │   │
    * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
-   *       │Dst│Dstp←│                           │Dstp→│   │
+   *       │DtR│DstA │                           │     │   │
    *       └───┴─────┴───────────────────────────┴─────┴───┘
    */
   [L_RCTRL] = LAYOUT(
@@ -87,6 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, TOP,     MV_UP,   BOTTOM,  PRV_TAB, _______, _______, _______, _______, _______, _______, _______, _______, CLEAR,
     _______, MV_LEFT, MV_DOWN, MV_RGHT, NXT_TAB, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    XXXXXXX, DESKTOP, DSKTP_L,                   _______,                   DSKTP_R, _______, XXXXXXX
+    XXXXXXX, DST_RMV, DST_ADD,                   _______,                   _______, _______, XXXXXXX
   ),
 };
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c
index e37097361a..a56d0a43e4 100644
--- a/keyboards/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/whitefox/keymaps/konstantin/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
    * │        │MA0│MA2│MW←│MW→│   │   │   │VoD│VoU│Mut│ App  │PgU│Btm│
    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-   * │    │Dstp│Dst←│          MW↓           │Dst→│    │ │Hom│PgD│End│
+   * │    │DtPR│DtNA│          MW↓           │    │    │ │Hom│PgD│End│
    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
    */
   [L_FN] = LAYOUT_truefox( \
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, 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, DSKTP_L,                            KC_WH_D,                   DSKTP_R, _______,                   KC_HOME, KC_PGDN, KC_END   \
+    _______, DST_P_R, DST_N_A,                            KC_WH_D,                   _______, _______,                   KC_HOME, KC_PGDN, KC_END   \
   ),
 
   /* Numpad layer
-- 
cgit v1.2.3


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

---
 keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c | 2 +-
 users/konstantin/konstantin.c                       | 2 +-
 users/konstantin/konstantin.h                       | 2 +-
 users/konstantin/tap_dance.c                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index 707515abb4..b1e8bf0581 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -87,6 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, TOP,     MV_UP,   BOTTOM,  PRV_TAB, _______, _______, _______, _______, _______, _______, _______, _______, CLEAR,
     _______, MV_LEFT, MV_DOWN, MV_RGHT, NXT_TAB, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    XXXXXXX, DST_RMV, DST_ADD,                   _______,                   _______, _______, XXXXXXX
+    XXXXXXX, DST_REM, DST_ADD,                   _______,                   _______, _______, XXXXXXX
   ),
 };
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index 5861574cba..686ff32ecc 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 a649e4f79d..48bd26cd59 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 e3f1729467..81f2d42e1f 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


From db1ace5426ab08842cec23e0da190ab222de6088 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Fri, 11 Jan 2019 07:55:47 +0100
Subject: Add melody96:konstantin keymap

---
 keyboards/melody96/keymaps/konstantin/config.h |  3 ++
 keyboards/melody96/keymaps/konstantin/keymap.c | 52 ++++++++++++++++++++++++++
 keyboards/melody96/keymaps/konstantin/rules.mk |  1 +
 3 files changed, 56 insertions(+)
 create mode 100644 keyboards/melody96/keymaps/konstantin/config.h
 create mode 100644 keyboards/melody96/keymaps/konstantin/keymap.c
 create mode 100644 keyboards/melody96/keymaps/konstantin/rules.mk

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/config.h b/keyboards/melody96/keymaps/konstantin/config.h
new file mode 100644
index 0000000000..4b511eb848
--- /dev/null
+++ b/keyboards/melody96/keymaps/konstantin/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define LAYER_FN
diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
new file mode 100644
index 0000000000..df93cd702b
--- /dev/null
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -0,0 +1,52 @@
+#include QMK_KEYBOARD_H
+#include "konstantin.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+   * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Ins│Hom│End│PgU│PgD│
+   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+   * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │Del│NLk│P/ │P* │P- │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
+   * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │P7 │P8 │P9 │   │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤P+ │
+   * │FnCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │P4 │P5 │P6 │   │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
+   * │LSft│RAG│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RShift│ ↑ │P1 │P2 │P3 │   │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤PEn│
+   * │LCtl│LGui│LAlt│         Space          │RAlGu│RCtrl│ ← │ ↓ │ → │P0 │P. │   │
+   * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
+   */
+  [L_BASE] = LAYOUT( \
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+    KC_GRV,  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_DEL,  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_P7,   KC_P8,   KC_P9,   XXXXXXX,
+    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_LSFT, RAL_RGU, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   XXXXXXX,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             RAL_RGU, XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+  ),
+
+  /* Function layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+   * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+   * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+   * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
+   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │   │   │   │   │   │   │Clear│   │   │   │   │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
+   * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │   │   │   │   │
+   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
+   * │    │   │MA0│MA2│MW←│MW→│   │   │   │VoD│VoU│Mut│      │PgU│   │   │   │   │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤   │
+   * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│   │   │   │
+   * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
+   */
+  [L_FN] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, CLEAR,            _______, _______, _______, XXXXXXX,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+    _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, _______, _______, _______, XXXXXXX,
+    _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  _______, _______, _______
+  ),
+};
diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/melody96/keymaps/konstantin/rules.mk
new file mode 100644
index 0000000000..7b30c0beff
--- /dev/null
+++ b/keyboards/melody96/keymaps/konstantin/rules.mk
@@ -0,0 +1 @@
+BACKLIGHT_ENABLE = no
-- 
cgit v1.2.3


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

---
 keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk | 9 +++++++++
 keyboards/melody96/keymaps/konstantin/rules.mk      | 9 +++++++++
 keyboards/whitefox/keymaps/konstantin/rules.mk      | 9 +++++++++
 users/konstantin/rules.mk                           | 9 ---------
 4 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
index a45a631dc0..38ccda621a 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
@@ -1,2 +1,11 @@
+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
+
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE  = no
diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/melody96/keymaps/konstantin/rules.mk
index 7b30c0beff..c1d4c9a037 100644
--- a/keyboards/melody96/keymaps/konstantin/rules.mk
+++ b/keyboards/melody96/keymaps/konstantin/rules.mk
@@ -1 +1,10 @@
+BOOTMAGIC_ENABLE = no
+COMMAND_ENABLE   = yes
+CONSOLE_ENABLE   = no
+EXTRAKEY_ENABLE  = yes
+MOUSEKEY_ENABLE  = yes
+NKRO_ENABLE      = yes
+TAP_DANCE_ENABLE = yes
+UNICODE_ENABLE   = yes
+
 BACKLIGHT_ENABLE = no
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk
index 1302f14ca8..14a29380ce 100644
--- a/keyboards/whitefox/keymaps/konstantin/rules.mk
+++ b/keyboards/whitefox/keymaps/konstantin/rules.mk
@@ -1,2 +1,11 @@
+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
+
 BACKLIGHT_ENABLE  = no
 VISUALIZER_ENABLE = no
diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
index d2522b9523..4af256e1eb 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


From ea23035c53162ee88ca02533d49cb931fdce3bb2 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 11 Feb 2019 22:03:14 +0100
Subject: Use "Vo-", "Vo+" instead of "VoD", "VoU" in keymap comments

---
 keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c | 2 +-
 keyboards/melody96/keymaps/konstantin/keymap.c      | 2 +-
 keyboards/whitefox/keymaps/konstantin/keymap.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
index b1e8bf0581..3404cc4e49 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
    * │      │ ← │ ↓ │ → │PgD│   │   │   │MW↑│M← │M↓ │M→ │        │
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
-   * │        │Mut│VoD│VoU│Ply│Prv│Nxt│MW←│MW→│M4 │M5 │      │   │
+   * │        │Mut│Vo-│Vo+│Ply│Prv│Nxt│MW←│MW→│M4 │M5 │      │   │
    * └─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┘
    *       │DPR│DstNA│            MW↓            │MAcl2│   │
    *       └───┴─────┴───────────────────────────┴─────┴───┘
diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index df93cd702b..2f05e288b0 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
    * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │   │   │   │   │
    * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
-   * │    │   │MA0│MA2│MW←│MW→│   │   │   │VoD│VoU│Mut│      │PgU│   │   │   │   │
+   * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│   │   │   │   │
    * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤   │
    * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│   │   │   │
    * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c
index a56d0a43e4..494300f2d6 100644
--- a/keyboards/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/whitefox/keymaps/konstantin/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
    * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │Top│
    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-   * │        │MA0│MA2│MW←│MW→│   │   │   │VoD│VoU│Mut│ App  │PgU│Btm│
+   * │        │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│ App  │PgU│Btm│
    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
    * │    │DtPR│DtNA│          MW↓           │    │    │ │Hom│PgD│End│
    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-- 
cgit v1.2.3


From d163b22dfbb4a9092e3b7fc2b18a679e03080a58 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 11 Feb 2019 22:04:59 +0100
Subject: Add RGB controls and numpad Unicode to Melody96 keymap

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index 2f05e288b0..11b687b55e 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -30,23 +30,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
    * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+   * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │RTg│ ÷ │ × │ − │
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
-   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │   │   │   │   │   │   │Clear│   │   │   │   │
+   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │   │   │   │   │   │   │Clear│RH+│RS+│RV+│   │
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
-   * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │   │   │   │   │
+   * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │RH-│RS-│RV-│   │
    * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
-   * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│   │   │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤   │
-   * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│   │   │   │
+   * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│RMB│RMK│RMG│   │
+   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤RMP│
+   * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│RMR│RMF│   │
    * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
    */
   [L_FN] = LAYOUT( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, CLEAR,            _______, _______, _______, XXXXXXX,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, _______, _______, _______, XXXXXXX,
-    _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  _______, _______, _______
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, DIVIDE,  TIMES,   MINUS,
+    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, _______,
+    _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_B, RGB_M_K, RGB_M_G, XXXXXXX,
+    _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  RGB_RMOD,RGB_MOD, RGB_M_P
   ),
 };
-- 
cgit v1.2.3


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

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 23 +++++++++++++++++++----
 users/konstantin/konstantin.h                  |  3 +++
 users/konstantin/rgb.c                         |  3 +++
 users/konstantin/rgb.h                         | 17 +++++++++++++++++
 users/konstantin/rules.mk                      |  3 +++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 users/konstantin/rgb.c
 create mode 100644 users/konstantin/rgb.h

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index 11b687b55e..4df856f8fb 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -1,6 +1,21 @@
 #include QMK_KEYBOARD_H
 #include "konstantin.h"
 
+enum keycodes_keymap {
+  RGB_SET = RANGE_KEYMAP,
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+  case RGB_SET:
+    rgblight_sethsv(GODSPEED_BLUE.h, GODSPEED_BLUE.s, GODSPEED_BLUE.v);
+    return false;
+
+  default:
+    return true;
+  }
+}
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Base layer
    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -32,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │RTg│ ÷ │ × │ − │
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
-   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │   │   │   │   │   │   │Clear│RH+│RS+│RV+│   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
+   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │UCM│   │   │   │   │   │Clear│RH+│RS+│RV+│   │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤RSt│
    * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │RH-│RS-│RV-│   │
    * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
    * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│RMB│RMK│RMG│   │
@@ -44,8 +59,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [L_FN] = LAYOUT( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, DIVIDE,  TIMES,   MINUS,
-    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, _______, _______, _______, _______, _______, _______, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
-    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, _______,
+    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, _______, _______, _______, _______, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
     _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_B, RGB_M_K, RGB_M_G, XXXXXXX,
     _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  RGB_RMOD,RGB_MOD, RGB_M_P
   ),
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index 989854c2e6..d8b00c4c89 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 0000000000..a09057d282
--- /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 0000000000..2ea10c67a7
--- /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 4af256e1eb..8913e57558 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


From 5a41c06cd7dcf04f5a27ac9b2fa95399c65367d6 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Mon, 18 Feb 2019 05:01:24 +0100
Subject: Switch to UNICODEMAP in keyboard rules

---
 keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk | 16 ++++++++--------
 keyboards/melody96/keymaps/konstantin/rules.mk      | 16 ++++++++--------
 keyboards/whitefox/keymaps/konstantin/rules.mk      | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
index 38ccda621a..4e485bf766 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
+++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/rules.mk
@@ -1,11 +1,11 @@
-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
+BOOTMAGIC_ENABLE  = no
+COMMAND_ENABLE    = yes
+CONSOLE_ENABLE    = yes
+EXTRAKEY_ENABLE   = yes
+MOUSEKEY_ENABLE   = yes
+NKRO_ENABLE       = yes
+TAP_DANCE_ENABLE  = yes
+UNICODEMAP_ENABLE = yes
 
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE  = no
diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/melody96/keymaps/konstantin/rules.mk
index c1d4c9a037..47a859d089 100644
--- a/keyboards/melody96/keymaps/konstantin/rules.mk
+++ b/keyboards/melody96/keymaps/konstantin/rules.mk
@@ -1,10 +1,10 @@
-BOOTMAGIC_ENABLE = no
-COMMAND_ENABLE   = yes
-CONSOLE_ENABLE   = no
-EXTRAKEY_ENABLE  = yes
-MOUSEKEY_ENABLE  = yes
-NKRO_ENABLE      = yes
-TAP_DANCE_ENABLE = yes
-UNICODE_ENABLE   = yes
+BOOTMAGIC_ENABLE  = no
+COMMAND_ENABLE    = yes
+CONSOLE_ENABLE    = no
+EXTRAKEY_ENABLE   = yes
+MOUSEKEY_ENABLE   = yes
+NKRO_ENABLE       = yes
+TAP_DANCE_ENABLE  = yes
+UNICODEMAP_ENABLE = yes
 
 BACKLIGHT_ENABLE = no
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/whitefox/keymaps/konstantin/rules.mk
index 14a29380ce..625ef346c8 100644
--- a/keyboards/whitefox/keymaps/konstantin/rules.mk
+++ b/keyboards/whitefox/keymaps/konstantin/rules.mk
@@ -1,11 +1,11 @@
-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
+BOOTMAGIC_ENABLE  = no
+COMMAND_ENABLE    = yes
+CONSOLE_ENABLE    = yes
+EXTRAKEY_ENABLE   = yes
+MOUSEKEY_ENABLE   = yes
+NKRO_ENABLE       = yes
+TAP_DANCE_ENABLE  = yes
+UNICODEMAP_ENABLE = yes
 
 BACKLIGHT_ENABLE  = no
 VISUALIZER_ENABLE = no
-- 
cgit v1.2.3


From 8e0dfdfb5307e8b0abb2f6030c9147cfd12964c8 Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Sat, 16 Feb 2019 18:26:27 +0100
Subject: Set Melody96 underglow color to Godspeed blue on EEPROM reset

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index 4df856f8fb..ab876f2f2f 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -1,6 +1,10 @@
 #include QMK_KEYBOARD_H
 #include "konstantin.h"
 
+void eeconfig_init_keymap(void) {
+  rgblight_sethsv(GODSPEED_BLUE.h, GODSPEED_BLUE.s, GODSPEED_BLUE.v);
+}
+
 enum keycodes_keymap {
   RGB_SET = RANGE_KEYMAP,
 };
-- 
cgit v1.2.3


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

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 6 +++---
 users/konstantin/rgb.c                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index ab876f2f2f..02d84d693a 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -55,9 +55,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤RSt│
    * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │RH-│RS-│RV-│   │
    * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
-   * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│RMB│RMK│RMG│   │
+   * │    │   │MA0│MA2│MW←│MW→│   │   │   │Vo-│Vo+│Mut│      │PgU│RMR│RMS│RMB│   │
    * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┤RMP│
-   * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│RMR│RMF│   │
+   * │    │DtPR│DtNA│          MW↓           │     │ App │Hom│PgD│End│RM-│RM+│   │
    * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
    */
   [L_FN] = LAYOUT( \
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, DIVIDE,  TIMES,   MINUS,
     KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, _______, _______, _______, _______, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
-    _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_B, RGB_M_K, RGB_M_G, XXXXXXX,
+    _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_R, RGB_M_SN,RGB_M_B, XXXXXXX,
     _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  RGB_RMOD,RGB_MOD, RGB_M_P
   ),
 };
diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index a09057d282..b69123be05 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


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

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 11 +++++++++--
 users/konstantin/konstantin.c                  |  2 +-
 users/konstantin/rgb.c                         |  3 ++-
 users/konstantin/rgb.h                         |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index 02d84d693a..c8b6edb3d6 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -1,8 +1,12 @@
 #include QMK_KEYBOARD_H
 #include "konstantin.h"
 
+static const hsv_t *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW };
+static size_t cnum = sizeof colors / sizeof *colors;
+static size_t cidx;
+
 void eeconfig_init_keymap(void) {
-  rgblight_sethsv(GODSPEED_BLUE.h, GODSPEED_BLUE.s, GODSPEED_BLUE.v);
+  rgblight_sethsv(colors[cidx]->h, colors[cidx]->s, colors[cidx]->v);
 }
 
 enum keycodes_keymap {
@@ -12,7 +16,10 @@ enum keycodes_keymap {
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case RGB_SET:
-    rgblight_sethsv(GODSPEED_BLUE.h, GODSPEED_BLUE.s, GODSPEED_BLUE.v);
+    if (record->event.pressed) {
+      cidx = (cidx + 1) % cnum;
+      rgblight_sethsv(colors[cidx]->h, colors[cidx]->s, colors[cidx]->v);
+    }
     return false;
 
   default:
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c
index a8f2a5f2c9..753742fa78 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 b69123be05..37b1ab3d57 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 e296cf12e7..53b5821b0e 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


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

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 2 +-
 users/konstantin/tap_dance.c                   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index c8b6edb3d6..de1b67e98b 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -3,7 +3,7 @@
 
 static const hsv_t *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW };
 static size_t cnum = sizeof colors / sizeof *colors;
-static size_t cidx;
+static size_t cidx = 0;
 
 void eeconfig_init_keymap(void) {
   rgblight_sethsv(colors[cidx]->h, colors[cidx]->s, colors[cidx]->v);
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index 377a0889fe..c01b29bd53 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


From 51182a4f03f2d0c6eef6a0bdd87529c7626e8eab Mon Sep 17 00:00:00 2001
From: Konstantin Đorđević <vomindoraan@gmail.com>
Date: Wed, 20 Feb 2019 00:28:34 +0100
Subject: Add media controls to Melody96 keymap

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index de1b67e98b..46dbc9ae7c 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │RTg│ ÷ │ × │ − │
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
-   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │UCM│   │   │   │   │   │Clear│RH+│RS+│RV+│   │
+   * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │UCM│   │Stp│Ply│Prv│Nxt│Clear│RH+│RS+│RV+│   │
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤RSt│
    * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │        │RH-│RS-│RV-│   │
    * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [L_FN] = LAYOUT( \
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, DIVIDE,  TIMES,   MINUS,
-    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, _______, _______, _______, _______, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
+    KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
     _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,          KC_PGUP, RGB_M_R, RGB_M_SN,RGB_M_B, XXXXXXX,
     _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, XXXXXXX, KC_APP,  KC_HOME, KC_PGDN, KC_END,  RGB_RMOD,RGB_MOD, RGB_M_P
-- 
cgit v1.2.3


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

---
 keyboards/melody96/keymaps/konstantin/keymap.c | 4 ++--
 keyboards/whitefox/keymaps/konstantin/keymap.c | 2 +-
 users/konstantin/konstantin.h                  | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/melody96/keymaps/konstantin/keymap.c
index 46dbc9ae7c..1150e5dc79 100644
--- a/keyboards/melody96/keymaps/konstantin/keymap.c
+++ b/keyboards/melody96/keymaps/konstantin/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Function layer
    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+   * │   │   │   │   │   │   │   │   │   │   │   │   │   │Sys│SLk│Pau│Brk│Top│Btm│
    * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │RTg│ ÷ │ × │ − │
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘
    */
   [L_FN] = LAYOUT( \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SYSR, KC_SLCK, KC_PAUS, KC_BRK,  TOP,     BOTTOM,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, DIVIDE,  TIMES,   MINUS,
     KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,            RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_HUD, RGB_SAD, RGB_VAD, RGB_SET,
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/whitefox/keymaps/konstantin/keymap.c
index 494300f2d6..dddfb274e7 100644
--- a/keyboards/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/whitefox/keymaps/konstantin/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* 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│SLk│Pau│
    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
    * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │UCM│   │Stp│Ply│Prv│Nxt│Clear│Ins│
    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
index d4e0e18991..0639b93a6d 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