updated usb-midi example to use rhmixxx as hardware

2 files changed, 202 insertions, 202 deletions

diff --git a/usb-midi/Makefile b/usb-midi/Makefile
index ba1b5b3..71ac11f 100644
--- a/usb-midi/Makefile
+++ b/usb-midi/Makefile
@@ -1,44 +1,44 @@
-##

-##  spreadspace avr utils

-##

-##

-##  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>

-##

-##  This file is part of spreadspace avr utils.

-##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

-##  it under the terms of the GNU General Public License as published by

-##  the Free Software Foundation, either version 3 of the License, or

-##  any later version.

-##

-##  spreadspace avr utils is distributed in the hope that it will be useful,

-##  but WITHOUT ANY WARRANTY; without even the implied warranty of

-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-##  GNU General Public License for more details.

-##

-##  You should have received a copy of the GNU General Public License

-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

-##

-

-NAME := usb-midi

-BOARD_TYPE := teensy2

-OBJ := $(NAME).o

-LIBS := util led lufa-descriptor-midi

-EXTERNAL_LIBS := lufa

-

-LUFA_PATH := ../contrib/LUFA-120219

-LUFA_OPTS  = -D USB_DEVICE_ONLY

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0

-LUFA_OPTS += -D ORDERED_EP_CONFIG

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

-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\"" -D USB_MANUFACTURER_LEN=14

-LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" -D USB_PRODUCT_LEN=23

-

-LUFA_COMPONENTS := USB USBCLASS SERIAL

-

-include ../include.mk

+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-midi
+BOARD_TYPE := rhmixxx
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-midi
+EXTERNAL_LIBS := lufa
+
+LUFA_PATH := ../contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+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\"" -D USB_MANUFACTURER_LEN=14
+LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" -D USB_PRODUCT_LEN=23
+
+LUFA_COMPONENTS := USB USBCLASS SERIAL
+
+include ../include.mk
diff --git a/usb-midi/usb-midi.c b/usb-midi/usb-midi.c
index c305462..5608a37 100644
--- a/usb-midi/usb-midi.c
+++ b/usb-midi/usb-midi.c
@@ -1,158 +1,158 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>

- *

- *  This file is part of spreadspace avr utils.

- *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  any later version.

- *

- *  spreadspace avr utils is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.

- */

-

-

-#include <avr/io.h>

-#include <avr/wdt.h>

-#include <avr/interrupt.h>

-#include <avr/power.h>

-#include <stdio.h>

-

-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2012.

-

-  dean [at] fourwalledcubicle [dot] com

-           www.lufa-lib.org

-*/

-#include <LUFA/Version.h>

-#include <LUFA/Drivers/USB/USB.h>

-#include "lufa-descriptor-midi.h"

-#include "LUFA/Drivers/Peripheral/Serial.h"

-

-/** LUFA MIDI Class driver interface configuration and state information. This structure is

- *  passed to all MIDI Class driver functions, so that multiple instances of the same class

- *  within a device can be differentiated from one another.

- */

-USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =

-  {

-    .Config =

-      {

-        .StreamingInterfaceNumber = 1,

-

-        .DataINEndpointNumber      = MIDI_STREAM_IN_EPNUM,

-        .DataINEndpointSize        = MIDI_STREAM_EPSIZE,

-        .DataINEndpointDoubleBank  = false,

-

-        .DataOUTEndpointNumber     = MIDI_STREAM_OUT_EPNUM,

-        .DataOUTEndpointSize       = MIDI_STREAM_EPSIZE,

-        .DataOUTEndpointDoubleBank = false,

-      },

-  };

-

-/** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_Device_ConfigurationChanged(void)

-{

-  bool ConfigSuccess = true;

-

-  ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface);

-}

-

-/** Event handler for the library USB Control Request reception event. */

-void EVENT_USB_Device_ControlRequest(void)

-{

-  MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);

-}

-

-/* end LUFA MIDI Class driver specific definitions*/

-

-#include "util.h"

-#include "led.h"

-

-static FILE serial_stream;

-

-#define KEY_PIN PINF

-#define KEY_PORT PORTF

-#define KEY_DDR DDRF

-#define KEY_BIT 0

-

-#define KEY_LP_MAX 255

-

-void key_init(void)

-{

-  KEY_DDR = KEY_DDR & ~(1<<KEY_BIT);

-  KEY_PORT |= (1<<KEY_BIT);

-}

-

-int main(void)

