Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

cleaning up midid

Browse source
This commit is contained in:
Jack Humbert 2016-11-21 20:14:16 -05:00
parent 664c0a036b
commit 6390033e86
3 changed files with 59 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
quantum/config_common.h
View file

@ -5,6 +5,7 @@
#define COL2ROW 0 #define COL2ROW 0
#define ROW2COL 1 #define ROW2COL 1
/* I/O pins */ /* I/O pins */
#ifndef F0
#define B0 0x30 #define B0 0x30
#define B1 0x31 #define B1 0x31
#define B2 0x32 #define B2 0x32
@ -53,7 +54,7 @@
#define A5 0x05 #define A5 0x05
#define A6 0x06 #define A6 0x06
#define A7 0x07 #define A7 0x07
#endif
/* USART configuration */ /* USART configuration */
#ifdef BLUETOOTH_ENABLE #ifdef BLUETOOTH_ENABLE

9
tmk_core/common/host_driver.h
View file

@ -20,7 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h> #include <stdint.h>
#include "report.h" #include "report.h"
#ifdef MIDI_ENABLE
#include "midi.h"
#endif
typedef struct { typedef struct {
uint8_t (*keyboard_leds)(void); uint8_t (*keyboard_leds)(void);
@ -28,6 +30,11 @@ typedef struct {
void (*send_mouse)(report_mouse_t *); void (*send_mouse)(report_mouse_t *);
void (*send_system)(uint16_t); void (*send_system)(uint16_t);
void (*send_consumer)(uint16_t); void (*send_consumer)(uint16_t);
#ifdef MIDI_ENABLE
void (*usb_send_func)(MidiDevice *, uint16_t, uint8_t, uint8_t, uint8_t);
void (*usb_get_midi)(MidiDevice *);
void (*midi_usb_init)(MidiDevice *);
#endif
} host_driver_t; } host_driver_t;
#endif #endif

2
tmk_core/protocol/lufa/lufa.c
View file

@ -1051,7 +1051,7 @@ int main(void)
// MIDI_Task(); // MIDI_Task();
#endif #endif
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ANIMATIONS
rgblight_task(); rgblight_task();
#endif #endif