summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2016-06-20 22:27:17 -0400
committerErez Zukerman <ezuk@madmimi.com>2016-06-20 22:27:17 -0400
commitf77df7e35679af46a206f3434785c24dc72c55fb (patch)
tree4550a9ee9f16d43e629d59fd2a612d9f2e471b5f /keyboard
parenteda5e84164f3e1a78b83b7c77bf344ebbf03bce8 (diff)
downloadqmk_firmware-f77df7e35679af46a206f3434785c24dc72c55fb.tar.gz
qmk_firmware-f77df7e35679af46a206f3434785c24dc72c55fb.zip
Adapts experimental layout file format
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/Makefile (renamed from keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk)4
-rw-r--r--keyboard/ergodox_ez/keymaps/erez_experimental/config.h (renamed from keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h)5
2 files changed, 7 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk b/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile
index faca18b543..b673c5ce52 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile
@@ -3,3 +3,7 @@
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
+
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
index d19c2783c3..314c2ec32b 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
@@ -1,8 +1,9 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
-#include "config.h"
+#include "../../config.h"
+
#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 3000
+#define ONESHOT_TIMEOUT 300
#endif