]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Add basic layer to sample MIDI keycap
authorGabriel Young <gabeplaysdrums@live.com>
Sun, 26 Feb 2017 03:37:33 +0000 (19:37 -0800)
committerGabriel Young <gabeplaysdrums@live.com>
Sun, 26 Feb 2017 03:37:33 +0000 (19:37 -0800)
keyboards/satan/keymaps/midi/keymap.c
quantum/process_keycode/process_audio.c
quantum/process_keycode/process_music.c

index 349391c3bfb3085427eabbaa4d1de23655ddf097..8378b4e4b98a3de520c31d948e663c76b68f42bf 100644 (file)
@@ -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
index 5b5da546eae1a51d790a720403b27af075b9dfd2..d45242c9e0fcf5322a5395c41ad0f670c2492294 100644 (file)
@@ -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) {
index a1e270df177bb89e8e6c7d7f4fc78b352893747b..43bcf973e971560064b12a52a18a9ece78c577cd 100644 (file)
@@ -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) {