Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

expose midi_config

Browse source
This commit is contained in:
Gabriel Young 2017-02-18 21:07:07 -08:00
parent 5e6097f015
commit ae0752dff5
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
quantum/process_keycode/process_midi.c
View file

@ -1,22 +1,6 @@
#include "process_midi.h" #include "process_midi.h"
#include "timer.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 tone_status[MIDI_TONE_COUNT];
static uint8_t midi_modulation; 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) bool process_midi(uint16_t keycode, keyrecord_t *record)
{ {
switch (keycode) { switch (keycode) {
@ -79,7 +68,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record)
uint8_t tone = keycode - MIDI_TONE_MIN; uint8_t tone = keycode - MIDI_TONE_MIN;
uint8_t velocity = compute_velocity(midi_config.velocity); uint8_t velocity = compute_velocity(midi_config.velocity);
if (record->event.pressed) { 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); midi_send_noteon(&midi_device, channel, note, velocity);
dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity); dprintf("midi noteon channel:%d note:%d velocity:%d\n", channel, note, velocity);
tone_status[tone] = note; tone_status[tone] = note;

18
quantum/process_keycode/process_midi.h
View file

@ -4,8 +4,26 @@
#include "quantum.h" #include "quantum.h"
#include "midi.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_init(void);
void midi_task(void); void midi_task(void);
bool process_midi(uint16_t keycode, keyrecord_t *record); 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 #endif