Changed setReportData length to 1 byte

This commit is contained in:
NicoHood 2015-09-20 12:30:43 +02:00
parent b617fb0b3d
commit 250ce02838
9 changed files with 10 additions and 8 deletions

View file

@ -116,7 +116,7 @@ void Keyboard_::send_now(void){
}
#if defined(HID_KEYBOARD_LEDS_ENABLED)
void Keyboard_::setReportData(const void* data, int len){
void Keyboard_::setReportData(const void* data, uint8_t len){
// Save led state
if(len == 1)
leds = *(uint8_t*)data;

View file

@ -57,7 +57,7 @@ private:
HID_KeyboardReport_Data_t _keyReport;
void sendReport(HID_KeyboardReport_Data_t* keys);
#if defined(HID_KEYBOARD_LEDS_ENABLED)
virtual void setReportData(const void* data, int len);
virtual void setReportData(const void* data, uint8_t len);
uint8_t leds;
#endif
public:

View file

@ -121,7 +121,7 @@ void NKROKeyboard_::send_now(void){
}
#if defined(HID_KEYBOARD_LEDS_ENABLED)
void NKROKeyboard_::setReportData(const void* data, int len){
void NKROKeyboard_::setReportData(const void* data, uint8_t len){
// Save led state
if(len == 1)
leds = *(uint8_t*)data;

View file

@ -56,7 +56,7 @@ protected:
HID_NKROKeyboardReport_Data_t _keyReport;
void sendReport(HID_NKROKeyboardReport_Data_t* keys);
#if defined(HID_KEYBOARD_LEDS_ENABLED)
virtual void setReportData(const void* data, int len);
virtual void setReportData(const void* data, uint8_t len);
uint8_t leds;
#endif
public:

View file

@ -160,12 +160,14 @@ bool HID_::HID_Setup(USBSetup& setup, u8 i)
// Get reportID and search for the suited HIDDevice
uint8_t ID = setup.wValueL;
HIDDevice *current = rootDevice;
while(current != NULL)
{
// Search HIDDevice for report ID
if(current->reportID == ID)
{
// Get the data length information and the corresponding bytes
// Assuming the host will never send more than 255 bytes
uint8_t length = setup.wLength;
uint8_t data[length];
USB_RecvControl(data, length);

View file

@ -20,7 +20,7 @@ void HIDDevice::SendRawReport(const void* data, int len){
HID.SendReport(HID_REPORTID_NONE, data, len);
}
void HIDDevice::setReportData(const void* data, int len){
void HIDDevice::setReportData(const void* data, uint8_t len){
// Discard this information if its not implemented by the HIDDevice
}

View file

@ -49,7 +49,7 @@ public:
const uint16_t descriptorLength;
const uint8_t reportID;
virtual void setReportData(const void* data, int len);
virtual void setReportData(const void* data, uint8_t len);
protected:
// Could be used and inherited public for custom, professional usage, like raw Keyboard

View file

@ -30,7 +30,7 @@ HIDDevice((uint8_t*)teensykeyboard_hid_report_desc, sizeof(teensykeyboard_hid_re
}
#if defined(HID_KEYBOARD_LEDS_ENABLED)
void usb_keyboard_class::setReportData(const void* data, int len){
void usb_keyboard_class::setReportData(const void* data, uint8_t len){
// Save led state
if(len == 1)
leds = *(uint8_t*)data;

View file

@ -128,7 +128,7 @@ class usb_keyboard_class : public Print, private HIDDevice
uint8_t keyboard_report_data[8];
#if defined(HID_KEYBOARD_LEDS_ENABLED)
virtual void setReportData(const void* data, int len);
virtual void setReportData(const void* data, uint8_t len);
uint8_t leds;
#endif
};