From e8d8cdb75ef1e9f2e73014a5d62011ae27d1ac0c Mon Sep 17 00:00:00 2001 From: arpruss Date: Wed, 13 Jun 2018 15:28:36 -0500 Subject: [PATCH] update to latest version of USBComposite --- .../USBComposite/USBCompositeSerial.cpp | 2 +- .../USBComposite/USBCompositeSerial.h | 2 +- STM32F1/libraries/USBComposite/USBHID.cpp | 2 +- .../libraries/USBComposite/USBMassStorage.cpp | 2 +- .../examples/jigglemouse/jigglemouse.ino | 23 +++++++++++++++++++ .../USBComposite/examples/mass/mass.ino | 3 +++ .../examples/sdreader/sdreader.ino | 2 ++ .../libraries/USBComposite/library.properties | 2 +- .../{usb_serial.c => usb_composite_serial.c} | 2 +- .../{usb_serial.h => usb_composite_serial.h} | 0 .../libraries/USBComposite/usb_midi_device.c | 1 + STM32F1/libraries/USBComposite/usb_setup.cpp | 3 --- 12 files changed, 35 insertions(+), 9 deletions(-) create mode 100755 STM32F1/libraries/USBComposite/examples/jigglemouse/jigglemouse.ino rename STM32F1/libraries/USBComposite/{usb_serial.c => usb_composite_serial.c} (99%) rename STM32F1/libraries/USBComposite/{usb_serial.h => usb_composite_serial.h} (100%) diff --git a/STM32F1/libraries/USBComposite/USBCompositeSerial.cpp b/STM32F1/libraries/USBComposite/USBCompositeSerial.cpp index 9da0f19..8fa6c98 100644 --- a/STM32F1/libraries/USBComposite/USBCompositeSerial.cpp +++ b/STM32F1/libraries/USBComposite/USBCompositeSerial.cpp @@ -23,7 +23,7 @@ #include #include -#include "usb_serial.h" +#include "usb_composite_serial.h" #define USB_TIMEOUT 50 diff --git a/STM32F1/libraries/USBComposite/USBCompositeSerial.h b/STM32F1/libraries/USBComposite/USBCompositeSerial.h index 4112617..80f110a 100644 --- a/STM32F1/libraries/USBComposite/USBCompositeSerial.h +++ b/STM32F1/libraries/USBComposite/USBCompositeSerial.h @@ -2,7 +2,7 @@ #define _COMPOSITE_SERIAL_H_ #include "USBComposite.h" -#include "usb_serial.h" +#include "usb_composite_serial.h" class USBCompositeSerial : public Stream { private: diff --git a/STM32F1/libraries/USBComposite/USBHID.cpp b/STM32F1/libraries/USBComposite/USBHID.cpp index e0b69b4..ca35396 100644 --- a/STM32F1/libraries/USBComposite/USBHID.cpp +++ b/STM32F1/libraries/USBComposite/USBHID.cpp @@ -21,7 +21,7 @@ #include #include #include "usb_hid.h" -#include "usb_serial.h" +#include "usb_composite_serial.h" #include "usb_generic.h" #include #include diff --git a/STM32F1/libraries/USBComposite/USBMassStorage.cpp b/STM32F1/libraries/USBComposite/USBMassStorage.cpp index c376e69..9c96359 100644 --- a/STM32F1/libraries/USBComposite/USBMassStorage.cpp +++ b/STM32F1/libraries/USBComposite/USBMassStorage.cpp @@ -1,7 +1,7 @@ #include "USBMassStorage.h" #include "usb_mass.h" #include "usb_mass_mal.h" -#include "usb_serial.h" +#include "usb_composite_serial.h" #include void USBMassStorageDevice::begin() { diff --git a/STM32F1/libraries/USBComposite/examples/jigglemouse/jigglemouse.ino b/STM32F1/libraries/USBComposite/examples/jigglemouse/jigglemouse.ino new file mode 100755 index 0000000..633db0c --- /dev/null +++ b/STM32F1/libraries/USBComposite/examples/jigglemouse/jigglemouse.ino @@ -0,0 +1,23 @@ +#include + +#define LED PB12 + +void setup(){ + pinMode(LED,OUTPUT); + digitalWrite(LED,1); + USBHID_begin_with_serial(HID_MOUSE); + delay(1000); +} + +void loop(){ + digitalWrite(LED,0); + Mouse.move(4,0); + delay(500); + digitalWrite(LED,1); + delay(30000); + digitalWrite(LED,0); + Mouse.move(-4,0); + delay(500); + digitalWrite(LED,1); + delay(30000); +} diff --git a/STM32F1/libraries/USBComposite/examples/mass/mass.ino b/STM32F1/libraries/USBComposite/examples/mass/mass.ino index e10c04e..e64e40d 100644 --- a/STM32F1/libraries/USBComposite/examples/mass/mass.ino +++ b/STM32F1/libraries/USBComposite/examples/mass/mass.ino @@ -1,5 +1,7 @@ #include +#define PRODUCT_ID 0x29 + #include "image.h" bool write(uint32_t memoryOffset, const uint8_t *writebuff, uint16_t transferLength) { @@ -49,6 +51,7 @@ void dumpDrive() { } void setup() { + USBComposite.setProductId(PRODUCT_ID); MassStorage.setDrive(0, sizeof(image), read, write); MassStorage.registerComponent(); CompositeSerial.registerComponent(); diff --git a/STM32F1/libraries/USBComposite/examples/sdreader/sdreader.ino b/STM32F1/libraries/USBComposite/examples/sdreader/sdreader.ino index a5f4a61..0d5631a 100644 --- a/STM32F1/libraries/USBComposite/examples/sdreader/sdreader.ino +++ b/STM32F1/libraries/USBComposite/examples/sdreader/sdreader.ino @@ -6,6 +6,7 @@ #include "SdFat.h" #define LED_PIN PB12 +#define PRODUCT_ID 0x29 SdFatEX sd; const uint32_t speed = SPI_CLOCK_DIV2 ; @@ -22,6 +23,7 @@ bool read(uint32_t memoryOffset, uint8_t *readbuff, uint16_t transferLength) { } void setup() { + USBComposite.setProductId(PRODUCT_ID); pinMode(LED_PIN,OUTPUT); digitalWrite(LED_PIN,1); } diff --git a/STM32F1/libraries/USBComposite/library.properties b/STM32F1/libraries/USBComposite/library.properties index 1d8c2cb..3fd8bca 100644 --- a/STM32F1/libraries/USBComposite/library.properties +++ b/STM32F1/libraries/USBComposite/library.properties @@ -1,5 +1,5 @@ name=USBComposite for STM32F1 -version=0.64 +version=0.66 author=Various email=arpruss@gmail.com sentence=USB HID / MIDI / mass storage library for STM32F1 diff --git a/STM32F1/libraries/USBComposite/usb_serial.c b/STM32F1/libraries/USBComposite/usb_composite_serial.c similarity index 99% rename from STM32F1/libraries/USBComposite/usb_serial.c rename to STM32F1/libraries/USBComposite/usb_composite_serial.c index 390d256..51fc3ac 100644 --- a/STM32F1/libraries/USBComposite/usb_serial.c +++ b/STM32F1/libraries/USBComposite/usb_composite_serial.c @@ -33,7 +33,7 @@ * the result made cleaner. */ -#include "usb_serial.h" +#include "usb_composite_serial.h" #include "usb_generic.h" #include #include diff --git a/STM32F1/libraries/USBComposite/usb_serial.h b/STM32F1/libraries/USBComposite/usb_composite_serial.h similarity index 100% rename from STM32F1/libraries/USBComposite/usb_serial.h rename to STM32F1/libraries/USBComposite/usb_composite_serial.h diff --git a/STM32F1/libraries/USBComposite/usb_midi_device.c b/STM32F1/libraries/USBComposite/usb_midi_device.c index 549d581..f8a4fba 100644 --- a/STM32F1/libraries/USBComposite/usb_midi_device.c +++ b/STM32F1/libraries/USBComposite/usb_midi_device.c @@ -264,6 +264,7 @@ static void getMIDIPartDescriptor(uint8* out) { // patch to reflect where the part goes in the descriptor OUT_BYTE(usbMIDIDescriptor_Config, AC_Interface.bInterfaceNumber) += usbMIDIPart.startInterface; OUT_BYTE(usbMIDIDescriptor_Config, MS_Interface.bInterfaceNumber) += usbMIDIPart.startInterface; + OUT_BYTE(usbMIDIDescriptor_Config, AC_CS_Interface.baInterfaceNr) += usbMIDIPart.startInterface; OUT_BYTE(usbMIDIDescriptor_Config, DataOutEndpoint.bEndpointAddress) += usbMIDIPart.startEndpoint; OUT_BYTE(usbMIDIDescriptor_Config, DataInEndpoint.bEndpointAddress) += usbMIDIPart.startEndpoint; } diff --git a/STM32F1/libraries/USBComposite/usb_setup.cpp b/STM32F1/libraries/USBComposite/usb_setup.cpp index 2136bf0..47fd3db 100644 --- a/STM32F1/libraries/USBComposite/usb_setup.cpp +++ b/STM32F1/libraries/USBComposite/usb_setup.cpp @@ -35,18 +35,15 @@ */ #include "boards_private.h" -#include "USBHID.h" #include #include #include -#include namespace wirish { namespace priv { void board_setup_usb(void) { - //Serial = CompositeSerial; #ifdef GENERIC_BOOTLOADER //Reset the USB interface on generic boards - developed by Victor PV gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_OUTPUT_PP);