[HID] renamed HIDDescriptorListNode to HIDSubDescriptor

Author: cmaglie

arduino-core/src/cc/arduino/Compiler.java

@@ -549,13 +549,11 @@ public void message(String s) {
       }
 
       if (error.trim().equals("'Mouse' was not declared in this scope")) {
-        error = tr("'Mouse' only supported on the Arduino Leonardo");
-        //msg = _("\nThe 'Mouse' class is only supported on the Arduino Leonardo.\n\n");
+        error = tr("'Mouse' not found. Have you included \"Mouse.h\"? Does your board support it?");
       }
 
       if (error.trim().equals("'Keyboard' was not declared in this scope")) {
-        error = tr("'Keyboard' only supported on the Arduino Leonardo");
-        //msg = _("\nThe 'Keyboard' class is only supported on the Arduino Leonardo.\n\n");
+        error = tr("'Keyboard' not found. Have you included \"Keyboard.h\"? Does your board support it?");
       }
 
       RunnerException exception = placeException(error, pieces[1], PApplet.parseInt(pieces[2]) - 1);

hardware/arduino/avr/libraries/HID/HID.cpp

@@ -47,7 +47,7 @@ int HID_::getDescriptor(USBSetup& setup)
 	if (setup.wIndex != pluggedInterface) { return 0; }
 
 	int total = 0;
-	HIDDescriptorListNode* node;
+	HIDSubDescriptor* node;
 	for (node = rootNode; node; node = node->next) {
 		int res = USB_SendControl(TRANSFER_PGM, node->data, node->length);
 		if (res == -1)
@@ -57,12 +57,12 @@ int HID_::getDescriptor(USBSetup& setup)
 	return total;
 }
 
-void HID_::AppendDescriptor(HIDDescriptorListNode *node)
+void HID_::AppendDescriptor(HIDSubDescriptor *node)
 {
 	if (!rootNode) {
 		rootNode = node;
 	} else {
-		HIDDescriptorListNode *current = rootNode;
+		HIDSubDescriptor *current = rootNode;
 		while (current->next) {
 			current = current->next;
 		}

hardware/arduino/avr/libraries/HID/HID.h

@@ -74,10 +74,10 @@ typedef struct
   EndpointDescriptor  in;
 } HIDDescriptor;
 
-class HIDDescriptorListNode {
+class HIDSubDescriptor {
 public:
-  HIDDescriptorListNode *next = NULL;
-  HIDDescriptorListNode(const void *d, const uint16_t l) : data(d), length(l) { }
+  HIDSubDescriptor *next = NULL;
+  HIDSubDescriptor(const void *d, const uint16_t l) : data(d), length(l) { }
 
   const void* data;
   const uint16_t length;
@@ -89,7 +89,7 @@ class HID_ : public PluggableUSBModule
   HID_(void);
   int begin(void);
   void SendReport(uint8_t id, const void* data, int len);
-  void AppendDescriptor(HIDDescriptorListNode* node);
+  void AppendDescriptor(HIDSubDescriptor* node);
 
 protected:
   // Implementation of the PluggableUSBModule
@@ -100,7 +100,7 @@ class HID_ : public PluggableUSBModule
 private:
   uint8_t epType[1];
 
-  HIDDescriptorListNode* rootNode;
+  HIDSubDescriptor* rootNode;
   uint16_t descriptorSize;
 
   uint8_t protocol;

libraries/Keyboard/src/Keyboard.cpp

@@ -62,7 +62,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
 
 Keyboard_::Keyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
+	static HIDSubDescriptor node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
 	HID().AppendDescriptor(&node);
 }
 

libraries/Mouse/src/Mouse.cpp

@@ -62,7 +62,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
 
 Mouse_::Mouse_(void) : _buttons(0)
 {
-    static HIDDescriptorListNode node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
+    static HIDSubDescriptor node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
     HID().AppendDescriptor(&node);
 }