From f77df7e35679af46a206f3434785c24dc72c55fb Mon Sep 17 00:00:00 2001 From: Erez Zukerman Date: Mon, 20 Jun 2016 22:27:17 -0400 Subject: [PATCH] Adapts experimental layout file format --- .../keymaps/erez_experimental/{makefile.mk => Makefile} | 4 ++++ .../keymaps/erez_experimental/{config_user.h => config.h} | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) rename keyboard/ergodox_ez/keymaps/erez_experimental/{makefile.mk => Makefile} (80%) rename keyboard/ergodox_ez/keymaps/erez_experimental/{config_user.h => config.h} (59%) diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk b/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile similarity index 80% rename from keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk rename to 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 similarity index 59% rename from keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h rename to 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