From 6f386ca6ae82be9212700dbfeb73517d077bef5a Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević Date: Mon, 28 Jan 2019 09:04:47 +0100 Subject: Change how desktop commands work --- users/konstantin/konstantin.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'users/konstantin/konstantin.h') 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 -- cgit v1.2.3-24-g4f1b From 6695c874fb8660989a129691bbffc6225be67362 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević Date: Mon, 28 Jan 2019 09:05:35 +0100 Subject: Add DST_MOD_MASK as a config option --- users/konstantin/konstantin.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'users/konstantin/konstantin.h') 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ć 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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/konstantin/konstantin.h') 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 -- cgit v1.2.3-24-g4f1b From 012c5ef9bdccc8d752481c3c1d35a0ef47b075c2 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević 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/konstantin/konstantin.h') 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 2f07627a5dd38ab1370804f4feb1972250928803 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević 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 +++ 1 file changed, 3 insertions(+) (limited to 'users/konstantin/konstantin.h') 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 -- cgit v1.2.3-24-g4f1b From ddb0f39ebf317c7a23c69ed45efb1882746a01b0 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević Date: Mon, 11 Feb 2019 23:21:41 +0100 Subject: Generate UNICODE and UNICODEMAP constants using macros --- users/konstantin/konstantin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/konstantin/konstantin.h') 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 -- cgit v1.2.3-24-g4f1b From be65a0cc7921a0f6a6397bd7682720b5bd7d9128 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević 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.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'users/konstantin/konstantin.h') 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 f09a237a07f2a3a341f6c6972d2f87eec3235254 Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević 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.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'users/konstantin/konstantin.h') 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 be1d5c66093faa8885855a2d133ef20a408233bd Mon Sep 17 00:00:00 2001 From: Konstantin Đorđević 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/konstantin/konstantin.h') 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