Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

makefile stuff

Browse source
This commit is contained in:
Jack Humbert 2015-08-23 15:31:51 -04:00
parent fd7a465d0d
commit b8425e8b58
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
protocol/lufa.mk
View file

@ -24,7 +24,9 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
$(LUFA_DIR)/midi/midi_device.c \ $(LUFA_DIR)/midi/midi_device.c \
$(LUFA_DIR)/midi/bytequeue/bytequeue.c \ $(LUFA_DIR)/midi/bytequeue/bytequeue.c \
$(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \ $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \
$(LUFA_DIR)/LUFA-git/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c $(LUFA_SRC_USB) \
$(LUFA_SRC_USBCLASS)
SRC += $(LUFA_SRC) SRC += $(LUFA_SRC)

2
protocol/lufa/lufa.c
View file

@ -52,6 +52,8 @@
#include "descriptor.h" #include "descriptor.h"
#include "lufa.h" #include "lufa.h"
// #include <LUFA/Version.h>
// #include <LUFA/Drivers/USB/USB.h>
uint8_t keyboard_idle = 0; uint8_t keyboard_idle = 0;
uint8_t keyboard_protocol = 1; uint8_t keyboard_protocol = 1;

5
protocol/lufa/lufa.h
View file

@ -48,8 +48,9 @@
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "host.h" #include "host.h"
#ifdef MIDI_ENABLE
#include "midi/midi.h" #include "midi/midi.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -66,7 +67,9 @@ typedef struct {
uint16_t usage; uint16_t usage;
} __attribute__ ((packed)) report_extra_t; } __attribute__ ((packed)) report_extra_t;
#ifdef MIDI_ENABLE
MidiDevice midi_device; MidiDevice midi_device;
#endif
#if LUFA_VERSION_INTEGER < 0x120730 #if LUFA_VERSION_INTEGER < 0x120730
/* old API 120219 */ /* old API 120219 */