aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez/keymaps/drashna/config.h
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-01-01 14:21:01 -0800
committerJack Humbert <jack.humb@gmail.com>2018-01-01 17:21:01 -0500
commit17200f47123b839ee0a5e4f2dfd33a00dff09e90 (patch)
tree46a6be6e61361e1f548daa1ce6cb461f5c291fee /keyboards/ergodox_ez/keymaps/drashna/config.h
parenteb903c7623f97ecd51a0fe4a0ca911bdcbc204cf (diff)
downloadfirmware-17200f47123b839ee0a5e4f2dfd33a00dff09e90.tar.gz
firmware-17200f47123b839ee0a5e4f2dfd33a00dff09e90.tar.bz2
firmware-17200f47123b839ee0a5e4f2dfd33a00dff09e90.zip
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 'keyboards/ergodox_ez/keymaps/drashna/config.h')
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/config.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/keyboards/ergodox_ez/keymaps/drashna/config.h b/keyboards/ergodox_ez/keymaps/drashna/config.h
index 3d138e072..c0286f16a 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna/config.h
@@ -1,9 +1,8 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
-#include "../../config.h"
+#include QMK_KEYBOARD_CONFIG_H
-#define TAPPING_TERM 200
#ifdef RGBLIGHT_ENABLE
#undef RGBLIGHT_SAT_STEP
@@ -13,6 +12,12 @@
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
#endif // RGBLIGHT_ENABLE
-#define FORCE_NKRO
+#ifdef TAPPING_TERM
+#undef TAPPING_TERM
+#endif
+#define TAPPING_TERM 150
+#undef PERMISSIVE_HOLD
+#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.)
+#define ONESHOT_TAP_TOGGLE 2
#endif