-{

-  MCUSR &= ~(1 << WDRF);

-  wdt_disable();

-

-  cpu_init();

-  led_init();

-  key_init();

-

-  Serial_Init(38400, 0);

-  Serial_CreateStream(&serial_stream);

-  stdin = stdout = stderr = &serial_stream;

-

-  USB_Init();

-  sei();

-

-  MIDI_EventPacket_t MIDIEventOn = (MIDI_EventPacket_t)

-    {

-      .CableNumber = 0,

-      .Command     = (MIDI_COMMAND_NOTE_ON >> 4),

-      .Data1       = MIDI_COMMAND_NOTE_ON | 0,

-      .Data2       = 0,

-      .Data3       = 0x7F,

-    };

-  MIDI_EventPacket_t MIDIEventOff = (MIDI_EventPacket_t)

-    {

-      .CableNumber = 0,

-      .Command     = (MIDI_COMMAND_NOTE_OFF >> 4),

-      .Data1       = MIDI_COMMAND_NOTE_OFF | 0,

-      .Data2       = 0,

-      .Data3       = 0,

-    };

-

-  static uint8_t last_state = (1<<KEY_BIT);

-  static uint8_t lp_cnt = 0;

-  for(;;) {

-

-    MIDI_EventPacket_t ReceivedMIDIEvent;

-    while(MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &ReceivedMIDIEvent)) {

-      led_on();

-      printf("%02X %02X %02X\r\n", ReceivedMIDIEvent.Data1, ReceivedMIDIEvent.Data2, ReceivedMIDIEvent.Data3);

-      led_off();

-    }

-

-    uint8_t state = KEY_PIN & (1<<KEY_BIT);

-    if(state != last_state)

-      lp_cnt++;

-    else

-      lp_cnt += lp_cnt ? -1 : 0;

-

-    if(lp_cnt >= KEY_LP_MAX) {

-      MIDI_EventPacket_t* MIDIEvent = state ? &MIDIEventOff : &MIDIEventOn;

-      MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, MIDIEvent);

-      MIDI_Device_Flush(&Keyboard_MIDI_Interface);

-

-      last_state = state;

-      lp_cnt = 0;

-    }

-

-    MIDI_Device_USBTask(&Keyboard_MIDI_Interface);

-    USB_USBTask();

-  }

-}

+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+#include <LUFA/Version.h>
+#include <LUFA/Drivers/USB/USB.h>
+#include "lufa-descriptor-midi.h"
+#include "LUFA/Drivers/Peripheral/Serial.h"
+
+/** LUFA MIDI Class driver interface configuration and state information. This structure is
+ *  passed to all MIDI Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface =
+  {
+    .Config =
+      {
+        .StreamingInterfaceNumber = 1,
+
+        .DataINEndpointNumber      = MIDI_STREAM_IN_EPNUM,
+        .DataINEndpointSize        = MIDI_STREAM_EPSIZE,
+        .DataINEndpointDoubleBank  = false,
+
+        .DataOUTEndpointNumber     = MIDI_STREAM_OUT_EPNUM,
+        .DataOUTEndpointSize       = MIDI_STREAM_EPSIZE,
+        .DataOUTEndpointDoubleBank = false,
+      },
+  };
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+  bool ConfigSuccess = true;
+
+  ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface);
+}
+
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)
+{
+  MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);
+}
+
+/* end LUFA MIDI Class driver specific definitions*/
+
+#include "util.h"
+#include "led.h"
+
+static FILE serial_stream;
+
+#define KEY_PIN PINA
+#define KEY_PORT PORTA
+#define KEY_DDR DDRA
+#define KEY_BIT 0
+
+#define KEY_LP_MAX 255
+
+void key_init(void)
+{
+  KEY_DDR = 0xF0;
+  KEY_PORT = 0xEF;
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  key_init();
+
+  Serial_Init(38400, 0);
+  Serial_CreateStream(&serial_stream);
+  stdin = stdout = stderr = &serial_stream;
+
+  USB_Init();
+  sei();
+
+  MIDI_EventPacket_t MIDIEventOn = (MIDI_EventPacket_t)
+    {
+      .CableNumber = 0,
+      .Command     = (MIDI_COMMAND_NOTE_ON >> 4),
+      .Data1       = MIDI_COMMAND_NOTE_ON | 0,
+      .Data2       = 0,
+      .Data3       = 0x7F,
+    };
+  MIDI_EventPacket_t MIDIEventOff = (MIDI_EventPacket_t)
+    {
+      .CableNumber = 0,
+      .Command     = (MIDI_COMMAND_NOTE_OFF >> 4),
+      .Data1       = MIDI_COMMAND_NOTE_OFF | 0,
+      .Data2       = 0,
+      .Data3       = 0,
+    };
+
+  static uint8_t last_state = (1<<KEY_BIT);
+  static uint8_t lp_cnt = 0;
+  for(;;) {
+
+    MIDI_EventPacket_t ReceivedMIDIEvent;
+    while(MIDI_Device_ReceiveEventPacket(&Keyboard_MIDI_Interface, &ReceivedMIDIEvent)) {
+      led_on();
+      printf("%02X %02X %02X\r\n", ReceivedMIDIEvent.Data1, ReceivedMIDIEvent.Data2, ReceivedMIDIEvent.Data3);
+      led_off();
+    }
+
+    uint8_t state = KEY_PIN & (1<<KEY_BIT);
+    if(state != last_state)
+      lp_cnt++;
+    else
+      lp_cnt += lp_cnt ? -1 : 0;
+
+    if(lp_cnt >= KEY_LP_MAX) {
+      MIDI_EventPacket_t* MIDIEvent = state ? &MIDIEventOff : &MIDIEventOn;
+      MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, MIDIEvent);
+      MIDI_Device_Flush(&Keyboard_MIDI_Interface);
+
+      last_state = state;
+      lp_cnt = 0;
+    }
+
+    MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
+    USB_USBTask();
+  }
+}