diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-01 21:10:05 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-11-01 21:10:05 -0400 |
| commit | e2e387f8f83af67f5946ffd5d3a41ecc1f11132b (patch) | |
| tree | 0c9092668b0e20cb2553658c843d9ca7f132fc1a /quantum/template/keymaps | |
| parent | 039cc8c93225083eddd39305c87b6dc600fb9e34 (diff) | |
update qmk template
Diffstat (limited to 'quantum/template/keymaps')
| -rw-r--r-- | quantum/template/keymaps/default/Makefile | 37 | ||||
| -rw-r--r-- | quantum/template/keymaps/default/config.h | 2 |
2 files changed, 1 insertions, 38 deletions
diff --git a/quantum/template/keymaps/default/Makefile b/quantum/template/keymaps/default/Makefile deleted file mode 100644 index b8879076bd..0000000000 --- a/quantum/template/keymaps/default/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2013 Jun Wako <wakojun@gmail.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - - -# QMK Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/quantum/template/keymaps/default/config.h b/quantum/template/keymaps/default/config.h index f52a97bbc8..0aa9e9e81b 100644 --- a/quantum/template/keymaps/default/config.h +++ b/quantum/template/keymaps/default/config.h @@ -17,7 +17,7 @@ #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" // place overrides here |