Change HID report "id" values from 16 to 8bits

HID report IDs are 1byte (8 bits) large, so I don't understand why 16 bits are used in this codebase.

Author: forderud

src/HID/HID.cpp

@@ -129,7 +129,7 @@ void HID_::AppendDescriptor(HIDSubDescriptor *node)
     descriptorSize += node->length;
 }
 
-int HID_::SetFeature(uint16_t id, const void* data, int len)
+int HID_::SetFeature(uint8_t id, const void* data, int len)
 {
     if(!rootReport) {
         rootReport = new HIDReport(id, data, len);
@@ -152,7 +152,7 @@ int HID_::SetFeature(uint16_t id, const void* data, int len)
     return reportCount;
 }
 
-bool HID_::LockFeature(uint16_t id, bool lock) {
+bool HID_::LockFeature(uint8_t id, bool lock) {
     if(rootReport) {
         HIDReport* current;
         for(current = rootReport;current; current=current->next) {
@@ -166,7 +166,7 @@ bool HID_::LockFeature(uint16_t id, bool lock) {
 }
 
 
-int HID_::SendReport(uint16_t id, const void* data, int len)
+int HID_::SendReport(uint8_t id, const void* data, int len)
 {
     auto ret = USB_Send(HID_TX, &id, 1);
     if (ret < 0) return ret;
@@ -175,7 +175,7 @@ int HID_::SendReport(uint16_t id, const void* data, int len)
     return ret + ret2;
 }
 
-HIDReport* HID_::GetFeature(uint16_t id)
+HIDReport* HID_::GetFeature(uint8_t id)
 {
     HIDReport* current;
     int i=0;

src/HID/HID.h

@@ -93,9 +93,9 @@ typedef struct
 class HIDReport {
 public:
     HIDReport *next = NULL;
-    HIDReport(uint16_t i, const void *d, uint8_t l) : id(i), data(d), length(l) {}
+    HIDReport(uint8_t i, const void *d, uint8_t l) : id(i), data(d), length(l) {}
 
-    uint16_t id;
+    uint8_t id;
     const void* data;
     uint16_t length;
     bool lock;
@@ -115,9 +115,9 @@ class HID_ : public PluggableUSBModule
 public:
     HID_(void);
     int begin(void);
-    int SendReport(uint16_t id, const void* data, int len);
-    int SetFeature(uint16_t id, const void* data, int len);
-    bool LockFeature(uint16_t id, bool lock);
+    int SendReport(uint8_t id, const void* data, int len);
+    int SetFeature(uint8_t id, const void* data, int len);
+    bool LockFeature(uint8_t id, bool lock);
 
     void AppendDescriptor(HIDSubDescriptor* node);
 
@@ -129,7 +129,7 @@ class HID_ : public PluggableUSBModule
         serial = s;
     }
 
-    HIDReport* GetFeature(uint16_t id);
+    HIDReport* GetFeature(uint8_t id);
 
 protected:
     // Implementation of the PluggableUSBModule

src/HIDPowerDevice.cpp

@@ -249,16 +249,16 @@ void HIDPowerDevice_::setSerial(const char* s) {
 void HIDPowerDevice_::end(void) {
 }
 
-int HIDPowerDevice_::sendDate(uint16_t id, uint16_t year, uint8_t month, uint8_t day) {
+int HIDPowerDevice_::sendDate(uint8_t id, uint16_t year, uint8_t month, uint8_t day) {
     uint16_t bval = (year - 1980)*512 + month * 32 + day;
     return HID().SendReport(id, &bval, sizeof (bval));
 }
 
-int HIDPowerDevice_::sendReport(uint16_t id, const void* bval, int len) {
+int HIDPowerDevice_::sendReport(uint8_t id, const void* bval, int len) {
     return HID().SendReport(id, bval, len);
 }
 
-int HIDPowerDevice_::setFeature(uint16_t id, const void *data, int len) {
+int HIDPowerDevice_::setFeature(uint8_t id, const void *data, int len) {
     return HID().SetFeature(id, data, len);
 }
 

src/HIDPowerDevice.h

@@ -121,10 +121,10 @@ class HIDPowerDevice_  {
 
   void end(void);
 
-  int sendDate(uint16_t id, uint16_t year, uint8_t month, uint8_t day);
-  int sendReport(uint16_t id, const void* bval, int len);
+  int sendDate(uint8_t id, uint16_t year, uint8_t month, uint8_t day);
+  int sendReport(uint8_t id, const void* bval, int len);
 
-  int setFeature(uint16_t id, const void* data, int len);
+  int setFeature(uint8_t id, const void* data, int len);
 
   int setStringFeature(uint8_t id, const uint8_t* index, const char* data);