summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Young <gabeplaysdrums@live.com>2017-02-25 19:37:33 -0800
committerGabriel Young <gabeplaysdrums@live.com>2017-02-25 19:37:33 -0800
commitea14ed122fb5c1b3be5f5d6edda9b39b151692e5 (patch)
tree8b5e1ca50aacbbbcb92adc5e617b71030c1523e9
parent1000799d1ef594bf9f48076986ec300ef9e536db (diff)
Add basic layer to sample MIDI keycap
-rw-r--r--keyboards/satan/keymaps/midi/keymap.c23
-rw-r--r--quantum/process_keycode/process_audio.c2
-rw-r--r--quantum/process_keycode/process_music.c3
3 files changed, 25 insertions, 3 deletions
diff --git a/keyboards/satan/keymaps/midi/keymap.c b/keyboards/satan/keymaps/midi/keymap.c
index 349391c3bf..8378b4e4b9 100644
--- a/keyboards/satan/keymaps/midi/keymap.c
+++ b/keyboards/satan/keymaps/midi/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, TG(_ML), KC_RCTL),
#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
-/* Keymap _ML: MIDI Layer
+/* Keymap _ML: MIDI Layer (Advanced)
* ,------------------------------------------------------------------------.
* | Exit | | | | | | | | | | | | | |
* |------------------------------------------------------------------------|
@@ -52,5 +52,26 @@ 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_ALLOFF, _______, _______, _______, _______),
+#elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
+/* Keymap _ML: MIDI Layer (Advanced)
+ * ,------------------------------------------------------------------------.
+ * | Exit | | | | | | | | | | | | | |
+ * |------------------------------------------------------------------------|
+ * | | | | | | | | | | | | | | |
+ * |------------------------------------------------------------------------|
+ * | | | | | | | | | | | | | |
+ * |------------------------------------------------------------------------|
+ * | |MuOn|MuOf|MiOn|MiOf| | | | | | | |
+ * |------------------------------------------------------------------------|
+ * | | | | | | | | |
+ * `------------------------------------------------------------------------'
+ */
+
+[_ML] = KEYMAP_ANSI(
+ TG(_ML), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______),
#endif
}; \ No newline at end of file
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 5b5da546ea..d45242c9e0 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -28,7 +28,7 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
{
audio_on();
}
- return false;
+ return false;
}
if (keycode == MUV_IN && record->event.pressed) {
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index a1e270df17..43bcf973e9 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -142,7 +142,8 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
if (keycode < 0xFF) // ignores all normal keycodes, but lets RAISE, LOWER, etc through
return false;
}
- return true;
+
+ return true;
}
bool is_music_on(void) {