summaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_midi.c58
-rw-r--r--quantum/process_keycode/process_midi.h5
2 files changed, 36 insertions, 27 deletions
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 9184feaae8..9728076dfd 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;
@@ -250,4 +229,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
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index ccac8981a6..1968fbe3fa 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -27,6 +27,8 @@ void process_midi_basic_noteoff(uint8_t note);
void process_midi_all_notes_off(void);
#endif
+void midi_task(void);
+
#ifdef MIDI_ADVANCED
typedef union {
uint32_t raw;
@@ -39,10 +41,9 @@ typedef union {
};
} midi_config_t;
-midi_config_t midi_config;
+extern midi_config_t midi_config;
void midi_init(void);
-void midi_task(void);
bool process_midi(uint16_t keycode, keyrecord_t *record);
#define MIDI_INVALID_NOTE 0xFF