Skip to content

Fixed description send function to have working USB device on Windows #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed description send function to have working USB device on Windows #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cores/arduino/USB/USBCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;


// DEVICE DESCRIPTOR
const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);

//==================================================================

Expand All @@ -90,14 +90,14 @@ bool USBDeviceClass::sendStringDescriptor(const uint8_t *string, uint8_t maxlen)
if (maxlen < 2)
return false;

uint16_t buff[maxlen/2];
uint16_t buff[maxlen];
int l = 1;

maxlen -= 2;
while (*string && maxlen>0)
maxlen -= 1;
while (*string && maxlen>=0)
{
buff[l++] = (uint8_t)(*string++);
maxlen -= 2;
maxlen -= 1;
}
buff[0] = (3<<8) | (l*2);

Expand Down Expand Up @@ -203,16 +203,16 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
desc_addr = (const uint8_t*)&STRING_LANGUAGE;
}
else if (setup.wValueL == IPRODUCT) {
return sendStringDescriptor(STRING_PRODUCT, setup.wLength);
return sendStringDescriptor(STRING_PRODUCT, strlen((char*)STRING_PRODUCT));
}
else if (setup.wValueL == IMANUFACTURER) {
return sendStringDescriptor(STRING_MANUFACTURER, setup.wLength);
return sendStringDescriptor(STRING_MANUFACTURER, strlen((char*)STRING_MANUFACTURER));
}
else if (setup.wValueL == ISERIAL) {
#ifdef PLUGGABLE_USB_ENABLED
char name[ISERIAL_MAX_LEN];
PluggableUSB().getShortName(name);
return sendStringDescriptor((uint8_t*)name, setup.wLength);
return sendStringDescriptor((uint8_t*)name, strlen(name));
#endif
}
else {
Expand Down Expand Up @@ -851,7 +851,7 @@ void USBDeviceClass::ISRHandler()
if (ok) {
usbd.epBank1SetReady(0);
} else {
stall(0);
//stall(0);
}

if (usbd.epBank1IsStalled(0))
Expand Down