aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Delmar Davis <don@suspectdevices.com>2013-04-25 16:52:44 -0700
committerDonald Delmar Davis <don@suspectdevices.com>2013-04-25 16:52:44 -0700
commit25e54367bfd65a3c36549b6800caabd6ce3b7f80 (patch)
treee97e3865745a135b595a60ca53ccf19959707c20
parentaa917d1d8fd5dde9934264bdaa0891e08a08fd1d (diff)
create board files for maple_midi
-rw-r--r--support/make/board-includes/maple_midi.mk7
-rw-r--r--wirish/include/wirish/boards.h7
-rw-r--r--wirish/include/wirish/usb_midi.h2
3 files changed, 12 insertions, 4 deletions
diff --git a/support/make/board-includes/maple_midi.mk b/support/make/board-includes/maple_midi.mk
new file mode 100644
index 0000000..b022537
--- /dev/null
+++ b/support/make/board-includes/maple_midi.mk
@@ -0,0 +1,7 @@
+MCU := STM32F103CB
+PRODUCT_ID := 0003
+ERROR_LED_PORT := GPIOB
+ERROR_LED_PIN := 1
+MCU_SERIES := stm32f1
+MCU_F1_LINE := performance
+LD_MEM_DIR := sram_20k_flash_128k
diff --git a/wirish/include/wirish/boards.h b/wirish/include/wirish/boards.h
index 1738dc8..b406f8d 100644
--- a/wirish/include/wirish/boards.h
+++ b/wirish/include/wirish/boards.h
@@ -170,8 +170,9 @@ bool boardUsesPin(uint8 pin);
#define BOARD_HAVE_SERIALUSB (defined(BOARD_USB_DISC_DEV) && \
defined(BOARD_USB_DISC_BIT))
-//#define BOARD_HAVE_MIDIUSB (defined(MIDIUSB)&&defined(BOARD_USB_DISC_DEV) && \
-// defined(BOARD_USB_DISC_BIT))
-#define BOARD_HAVE_MIDIUSB 1
+#define BOARD_HAVE_MIDIUSB (defined(MIDIUSB)&&defined(BOARD_USB_DISC_DEV) && \
+ defined(BOARD_USB_DISC_BIT))
+
+//#define BOARD_HAVE_MIDIUSB 1
#endif
diff --git a/wirish/include/wirish/usb_midi.h b/wirish/include/wirish/usb_midi.h
index 99f2ad8..acab273 100644
--- a/wirish/include/wirish/usb_midi.h
+++ b/wirish/include/wirish/usb_midi.h
@@ -61,7 +61,7 @@
* public:
*
* // Need this to compile; it just hands things off to the Midi class.
- * MyMidi(HardwareSerial &s) : Midi(s) {}
+ * MyMidi() : USBMidi(s) {}
*
* void handleNoteOn(unsigned int channel, unsigned int note, unsigned int velocity)
* {