summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-05-29 10:54:56 -0400
committerJack Humbert <jack.humb@gmail.com>2017-05-29 10:54:56 -0400
commit7041055ace4d7fe2b65f9ba9d045debdcceebf1f (patch)
tree6d70f86b886d842770b66f2d544f2f5787b3b969 /keyboards
parentae6b803ad61d647febbfe806d795b8b757fce074 (diff)
parent80707d529cefdf96b41a0c27d4ea0bc30fce503f (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox/config.h2
-rw-r--r--keyboards/ergodox/ez/config.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h
index e870835d85..2091999bb3 100644
--- a/keyboards/ergodox/config.h
+++ b/keyboards/ergodox/config.h
@@ -3,7 +3,7 @@
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 40
+#define MOUSEKEY_TIME_TO_MAX 60
#define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index aa17c3e8d3..cc8aa3d40e 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -60,6 +60,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 15
+#define PREVENT_STUCK_MODIFIERS
+
#define USB_MAX_POWER_CONSUMPTION 500
/*