diff options
| author | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
| commit | 62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch) | |
| tree | 281ae30283f7491b2529465da4897dc2ddd7088c /quantum/template | |
| parent | d5ee0194abf5cc9df4086a89ad78cf188352028a (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
| download | qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.gz qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.zip | |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'quantum/template')
| -rw-r--r-- | quantum/template/config.h | 23 | ||||
| -rw-r--r-- | quantum/template/keymaps/default/Makefile | 2 | ||||
| -rw-r--r-- | quantum/template/rules.mk | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/quantum/template/config.h b/quantum/template/config.h index c61c4a6181..7393097e1e 100644 --- a/quantum/template/config.h +++ b/quantum/template/config.h @@ -159,4 +159,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + #endif diff --git a/quantum/template/keymaps/default/Makefile b/quantum/template/keymaps/default/Makefile index f4671a9d11..29f11bbc77 100644 --- a/quantum/template/keymaps/default/Makefile +++ b/quantum/template/keymaps/default/Makefile @@ -9,7 +9,7 @@ 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 controls +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 diff --git a/quantum/template/rules.mk b/quantum/template/rules.mk index 55898147dd..a1f9377d87 100644 --- a/quantum/template/rules.mk +++ b/quantum/template/rules.mk @@ -61,7 +61,8 @@ SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE ?= no # USB Nkey Rollover BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls +MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) UNICODE_ENABLE ?= no # Unicode BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE ?= no # Audio output on port C6 +FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches |