summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Young <gabeplaysdrums@live.com>2017-02-20 02:45:08 +0100
committerGabriel Young <gabeplaysdrums@live.com>2017-02-20 02:45:08 +0100
commited15973a3ffff6e18e62f81654632b97961f18d2 (patch)
treeaedd3c466e3318e2e5e4945e00b4acad2f243386
parentd1fe24ad9f85768774ae50465c71f3757a33cc00 (diff)
downloadqmk_firmware-ed15973a3ffff6e18e62f81654632b97961f18d2.tar.gz
qmk_firmware-ed15973a3ffff6e18e62f81654632b97961f18d2.tar.xz
Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)
satan/keymaps/midi MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes #define MIDI_TONE_KEYCODE_OCTAVES 3 // default text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex MIDI_ENABLE = yes #define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex
-rw-r--r--keyboards/satan/keymaps/midi/Makefile2
-rw-r--r--keyboards/satan/keymaps/midi/config.h2
-rw-r--r--keyboards/satan/keymaps/midi/keymap.c2
-rw-r--r--quantum/process_keycode/process_midi.c2
-rw-r--r--quantum/template/config.h2
-rw-r--r--quantum/template/keymaps/default/Makefile2
6 files changed, 8 insertions, 4 deletions
diff --git a/keyboards/satan/keymaps/midi/Makefile b/keyboards/satan/keymaps/midi/Makefile
index 5cbda96ce..4e2d9d2f7 100644
--- a/keyboards/satan/keymaps/midi/Makefile
+++ b/keyboards/satan/keymaps/midi/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 = yes # Enable keyboard backlight functionality
-MIDI_ENABLE = yes # MIDI controls
+MIDI_ENABLE = yes # MIDI support (+3800)
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/keyboards/satan/keymaps/midi/config.h b/keyboards/satan/keymaps/midi/config.h
index e345d40c9..0dbdb5cbc 100644
--- a/keyboards/satan/keymaps/midi/config.h
+++ b/keyboards/satan/keymaps/midi/config.h
@@ -5,7 +5,7 @@
// place overrides here
-/* override number of MIDI tone keycodes (each octave adds 12 bytes) */
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
#define MIDI_TONE_KEYCODE_OCTAVES 2
#endif \ No newline at end of file
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index ac9725933..004690f41 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -32,6 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, \
KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
+#ifdef MIDI_ENABLE
/* Keymap _ML: MIDI Layer
* ,------------------------------------------------------------------------.
* | Exit | | | | | | | | | | | | | |
@@ -57,4 +58,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
MI_MOD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, _______, \
MI_SUS, MI_OCTD, MI_OCTU, MI_MODSD, MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD, MI_TRNSU, MI_TRNS_0, MI_SUS, \
_______, _______, _______, MI_OFF, _______, _______, _______, _______),
+#endif
}; \ No newline at end of file
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 9190fa047..5530ea97c 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -1,3 +1,5 @@
+#define MIDI_TONE_KEYCODE_OCTAVES 2
+
#include "process_midi.h"
#include "timer.h"
diff --git a/quantum/template/config.h b/quantum/template/config.h
index d0bee0d89..cd6dfa2c6 100644
--- a/quantum/template/config.h
+++ b/quantum/template/config.h
@@ -159,7 +159,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-/* override number of MIDI tone keycodes (each octave adds 12 bytes) */
+/* 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 f4671a9d1..24442db37 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 (+3800)
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID