1
0
Fork 0

[Keymap] Update personal userspace and keymaps (now with 4 spaces!) (#5774)

* Add FnLk to Melody96 bottom row

* Update conditional in userspace makefile

Thanks @drashna

* Add F keys to Melody96 Fn layer

* Add FN_ESC alias to userspace

* Update KBD6X keymap

* Fix RGB_MATRIX_ENABLE constant name in #if

* Remove trailing \ from LAYOUT macro calls

* Set RGB mode on EEPROM reset in KBD6X

* Swap right and middle mouse buttons in KBD6X

* Rearrange RGB controls in KBD6X

* Update keycode aliases, replace CLEAR with DEL_NXT in KBD6X

Add Clear to KBD6X as RCtrl+`

* Convert code to 4 space indents

* Tweak RCTRL layer functionality

* Replace NUMPAD custom keycode with layer state logic

* Update RGB_MATRIX_ENABLE check

Co-Authored-By: vomindoraan <vomindoraan@gmail.com>
This commit is contained in:
Konstantin Đorđević 2019-05-06 17:41:45 +02:00 committed by Drashna Jaelre
parent 8a9c90ad78
commit cb1935aaff
12 changed files with 414 additions and 411 deletions

View file

@ -1,20 +1,25 @@
#pragma once
#include "quantum.h"
#if defined(RGBLIGHT_ENABLE) || defined(RGBMATRIX_ENABLE)
#include "rgb.h"
#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
#include "rgb.h"
#endif
#ifdef TAP_DANCE_ENABLE
#include "tap_dance.h"
#include "tap_dance.h"
#endif
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE)
#include "unicode.h"
#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)
#define FN MO(L_FN)
#define FN_CAPS LT(L_FN, KC_CAPS)
#define FN_ESC LT(L_FN, KC_ESC)
#define FN_FNLK TT(L_FN)
#endif
#ifdef LAYER_NUMPAD
#define NUMPAD TG(L_NUMPAD)
#endif
#define KC_SYSR LALT(KC_PSCR)
@ -27,50 +32,49 @@
#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 TAB_PRV LCTL(KC_PGUP)
#define TAB_NXT LCTL(KC_PGDN)
#define DEL_PRV LCTL(KC_BSPC)
#define DEL_NXT LCTL(KC_DEL)
#define DST_ADD LCTL(LGUI(KC_D))
#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
#define DST_MOD_MASK MOD_MASK_CTRL
#define DST_MOD_MASK MOD_MASK_SHIFT
#endif
#define LCT_CPS LCTL_T(KC_CAPS)
#ifdef SEND_STRING_CLEAN
#undef SEND_STRING
#define SEND_STRING(string) { \
uint8_t ss_mods = get_mods(); \
clear_mods(); \
send_string_P(PSTR(string)); \
set_mods(ss_mods); \
}
#undef SEND_STRING
#define SEND_STRING(string) { \
uint8_t ss_mods = get_mods(); \
clear_mods(); \
send_string_P(PSTR(string)); \
set_mods(ss_mods); \
}
#endif
enum keycodes_user {
CLEAR = SAFE_RANGE,
DST_P_R,
DST_N_A,
#ifdef LAYER_NUMPAD
NUMPAD,
#endif
CLEAR = SAFE_RANGE,
DST_P_R,
DST_N_A,
RANGE_KEYMAP,
RANGE_KEYMAP,
};
enum layers_user {
L_BASE,
L_BASE,
#ifdef LAYER_FN
L_FN,
L_FN,
#endif
#ifdef LAYER_NUMPAD
L_NUMPAD,
L_NUMPAD,
#endif
L_RANGE_KEYMAP,
L_RANGE_KEYMAP,
};
void keyboard_pre_init_keymap(void);