DO NOT USE Merge branch 'master' into debounce_refactor

Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
#	quantum/matrix.c

1 files changed, 50 insertions, 0 deletions

diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
new file mode 100644
index 000000000..06081496b
--- /dev/null
+++ b/users/konstantin/konstantin.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "quantum.h"
+#ifdef TAP_DANCE_ENABLE
+  #include "tap_dance.h"
+#endif
+#ifdef UNICODE_ENABLE
+  #include "unicode.h"
+#endif
+
+#ifdef LAYER_FN
+  #define FN      MO(L_FN)
+  #define FN_CAPS LT(L_FN, KC_CAPS)
+  #define FN_FNLK TT(L_FN)
+#endif
+
+#define MV_UP   LCTL(KC_UP)
+#define MV_DOWN LCTL(KC_DOWN)
+#define MV_LEFT LCTL(KC_LEFT)
+#define MV_RGHT LCTL(KC_RGHT)
+#define TOP     LCTL(KC_HOME)
+#define BOTTOM  LCTL(KC_END)
+#define PRV_TAB LCTL(KC_PGUP)
+#define NXT_TAB LCTL(KC_PGDN)
+
+#define LCT_CPS LCTL_T(KC_CAPS)
+
+enum keycodes_user {
+  CLEAR = SAFE_RANGE,
+#ifdef LAYER_NUMPAD
+  NUMPAD,
+#endif
+
+  RANGE_KEYMAP,
+};
+
+enum layers_user {
+  L_BASE,
+#ifdef LAYER_FN
+  L_FN,
+#endif
+#ifdef LAYER_NUMPAD
+  L_NUMPAD,
+#endif
+
+  L_RANGE_KEYMAP,
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
+uint32_t layer_state_set_keymap(uint32_t state);