diff options
author | Drashna Jaelre <drashna@live.com> | 2018-01-01 14:21:01 -0800 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-01-01 17:21:01 -0500 |
commit | 17200f47123b839ee0a5e4f2dfd33a00dff09e90 (patch) | |
tree | 46a6be6e61361e1f548daa1ce6cb461f5c291fee /users/drashna/drashna.h | |
parent | eb903c7623f97ecd51a0fe4a0ca911bdcbc204cf (diff) |
Clean up and tweaks of drashna keymaps and userspace (#2200)
* Minor tweaks
modified: users/drashna/drashna.c
* Fix Workman ASCII art
* Add OSM for shifts
* Make Viterbi's 00 code consistant
* Minor Cleanup off Userspace
* Change Tapping Term on Ergodox
* Re-add EEPROM code
* Minor updates and tweaks
* Use QMK_H variables to make keymaps more universal
* Forgot 'break;' for covecube layer
* Tweak Viterbi files now that I have hands on
* Add secrets to Ergodox
* RGB tweaks to Viterbi
* Viterbi RGB layout tweeks
* Minor tweaks
* Add One Shot Mod tap toggle
* Add Faux Clicky to Viterbi, and disable controller's LEDs
* Minor tweaks
* Move D3 keycode defines into userspace
* Updated Userspace Readme
Diffstat (limited to 'users/drashna/drashna.h')
-rw-r--r-- | users/drashna/drashna.h | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h index 0b9347f1d0..2475c99d4f 100644 --- a/users/drashna/drashna.h +++ b/users/drashna/drashna.h @@ -45,17 +45,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) -#ifdef RGBLIGHT_ENABLE +#ifndef RGBLIGHT_ANIMATIONS // add "EXTRA_FLADS=-DDRASHNA_SETRGB" to enable this ... but don't +#define rgblight_set_blue rgblight_setrgb (0x00, 0x00, 0xFF); +#define rgblight_set_red rgblight_setrgb (0xFF, 0x00, 0x00); +#define rgblight_set_green rgblight_setrgb (0x00, 0xFF, 0x00); +#define rgblight_set_orange rgblight_setrgb (0xFF, 0x80, 0x00); +#define rgblight_set_teal rgblight_setrgb (0x00, 0xFF, 0xFF); +#define rgblight_set_magenta rgblight_setrgb (0xFF, 0x00, 0xFF); +#define rgblight_set_yellow rgblight_setrgb (0xFF, 0xFF, 0x00); +#define rgblight_set_purple rgblight_setrgb (0x7A, 0x00, 0xFF); +#define rgblight_set_white rgblight_setrgb (0xFF, 0xFF, 0xFF); +#else #define rgblight_set_blue rgblight_sethsv (0xFF, 0xFF, 0xFF); #define rgblight_set_red rgblight_sethsv (0x00, 0xFF, 0xFF); #define rgblight_set_green rgblight_sethsv (0x78, 0xFF, 0xFF); #define rgblight_set_orange rgblight_sethsv (0x1E, 0xFF, 0xFF); -#define rgblight_set_teal rgblight_sethsv (0xC3, 0xFF, 0xFF); +#define rgblight_set_teal rgblight_sethsv (0xB4, 0xFF, 0xFF); #define rgblight_set_magenta rgblight_sethsv (0x12C, 0xFF, 0xFF); #define rgblight_set_yellow rgblight_sethsv (0x3C, 0xFF, 0xFF); #define rgblight_set_purple rgblight_sethsv (0x10E, 0xFF, 0xFF); #define rgblight_set_white rgblight_sethsv (0x00, 0x00, 0xFF); -#endif +#endif // DRASHNA_SETRGB extern bool is_overwatch; extern bool rgb_layer_change; @@ -103,6 +113,17 @@ enum { }; #endif +#ifdef TAP_DANCE_ENABLE +#define KC_D3_1 TD(TD_D3_1) +#define KC_D3_2 TD(TD_D3_2) +#define KC_D3_3 TD(TD_D3_3) +#define KC_D3_4 TD(TD_D3_4) +#else +#define KC_D3_1 KC_1 +#define KC_D3_2 KC_2 +#define KC_D3_3 KC_3 +#define KC_D3_4 KC_4 +#endif #define QMK_KEYS_PER_SCAN 8 @@ -110,4 +131,6 @@ enum { #define RGBLIGHT_SLEEP #endif +#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) + #endif |