summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Young <gabeplaysdrums@live.com>2017-02-18 21:07:07 -0800
committerGabriel Young <gabeplaysdrums@live.com>2017-02-19 16:43:45 -0800
commitae0752dff552a07fb52e08c7057979959959d247 (patch)
tree1f1c1dc6605e20ddf46894cef2e6b52bd2dc2b81
parent5e6097f0154403dccb9b5658390c84441aa509bc (diff)
downloadqmk_firmware-ae0752dff552a07fb52e08c7057979959959d247.tar.gz
qmk_firmware-ae0752dff552a07fb52e08c7057979959959d247.zip
expose midi_config
-rw-r--r--quantum/process_keycode/process_midi.c23
-rw-r--r--quantum/process_keycode/process_midi.h18
2 files changed, 24 insertions, 17 deletions
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 4d60aefb1c..9190fa0471 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -1,22 +1,6 @@
#include "process_midi.h"
#include "timer.h"
-typedef union {
- uint32_t raw;
- struct {
- uint8_t octave :4;
- int8_t transpose :4;
- uint8_t velocity :4;
- uint8_t channel :4;
- uint8_t modulation_interval :4;
- };
-} midi_config_t;
-
-midi_config_t midi_config;
-
-#define MIDI_INVALID_NOTE 0xFF
-
-#define MIDI_TONE_COUNT (MIDI_TONE_MAX - MIDI_TONE_MIN + 1)
static uint8_t tone_status[MIDI_TONE_COUNT];
static uint8_t midi_modulation;
@@ -70,6 +54,11 @@ void midi_task(void)
}
}
+uint8_t midi_compute_note(uint16_t keycode)
+{
+ return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose;
+}
+
bool process_midi(uint16_t keycode, keyrecord_t *record)
{
switch (keycode) {
@@ -79,7 +68,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record)
uint8_t tone = keycode - MIDI_TONE_MIN;
uint8_t velocity = compute_velocity(midi_config.velocity);
if (record->event.pressed) {
- uint8_t note = 12 * midi_config.octave + tone + midi_config.transpose;
+ uint8_t note = midi_compute_note(keycode);
midi_send_noteon(&midi_device, channel, note, velocity);
dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
tone_status[tone] = note;
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index 66ce60b0e5..ffd41579f2 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -4,8 +4,26 @@
#include "quantum.h"
#include "midi.h"
+typedef union {
+ uint32_t raw;
+ struct {
+ uint8_t octave :4;
+ int8_t transpose :4;
+ uint8_t velocity :4;
+ uint8_t channel :4;
+ uint8_t modulation_interval :4;
+ };
+} midi_config_t;
+
+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
+#define MIDI_TONE_COUNT (MIDI_TONE_MAX - MIDI_TONE_MIN + 1)
+
+uint8_t midi_compute_note(uint16_t keycode);
+
#endif \ No newline at end of file