aboutsummaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorfredizzimo <fsundvik@gmail.com>2018-02-08 22:07:46 +0200
committerJack Humbert <jack.humb@gmail.com>2018-02-08 15:07:46 -0500
commit53ff8a31b61952d9675558149d927f7942071df9 (patch)
treea57b9e6f7d6494c9ef903f886a660dd43f4e5044 /quantum/process_keycode
parent63c16f4b632a2a82a775f51a3ad0cc690cca1fc9 (diff)
downloadqmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.tar.gz
qmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.zip
Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor * Try to compile usb_descriptor on ChibiOS * Add lufa_utils for ChibiOS Lufa USB descriptors for ChibiOS * More lufa_util compatibility fixes * First compiling version of shared USB descriptor * Send the usb descriptors * Fix the CONSOLE output on ChibiOS * Add errors for unsupported interfaces * Enable support for vitual serial port USB descriptors * Implement virtual serial port for ChibiOS * Cleanup the lufa_utils Use the default lufa header files * Add raw hid support for ChibiOS This is completely untested * Enable midi compilation on ChibiOS * Move midi functionality out of lufa.c * Don't register sysex callback when not needed * ChibiOS compilation fixes * Update ChibiOS submodule * Fix the Midi USB descriptor It didn't work properly when both Midi and Virtual serial port was enabled. * Add MIDI support for ChibiOS * Fix USB descriptor strings on ChibiOS * Use serial usb driver for raw hid * Generalize the ChibiOS stream like drivers This makes the initialization much more simple and eliminates a lot of the code duplication. * Convert console output to chibios stream driver * Fixes for ChibiOS update * Update the ChibiOS contrib submodule To include the usb data toggle synchronization fixes * Fix duplicate reset enumeration on ChibiOS * Add missing include * Add number of endpoints check for ChibiOS * Enable serial USB driver on all keyboards * Add missing includes when API is enabled withot midi * Add another missing inlcude
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 9184feaae..9728076df 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -16,11 +16,13 @@
16#include "process_midi.h" 16#include "process_midi.h"
17 17
18#ifdef MIDI_ENABLE 18#ifdef MIDI_ENABLE
19#include <LUFA/Drivers/USB/USB.h>
19#include "midi.h" 20#include "midi.h"
21#include "qmk_midi.h"
20 22
21#ifdef MIDI_BASIC 23#ifdef MIDI_BASIC
22 24
23void process_midi_basic_noteon(uint8_t note) 25void process_midi_basic_noteon(uint8_t note)
24{ 26{
25 midi_send_noteon(&midi_device, 0, note, 128); 27 midi_send_noteon(&midi_device, 0, note, 128);
26} 28}
@@ -46,6 +48,7 @@ static uint8_t tone_status[MIDI_TONE_COUNT];
46static uint8_t midi_modulation; 48static uint8_t midi_modulation;
47static int8_t midi_modulation_step; 49static int8_t midi_modulation_step;
48static uint16_t midi_modulation_timer; 50static uint16_t midi_modulation_timer;
51midi_config_t midi_config;
49 52
50inline uint8_t compute_velocity(uint8_t setting) 53inline uint8_t compute_velocity(uint8_t setting)
51{ 54{
@@ -70,30 +73,6 @@ void midi_init(void)
70 midi_modulation_timer = 0; 73 midi_modulation_timer = 0;
71} 74}
72 75
73void midi_task(void)
74{
75 if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
76 return;
77 midi_modulation_timer = timer_read();
78
79 if (midi_modulation_step != 0)
80 {
81 dprintf("midi modulation %d\n", midi_modulation);
82 midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
83
84 if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
85 midi_modulation = 0;
86 midi_modulation_step = 0;
87 return;
88 }
89
90 midi_modulation += midi_modulation_step;
91
92 if (midi_modulation > 127)
93 midi_modulation = 127;
94 }
95}
96
97uint8_t midi_compute_note(uint16_t keycode) 76uint8_t midi_compute_note(uint16_t keycode)
98{ 77{
99 return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose; 78 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)
250 229
251#endif // MIDI_ADVANCED 230#endif // MIDI_ADVANCED
252 231
232void midi_task(void)
233{
234 midi_device_process(&midi_device);
235#ifdef MIDI_ADVANCED
236 if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval)
237 return;
238 midi_modulation_timer = timer_read();
239
240 if (midi_modulation_step != 0)
241 {
242 dprintf("midi modulation %d\n", midi_modulation);
243 midi_send_cc(&midi_device, midi_config.channel, 0x1, midi_modulation);
244
245 if (midi_modulation_step < 0 && midi_modulation < -midi_modulation_step) {
246 midi_modulation = 0;
247 midi_modulation_step = 0;
248 return;
249 }
250
251 midi_modulation += midi_modulation_step;
252
253 if (midi_modulation > 127)
254 midi_modulation = 127;
255 }
256#endif
257}
258
259
260
253#endif // MIDI_ENABLE 261#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index ccac8981a..1968fbe3f 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);
27void process_midi_all_notes_off(void); 27void process_midi_all_notes_off(void);
28#endif 28#endif
29 29
30void midi_task(void);
31
30#ifdef MIDI_ADVANCED 32#ifdef MIDI_ADVANCED
31typedef union { 33typedef union {
32 uint32_t raw; 34 uint32_t raw;
@@ -39,10 +41,9 @@ typedef union {
39 }; 41 };
40} midi_config_t; 42} midi_config_t;
41 43
42midi_config_t midi_config; 44extern midi_config_t midi_config;
43 45
44void midi_init(void); 46void midi_init(void);
45void midi_task(void);
46bool process_midi(uint16_t keycode, keyrecord_t *record); 47bool process_midi(uint16_t keycode, keyrecord_t *record);
47 48
48#define MIDI_INVALID_NOTE 0xFF 49#define MIDI_INVALID_NOTE 0xFF