X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fprocess_keycode%2Fprocess_midi.c;h=a67f736285fbcd60837ca468e0dfd8ef8e304406;hb=7a44ad83fce391c938d18abcc2125e15c1982078;hp=9184feaae846027500a1d302592567e00e825f96;hpb=704794bae3bf96541b0362ea38b84706d5ee6958;p=qmk_firmware.git

diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 9184feaae..a67f73628 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -16,11 +16,13 @@
 #include "process_midi.h"
 
 #ifdef MIDI_ENABLE
+#include <LUFA/Drivers/USB/USB.h>
 #include "midi.h"
+#include "qmk_midi.h"
 
 #ifdef MIDI_BASIC
 
-void process_midi_basic_noteon(uint8_t note) 
+void process_midi_basic_noteon(uint8_t note)
 {
     midi_send_noteon(&midi_device, 0, note, 128);
 }
@@ -46,6 +48,7 @@ static uint8_t tone_status[MIDI_TONE_COUNT];
 static uint8_t midi_modulation;
 static int8_t midi_modulation_step;
 static uint16_t midi_modulation_timer;
+midi_config_t midi_config;
 
 inline uint8_t compute_velocity(uint8_t setting)
 {
@@ -70,30 +73,6 @@ void midi_init(void)
     midi_modulation_timer = 0;
 }
 
-void midi_task(void)
-{
-    if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
-        return;
-    midi_modulation_timer = timer_read();
-
-    if (midi_modulation_step != 0)
-    {
-        dprintf("midi modulation %d\n", midi_modulation);
-        midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
-
-        if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
-            midi_modulation = 0;
-            midi_modulation_step = 0;
-            return;
-        }
-
-        midi_modulation += midi_modulation_step;
-
-        if (midi_modulation > 127)
-            midi_modulation = 127;
-    }
-}
-
 uint8_t midi_compute_note(uint16_t keycode)
 {
     return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose;
@@ -243,6 +222,26 @@ bool process_midi(uint16_t keycode, keyrecord_t *record)
                 dprintf("midi modulation interval %d\n", midi_config.modulation_interval);
             }
             return false;
+        case MI_BENDD:
+            if (record->event.pressed) {
+                midi_send_pitchbend(&midi_device, midi_config.channel, -0x2000);
+                dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, -0x2000);
+            }
+            else {
+                midi_send_pitchbend(&midi_device, midi_config.channel, 0);
+                dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0);
+            }
+            return false;
+        case MI_BENDU:
+            if (record->event.pressed) {
+                midi_send_pitchbend(&midi_device, midi_config.channel, 0x1fff);
+                dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0x1fff);
+            }
+            else {
+                midi_send_pitchbend(&midi_device, midi_config.channel, 0);
+                dprintf("midi pitchbend channel:%d amount:%d\n", midi_config.channel, 0);
+            }
+            return false;
     };
 
     return true;
@@ -250,4 +249,33 @@ bool process_midi(uint16_t keycode, keyrecord_t *record)
 
 #endif // MIDI_ADVANCED
 
+void midi_task(void)
+{
+    midi_device_process(&midi_device);
+#ifdef MIDI_ADVANCED
+    if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
+        return;
+    midi_modulation_timer = timer_read();
+
+    if (midi_modulation_step != 0)
+    {
+        dprintf("midi modulation %d\n", midi_modulation);
+        midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
+
+        if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
+            midi_modulation = 0;
+            midi_modulation_step = 0;
+            return;
+        }
+
+        midi_modulation += midi_modulation_step;
+
+        if (midi_modulation > 127)
+            midi_modulation = 127;
+    }
+#endif
+}
+
+
+
 #endif // MIDI_ENABLE