From 53ff8a31b61952d9675558149d927f7942071df9 Mon Sep 17 00:00:00 2001
From: fredizzimo <fsundvik@gmail.com>
Date: Thu, 8 Feb 2018 22:07:46 +0200
Subject: 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
---
quantum/process_keycode/process_midi.c | 58 +++++++++++++++++++---------------
1 file changed, 33 insertions(+), 25 deletions(-)
(limited to 'quantum/process_keycode/process_midi.c')
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 @@
#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
--
cgit v1.2.3