summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/ez
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-09 11:26:15 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-07-29 20:48:22 +0300
commite7670f6d19639ba2a0cead228cc58ff58eef5a60 (patch)
treee09704f3bbb7d709f4752b51ac2cffcbe325b362 /keyboards/ergodox/ez
parente0f28c2b1068d8cd218e1450dea97fde946ba87a (diff)
Move some of the Ergodox config settings to shared
Diffstat (limited to 'keyboards/ergodox/ez')
-rw-r--r--keyboards/ergodox/ez/config.h29
1 files changed, 5 insertions, 24 deletions
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index 2bb56731b2..59fc0fda74 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef CONFIG_H
#define CONFIG_H
-#include "config_common.h"
+#include "../config.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
@@ -33,34 +33,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 14
#define MATRIX_COLS 6
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_MAX_SPEED 3
-#define MOUSEKEY_TIME_TO_MAX 10
-
-#define TAPPING_TOGGLE 1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
/* number of backlight levels */
#define BACKLIGHT_LEVELS 3
+#define LED_BRIGHTNESS_LO 15
+#define LED_BRIGHTNESS_HI 255
+
+
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
-#define TAPPING_TERM 200
-#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.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
- keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
/*
* Feature disable options