diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-10-11 16:09:01 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-10-11 16:09:01 +0200 |
| commit | d41aab2acf9c6fce6224e6dbf1b6364ea88c6109 (patch) | |
| tree | ce9bfec22d36565308d9ab4ccc2eb365d96ee2d5 | |
| parent | improved contrib handling (diff) | |
fixed usb-midi example
| -rw-r--r-- | usb-midi/Makefile | 6 | ||||
| -rw-r--r-- | usb-midi/usb-midi.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usb-midi/Makefile b/usb-midi/Makefile index d1ff37b..77e79ce 100644 --- a/usb-midi/Makefile +++ b/usb-midi/Makefile @@ -21,7 +21,7 @@ ## NAME := usb-midi -BOARD_TYPE := rhmixxx +BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-midi serialio EXTERNAL_LIBS := lufa @@ -37,8 +37,8 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT -LUFA_OPTS += -D USB_MANUFACTURER="L\"Radio Helsinki\"" -LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-midi example\"" LUFA_COMPONENTS := USB USBCLASS SERIAL diff --git a/usb-midi/usb-midi.c b/usb-midi/usb-midi.c index 741e232..e91466c 100644 --- a/usb-midi/usb-midi.c +++ b/usb-midi/usb-midi.c @@ -85,17 +85,17 @@ void EVENT_USB_Device_ControlRequest(void) #include "util.h" #include "led.h" -#define KEY_PIN PINA -#define KEY_PORT PORTA -#define KEY_DDR DDRA +#define KEY_PIN PINB +#define KEY_PORT PORTB +#define KEY_DDR DDRB #define KEY_BIT 0 #define KEY_LP_MAX 255 void key_init(void) { - KEY_DDR = 0x10; - KEY_PORT = 0xEF; + KEY_DDR = (1<<KEY_BIT); + KEY_PORT = (1<<KEY_BIT); } int main(void) |