HID: Replace manual defines with pluggedEndpoint member

Adopt coding style from https://github.com/arduino/ArduinoCore-avr/blob/master/libraries/HID/src/HID.cpp that uses "pluggedEndpoint" from the PluggableUSBModule base-class as endpoint number instead of a hardcoded preprocessor define. This allows removal of several defines in the header that are now unused.

Benefits:
* Closer alignment to the upstream Arduino sources.
* Fewer hardcoded values, which will simplify future scaling to support multiple batteries in a USB composite device.

Author: forderud

src/HID/HID.cpp

@@ -31,10 +31,9 @@ int HID_::getInterface(uint8_t* interfaceCount)
 {
     *interfaceCount += 1; // uses 1
     HIDDescriptor hidInterface = {
-        D_INTERFACE(pluggedInterface, 2, USB_DEVICE_CLASS_HUMAN_INTERFACE, HID_SUBCLASS_NONE, HID_PROTOCOL_NONE),
+        D_INTERFACE(pluggedInterface, 1, USB_DEVICE_CLASS_HUMAN_INTERFACE, HID_SUBCLASS_NONE, HID_PROTOCOL_NONE),
         D_HIDREPORT(descriptorSize),
-        D_ENDPOINT(USB_ENDPOINT_IN(HID_TX), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x14),
-        D_ENDPOINT(USB_ENDPOINT_OUT(HID_RX), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x0A)
+        D_ENDPOINT(USB_ENDPOINT_IN(pluggedEndpoint), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x14)
     };
     return USB_SendControl(0, &hidInterface, sizeof(hidInterface));
 }
@@ -168,9 +167,9 @@ bool HID_::LockFeature(uint16_t id, bool lock) {
 
 int HID_::SendReport(uint16_t id, const void* data, int len)
 {
-    auto ret = USB_Send(HID_TX, &id, 1);
+    auto ret = USB_Send(pluggedEndpoint, &id, 1);
     if (ret < 0) return ret;
-    auto ret2 = USB_Send(HID_TX | TRANSFER_RELEASE, data, len);
+    auto ret2 = USB_Send(pluggedEndpoint | TRANSFER_RELEASE, data, len);
     if (ret2 < 0) return ret2;
     return ret + ret2;
 }
@@ -254,12 +253,11 @@ bool HID_::setup(USBSetup& setup)
     return false;
 }
 
-HID_::HID_(void) : PluggableUSBModule(2, 1, epType),
+HID_::HID_(void) : PluggableUSBModule(1, 1, epType),
                    rootNode(NULL), descriptorSize(0),
                    protocol(HID_REPORT_PROTOCOL), idle(1)
 {
     epType[0] = EP_TYPE_INTERRUPT_IN;
-        epType[1] = EP_TYPE_INTERRUPT_OUT;
     PluggableUSB().plug(this);
 }
 

src/HID/HID.h

@@ -61,14 +61,6 @@
 #define HID_REPORT_TYPE_OUTPUT  2
 #define HID_REPORT_TYPE_FEATURE 3
 
-#define HID_INTERFACE		(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT)		// HID Interface
-#define HID_FIRST_ENDPOINT	(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
-#define HID_ENDPOINT_INT	(HID_FIRST_ENDPOINT)
-#define HID_ENDPOINT_OUT	(HID_FIRST_ENDPOINT+1)   
-
-#define HID_TX HID_ENDPOINT_INT
-#define HID_RX HID_ENDPOINT_OUT     //++ EP  HID_RX for ease of use with USB_Available & USB_Rec
-
 typedef struct
 {
   uint8_t len;      // 9
@@ -87,7 +79,6 @@ typedef struct
   InterfaceDescriptor hid;
   HIDDescDescriptor   desc;
   EndpointDescriptor  in;
-  EndpointDescriptor  out;                  //added
 } HIDDescriptor;
 
 class HIDReport {
@@ -138,7 +129,7 @@ class HID_ : public PluggableUSBModule
     uint8_t getShortName(char* name) override;
 
 private:
-    uint8_t epType[2];
+    uint8_t epType[1];
 
     HIDSubDescriptor* rootNode;
     uint16_t descriptorSize;